From 0a2fc19461a141fbbb2c303142afdee22c72daac Mon Sep 17 00:00:00 2001
From: binxie <137736985@qq.com>
Date: 星期六, 20 一月 2024 09:56:08 +0800
Subject: [PATCH] workflow backup0120
---
force-app/main/default/objects/Opportunity/validationRules/notcanEditCelon.validationRule-meta.xml | 10
force-app/main/default/objects/Opportunity/fields/Agency_Is_Delete__c.field-meta.xml | 12
force-app/main/default/objects/Repair__c/validationRules/Check_Return_Without_Repair.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/TAT_Contract_approved__c.field-meta.xml | 15
force-app/main/default/objects/Opportunity/validationRules/Not_On_Estimation_Decision.validationRule-meta.xml | 9
force-app/main/default/objects/PBIAuthorization__c/fields/MSOM_A_MarketAnalysis__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/BC_Wave__c.field-meta.xml | 49
force-app/main/default/objects/Opportunity/fields/DeliveryForecastMonth__c.field-meta.xml | 15
force-app/main/default/objects/Event__c/fields/Purpose_Type3__c.field-meta.xml | 20
force-app/main/default/objects/Opportunity/fields/Estimation_Name__c.field-meta.xml | 13
force-app/main/default/objects/Rental_Apply__c/validationRules/checkOPDPlan.validationRule-meta.xml | 1
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Jie_Chu_Shi_Jian_Jia__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/Opp_Retention_Days__c.field-meta.xml | 15
force-app/main/default/objects/Opportunity/validationRules/Tender_Closed_Day_should_be_past_day.validationRule-meta.xml | 8
force-app/main/default/objects/Quote/fields/Cancel_Decide__c.field-meta.xml | 9
force-app/main/default/objects/Opportunity/validationRules/CannotBackToOpportunity.validationRule-meta.xml | 8
force-app/main/default/objects/Lead/fields/intention_within_seven_days__c.field-meta.xml | 40
force-app/main/default/objects/Opportunity/fields/Elapsed_day_after_authorized_doc__c.field-meta.xml | 16
force-app/main/default/objects/CampaignMember/fields/Title.field-meta.xml | 4
force-app/main/default/objects/Opportunity/fields/Competitor__c.field-meta.xml | 61
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/New_Rental_Apply_Equipment__c.field-meta.xml | 1
force-app/main/default/objects/OPDPlan__c/OPDPlan__c.object-meta.xml | 4
force-app/main/default/objects/Quote/validationRules/Quote_Adjust_Amount_Great_0.validationRule-meta.xml | 9
force-app/main/default/objects/Opportunity/fields/BO_Forecast_ThousandY__c.field-meta.xml | 15
force-app/main/default/objects/Account/fields/HP_OCM_Category_From_Class__c.field-meta.xml | 2
force-app/main/default/objects/Maintenance_Contract__c/fields/Opportunity_Stage__c.field-meta.xml | 2
force-app/main/default/objects/FixtureDeliverySlip__c/validationRules/Cannot_Change_ConsumSlip.validationRule-meta.xml | 3
force-app/main/default/objects/Opportunity/webLinks/Opponent_Bid_Information.webLink-meta.xml | 63
force-app/main/default/objects/Rental_Apply__c/validationRules/HP_Recieved_Required_Check.validationRule-meta.xml | 10
force-app/main/default/objects/Opportunity/fields/First_Review_Date__c.field-meta.xml | 11
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/QIS_Final_reply_day_Text_Holiday_backup__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/Latest_report_Created_Date__c.field-meta.xml | 11
force-app/main/default/objects/Contact/fields/Name.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Monthly_third_working_day__c.field-meta.xml | 11
force-app/main/default/objects/TransferApplyDetail__c/validationRules/Cannot_Change_When_Cancel.validationRule-meta.xml | 2
force-app/main/default/objects/Repair__c/validationRules/RequireInternalAssetInfo.validationRule-meta.xml | 2
force-app/main/default/objects/Lead/listViews/FOLLOWEDd.listView-meta.xml | 26
force-app/main/default/objects/Quote/fields/CurrencyIsoCode.field-meta.xml | 5
force-app/main/default/objects/AssetModifyBelongsChange__c/fields/AccountField__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Sales_Contract_No__c.field-meta.xml | 13
force-app/main/default/objects/Repair__c/validationRules/Direct_Delivery_Logic_OGZ_CLVS200IR.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/validationRules/notRemoveBid.validationRule-meta.xml | 10
force-app/main/default/objects/Quote/fields/Quote_Adjust_Amount_Page__c.field-meta.xml | 12
force-app/main/default/objects/Opportunity/fields/Area_Authorized_dealer__c.field-meta.xml | 17
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Extend_request_reason__c.field-meta.xml | 1
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/NG_Return_DeliverySlip_Information__c.field-meta.xml | 1
force-app/main/default/objects/Lead/listViews/UNUSED.listView-meta.xml | 18
force-app/main/default/objects/Opportunity/fields/Contract_DB_complite_day__c.field-meta.xml | 11
force-app/main/default/objects/Quote/fields/Opportunity_sub_owner__c.field-meta.xml | 12
force-app/main/default/objects/Opportunity/fields/Objective_Tax1__c.field-meta.xml | 19
force-app/main/default/objects/QIS_Report__c/validationRules/Department_DepartmentClass_check.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/OCSM_RMB_Without_Tax_1000TR__c.field-meta.xml | 25
force-app/main/default/objects/Instructed_staff__c/fields/Instruct_content__c.field-meta.xml | 31
force-app/main/default/objects/Maintenance_Contract_Estimate__c/validationRules/Discount_Changed_Check.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Sales_incharge__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/validationRules/Must_input_cancel_reason_text.validationRule-meta.xml | 9
force-app/main/default/objects/Lead/listViews/FOLLOWED_opptunity.listView-meta.xml | 25
force-app/main/default/objects/RepairAgainAn__c/RepairAgainAn__c.object-meta.xml | 7
force-app/main/default/objects/CampaignMember/fields/Purchase_Plan__c.field-meta.xml | 28
force-app/main/default/objects/Opportunity/fields/TxtShippedAmount_ThisYear_PB_Sum__c.field-meta.xml | 14
force-app/main/default/objects/Equipment_Set_Detail__c/fields/Asset__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/TAT_last_close_bid__c.field-meta.xml | 15
force-app/main/default/objects/Quote/webLinks/ReQuote.webLink-meta.xml | 44
force-app/main/default/objects/Tender_information__c/fields/OBSAP_WinnerAmount__c.field-meta.xml | 2
force-app/main/default/objects/Agency_Report__c/validationRules/Product_Category1_required_when_OPD_SIS.validationRule-meta.xml | 2
force-app/main/default/objects/Quote/fields/checkQuote__c.field-meta.xml | 14
force-app/main/default/objects/Quote/webLinks/QuoteEntryNew.webLink-meta.xml | 47
force-app/main/default/objects/Opportunity/fields/isContainsStrategyProduct__c.field-meta.xml | 16
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Shipment_request_time__c.field-meta.xml | 1
force-app/main/default/objects/ReceivingNoteSummary__c/validationRules/Cannot_Change_When_Acceptance.validationRule-meta.xml | 2
force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Check_NG_For_Un_Delivery.validationRule-meta.xml | 2
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Rental_Asset_SerialNumber__c.field-meta.xml | 1
force-app/main/default/objects/Repair_Quotation__c/validationRules/Edit_Disabled_When_Repair_Finished.validationRule-meta.xml | 2
force-app/main/default/objects/Visit_Report__c/validationRules/Require_Evaluate2.validationRule-meta.xml | 2
force-app/main/default/objects/OpportunitySpecialApply__c/validationRules/Other_Reason_Must_Memo.validationRule-meta.xml | 2
force-app/main/default/objects/Infrastructure_Project__c/listViews/All_001.listView-meta.xml | 25
force-app/main/default/objects/Opportunity/validationRules/OBA4_CannotmodifyName.validationRule-meta.xml | 8
force-app/main/default/objects/Rental_Apply__c/validationRules/IF_OPDPlan_validation.validationRule-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/Hospital__c.field-meta.xml | 25
force-app/main/default/objects/Opportunity/validationRules/QuolifiedCustomerCanDirectSale.validationRule-meta.xml | 24
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/ZongjianApprovalManager__c.field-meta.xml | 1
force-app/main/default/objects/OPDPlan__c/validationRules/IF_Status_jhz.validationRule-meta.xml | 3
force-app/main/default/objects/Opportunity/fields/Order_Process_Category__c.field-meta.xml | 13
force-app/main/default/objects/Asset/validationRules/You_Xiao_Ku_Cun_chk.validationRule-meta.xml | 4
force-app/main/default/objects/Opportunity/fields/Amount__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/ForecastAccuracyObject__c.field-meta.xml | 15
force-app/main/default/objects/Opportunity/fields/Last_opportunity_file__c.field-meta.xml | 15
force-app/main/default/objects/ReceivingNoteSummary__c/validationRules/Cannot_Update_Fixture_Set_After_DataConf.validationRule-meta.xml | 3
force-app/main/default/objects/Opportunity/fields/DeliveryDate__c.field-meta.xml | 11
force-app/main/default/objects/Maintenance_Contract__c/validationRules/CheckService_Contract_Staff.validationRule-meta.xml | 2
force-app/main/default/objects/PCLLostBrand__c/fields/InclusionUltrasound__c.field-meta.xml | 1
force-app/main/default/objects/TransferApplyDetail__c/validationRules/Final_arrival_check.validationRule-meta.xml | 2
force-app/main/default/objects/Asset/fields/Asset_OwnerNew__c.field-meta.xml | 8
force-app/main/default/objects/Survey_Question__c/Survey_Question__c.object-meta.xml | 1
force-app/main/default/objects/Opportunity/validationRules/Check_AgencyContract_Quote_Decide_Flag.validationRule-meta.xml | 17
force-app/main/default/objects/MaintanceContractPackEstimate__c/webLinks/DBPast2YearsRepairPriceReport.webLink-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/HP_Name__c.field-meta.xml | 19
force-app/main/default/objects/Opportunity/fields/Agency1__c.field-meta.xml | 27
force-app/main/default/objects/TransferApplyDetail__c/validationRules/Repair_For_Main_Cant_Reload.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/validationRules/Rejectiondate_Filingdate.validationRule-meta.xml | 8
force-app/main/default/objects/Case/validationRules/Request_problem_reason.validationRule-meta.xml | 1
force-app/main/default/objects/Lead/fields/Owner_Dep__c.field-meta.xml | 12
force-app/main/default/objects/Lead/fields/Sales_Root__c.field-meta.xml | 25
force-app/main/default/objects/Opportunity/fields/Distributor_InCharge_opp__c.field-meta.xml | 11
force-app/main/default/objects/Maintenance_Contract_Estimate__c/fields/renewTen_OFF__c.field-meta.xml | 2
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Repair_delete_Final_reply_day_Text_Ho__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/RANK_D_inc_tax__c.field-meta.xml | 14
force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Only_Can_Select_Same_asset_location.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Create_Comment__c.field-meta.xml | 38
force-app/main/default/objects/Quote/fields/multiYearWarranty__c.field-meta.xml | 9
force-app/main/default/objects/Opportunity/fields/After_tender_past_2week__c.field-meta.xml | 15
force-app/main/default/objects/Opportunity/fields/Bidding_No_Bid__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/NewCnt__c.field-meta.xml | 16
force-app/main/default/objects/Opportunity/listViews/PERSON.listView-meta.xml | 30
force-app/main/default/objects/Asset/Asset.object-meta.xml | 30
force-app/main/default/objects/Account/validationRules/Not_Modify_Alias_Name2.validationRule-meta.xml | 2
force-app/main/default/objects/Infrastructure_Project__c/fields/Project_level__c.field-meta.xml | 2
force-app/main/default/objects/Repair__c/validationRules/date123_order_chk.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/webLinks/Request_DB.webLink-meta.xml | 52
force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Receive_After_Repair_Aborted.validationRule-meta.xml | 2
force-app/main/default/objects/Lead/fields/MobilePhone.field-meta.xml | 6
force-app/main/default/objects/Opportunity/fields/Sales_manager_departmentID__c.field-meta.xml | 13
force-app/main/default/objects/SS_OPDPlan__c/fields/SSOPDLendSort__c.field-meta.xml | 2
force-app/main/default/objects/Rental_Apply__c/validationRules/OPDPlan_if_Have_Blank.validationRule-meta.xml | 1
force-app/main/default/objects/Asset/fields/SerialNumber.field-meta.xml | 2
force-app/main/default/objects/Case/fields/CurrencyIsoCode.field-meta.xml | 2
force-app/main/default/objects/Visit_Report__c/validationRules/Required_Department.validationRule-meta.xml | 2
force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/rentalNumReduceChk.validationRule-meta.xml | 2
force-app/main/default/objects/PCLLostProduct__c/fields/ProductClass__c.field-meta.xml | 47
force-app/main/default/objects/Opportunity/webLinks/BidProduct.webLink-meta.xml | 20
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Condition_Final_Reply_Days__c.field-meta.xml | 1
force-app/main/default/objects/Lead/fields/Fund_Basis__c.field-meta.xml | 50
force-app/main/default/objects/Quote/fields/Discount_Amount_F__c.field-meta.xml | 14
force-app/main/default/objects/On_Line_Survey__c/validationRules/Input_Colon_Other_product_name.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Nunber_of_visit__c.field-meta.xml | 14
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Cancel_Reason__c.field-meta.xml | 1
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Loaner_cancel_Remarks__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/Whether_Bidding__c.field-meta.xml | 28
force-app/main/default/objects/Opportunity/fields/Monthly3_ship_target_stock_txt__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/webLinks/Estimation.webLink-meta.xml | 20
force-app/main/default/objects/Opportunity/fields/InfoTypeBid__c.field-meta.xml | 13
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Loaner_name_text__c.field-meta.xml | 1
force-app/main/default/objects/Maintenance_Contract__c/validationRules/Cannot_Create_Old_Contract.validationRule-meta.xml | 2
force-app/main/default/objects/TrackConsumableSalesForecast__c/listViews/All002.listView-meta.xml | 8
force-app/main/default/objects/Opportunity/webLinks/Quotation_Product.webLink-meta.xml | 20
force-app/main/default/objects/Account/validationRules/Suggest_Hospital_Source.validationRule-meta.xml | 2
force-app/main/default/objects/Account/recordTypes/Department_Class_BF.recordType-meta.xml | 34
force-app/main/default/objects/Opportunity/fields/NoComputeRestender__c.field-meta.xml | 15
force-app/main/default/objects/CampaignMember/fields/Email.field-meta.xml | 4
force-app/main/default/objects/Repair__c/fields/Repair_Return_Province__c.field-meta.xml | 120
force-app/main/default/objects/Report__c/validationRules/NotVOC_chk.validationRule-meta.xml | 2
force-app/main/default/objects/Lead/listViews/FOLLOWING.listView-meta.xml | 32
force-app/main/default/objects/Asset/validationRules/Fixture_OneToOne_Link_Should_Delete.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Infrastructure_Node_Options__c.field-meta.xml | 12
force-app/main/default/objects/Account/recordTypes/Department_Class_GI.recordType-meta.xml | 34
force-app/main/default/objects/Maintenance_Contract_Asset_Estimate__c/validationRules/Comment_length_limit.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/LeakageNumber__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/Contract_Number_Input_Total__c.field-meta.xml | 26
force-app/main/default/objects/Consum_Apply__c/webLinks/Loaned_history.webLink-meta.xml | 2
force-app/main/default/objects/Quote/fields/AgencyDiscount__c.field-meta.xml | 11
force-app/main/default/objects/RepairSubOrder__c/RepairSubOrder__c.object-meta.xml | 14
force-app/main/default/objects/Opportunity/validationRules/Ass_can_not_update_authorizationNo.validationRule-meta.xml | 8
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Canceled_Id__c.field-meta.xml | 1
force-app/main/default/objects/Quote/fields/Dealer_Final_Price_Page__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/Rating__c.field-meta.xml | 13
force-app/main/default/objects/Repair__c/validationRules/Send_NFM103_Chk1.validationRule-meta.xml | 2
force-app/main/default/objects/Contact/validationRules/Doctor_Create_dept_only.validationRule-meta.xml | 2
force-app/main/default/objects/Consum_Apply__c/validationRules/Need_CampaignInfo.validationRule-meta.xml | 2
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Arrival_wh_time__c.field-meta.xml | 1
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Rental_Start_Date__c.field-meta.xml | 1
force-app/main/default/objects/Maintenance_Contract__c/validationRules/CheckUpper_limitReason2.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/CorrosionNumber__c.field-meta.xml | 16
force-app/main/default/objects/Repair__c/validationRules/MaintenancePredictionVerification.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Department_Class__c.field-meta.xml | 25
force-app/main/default/objects/Quote/fields/Agent1_Agent2_Price_F__c.field-meta.xml | 14
force-app/main/default/objects/Infrastructure_Project__c/fields/OCSM_Hospital__c.field-meta.xml | 18
force-app/main/default/objects/Opportunity/fields/Other_Society__c.field-meta.xml | 13
force-app/main/default/objects/Rental_Apply__c/validationRules/Applicant_CancelReason_Active_Only.validationRule-meta.xml | 7
force-app/main/default/objects/ReceivingNoteDetail__c/fields/Loaner_category__c.field-meta.xml | 9
force-app/main/default/objects/Maintenance_Contract__c/validationRules/Need_SalesOfficeCode_When_Contract.validationRule-meta.xml | 4
force-app/main/default/objects/Quote/fields/Agent1_Agent2_Price__c.field-meta.xml | 11
force-app/main/default/objects/Product2/fields/ConsumCategory3__c.field-meta.xml | 4
force-app/main/default/objects/Maintenance_Contract__c/fields/Actual_Execute_Num_Summary__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/AgenBusiness_Paper_Expiration_Date__c.field-meta.xml | 12
force-app/main/default/objects/PCLLostProduct__c/fields/LostBrandName__c.field-meta.xml | 1
force-app/main/default/objects/Account/validationRules/Not_Modify_sparepartsdeliveryaddress.validationRule-meta.xml | 4
force-app/main/default/objects/Lead/fields/LastTransferDate.field-meta.xml | 4
force-app/main/default/objects/Opportunity/fields/Monthly3_ship_target_stock__c.field-meta.xml | 58
force-app/main/default/objects/Repair_Quotation__c/validationRules/Service_CutPrice_Greaterthan_Zero.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Tax_Intra_F_Copy__c.field-meta.xml | 14
force-app/main/default/objects/LastbuyProduct__c/webLinks/CB_LBP_New.webLink-meta.xml | 15
force-app/main/default/objects/PCLLostProduct__c/fields/LostHP__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/Monthly3_ship_target_txt__c.field-meta.xml | 13
force-app/main/default/objects/Consumable_order_details2__c/fields/ApplySalsesTeam_F2__c.field-meta.xml | 7
force-app/main/default/objects/Repair__c/fields/Elapsed_OnCall_QIS_Time__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Tax_Intra_F__c.field-meta.xml | 34
force-app/main/default/objects/Opportunity/fields/OrderThisYear__c.field-meta.xml | 32
force-app/main/default/objects/Opportunity/fields/SI_Flg__c.field-meta.xml | 11
force-app/main/default/objects/Quote/fields/Quote_Adjust_Amount_F__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/Max_LastApproveDate__c.field-meta.xml | 22
force-app/main/default/objects/Statu_Achievements__c/fields/Backorder_Comment__c.field-meta.xml | 2
force-app/main/default/objects/PCLLostBrand__c/fields/Lost_reason_main__c.field-meta.xml | 11
force-app/main/default/objects/CampaignMember/fields/MobilePhone.field-meta.xml | 4
force-app/main/default/objects/Lead/recordTypes/Standard.recordType-meta.xml | 455
force-app/main/default/objects/Lead/fields/Count_number__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/Strategic_department_new__c.field-meta.xml | 87
force-app/main/default/objects/Account/recordTypes/AgencyContact.recordType-meta.xml | 34
force-app/main/default/objects/Opportunity/fields/Important_Key_product_category__c.field-meta.xml | 181
force-app/main/default/objects/Lead/fields/GenderIdentity.field-meta.xml | 7
force-app/main/default/objects/Opportunity/fields/Authorized_Date__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/Opp_Actual_ThousandY__c.field-meta.xml | 16
force-app/main/default/objects/Quote/fields/OCM_Sales_Forecast_Without_Tax__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/Manager_name__c.field-meta.xml | 13
force-app/main/default/objects/Repair__c/validationRules/Must_input_SAPTransfer_time_Chk.validationRule-meta.xml | 2
force-app/main/default/objects/Lead/fields/Inquiry_form_num__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/Opp_Code__c.field-meta.xml | 22
force-app/main/default/objects/Repair_Quotation__c/validationRules/discount_apply_user.validationRule-meta.xml | 2
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Yigoudaihuo_Final_reply_day_Text__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/UnshippedAmount_without_tax__c.field-meta.xml | 22
force-app/main/default/objects/Opportunity/fields/Consumable_Order__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/Follow_up_comment__c.field-meta.xml | 12
force-app/main/default/objects/Opportunity/fields/Opp_Delay_Mark__c.field-meta.xml | 14
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Old_RetalFSetDetail_Cnt__c.field-meta.xml | 1
force-app/main/default/objects/CampaignMember/fields/Account_Salesdepartment__c.field-meta.xml | 11
force-app/main/default/objects/Daily_Report__c/Daily_Report__c.object-meta.xml | 3
force-app/main/default/objects/Lead/fields/NumberOfEmployees.field-meta.xml | 6
force-app/main/default/objects/Opportunity/fields/LastApproveDate__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/validationRules/Corrosion_PurchaseType.validationRule-meta.xml | 8
force-app/main/default/objects/Repair__c/validationRules/ApplyMust_AfterFailureInformation.validationRule-meta.xml | 16
force-app/main/default/objects/Opportunity/fields/Rating03__c.field-meta.xml | 13
force-app/main/default/objects/Quote/fields/ContactId.field-meta.xml | 6
force-app/main/default/objects/LostReport__c/fields/isBeipin__c.field-meta.xml | 3
force-app/main/default/objects/Opportunity/fields/Closing_Bid_Company_Bid__c.field-meta.xml | 13
force-app/main/default/objects/TransferApplyDetail__c/validationRules/Receive_After_Repair_Aborted_Final.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/X30_Deposit_Day__c.field-meta.xml | 11
force-app/main/default/objects/Quote/compactLayouts/QuotationMiniatureLayout.compactLayout-meta.xml | 6
force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Receive_After_Repair_Aborted_Final.validationRule-meta.xml | 2
force-app/main/default/objects/Report__c/validationRules/WhetherRunningFollow2.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/OCM_Target_period_New__c.field-meta.xml | 13
force-app/main/default/objects/Lead/validationRules/Status_Check.validationRule-meta.xml | 8
force-app/main/default/objects/Opportunity/fields/Status_Formula_Text__c.field-meta.xml | 14
force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Lost_For_Grounding.validationRule-meta.xml | 2
force-app/main/default/objects/Competition_Company__c/fields/Aim_Price__c.field-meta.xml | 2
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Return_to_office_Final_reply_day_U_RC__c.field-meta.xml | 1
force-app/main/default/objects/Account/fields/Aim_Price__c.field-meta.xml | 2
force-app/main/default/objects/Account_Number_of_target__c/fields/Account_HP__c.field-meta.xml | 2
force-app/main/default/objects/Lead/validationRules/Should_Be_Dept_Check.validationRule-meta.xml | 18
force-app/main/default/objects/task__c/validationRules/NotAdminCannotCreateTask.validationRule-meta.xml | 2
force-app/main/default/objects/Lead/webLinks/GoogleNews.webLink-meta.xml | 20
force-app/main/default/objects/OPDPlan__c/listViews/On_prosess.listView-meta.xml | 4
force-app/main/default/objects/Repair__c/Repair__c.object-meta.xml | 21
force-app/main/default/objects/Opportunity/fields/Forecast_target_ship_prospect__c.field-meta.xml | 16
force-app/main/default/objects/Opportunity/fields/ConfirmationofAward__c.field-meta.xml | 27
force-app/main/default/objects/Opportunity/fields/Opp_Forecast__c.field-meta.xml | 23
force-app/main/default/objects/Account/recordTypes/office.recordType-meta.xml | 15
force-app/main/default/objects/Opportunity/fields/Monthly_Forecast_in_thismonth__c.field-meta.xml | 18
force-app/main/default/objects/Lead/compactLayouts/BuyLead_CampaignLayout.compactLayout-meta.xml | 12
force-app/main/default/objects/Rental_Apply__c/validationRules/Applicant_Set_Must_One.validationRule-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/Forecast_this_month__c.field-meta.xml | 36
force-app/main/default/objects/Quote/fields/Opportunity_sub_ownerID__c.field-meta.xml | 12
force-app/main/default/objects/Quote/fields/BidAnnounce__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/ifOpenBid__c.field-meta.xml | 27
force-app/main/default/objects/Lead/listViews/FOLLOW.listView-meta.xml | 34
force-app/main/default/objects/Opportunity/fields/OCM__c.field-meta.xml | 13
force-app/main/default/objects/Report__c/validationRules/SIS_Required_OPD_ProductCategory1.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/bid_Confrim_Date__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/CLBIC_Category__c.field-meta.xml | 61
force-app/main/default/objects/Opportunity/fields/BackOfficeUseForecastAmount_PBI__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/Owner_ID__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/SpecialAgency_Text__c.field-meta.xml | 13
force-app/main/default/objects/On_Call__c/validationRules/Is_Active_Hospital.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/validationRules/Delete_Reason_Check.validationRule-meta.xml | 10
force-app/main/default/objects/PCLLostBrand__c/fields/ChannelSpecificReasons__c.field-meta.xml | 1
manifest/package.xml | 192
force-app/main/default/objects/Opportunity/validationRules/Clear_on_BidDate.validationRule-meta.xml | 8
force-app/main/default/objects/Contact/fields/Jigsaw.field-meta.xml | 6
force-app/main/default/objects/Opportunity/fields/Last_month_stage2__c.field-meta.xml | 26
force-app/main/default/objects/Opportunity/fields/City__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/SPOApprovedQuote__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/Sales_forecast_day_BA__c.field-meta.xml | 12
force-app/main/default/objects/Rental_Apply__c/validationRules/For_Repair_loaner_Need_repair_number.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Wholesale_Price_F__c.field-meta.xml | 17
force-app/main/default/objects/Opportunity/fields/Detail_Suggestion__c.field-meta.xml | 11
force-app/main/default/objects/Maintenance_Contract__c/fields/Service_Contract_Staff__c.field-meta.xml | 10
force-app/main/default/objects/Opportunity/fields/Number_of_OPD__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/Sales_owner_buchang__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/Caluculated_start_day__c.field-meta.xml | 26
force-app/main/default/objects/Case/fields/SourceId.field-meta.xml | 8
force-app/main/default/objects/Opportunity/fields/Hospital_Is_Active__c.field-meta.xml | 19
force-app/main/default/objects/TransferApplySummary__c/validationRules/Cancel_reason_not_null.validationRule-meta.xml | 2
force-app/main/default/objects/Report__c/validationRules/Date_Validation1.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Equipment_Order_Flg__c.field-meta.xml | 11
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Cancel_Date__c.field-meta.xml | 1
force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/consumNumReduceChk.validationRule-meta.xml | 2
force-app/main/default/objects/Quote/fields/Manager_Sell__c.field-meta.xml | 12
force-app/main/default/objects/Opportunity/fields/RANK_A__c.field-meta.xml | 19
force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/Consum_Start_Date_Must_Input.validationRule-meta.xml | 2
force-app/main/default/objects/Lead/fields/Purchase_Plan__c.field-meta.xml | 30
force-app/main/default/objects/Tender_information__c/recordTypes/Mannual.recordType-meta.xml | 54
force-app/main/default/objects/Visit_Report__c/validationRules/Require_Evaluate4.validationRule-meta.xml | 2
force-app/main/default/objects/Lead/validationRules/StateJudgment.validationRule-meta.xml | 9
force-app/main/default/objects/Lead/fields/Email_Encrypted__c.field-meta.xml | 11
force-app/main/default/objects/Repair__c/fields/FSE_owner__c.field-meta.xml | 20
force-app/main/default/objects/Opportunity/fields/Days_Between_Bid_And_Contract__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/ImportDemonstration_Approval_date__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/Dealer_Final_Price_F__c.field-meta.xml | 15
force-app/main/default/objects/CancelPostponePlan__c/validationRules/NextPlanDateMustMaxToday.validationRule-meta.xml | 2
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/webLinks/RentalApplyJump.webLink-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Opp_Actual_incl_tax__c.field-meta.xml | 23
force-app/main/default/objects/Lead/fields/LeadSource.field-meta.xml | 7
force-app/main/default/objects/Opportunity/fields/Group_purchase_PCL__c.field-meta.xml | 11
force-app/main/default/objects/Repair__c/validationRules/Is_Same_Hospital.validationRule-meta.xml | 2
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Not_date_over_37_or_47_day_for_trial.validationRule-meta.xml | 2
force-app/main/default/objects/Quote/fields/Status.field-meta.xml | 6
force-app/main/default/objects/Lead/fields/Opportunity_Category__c.field-meta.xml | 12
force-app/main/default/objects/Opportunity/fields/Wholesale_Price__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/Authorized_start__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/SI_FinishedPorj_Date__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/Special_Opp_lanhai__c.field-meta.xml | 11
force-app/main/default/objects/PCLLostProduct__c/fields/isSpec__c.field-meta.xml | 1
force-app/main/default/objects/Rental_Apply__c/validationRules/Cannot_change_PIC.validationRule-meta.xml | 2
force-app/main/default/objects/Maintenance_Contract_Asset__c/webLinks/SelectAssets.webLink-meta.xml | 2
force-app/main/default/objects/Opportunity/validationRules/CanNotWinIfFinalUserChanged.validationRule-meta.xml | 15
force-app/main/default/objects/CancelPostponePlan__c/validationRules/NextPlanDateCheck.validationRule-meta.xml | 2
force-app/main/default/objects/AssetMaintainHeader__c/validationRules/Cannot_Change_MaintainType.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/GeneralInquirySeparateBill__c.field-meta.xml | 13
force-app/main/default/objects/PCLLostProduct__c/PCLLostProduct__c.object-meta.xml | 3
force-app/main/default/objects/Account/fields/Department_Class_Wd__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Opportunity_ThousandY__c.field-meta.xml | 30
force-app/main/default/objects/Opportunity/fields/old_Oppo_No__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/validationRules/Not_Off_Estimation_Decision.validationRule-meta.xml | 8
force-app/main/default/objects/Quote/fields/Majordomo_Sell__c.field-meta.xml | 12
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Condition_X21_Days__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/IqScore.field-meta.xml | 5
force-app/main/default/objects/Opportunity/fields/Opp_forecast_day_last_update_day__c.field-meta.xml | 11
force-app/main/default/objects/Rental_Apply__c/fields/Loaner_medical_Staff__c.field-meta.xml | 2
force-app/main/default/objects/GuaranteePeriodAlterationApplication__c/GuaranteePeriodAlterationApplication__c.object-meta.xml | 10
force-app/main/default/objects/ASEActivity__c/ASEActivity__c.object-meta.xml | 12
force-app/main/default/objects/OPDPlan__c/validationRules/isNewNull.validationRule-meta.xml | 1
force-app/main/default/objects/Lead/fields/ET_Check__c.field-meta.xml | 10
force-app/main/default/objects/Opportunity/fields/Request_update_quotation__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/NotesApprovedNo__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/HP_OCM_Category_From_Class__c.field-meta.xml | 16
force-app/main/default/objects/Opportunity/businessProcesses/目標.businessProcess-meta.xml | 10
force-app/main/default/objects/Opportunity/fields/Referee__c.field-meta.xml | 13
force-app/main/default/objects/Quote/fields/Minister_Service__c.field-meta.xml | 12
force-app/main/default/objects/Opportunity/fields/OCM_man_province_no_eng__c.field-meta.xml | 29
force-app/main/default/objects/Order__c/Order__c.object-meta.xml | 16
force-app/main/default/objects/Opportunity/validationRules/Request_Contract_DB_SalesDept_complite_d.validationRule-meta.xml | 15
force-app/main/default/objects/Opportunity/fields/Follow_or_not__c.field-meta.xml | 15
force-app/main/default/objects/Account/recordTypes/Training.recordType-meta.xml | 34
force-app/main/default/objects/Opportunity/fields/Create_Activity__c.field-meta.xml | 17
force-app/main/default/objects/Opportunity/fields/ID_18__c.field-meta.xml | 13
force-app/main/default/objects/Inspection_Item__c/fields/Fault_Classification3__c.field-meta.xml | 110
force-app/main/default/objects/Repair_Quotation__c/validationRules/Service_CutPriceEditDisabledWhenFinished.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Agency1_Name_F__c.field-meta.xml | 14
force-app/main/default/objects/Lead/fields/Account_Province__c.field-meta.xml | 51
force-app/main/default/objects/TransferApplyDetail__c/validationRules/Cannot_stock_when_ng.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Monthly_order_target_stock__c.field-meta.xml | 51
force-app/main/default/objects/TransferApplySummary__c/validationRules/First_RAESD_Cannot_Canceled.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/BudgetAmount__c.field-meta.xml | 14
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Received_Confirm_Status_Text__c.field-meta.xml | 1
force-app/main/default/objects/Lead/fields/Name.field-meta.xml | 6
force-app/main/default/objects/Opportunity/fields/Test_staff__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/listViews/AllOpportunitiesFollowAB.listView-meta.xml | 38
force-app/main/default/objects/Opportunity/listViews/AllOpportunitiesFollowbidingcppy.listView-meta.xml | 54
force-app/main/default/objects/Quote/fields/Minister_Sell__c.field-meta.xml | 12
force-app/main/default/objects/Quote/fields/Estimation_List_Price__c.field-meta.xml | 11
force-app/main/default/objects/Account/fields/Ideal_Image_Sales__c.field-meta.xml | 2
force-app/main/default/objects/Contact/fields/Doctor_Division1__c.field-meta.xml | 16
force-app/main/default/objects/Lead/webLinks/AltavistaNews.webLink-meta.xml | 20
force-app/main/default/objects/Opportunity/listViews/SI_InquirySI.listView-meta.xml | 27
force-app/main/default/objects/Repair__c/validationRules/work_location_Limit.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Decision_Maker__c.field-meta.xml | 13
force-app/main/default/objects/Report__c/validationRules/SIS_Required_Operation_To.validationRule-meta.xml | 2
force-app/main/default/objects/Account_Delay_Apply__c/listViews/MYView.listView-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/If_30_complete__c.field-meta.xml | 15
force-app/main/default/objects/Consum_Apply_Equipment_Set_Detail__c/Consum_Apply_Equipment_Set_Detail__c.object-meta.xml | 18
force-app/main/default/objects/Lead/fields/Other_Society__c.field-meta.xml | 12
force-app/main/default/objects/Statu_Achievements__c/listViews/All_return.listView-meta.xml | 7
force-app/main/default/objects/Opportunity/fields/Status_Formula_Retention_Days__c.field-meta.xml | 37
force-app/main/default/objects/Opportunity/fields/Opp_Number__c.field-meta.xml | 10
force-app/main/default/objects/Quote/fields/OCM_Agent1_Price_Page__c.field-meta.xml | 12
force-app/main/default/objects/Opportunity/fields/PartnerAccountId.field-meta.xml | 8
force-app/main/default/objects/Opportunity/fields/Keyman__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/ShippedAmount_Sum__c.field-meta.xml | 16
force-app/main/default/objects/Repair__c/validationRules/work_location_select_beipin.validationRule-meta.xml | 2
force-app/main/default/objects/Fixture_Set_Detail__c/fields/Loaner_category__c.field-meta.xml | 20
force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/Can_Not_Cancel_When_Have_Shipment.validationRule-meta.xml | 2
force-app/main/default/objects/Maintenance_Contract__c/fields/Forecast_Selling_Price__c.field-meta.xml | 2
force-app/main/default/objects/Quote/fields/Agency2_Profit__c.field-meta.xml | 11
force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Can_not_Delivery_By_Main_Error.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/CHECK2__c.field-meta.xml | 19
force-app/main/default/objects/Opportunity/fields/WinCnt__c.field-meta.xml | 15
force-app/main/default/objects/BatchIF_Log__c/listViews/OTS005.listView-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/Contract_Authorize__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/Forecast_3month_formula__c.field-meta.xml | 20
force-app/main/default/objects/CampaignMember/fields/Sales_lead__c.field-meta.xml | 23
force-app/main/default/objects/Inventory_Header__c/validationRules/Cannot_Submit_When_Have_Not_Inventor_C.validationRule-meta.xml | 2
force-app/main/default/objects/Quote/fields/Unit_Price__c.field-meta.xml | 9
force-app/main/default/objects/Opportunity/fields/OCSM_RMB_Without_Tax_1000__c.field-meta.xml | 22
force-app/main/default/objects/PCLLostBrand__c/fields/Lost_By_Company__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/NextMonthly_ship_target_txt__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/Possibility_mark__c.field-meta.xml | 19
force-app/main/default/objects/Quote/fields/LineItemCount.field-meta.xml | 5
force-app/main/default/objects/Opportunity/validationRules/Stage_check2.validationRule-meta.xml | 8
force-app/main/default/objects/Quote/fields/QuoteToName.field-meta.xml | 5
force-app/main/default/objects/Opportunity/fields/OP_incl_tax__c.field-meta.xml | 33
force-app/main/default/objects/Opportunity/webLinks/copy_to_base.webLink-meta.xml | 25
force-app/main/default/objects/Opportunity/fields/Status_Formula__c.field-meta.xml | 64
force-app/main/default/objects/Consumable_order_details2__c/fields/Consumable_Sale_order__c.field-meta.xml | 2
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Return_to_office_Final_reply_day_Text_Ho__c.field-meta.xml | 1
force-app/main/default/objects/Repair__c/validationRules/ApplyMust_UseFailProductFinish.validationRule-meta.xml | 2
force-app/main/default/objects/TransferApplyDetail__c/validationRules/Check_UnCDS_For_UpLoad.validationRule-meta.xml | 2
force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Inspection_result_notOK_cannot_Shippment.validationRule-meta.xml | 2
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/First_RAESD__c.field-meta.xml | 1
force-app/main/default/objects/Product_Documentation__c/validationRules/Select_competitor_product.validationRule-meta.xml | 2
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Received_Confirm__c.field-meta.xml | 1
force-app/main/default/objects/Asset/recordTypes/Shipment.recordType-meta.xml | 76
force-app/main/default/objects/Opportunity/fields/Cancel_Comment__c.field-meta.xml | 13
force-app/main/default/objects/MaintanceContractPack__c/MaintanceContractPack__c.object-meta.xml | 20
force-app/main/default/objects/Contact/fields/MobilePhone_Encrypted__c.field-meta.xml | 2
force-app/main/default/objects/Quote/fields/OCM_Agent1_Price__c.field-meta.xml | 11
force-app/main/default/objects/Contact/fields/Phone.field-meta.xml | 2
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Received_ng_detail__c.field-meta.xml | 1
force-app/main/default/objects/Repair__c/validationRules/ApplyMust_DateReceiptQuestions.validationRule-meta.xml | 18
force-app/main/default/objects/Opportunity/fields/RANK_B_inc_tax__c.field-meta.xml | 14
force-app/main/default/objects/PCLLostBrand__c/fields/AgencyMannual__c.field-meta.xml | 1
force-app/main/default/objects/Lead/fields/CreatedBy_ID__c.field-meta.xml | 12
force-app/main/default/objects/Account/validationRules/Asistant_can_not_change_OCM_hospital_cat.validationRule-meta.xml | 2
force-app/main/default/objects/Event_Oppotunity__c/Event_Oppotunity__c.object-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Objective_Tax_K__c.field-meta.xml | 16
force-app/main/default/objects/Consum_Apply__c/validationRules/Need_QIS_input.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Direct_Separate__c.field-meta.xml | 25
force-app/main/default/objects/Infrastructure_Project__c/fields/Source__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Sfdc_Bidding_No__c.field-meta.xml | 13
force-app/main/default/objects/On_Line_Survey__c/validationRules/Input_stomach_Other_product_name.validationRule-meta.xml | 2
force-app/main/default/objects/CampaignMember/fields/Request__c.field-meta.xml | 34
force-app/main/default/objects/Opportunity/fields/SPOApprovedNo__c.field-meta.xml | 13
force-app/main/default/objects/Consumable_order_details2__c/fields/Product_Type__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Estimation_List_Price_Without_Tax__c.field-meta.xml | 14
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/KeyCode__c.field-meta.xml | 1
force-app/main/default/objects/Tender_information_details__c/fields/TotalPrice_N__c.field-meta.xml | 8
force-app/main/default/objects/Contact/fields/ContactType__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/Forecast_this_month2__c.field-meta.xml | 15
force-app/main/default/objects/Lead/fields/Caluculated_start_day__c.field-meta.xml | 25
force-app/main/default/objects/Opportunity/fields/Closeing_day_catagory__c.field-meta.xml | 20
force-app/main/default/objects/Opportunity/fields/Analysiz_target_dinghuo_forecast__c.field-meta.xml | 26
force-app/main/default/objects/Opportunity/fields/ETPromoteSale__c.field-meta.xml | 11
force-app/main/default/objects/Quote/validationRules/needInstallationLocation.validationRule-meta.xml | 8
force-app/main/default/objects/Opportunity/fields/Infrastructure_ProjectNum__c.field-meta.xml | 12
force-app/main/default/objects/Quote/fields/Quote_Adjust_Calculate_F__c.field-meta.xml | 14
force-app/main/default/objects/Survey__c/Survey__c.object-meta.xml | 1
force-app/main/default/objects/Quote/fields/AccountId.field-meta.xml | 6
force-app/main/default/objects/Account/validationRules/Cannot_update_name.validationRule-meta.xml | 2
force-app/main/default/objects/TransferApplyDetail__c/validationRules/Cannot_check_when_no_cds.validationRule-meta.xml | 2
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Request_extend_day__c.field-meta.xml | 1
force-app/main/default/objects/Repair__c/validationRules/Direct_Delivery_Logic_OGZ.validationRule-meta.xml | 2
force-app/main/default/objects/LostReport_Detail__c/validationRules/Cancel_Mustinput_DeleteReason.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/OCM_forecast_order_day_less_ThisMonth15__c.field-meta.xml | 12
force-app/main/default/objects/Opportunity/fields/Agency_Intelligence_Expire_Remind_Flag__c.field-meta.xml | 14
force-app/main/default/objects/Quote/fields/AdditionalName.field-meta.xml | 5
force-app/main/default/objects/Rental_Apply__c/validationRules/After_Shippment_loaner.validationRule-meta.xml | 5
force-app/main/default/objects/PCLLostProduct__c/fields/LostProduct__c.field-meta.xml | 1
force-app/main/default/objects/PCLLostBrand__c/fields/LostPrices_ThousandY__c.field-meta.xml | 1
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Request_asset_extend_time__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/ApprovedNum__c.field-meta.xml | 15
force-app/main/default/objects/Opportunity/fields/Forecast_target_ship_lastmonth__c.field-meta.xml | 27
force-app/main/default/objects/Quote/Quote.object-meta.xml | 208
force-app/main/default/objects/AssetModifyBelongsChange__c/fields/SPOLink__c.field-meta.xml | 2
force-app/main/default/objects/Lead/fields/Phone_Encrypted__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/webLinks/Quotation_Product_NotUse.webLink-meta.xml | 20
force-app/main/default/objects/Opportunity/fields/Last_Shipping_Scheduled_Date_backup__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/Bidding_No__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/Sales_Method__c.field-meta.xml | 46
force-app/main/default/objects/Account/validationRules/Qualifying_Check.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/validationRules/SAP_Send_Check_IsChanged_After_Decided.validationRule-meta.xml | 9
force-app/main/default/objects/Rental_Apply__c/fields/OPDLendSort__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Elapsed_day_after_tender__c.field-meta.xml | 33
force-app/main/default/objects/Opportunity/fields/TargetType__c.field-meta.xml | 57
force-app/main/default/objects/Repair__c/validationRules/ApplyMust_SupportingProducts.validationRule-meta.xml | 2
force-app/main/default/objects/LostReport__c/validationRules/Cannot_Create_When_IH_Not_App.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/recordTypes/Target.recordType-meta.xml | 1197 +
force-app/main/default/objects/Repair__c/validationRules/Repair_Product_Input_Day.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity_File__c/validationRules/SpecificInquiryFileType01.validationRule-meta.xml | 2
force-app/main/default/objects/Opponent_Bid_Information__c/validationRules/Dummy_product_request.validationRule-meta.xml | 2
force-app/main/default/objects/Account/validationRules/Hospital_Effective_Check.validationRule-meta.xml | 2
force-app/main/default/objects/Lead/fields/Coverted_Num__c.field-meta.xml | 14
force-app/main/default/objects/Lead/recordTypes/NewDaily_Report.recordType-meta.xml | 455
force-app/main/default/objects/Quote/fields/Quote_No_Auto__c.field-meta.xml | 9
force-app/main/default/objects/OPDPlan__c/listViews/WaitReport.listView-meta.xml | 10
force-app/main/default/objects/Opportunity/fields/AgenTax_Practice_No__c.field-meta.xml | 13
force-app/main/default/objects/Address__c/Address__c.object-meta.xml | 12
force-app/main/default/objects/Opportunity/fields/Num_CurrentYearEventOppotunity__c.field-meta.xml | 17
force-app/main/default/objects/Opportunity/fields/Special_Apply_Reason__c.field-meta.xml | 13
force-app/main/default/objects/Asset/validationRules/Last_Reserve_Valitaion.validationRule-meta.xml | 6
force-app/main/default/objects/Lead/fields/OfferToEntrust__c.field-meta.xml | 14
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Repair_cancel_Final_reply_day_Text__c.field-meta.xml | 1
force-app/main/default/objects/TransferApplyDetail__c/validationRules/Cancel_reason_not_null.validationRule-meta.xml | 2
force-app/main/default/objects/Lead/fields/Product_Quote__c.field-meta.xml | 11
force-app/main/default/objects/Inspection_Report__c/fields/Reporter__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Ban_On_Use_Date__c.field-meta.xml | 12
force-app/main/default/objects/Monthly_Report__c/validationRules/Not_Update_By_Owner_After_Submit.validationRule-meta.xml | 2
force-app/main/default/objects/Rental_Apply_Fault__c/validationRules/NOT_TO_CHANGE_Detail.validationRule-meta.xml | 2
force-app/main/default/objects/Repair__c/validationRules/Repair_SalesOfficeCode.validationRule-meta.xml | 2
force-app/main/default/objects/Lead/fields/Request_Detail__c.field-meta.xml | 10
force-app/main/default/objects/Request_tedner_doc__c/validationRules/Request_input_reason_for_no_tender_numbe.validationRule-meta.xml | 2
force-app/main/default/objects/Quote/fields/MainEngineWithoutMonitor__c.field-meta.xml | 9
force-app/main/default/objects/Opportunity/fields/If_Have_EP_T1__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/Bidding_Flag__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/AgencyOpp_OCMSale_Price__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/Autholization_Activated_Date__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/validationRules/Check_Cancel_WIN.validationRule-meta.xml | 9
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Cancel_Time__c.field-meta.xml | 1
force-app/main/default/objects/Repair__c/validationRules/No_ChangeIF_After_Draf.validationRule-meta.xml | 2
force-app/main/default/objects/waybill__c/compactLayouts/OTS.compactLayout-meta.xml | 8
force-app/main/default/objects/Lead/fields/Lead_Num__c.field-meta.xml | 9
force-app/main/default/objects/Contact/recordTypes/Internal_staff.recordType-meta.xml | 179
force-app/main/default/objects/waybill__c/waybill__c.object-meta.xml | 2
force-app/main/default/objects/LastbuyProduct__c/LastbuyProduct__c.object-meta.xml | 12
force-app/main/default/objects/QIS_Report__c/QIS_Report__c.object-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/Tender_Number_Flag__c.field-meta.xml | 15
force-app/main/default/objects/Product2/recordTypes/OlympusProducts.recordType-meta.xml | 4
force-app/main/default/objects/Knowledge__kav/listViews/published_articles.listView-meta.xml | 4
force-app/main/default/objects/Opportunity/fields/ImportDemonstration_state__c.field-meta.xml | 18
force-app/main/default/objects/Account/fields/ChannelProgramLevelName.field-meta.xml | 4
force-app/main/default/objects/Opportunity/fields/Past_authorization_valide_day__c.field-meta.xml | 17
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/After_Inspection_time__c.field-meta.xml | 1
force-app/main/default/objects/Account/recordTypes/AgencyContract.recordType-meta.xml | 34
force-app/main/default/objects/CampaignMember/fields/Salutation.field-meta.xml | 5
force-app/main/default/objects/BatchIF_Log__c/listViews/NFM110_Veiwer.listView-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/ENG2_Opp__c.field-meta.xml | 11
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/NG_Return_DeliverySlip__c.field-meta.xml | 1
force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/IsBodyOrIsAccessory.validationRule-meta.xml | 2
force-app/main/default/objects/Lead/fields/Hospital_Owner__c.field-meta.xml | 12
force-app/main/default/objects/TransferApplyDetail__c/validationRules/Can_Not_Select_Cancel_Reason_Zhu.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Estimation_Confirm_Qty_Trans__c.field-meta.xml | 21
force-app/main/default/objects/Opportunity/fields/WhetherTrySpareParts_6m__c.field-meta.xml | 12
force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/cannot_hospital_sign_without_site_time.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/State_Owner__c.field-meta.xml | 15
force-app/main/default/objects/Lead/fields/Dicision_Maker__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/Is_ConfirmationofAward__c.field-meta.xml | 14
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Add_RetalFSetDetail_Text__c.field-meta.xml | 1
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Received_NG_ReAssign_Text__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/Bid_Planned_Date__c.field-meta.xml | 11
force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Must_Set_Both.validationRule-meta.xml | 2
force-app/main/default/objects/Consum_Apply__c/validationRules/Before_Request_Apporve.validationRule-meta.xml | 7
force-app/main/default/objects/BatchIF_Log__c/listViews/NFM705_Veiwer.listView-meta.xml | 5
force-app/main/default/objects/Opportunity/fields/Proposal_Competitors__c.field-meta.xml | 41
force-app/main/default/objects/Opportunity/fields/Note_Residual_Result__c.field-meta.xml | 25
force-app/main/default/objects/Lead/listViews/FOLLOW_new_sales.listView-meta.xml | 30
force-app/main/default/objects/Infrastructure_Project__c/fields/NoRelate_Reson__c.field-meta.xml | 2
force-app/main/default/objects/Quote/fields/Oppor_Type__c.field-meta.xml | 12
force-app/main/default/objects/TransferApplyDetail__c/validationRules/Fixture_Cannot_Repair_Without_NG.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/validationRules/cannotchange_agencyopp.validationRule-meta.xml | 10
force-app/main/default/objects/Opportunity/validationRules/ImportDemonstration_Filing_date_limit.validationRule-meta.xml | 8
force-app/main/default/objects/Repair__c/fields/Rental_Apply_Equipment_Set_Detail__c.field-meta.xml | 15
force-app/main/default/objects/Infrastructure_Project__c/fields/ProjectStatus1__c.field-meta.xml | 2
force-app/main/default/objects/Account/validationRules/Dept_Effective_Check.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/No_Visit_Opp__c.field-meta.xml | 17
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/IndexFromUniqueKey__c.field-meta.xml | 1
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Manual_Queue__c.field-meta.xml | 1
force-app/main/default/objects/Report__c/validationRules/Date_Validation.validationRule-meta.xml | 2
force-app/main/default/objects/Consum_Apply__c/validationRules/QIS_next_action_Confim.validationRule-meta.xml | 2
force-app/main/default/objects/Consumable_order_details2__c/fields/Province_Account__c.field-meta.xml | 15
force-app/main/default/objects/Knowledge__kav/Knowledge__kav.object-meta.xml | 7
force-app/main/default/objects/Infrastructure_Project__c/fields/BedUnit__c.field-meta.xml | 2
force-app/main/default/objects/OTS_order__c/OTS_order__c.object-meta.xml | 4
force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/Rental_Apply_Equipment_Set_Detail__c.object-meta.xml | 16
force-app/main/default/objects/Lead/fields/DoNotCall.field-meta.xml | 6
force-app/main/default/objects/Lead/validationRules/Check_Forecast_Date.validationRule-meta.xml | 8
force-app/main/default/objects/Quote/fields/Discount_Amount_Calculate__c.field-meta.xml | 11
force-app/main/default/objects/Repair__c/validationRules/ApplyMust_ReportAdverseEvents.validationRule-meta.xml | 2
force-app/main/default/objects/CampaignMember/fields/CalculationExcludes__c.field-meta.xml | 8
force-app/main/default/objects/Opportunity/fields/Is_Submitontime__c.field-meta.xml | 25
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Return_Distributor_method2__c.field-meta.xml | 17
force-app/main/default/objects/Maintenance_Contract__c/Maintenance_Contract__c.object-meta.xml | 8
force-app/main/default/objects/Repair__c/validationRules/RequireAWSDataId.validationRule-meta.xml | 2
force-app/main/default/objects/CampaignMember/fields/Comments_Participation__c.field-meta.xml | 8
force-app/main/default/objects/Opportunity/validationRules/AgencyContract_Hospital_Equals_Account.validationRule-meta.xml | 9
force-app/main/default/objects/Report__c/fields/Hospital_Reference__c.field-meta.xml | 2
force-app/main/default/objects/Daily_Report__c/fields/Daily_Report_Key__c.field-meta.xml | 5
force-app/main/default/objects/Lead/fields/Contact_Method__c.field-meta.xml | 35
force-app/main/default/objects/Opportunity/fields/DoOPD__c.field-meta.xml | 15
force-app/main/default/objects/Account/recordTypes/Department_GS.recordType-meta.xml | 34
force-app/main/default/objects/Opportunity/fields/owner_not_automatically_update__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/Fixed_Check__c.field-meta.xml | 11
force-app/main/default/objects/QIS_Report__c/fields/Hospital__c.field-meta.xml | 7
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Bie_Cun_Fang_Di_Ku_Cun_Jia__c.field-meta.xml | 1
force-app/main/default/objects/Account/recordTypes/Department_GYN.recordType-meta.xml | 34
force-app/main/default/objects/Opportunity/fields/is_CheckTarget_TF__c.field-meta.xml | 11
force-app/main/default/objects/Account/validationRules/System_Stop_Account.validationRule-meta.xml | 2
force-app/main/default/objects/Rental_Apply__c/validationRules/QIS_next_action_Confim.validationRule-meta.xml | 1
force-app/main/default/objects/Account_Number_of_case__c/Account_Number_of_case__c.object-meta.xml | 4
force-app/main/default/objects/Opportunity/fields/Old_Opportunity_ID__c.field-meta.xml | 15
force-app/main/default/objects/Opportunity/fields/Closing_Bid_Date_Bid__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/Opportunity_ThousandY_Target__c.field-meta.xml | 29
force-app/main/default/objects/Opportunity/fields/Whether_Upload_Question_Document__c.field-meta.xml | 15
force-app/main/default/objects/Opportunity/validationRules/Trade_ChangeRule.validationRule-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/Decided_Estimation__c.field-meta.xml | 12
force-app/main/default/objects/CampaignMember/fields/type__c.field-meta.xml | 11
force-app/main/default/objects/Consum_Apply__c/validationRules/Applicant_CancelReason_Active_Only.validationRule-meta.xml | 7
force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Can_Not_Reassign.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/ToDo__c.field-meta.xml | 21
force-app/main/default/objects/Report__c/listViews/All_NTC.listView-meta.xml | 3
force-app/main/default/objects/Opportunity/fields/Forecast_3month__c.field-meta.xml | 31
force-app/main/default/objects/Opportunity/fields/OCM_15__c.field-meta.xml | 15
force-app/main/default/objects/Opportunity/fields/Opportunity_stage__c.field-meta.xml | 57
force-app/main/default/objects/Opportunity/validationRules/SAP_Send_Check.validationRule-meta.xml | 19
force-app/main/default/objects/Opportunity/fields/ProvisionPrice__c.field-meta.xml | 12
force-app/main/default/objects/Rental_Apply_Fault__c/fields/AttachmentImage1__c.field-meta.xml | 2
force-app/main/default/objects/Rental_Apply__c/validationRules/For_contract_loaner_only_active_contract.validationRule-meta.xml | 2
force-app/main/default/objects/Daily_Report__c/listViews/NotApprovedReport_new.listView-meta.xml | 3
force-app/main/default/objects/Opportunity/validationRules/OpportunityStageLimited.validationRule-meta.xml | 7
force-app/main/default/objects/Quote/fields/Phone.field-meta.xml | 5
force-app/main/default/objects/PCLLostProduct__c/fields/lcrRecordType_DevName__c.field-meta.xml | 1
force-app/main/default/objects/MaintanceContractPack__c/fields/Limit_Price_Amount__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Objective__c.field-meta.xml | 16
force-app/main/default/objects/Opportunity/fields/SalesdepartmentForecastTxt__c.field-meta.xml | 13
force-app/main/default/objects/Infrastructure_Project__c/fields/HospitalName__c.field-meta.xml | 2
force-app/main/default/objects/Lead/fields/CreateEvent__c.field-meta.xml | 12
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Repair_cancel_Final_reply_day_Text_Holid__c.field-meta.xml | 1
force-app/main/default/objects/Maintenance_Product_Data__c/listViews/draft.listView-meta.xml | 1
force-app/main/default/objects/On_Line_Survey__c/validationRules/Input_Esopha_Other_product_name.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Gurantee_Period__c.field-meta.xml | 42
force-app/main/default/objects/Account/recordTypes/Department_BF.recordType-meta.xml | 34
force-app/main/default/objects/Opportunity/fields/NM_Forecast_twomonth_before__c.field-meta.xml | 13
force-app/main/default/objects/Lead/validationRules/HospitalDepartmentClassCheck.validationRule-meta.xml | 10
force-app/main/default/objects/Opportunity/fields/Bid_date_last_update_day__c.field-meta.xml | 11
force-app/main/default/objects/Lead/fields/AnnualRevenue.field-meta.xml | 6
force-app/main/default/objects/Opportunity/fields/Contract_Once_Recognize_Day__c.field-meta.xml | 11
force-app/main/default/objects/Account/fields/Key_hospital__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Forecast_Amount_All_F__c.field-meta.xml | 16
force-app/main/default/objects/Maintenance_Contract__c/fields/Actual_Execution_Quantity_Inplan_Sum__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/validationRules/Authorizing_ChangeCloseBid.validationRule-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/RANK_D__c.field-meta.xml | 16
force-app/main/default/objects/Rental_Apply__c/validationRules/New_Request_Verify.validationRule-meta.xml | 1
force-app/main/default/objects/Asset/validationRules/Dummy_product_request_product_info.validationRule-meta.xml | 2
force-app/main/default/objects/Event__c/fields/Purpose_Type2__c.field-meta.xml | 20
force-app/main/default/objects/Opportunity/fields/SpecialApplyMemo__c.field-meta.xml | 12
force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Cannot_Change_When_Cancel.validationRule-meta.xml | 2
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Zhu_Ti_Fen_Pei_Jia__c.field-meta.xml | 1
force-app/main/default/objects/CancelPostponePlan__c/listViews/All.listView-meta.xml | 3
force-app/main/default/objects/On_Call__c/validationRules/Need_Follow_up_result.validationRule-meta.xml | 2
force-app/main/default/objects/Lead/webLinks/NewLead_FromContact2.webLink-meta.xml | 16
force-app/main/default/objects/Opportunity/validationRules/Corrosion_Check.validationRule-meta.xml | 7
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/NG_Final_reply_day_Text__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/Bid60NextMonth__c.field-meta.xml | 17
force-app/main/default/objects/Opportunity/fields/AgencyOpp_OCM_Term__c.field-meta.xml | 12
force-app/main/default/objects/Repair__c/validationRules/Direct_Delivery_Logic_Only_SORC.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Contract_Authorize_Lock__c.field-meta.xml | 11
force-app/main/default/objects/TransferApplyDetail__c/validationRules/Lost_For_Grounding.validationRule-meta.xml | 2
force-app/main/default/objects/Lead/webLinks/CopyPI.webLink-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/Purchasing_Cost__c.field-meta.xml | 13
force-app/main/default/objects/Event__c/fields/Purpose_Type4__c.field-meta.xml | 20
force-app/main/default/objects/Opportunity/fields/OPD_SIS_last_update__c.field-meta.xml | 13
force-app/main/default/objects/TransferApplyDetail__c/validationRules/Need_Shippment_info_before_receive.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Dealer_Final_Price__c.field-meta.xml | 13
force-app/main/default/objects/Lead/fields/urgent__c.field-meta.xml | 10
force-app/main/default/objects/TransferApplyDetail__c/validationRules/Receive_After_NG_Aborted.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Lost_reason_main__c.field-meta.xml | 13
force-app/main/default/objects/Lead/Lead.object-meta.xml | 312
force-app/main/default/objects/Lead/fields/CreatedBy_Name__c.field-meta.xml | 11
force-app/main/default/objects/Consum_Apply__c/validationRules/Person_In_Charge_Not_Support.validationRule-meta.xml | 13
force-app/main/default/objects/OPDPlan__c/listViews/On_prosessforconfirm.listView-meta.xml | 4
force-app/main/default/objects/Quote/fields/Discount__c.field-meta.xml | 9
force-app/main/default/objects/Opportunity/fields/Salesdepartment_Owner_txt__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/RANK_B__c.field-meta.xml | 16
force-app/main/default/objects/Opportunity/fields/Opportunity_Category_for_report__c.field-meta.xml | 21
force-app/main/default/objects/PBIAuthorization__c/fields/SOM_monthly_report__c.field-meta.xml | 2
force-app/main/default/objects/Visit_Report__c/validationRules/Required_Date.validationRule-meta.xml | 2
force-app/main/default/objects/Asset/validationRules/Must_Input_InspectionNo.validationRule-meta.xml | 2
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Pre_inspection_time__c.field-meta.xml | 1
force-app/main/default/objects/Lead/fields/QuotationDelegationStatus__c.field-meta.xml | 12
force-app/main/default/objects/Opportunity/fields/Close_Forecasted_Date_ThisMonth__c.field-meta.xml | 16
force-app/main/default/objects/Opportunity/fields/Opportunity_No__c.field-meta.xml | 14
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Cancel_Select__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/SAP_win_elapse_day__c.field-meta.xml | 15
force-app/main/default/objects/Statu_Achievements__c/fields/NextMonthly_ship_target__c.field-meta.xml | 22
force-app/main/default/objects/MaintanceContractPack__c/listViews/All.listView-meta.xml | 2
force-app/main/default/objects/Agency_Opportunity__c/fields/Agency_Person__c.field-meta.xml | 4
force-app/main/default/objects/Quote/fields/OpporsAssistance__c.field-meta.xml | 12
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Can_Not_Chagne_Cancel_Reason_ToSubstitut.validationRule-meta.xml | 2
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/IsOPD_Account__c.field-meta.xml | 1
force-app/main/default/objects/Statu_Achievements__c/listViews/All_Backorder_stop.listView-meta.xml | 1
force-app/main/default/objects/eSignForm__c/fields/skip_Distribution_Sign__c.field-meta.xml | 6
force-app/main/default/objects/Account/recordTypes/Department_Class_Unification.recordType-meta.xml | 34
force-app/main/default/objects/Opportunity/fields/Application_Amount_Submit__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/Opp_Actual__c.field-meta.xml | 23
force-app/main/default/objects/Agency_Hospital_Link__c/fields/Agency_ID__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/SpecialAgency__c.field-meta.xml | 16
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/QueueDetail__c.field-meta.xml | 1
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Irreplaceable_flag__c.field-meta.xml | 1
force-app/main/default/objects/Repair_Quotation__c/fields/Discount_reason_list_comma_c__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/validationRules/Check_SAP_WIN.validationRule-meta.xml | 9
force-app/main/default/objects/Lead/webLinks/GoogleSearch.webLink-meta.xml | 20
force-app/main/default/objects/Maintenance_Contract__c/fields/Sales_Method__c.field-meta.xml | 3
force-app/main/default/objects/Opportunity/fields/Recordtype_Name__c.field-meta.xml | 13
force-app/main/default/objects/Report__c/validationRules/Input_comment_before_share_with_MKE.validationRule-meta.xml | 4
force-app/main/default/objects/Opportunity/fields/Null__c.field-meta.xml | 13
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/UniqueKey_Not_Null.validationRule-meta.xml | 2
force-app/main/default/objects/TransferApplyDetail__c/validationRules/Cannot_Change_Asset.validationRule-meta.xml | 2
force-app/main/default/objects/Asset/validationRules/RequireSerialNumber.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/LTV_Account__c.field-meta.xml | 15
force-app/main/default/objects/Opportunity/fields/Lead_Num__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/Purchase_Reason__c.field-meta.xml | 36
force-app/main/default/objects/Opportunity/validationRules/Invalid_department.validationRule-meta.xml | 8
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/First_RAESD_Cannot_Canceled.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/validationRules/ImportDemonstrationApprovalda_sametime.validationRule-meta.xml | 8
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/NG_Select_Again__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/Closing_Bid_date_last_update_day__c.field-meta.xml | 11
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Cannot_Change_CancelANDCancelR.validationRule-meta.xml | 2
force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Inspection_After_NG_Aborted.validationRule-meta.xml | 2
force-app/main/default/objects/Consum_Apply__c/validationRules/Must_Is_Class.validationRule-meta.xml | 4
force-app/main/default/objects/Opportunity/fields/Last_alert_to_user_update__c.field-meta.xml | 11
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Extend_Final_reply_day_Text__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/Next_action__c.field-meta.xml | 11
force-app/main/default/objects/Lead/businessProcesses/標準.businessProcess-meta.xml | 21
force-app/main/default/objects/Opportunity/fields/Budget_unapproved_date__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/validationRules/Account_Inactive.validationRule-meta.xml | 48
force-app/main/default/objects/Maintenance_Contract_Estimate__c/Maintenance_Contract_Estimate__c.object-meta.xml | 6
force-app/main/default/objects/Quote/fields/Quote_No_last2__c.field-meta.xml | 12
force-app/main/default/objects/Opportunity/fields/Pay_All_Money__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/Last_opportunity_file_stage__c.field-meta.xml | 20
force-app/main/default/objects/Agency_Opportunity__c/listViews/View_Nearly_J_Year.listView-meta.xml | 382
force-app/main/default/objects/Opportunity/fields/Opportunity_stms_owner__c.field-meta.xml | 14
force-app/main/default/objects/Lead/fields/Purchase_Type__c.field-meta.xml | 30
force-app/main/default/objects/Asset/validationRules/IF_IsBody_Need_SerialManageType.validationRule-meta.xml | 6
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Asset_return_Day__c.field-meta.xml | 1
force-app/main/default/objects/Maintenance_Contract__c/fields/Implementation_Rate_Summary__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/DetailNum__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/Monthly3_order_target_txt__c.field-meta.xml | 13
force-app/main/default/objects/PCLLostProduct__c/fields/LostProductMannual__c.field-meta.xml | 1
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Repair_delete_Final_reply_day_Text__c.field-meta.xml | 1
force-app/main/default/objects/Lead/fields/Is_Followed_Intime__c.field-meta.xml | 10
force-app/main/default/objects/Asset/fields/CurrentSOM_Status_2H__c.field-meta.xml | 2
force-app/main/default/objects/Inspection_Report__c/validationRules/PdfRPCheck.validationRule-meta.xml | 4
force-app/main/default/objects/Quote/fields/Interdepartmental__c.field-meta.xml | 9
force-app/main/default/objects/Case/fields/Status.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Dealer_Final_Price_Notax__c.field-meta.xml | 16
force-app/main/default/objects/Opportunity/validationRules/lastAccount.validationRule-meta.xml | 7
force-app/main/default/objects/Opportunity/validationRules/OpportunityStageLimited2.validationRule-meta.xml | 7
force-app/main/default/objects/Quote/fields/Quote_Adjust_Calculate__c.field-meta.xml | 11
force-app/main/default/objects/Repair__c/fields/Incharge_Staff_Contact__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Monthly3_order_target__c.field-meta.xml | 25
force-app/main/default/objects/Opportunity/fields/Recommended_Confirmation_Time__c.field-meta.xml | 11
force-app/main/default/objects/Lead/fields/Report_FirstDate_Quote_Irai__c.field-meta.xml | 10
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Rental_workday__c.field-meta.xml | 1
force-app/main/default/objects/Rental_Apply__c/validationRules/After_Request_shipping.validationRule-meta.xml | 9
force-app/main/default/objects/Opportunity/fields/Spare_Application_Singular__c.field-meta.xml | 14
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Repair_Agreed_Quotation_Text__c.field-meta.xml | 1
force-app/main/default/objects/On_Call__c/On_Call__c.object-meta.xml | 12
force-app/main/default/objects/Quote/fields/Discount.field-meta.xml | 5
force-app/main/default/objects/Opportunity/fields/Sales_assistant_name__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/validationRules/canEditCelon.validationRule-meta.xml | 13
force-app/main/default/objects/Maintenance_Contract__c/fields/Sum_repair_price_new__c.field-meta.xml | 2
force-app/main/default/objects/Solution_Programme__c/Solution_Programme__c.object-meta.xml | 15
force-app/main/default/objects/Event__c/fields/Purpose_TypeFSE3__c.field-meta.xml | 287
force-app/main/default/objects/Opportunity/fields/PackedCaculation__c.field-meta.xml | 15
force-app/main/default/objects/Quote/fields/Quote_Adjust_Amount__c.field-meta.xml | 11
force-app/main/default/objects/Lead/fields/Department_Class__c.field-meta.xml | 23
force-app/main/default/objects/Opportunity/fields/Opp_Bid__c.field-meta.xml | 15
force-app/main/default/objects/Tender_information__c/listViews/View25.listView-meta.xml | 7
force-app/main/default/objects/Opportunity/fields/Last_Shipping_Date_backup__c.field-meta.xml | 11
force-app/main/default/objects/Lead/fields/SI_OppoLeadSec__c.field-meta.xml | 69
force-app/main/default/objects/Agency_Opportunity__c/fields/No_Convert_Reason__c.field-meta.xml | 6
force-app/main/default/objects/Opportunity/fields/ImportArgumentsNumber__c.field-meta.xml | 15
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Can_Not_Change_RepairRenewal_Confirm.validationRule-meta.xml | 2
force-app/main/default/objects/Rental_Apply__c/validationRules/AllOperateApplyCheck.validationRule-meta.xml | 3
force-app/main/default/objects/PCLLostProduct__c/fields/LostAccount__c.field-meta.xml | 1
force-app/main/default/objects/AssetMaintainHeader__c/validationRules/Cannot_Submit_Without_BuzhangZongjian.validationRule-meta.xml | 2
force-app/main/default/objects/Visit_Report__c/fields/Superior__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/NM_Forecast__c.field-meta.xml | 32
force-app/main/default/objects/Repair_Quotation__c/validationRules/need_discount_RC_Mail_Address.validationRule-meta.xml | 2
force-app/main/default/objects/Quote/fields/MultiYearWarrantyTotalPrice__c.field-meta.xml | 13
force-app/main/default/objects/Quote/fields/Agency1_Profit__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/Dealer_Contract_No__c.field-meta.xml | 13
force-app/main/default/objects/Consum_Apply__c/validationRules/Must_Is_DeptClas.validationRule-meta.xml | 4
force-app/main/default/objects/Opportunity/fields/Status0_Elapsed_Date_Function__c.field-meta.xml | 47
force-app/main/default/objects/Quote/fields/HasType3Machine__c.field-meta.xml | 9
force-app/main/default/objects/TransferApplyDetail__c/validationRules/repair_can_not_Shipment.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Custmor_pic_IsActive__c.field-meta.xml | 11
force-app/main/default/objects/Quote/fields/BillingAddress.field-meta.xml | 5
force-app/main/default/objects/Opportunity/fields/Last_Shipping_Date__c.field-meta.xml | 32
force-app/main/default/objects/IS_Opportunity_Demand__c/IS_Opportunity_Demand__c.object-meta.xml | 4
force-app/main/default/objects/PCLLostProduct__c/fields/HP_RecordType_DevName__c.field-meta.xml | 1
force-app/main/default/objects/Repair__c/validationRules/Repair_Allowed_Check.validationRule-meta.xml | 2
force-app/main/default/objects/TransferApplyDetail__c/validationRules/Inspection_After_NG_Aborted_Comment.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Determine_oly_parameter_day__c.field-meta.xml | 11
force-app/main/default/objects/SolutionProjectRequirements__c/validationRules/ProposalPurposeOtherRequire.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Opp_Forecast_incl_tax__c.field-meta.xml | 21
force-app/main/default/objects/Product2/recordTypes/CompetitiveProductsConsumables.recordType-meta.xml | 4
force-app/main/default/objects/Opportunity/webLinks/BeforeOPDPDFBtn_SIS.webLink-meta.xml | 49
force-app/main/default/objects/Quote/fields/OpportunityId__c.field-meta.xml | 12
force-app/main/default/objects/Opportunity/fields/LostPrices__c.field-meta.xml | 14
force-app/main/default/objects/Quote/fields/Stocking_Price__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/Deposit_In_Full_Day__c.field-meta.xml | 32
force-app/main/default/objects/Inquiry_form__c/fields/Opp_Name_Search__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/webLinks/Quotation_request.webLink-meta.xml | 28
force-app/main/default/objects/Opportunity/fields/remarks__c.field-meta.xml | 13
force-app/main/default/objects/CampaignMember/fields/Favorite_Equipment__c.field-meta.xml | 11
force-app/main/default/objects/LostReport__c/validationRules/Submit_AppV_Check.validationRule-meta.xml | 2
force-app/main/default/objects/task__c/validationRules/CanNotAssignTasksToNonSubordinaUsers.validationRule-meta.xml | 5
force-app/main/default/objects/CancelPostponePlan__c/fields/Status__c.field-meta.xml | 1
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Not_date_over_90_day_for_newproduct.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Custmor_pic__c.field-meta.xml | 15
force-app/main/default/objects/Consum_Apply__c/fields/Loaner_medical_Staff__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Territory2Id.field-meta.xml | 6
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Canceled__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/Owner_Category__c.field-meta.xml | 13
force-app/main/default/objects/SS_OPDPlan__c/fields/OPDLendSortBefore__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Attribute_Type__c.field-meta.xml | 13
force-app/main/default/objects/TrackConsumableSalesForecast__c/listViews/All003.listView-meta.xml | 10
force-app/main/default/objects/Opportunity/fields/Close_Forecasted_Date_ThisMonth_long__c.field-meta.xml | 14
force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Can_Not_Change_Inspection_result_afterNG.validationRule-meta.xml | 2
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Yigoudaihuo_Final_reply_day_Text_Holiday__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/webLinks/EditLost.webLink-meta.xml | 51
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Loaner_received_time__c.field-meta.xml | 1
force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Check_UnCDS_For_UpLoad.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Status_List_SI__c.field-meta.xml | 102
force-app/main/default/objects/TransferApplyDetail__c/validationRules/Must_Set_Both.validationRule-meta.xml | 2
force-app/main/default/objects/Lead/fields/begin_opp_date__c.field-meta.xml | 10
force-app/main/default/objects/Opportunity/fields/Set_Target_DC_wave__c.field-meta.xml | 11
force-app/main/default/objects/Lead/fields/Product_Sales_Category__c.field-meta.xml | 21
force-app/main/default/objects/Opportunity/fields/Department_Snapshot__c.field-meta.xml | 13
force-app/main/default/objects/Repair_Quotation__c/validationRules/need_discount_ratio_Greaterthan_Zero.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Province_for_alart__c.field-meta.xml | 15
force-app/main/default/objects/Opportunity/fields/TotalOpportunityQuantity.field-meta.xml | 7
force-app/main/default/objects/Opportunity/fields/Risk__c.field-meta.xml | 11
force-app/main/default/objects/Event__c/fields/Purpose_Type__c.field-meta.xml | 20
force-app/main/default/objects/Opportunity/fields/Situation_last_update_day__c.field-meta.xml | 11
force-app/main/default/objects/Report__c/validationRules/Input_confirm_before_VOC_finish.validationRule-meta.xml | 2
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/QIS_Final_reply_day_Text__c.field-meta.xml | 1
force-app/main/default/objects/Event__c/fields/Activity_PurposeFSE__c.field-meta.xml | 31
force-app/main/default/objects/Lead/fields/have_opp_date__c.field-meta.xml | 10
force-app/main/default/objects/Opportunity/fields/X153PNetWorthNoProviston__c.field-meta.xml | 27
force-app/main/default/objects/Opportunity/fields/Last_opd_date__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/Authorized_Start_Date__c.field-meta.xml | 24
force-app/main/default/objects/Opportunity/fields/Quote_Update_Sum__c.field-meta.xml | 15
force-app/main/default/objects/Opportunity/fields/OCM_man_province_cus_txt__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/RivalHostsNumber__c.field-meta.xml | 14
force-app/main/default/objects/Product2/fields/ProductClass__c.field-meta.xml | 44
force-app/main/default/objects/Tender_information_details__c/fields/Price_N__c.field-meta.xml | 4
force-app/main/default/objects/Opportunity/fields/Salesdepartment_Owner_Snapshot__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/Bid_Date__c.field-meta.xml | 11
force-app/main/default/objects/Repair_Quotation__c/validationRules/Service_Background_Description.validationRule-meta.xml | 2
force-app/main/default/objects/CampaignMember/recordTypes/Internal_training_participants.recordType-meta.xml | 128
force-app/main/default/objects/Opportunity/fields/IsPrivate.field-meta.xml | 7
force-app/main/default/objects/Quote/fields/Offer_Amount__c.field-meta.xml | 9
force-app/main/default/objects/Opportunity/fields/Estimation_List_Price__c.field-meta.xml | 13
force-app/main/default/objects/Asset/validationRules/Out_of_wh_CanNot_Be_Negativenumber.validationRule-meta.xml | 4
force-app/main/default/objects/Opportunity/fields/If_Have_EPT1__c.field-meta.xml | 11
force-app/main/default/objects/Lead/fields/OCM_Oppor_Assistant__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/order_Date_For_Report__c.field-meta.xml | 23
force-app/main/default/objects/Asset/validationRules/Out_of_wh_ge_Rental_Count.validationRule-meta.xml | 4
force-app/main/default/objects/Lead/validationRules/Check_Hospital_IsActive.validationRule-meta.xml | 9
force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Cannot_ChangeStockDown_WhenCancel.validationRule-meta.xml | 2
force-app/main/default/objects/Lead/fields/HasOptedOutOfEmail.field-meta.xml | 6
force-app/main/default/objects/CampaignMember/fields/LeadSource.field-meta.xml | 5
force-app/main/default/objects/Opportunity/fields/DoNTC__c.field-meta.xml | 15
force-app/main/default/objects/TrackConsumableSalesForecast__c/fields/Consumable_Category3__c.field-meta.xml | 4
force-app/main/default/objects/Opportunity/recordTypes/Opportunity.recordType-meta.xml | 1246 +
force-app/main/default/objects/Account/recordTypes/Department_Class_GYN.recordType-meta.xml | 34
force-app/main/default/objects/Opportunity/fields/NotesApprovedNo_146PBACKUP__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/validationRules/Close_Date_Check.validationRule-meta.xml | 7
force-app/main/default/objects/Lead/fields/Compagin_ID__c.field-meta.xml | 12
force-app/main/default/objects/Opportunity/fields/If_Have_OERAW_F__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/TAT_WIN__c.field-meta.xml | 17
force-app/main/default/objects/CampaignMember/fields/Strategic_dept_name__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/Bid60ThisMonth__c.field-meta.xml | 16
force-app/main/default/objects/Report__c/validationRules/WhetherInstallTarining.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Monthly_Forecast_in__c.field-meta.xml | 15
force-app/main/default/objects/Lead/fields/Hospital_Budget__c.field-meta.xml | 12
force-app/main/default/objects/Opportunity/fields/Opp_Confirmation_Day__c.field-meta.xml | 11
force-app/main/default/objects/Quote/fields/OCM_Agent1_Price_F__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/Job_category__c.field-meta.xml | 13
force-app/main/default/objects/Asset/validationRules/Delete_Manual_asset_request.validationRule-meta.xml | 2
force-app/main/default/objects/Report__c/validationRules/VOC_answer_chk1.validationRule-meta.xml | 4
force-app/main/default/objects/Opportunity/validationRules/Authorizing_ChangeOppNo.validationRule-meta.xml | 7
force-app/main/default/objects/Opportunity/fields/Project_decide_date__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/OCM_Agent1_Price_DB__c.field-meta.xml | 13
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Inspection_after_ng__c.field-meta.xml | 1
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Cannot_Cancel_When_Application.validationRule-meta.xml | 2
force-app/main/default/objects/Repair__c/validationRules/ApplyMust_ProblemOccurred.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/InstallDate__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/ProAH_count__c.field-meta.xml | 16
force-app/main/default/objects/Opportunity/fields/OP__c.field-meta.xml | 34
force-app/main/default/objects/Lead/fields/PartnerAccountId.field-meta.xml | 7
force-app/main/default/objects/Repair__c/validationRules/ApplyMust_WhatProject.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/RANK_E_inc_Tax__c.field-meta.xml | 14
force-app/main/default/objects/Report__c/listViews/All_NTC_146P.listView-meta.xml | 3
force-app/main/default/objects/Repair__c/listViews/All2.listView-meta.xml | 6
force-app/main/default/objects/Case/fields/AccountId.field-meta.xml | 15
force-app/main/default/objects/Opportunity/fields/Stock_cancel_reason_text__c.field-meta.xml | 13
force-app/main/default/objects/Report__c/validationRules/IsVOC_chk.validationRule-meta.xml | 2
force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Delivery_Before_Repair_Aborted.validationRule-meta.xml | 2
force-app/main/default/objects/Event__c/Event__c.object-meta.xml | 10
force-app/main/default/objects/Request_tedner_doc__c/fields/Bid_distributor__c.field-meta.xml | 2
force-app/main/default/objects/Case/fields/Origin.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Backup_order_number__c.field-meta.xml | 12
force-app/main/default/objects/Lead/fields/Hospital_Name__c.field-meta.xml | 15
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Send_to_return_email__c.field-meta.xml | 1
force-app/main/default/objects/Maintenance_Contract__c/validationRules/Opportunity_Stage_check.validationRule-meta.xml | 2
force-app/main/default/objects/Rental_Apply__c/fields/RA_Status__c.field-meta.xml | 3
force-app/main/default/objects/Opportunity/fields/Status0_Elapsed_Date__c.field-meta.xml | 14
force-app/main/default/objects/Contact/fields/Description.field-meta.xml | 2
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Received_confirmation_staff2__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/validationRules/Corrosion_Account.validationRule-meta.xml | 8
force-app/main/default/objects/CampaignMember/fields/Status.field-meta.xml | 5
force-app/main/default/objects/Product2/validationRules/Check_competitor_code.validationRule-meta.xml | 2
force-app/main/default/objects/CampaignMember/fields/LastName.field-meta.xml | 4
force-app/main/default/objects/Opportunity/fields/oldData_flg__c.field-meta.xml | 11
force-app/main/default/objects/Inventory_Header__c/validationRules/Cannot_Submit_When_NOTHave_ManagerBuzhan.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/ShippedAmount_ThisYear_PA_SumTxt__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/webLinks/NewOpportunity_Agency.webLink-meta.xml | 115
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Asset_return_time__c.field-meta.xml | 1
force-app/main/default/objects/Account/validationRules/Not_Modify_Site.validationRule-meta.xml | 2
force-app/main/default/objects/Account/validationRules/Department_Name_Check.validationRule-meta.xml | 4
force-app/main/default/objects/Tender_information__c/fields/TenderDate__c.field-meta.xml | 2
force-app/main/default/objects/OpportunityFileOrder__c/validationRules/SpecificInquiryFileType.validationRule-meta.xml | 2
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Cancel_Mem__c.field-meta.xml | 1
force-app/main/default/objects/Maintenance_Contract__c/validationRules/Agree_Upper_Limit_Check.validationRule-meta.xml | 4
force-app/main/default/objects/RepairSubOrder__c/fields/AWS_Data_Id__c.field-meta.xml | 2
force-app/main/default/objects/CampaignMember/fields/Decision_Maker_Type__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/Stage2_last_update_day__c.field-meta.xml | 11
force-app/main/default/objects/PCLLostProduct__c/fields/Opportunity__c.field-meta.xml | 1
force-app/main/default/objects/SMARM__c/validationRules/Need_FinalComment.validationRule-meta.xml | 2
force-app/main/default/objects/CampaignMember/fields/Trainees_Participate_Day__c.field-meta.xml | 8
force-app/main/default/objects/Opportunity/fields/Min_FirstApproveDate_backup__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/InfoTypeBid_text__c.field-meta.xml | 14
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Bie_Chan_Pin_Fen_Lei_Jia__c.field-meta.xml | 1
force-app/main/default/objects/Asset/validationRules/Request_input_dealer_name.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Department_lastmonth__c.field-meta.xml | 13
force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/Cannot_reply_before_received.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/If_Have_OERAW__c.field-meta.xml | 12
force-app/main/default/objects/Opportunity/listViews/taget_PROVINCE.listView-meta.xml | 35
force-app/main/default/objects/Opportunity/validationRules/NeedImportDemonstration_verification.validationRule-meta.xml | 8
force-app/main/default/objects/Opportunity/fields/UnshippedAmount_DN__c.field-meta.xml | 22
force-app/main/default/objects/On_Call__c/validationRules/On_call_finish_time.validationRule-meta.xml | 2
force-app/main/default/objects/PCLLostBrand__c/PCLLostBrand__c.object-meta.xml | 3
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Ke_Yi_Fen_Pei_Zhu_Ti_Jia__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/validationRules/Status_Phase_Change_Fixed_To_Opp.validationRule-meta.xml | 22
force-app/main/default/objects/Repair__c/validationRules/Aset_SORC_Repair_chk.validationRule-meta.xml | 2
force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/repair_can_not_Shipment.validationRule-meta.xml | 2
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Product2__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/Agency2_Profit__c.field-meta.xml | 13
force-app/main/default/objects/QIS_M_BC__c/validationRules/QIS_submit_request_shipment_product_info.validationRule-meta.xml | 2
force-app/main/default/objects/Rental_Apply__c/validationRules/Track_Number_Need.validationRule-meta.xml | 1
force-app/main/default/objects/Inquiry_form__c/fields/Contact_Name__c.field-meta.xml | 2
force-app/main/default/objects/Lead/fields/Inquiry_Num__c.field-meta.xml | 12
force-app/main/default/objects/Lead/fields/Trade__c.field-meta.xml | 25
force-app/main/default/objects/Product2__c/Product2__c.object-meta.xml | 10
force-app/main/default/objects/Opportunity/fields/Min_FirstApproveDate__c.field-meta.xml | 27
force-app/main/default/objects/Lead/listViews/FOLLOWEDd1.listView-meta.xml | 22
force-app/main/default/objects/PCLLostProduct__c/fields/PCLLostBrand__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/Contract_less_ThisMonthSS__c.field-meta.xml | 11
force-app/main/default/objects/GuaranteePeriodAlterationApplication__c/listViews/All.listView-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Custmor_pic_ID__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/Stage_prospect__c.field-meta.xml | 36
force-app/main/default/objects/Opportunity/fields/ThisPhase_Ship_Forecast__c.field-meta.xml | 11
force-app/main/default/objects/Lead/fields/Request__c.field-meta.xml | 36
force-app/main/default/objects/Quote/fields/BillingName.field-meta.xml | 5
force-app/main/default/objects/TrackConsumableSalesForecast__c/TrackConsumableSalesForecast__c.object-meta.xml | 4
force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Start_day_not_null.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/leaveTime__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/Amount_Without_Tax_F__c.field-meta.xml | 15
force-app/main/default/objects/Opportunity/fields/Lead_CreateBy__c.field-meta.xml | 14
force-app/main/default/objects/AssetMaintainDetail__c/validationRules/MaintainType_Cannot_Change.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Type.field-meta.xml | 8
force-app/main/default/objects/Product_Documentation__c/validationRules/E_Learning_require.validationRule-meta.xml | 2
force-app/main/default/objects/Infrastructure_Project__c/fields/PlanningDepartment__c.field-meta.xml | 15
force-app/main/default/objects/Opportunity/listViews/AllForcastFollowThisMONTH.listView-meta.xml | 39
force-app/main/default/objects/Asset/validationRules/Compeitor_and_UnknownSerial_Competitor.validationRule-meta.xml | 2
force-app/main/default/objects/Maintenance_Contract__c/validationRules/CheckUpper_limitReasonOther.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Competitor_copy__c.field-meta.xml | 56
force-app/main/default/objects/Opportunity/fields/Monthly_order_target_stock_txt__c.field-meta.xml | 13
force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Cannot_ChangeLost_When_Inspection.validationRule-meta.xml | 2
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/IsCancelMainAssign__c.field-meta.xml | 1
force-app/main/default/objects/Agency_Report_Header__c/validationRules/monday.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/webLinks/Create_Activity.webLink-meta.xml | 17
force-app/main/default/objects/Consumable_order_details2__c/fields/Order_ProType_det2_formula__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Forecast_Amount_All_withouttax_F__c.field-meta.xml | 16
force-app/main/default/objects/Maintenance_Contract__c/fields/Recycling_Predetermined_Day__c.field-meta.xml | 2
force-app/main/default/objects/SS_Prospect_5days_list__c/fields/StageNameDeal__c.field-meta.xml | 4
force-app/main/default/objects/Report__c/validationRules/Required_VOC_solution_category.validationRule-meta.xml | 2
force-app/main/default/objects/CampaignMember/fields/OCM_segmentation__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/AgencyOpp_Close_Forecasted_Date__c.field-meta.xml | 12
force-app/main/default/objects/Opportunity/fields/Forecast_ship_monthly_mannual__c.field-meta.xml | 41
force-app/main/default/objects/Repair__c/fields/Request_repair__c.field-meta.xml | 2
force-app/main/default/objects/ConsumableSampleLineItem__c/fields/OPD_SIS_Report__c.field-meta.xml | 4
force-app/main/default/objects/Lead/fields/Account_Salesdepartment__c.field-meta.xml | 12
force-app/main/default/objects/Quote/fields/ShippingAddress.field-meta.xml | 5
force-app/main/default/objects/Opportunity/fields/Tax_Foreign_F__c.field-meta.xml | 32
force-app/main/default/objects/Opportunity/fields/EnergyHost__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/IsAuthorized__c.field-meta.xml | 11
force-app/main/default/objects/Asset/validationRules/Last_Reserve_RAESD_Not_Null.validationRule-meta.xml | 2
force-app/main/default/objects/Tender_information__c/fields/subInfoType__c.field-meta.xml | 16
force-app/main/default/objects/Opportunity/fields/Forecast_shipping_day_last_update__c.field-meta.xml | 11
force-app/main/default/objects/Case/fields/Reason.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/X30_Deposit_Day_New__c.field-meta.xml | 32
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/canDelete__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/From_Today_Num__c.field-meta.xml | 15
force-app/main/default/objects/Lead/fields/Phone.field-meta.xml | 6
force-app/main/default/objects/Opportunity/fields/MeetingApprovedNo__c.field-meta.xml | 12
force-app/main/default/objects/Contact/validationRules/Create_Contrat_Firstname_Check.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Opp_order_Type__c.field-meta.xml | 32
force-app/main/default/objects/CampaignMember/fields/Product_Model__c.field-meta.xml | 8
force-app/main/default/objects/CampaignMember/fields/LeadSource__c.field-meta.xml | 73
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Return_to_office_Final_reply_day_Text__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/Pro170_count__c.field-meta.xml | 17
force-app/main/default/objects/SS_Prospect_5days_list__c/fields/StageNameDiff__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/Forecasted_Bid_Date__c.field-meta.xml | 12
force-app/main/default/objects/On_Call__c/fields/Hospital__c.field-meta.xml | 4
force-app/main/default/objects/Quote/fields/Quote_Comment__c.field-meta.xml | 11
force-app/main/default/objects/Tender_Opportunity_Link__c/fields/IsLeakage_New__c.field-meta.xml | 4
force-app/main/default/objects/CampaignMember/fields/FirstRespondedDate.field-meta.xml | 4
force-app/main/default/objects/Opportunity/fields/Trade__c.field-meta.xml | 26
force-app/main/default/objects/Opportunity/fields/Status2_Elapsed_Date_Function__c.field-meta.xml | 39
force-app/main/default/objects/Opportunity/fields/AgenBusiness_Authorization_No__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/State_Owner_Snapshot__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/Forecast_target_ship_nextmonth__c.field-meta.xml | 19
force-app/main/default/objects/Opportunity/fields/If_Authorizing_Lock__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/validationRules/CloseDate_gt_Close_Forecasted_Date.validationRule-meta.xml | 67
force-app/main/default/objects/Agency_Opportunity__c/listViews/View_Nearly_J_LYear.listView-meta.xml | 382
force-app/main/default/objects/Lead/fields/Status.field-meta.xml | 7
force-app/main/default/objects/Infrastructure_Project__c/fields/Node__c.field-meta.xml | 2
force-app/main/default/objects/Maintenance_Contract__c/validationRules/CheckUpper_limitReason.validationRule-meta.xml | 2
force-app/main/default/objects/QuoteIrai__c/fields/Quotation_Request_list__c.field-meta.xml | 2
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Cannot_reply_before_received.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Last_Install_Date__c.field-meta.xml | 12
force-app/main/default/objects/Opportunity/fields/OCM_forecast_order_day_backup__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/StrategyProductNumber__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/SalesdepartmentForecast_Snapshot__c.field-meta.xml | 13
force-app/main/default/objects/Product2/Product2.object-meta.xml | 17
force-app/main/default/objects/PCLLostProduct__c/fields/LostDepartment_Class__c.field-meta.xml | 1
force-app/main/default/objects/CampaignMember/fields/Description.field-meta.xml | 4
force-app/main/default/objects/Opportunity/fields/Visit_President_Flag__c.field-meta.xml | 14
force-app/main/default/objects/Account/webLinks/N_CIC_B.webLink-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/SeparateBillMark__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/S_Install_Date__c.field-meta.xml | 11
force-app/main/default/objects/Agency_Opportunity__c/recordTypes/Opportunity.recordType-meta.xml | 4
force-app/main/default/objects/Opportunity/fields/EPT1_count__c.field-meta.xml | 16
force-app/main/default/objects/PCLLostProduct__c/fields/ProductCategory__c.field-meta.xml | 320
force-app/main/default/objects/Asset/validationRules/CannotChangeColumnFromIF.validationRule-meta.xml | 6
force-app/main/default/objects/TransferApplyDetail__c/fields/Repair_Status_F__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/Oppor_Number_Report__c.field-meta.xml | 13
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Loaner_code_text__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/listViews/AllForcastFollowThisMONTHtoship.listView-meta.xml | 39
force-app/main/default/objects/Maintenance_Contract_Estimate__c/webLinks/CustomNew.webLink-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/AgencyOpp_Amount__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/businessProcesses/引合.businessProcess-meta.xml | 10
force-app/main/default/objects/Opportunity/fields/Num_Of_Past_Days__c.field-meta.xml | 15
force-app/main/default/objects/Tender_information__c/fields/irresponsibleReason__c.field-meta.xml | 40
force-app/main/default/objects/Tender_information__c/fields/Spot_Check_Result_Op__c.field-meta.xml | 2
force-app/main/default/objects/Tender_information__c/fields/department_selection__c.field-meta.xml | 14
force-app/main/default/objects/Tender_information__c/listViews/All_xin.listView-meta.xml | 12
force-app/main/default/objects/Maintenance_Contract_Estimate__c/fields/DealerType__c.field-meta.xml | 2
force-app/main/default/objects/Inspection_Report__c/Inspection_Report__c.object-meta.xml | 21
force-app/main/default/objects/Opportunity/fields/Opp_Order__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/recordTypes/SI_Oppor.recordType-meta.xml | 1370 ++
force-app/main/default/objects/Opportunity/fields/AgencyQuolified_Flag__c.field-meta.xml | 15
force-app/main/default/objects/Opportunity/fields/AccDealerBlacklist__c.field-meta.xml | 28
force-app/main/default/objects/Quote/fields/ShippingHandling.field-meta.xml | 5
force-app/main/default/objects/Opportunity/fields/Sight2SendEmail_flag__c.field-meta.xml | 11
force-app/main/default/objects/Repair__c/validationRules/ApplyMust_ifDeadHurt.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/PredictPaymentDate__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/Dicision_Maker__c.field-meta.xml | 15
force-app/main/default/objects/Opportunity/fields/B_1_shipping_date__c.field-meta.xml | 16
force-app/main/default/objects/Rental_Apply__c/validationRules/NotNeed_Opp_Try.validationRule-meta.xml | 1
force-app/main/default/objects/Quote/fields/Agency1_Profit_F__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/validationRules/Request_NotesApprovedNo.validationRule-meta.xml | 16
force-app/main/default/objects/Lead/fields/SI_PromoteInquiry__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/Opp_Forecast_before_tender__c.field-meta.xml | 46
force-app/main/default/objects/Opportunity/fields/NoDRMB_Without_Tax__c.field-meta.xml | 19
force-app/main/default/objects/Lead/fields/Lead_Olympus__c.field-meta.xml | 14
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Repair_Status_Text__c.field-meta.xml | 1
force-app/main/default/objects/Account/recordTypes/Department_GI.recordType-meta.xml | 34
force-app/main/default/objects/Opportunity/fields/New_QuoteIrai__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/OPD_target_energy__c.field-meta.xml | 15
force-app/main/default/objects/Opportunity/validationRules/System_Stop_Win.validationRule-meta.xml | 7
force-app/main/default/objects/Lead/fields/Sales_Method__c.field-meta.xml | 45
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Guzhangpaicha_Final_reply_day_Text_Holid__c.field-meta.xml | 1
force-app/main/default/objects/Consumable_order_details2__c/fields/Sales_Promotion__c.field-meta.xml | 7
force-app/main/default/objects/On_Call__c/validationRules/Request_on_call_document_number.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/OCM_man_province_lastmonth__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/If_Have_170__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/LastModified_Day__c.field-meta.xml | 12
force-app/main/default/objects/Opportunity/fields/Status6_Elapsed_Date_Function__c.field-meta.xml | 23
force-app/main/default/objects/Event__c/fields/Purpose_TypeFSE4__c.field-meta.xml | 287
force-app/main/default/objects/Quote/fields/Agency1_Profit_Rate_F__c.field-meta.xml | 15
force-app/main/default/objects/Report__c/validationRules/WhetherInstallTarining2.validationRule-meta.xml | 2
force-app/main/default/objects/Lead/fields/Tender_information__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/Status4_Elapsed_Date__c.field-meta.xml | 14
force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Can_Not_Change_QueNum_WhenSelect.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/listViews/AllOpportunitiesFollowRANK_SHIP.listView-meta.xml | 31
force-app/main/default/objects/Lead/webLinks/Cancel_Lead_Btn.webLink-meta.xml | 38
force-app/main/default/objects/Opportunity/fields/SaleProvince_SAP__c.field-meta.xml | 48
force-app/main/default/objects/Opportunity/validationRules/Request_authorized_DB_number.validationRule-meta.xml | 15
force-app/main/default/objects/Tender_information__c/fields/WinnerAmount1__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/QuotePrinted__c.field-meta.xml | 15
force-app/main/default/objects/Opportunity/fields/LoanApprovedDate__c.field-meta.xml | 11
force-app/main/default/objects/TrackConsumableSalesForecast__c/listViews/All001.listView-meta.xml | 3
force-app/main/default/objects/Asset/fields/SN_BACKUP__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/webLinks/NewOpportunity.webLink-meta.xml | 92
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Guzhangpaicha_Final_reply_day_Text__c.field-meta.xml | 1
force-app/main/default/objects/Asset/validationRules/Compeitor_and_UnknownSerial_Serial.validationRule-meta.xml | 2
force-app/main/default/objects/Asset/validationRules/IFData_cant_Change_to_CopetitorData.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Status2_Elapsed_Date__c.field-meta.xml | 14
force-app/main/default/objects/TransferApplyDetail__c/validationRules/IsBodyOrIsAccessory.validationRule-meta.xml | 2
force-app/main/default/objects/Quote/fields/Discount_Amount__c.field-meta.xml | 11
force-app/main/default/objects/Repair__c/validationRules/Must_Be_Dept_Check.validationRule-meta.xml | 2
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Rental_Date_byHand__c.field-meta.xml | 1
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Bie_Yong_Tu_Ku_Cun_Jia__c.field-meta.xml | 1
force-app/main/default/objects/Knowledge__kav/listViews/draft_articles.listView-meta.xml | 9
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/BuchangApprovalManager__c.field-meta.xml | 1
force-app/main/default/objects/FixtureDeliverySlip__c/validationRules/Return_Back_IMF_CHECK.validationRule-meta.xml | 3
force-app/main/default/objects/Rental_Apply_Fault__c/validationRules/NOT_TO_CHANGE_Reply_message.validationRule-meta.xml | 2
force-app/main/default/objects/Account/recordTypes/RecordType_8.recordType-meta.xml | 34
force-app/main/default/objects/Opportunity/listViews/AllOpportunitiesFollowRANK_DATE1.listView-meta.xml | 34
force-app/main/default/objects/Visit_Report__c/validationRules/Require_submit_manager.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Estimation_Confirm_Qty__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/Status4_Elapsed_Date_Function__c.field-meta.xml | 31
force-app/main/default/objects/TransferApplyDetail__c/validationRules/Can_Not_Create_Detail.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Judge_Lost_or_Cancel__c.field-meta.xml | 12
force-app/main/default/objects/Lead/businessProcesses/日報.businessProcess-meta.xml | 21
force-app/main/default/objects/Opportunity/fields/Sales_Shop_Hospital_Contract__c.field-meta.xml | 11
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Equipment_Set__c.field-meta.xml | 1
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Shippment_loaner_time__c.field-meta.xml | 1
force-app/main/default/objects/Lead/fields/Lead_No__c.field-meta.xml | 13
force-app/main/default/objects/Lead/fields/Account_for_search__c.field-meta.xml | 12
force-app/main/default/objects/Asset/validationRules/You_Xiao_Ku_Cun_ge0.validationRule-meta.xml | 4
force-app/main/default/objects/AssetMaintainHeader__c/validationRules/Scrap_Only.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Configuration_Suggestion__c.field-meta.xml | 27
force-app/main/default/objects/Opportunity/fields/StageName_lastmonth__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/ImportDemonstration_Rejection_date__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/Order_status_sql__c.field-meta.xml | 19
force-app/main/default/objects/CampaignMember/fields/HasOptedOutOfFax.field-meta.xml | 4
force-app/main/default/objects/Event__c/fields/Purpose_TypeFSE5__c.field-meta.xml | 293
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Can_Not_Change_Received_Confirm.validationRule-meta.xml | 2
force-app/main/default/objects/Repair__c/validationRules/Edit_Disabled_When_Finished.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/webLinks/Oppor_Splite.webLink-meta.xml | 21
force-app/main/default/objects/Opportunity/fields/Lead_CreateDate__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/Product_Rep__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/If_Account_Change__c.field-meta.xml | 11
force-app/main/default/objects/Lost_Report__c/validationRules/Third_Party_Company_Is.validationRule-meta.xml | 2
force-app/main/default/objects/Quote/webLinks/Quotation_product.webLink-meta.xml | 20
force-app/main/default/objects/Lead/fields/Jigsaw.field-meta.xml | 6
force-app/main/default/objects/Tender_information__c/fields/ViewBidConfirm__c.field-meta.xml | 8
force-app/main/default/objects/Opportunity/fields/Inquiry_forcast_date_copy__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fieldSets/Customer_enquiry.fieldSet-meta.xml | 76
force-app/main/default/objects/CampaignMember/fields/Speciality__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/Opp_situation__c.field-meta.xml | 26
force-app/main/default/objects/TransferApplyDetail__c/validationRules/Cannot_ChangeLost_When_Inspection.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/webLinks/OLYwinBid.webLink-meta.xml | 48
force-app/main/default/objects/Opportunity/validationRules/CelonCheck.validationRule-meta.xml | 11
force-app/main/default/objects/Quote/fields/ContractId.field-meta.xml | 6
force-app/main/default/objects/Opportunity/fields/If_Authorizing__c.field-meta.xml | 11
force-app/main/default/objects/Case/fields/answer_day__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/Update_follow_category__c.field-meta.xml | 16
force-app/main/default/objects/Opportunity/validationRules/Change_Warning.validationRule-meta.xml | 8
force-app/main/default/objects/SS_Prospect_5days_list__c/fields/InquiryAdvanceRate__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/NM_Forecast_onemonth_before__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/subInfoType__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/Configuration_Suggestions_Feedback__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/Stocking_Price__c.field-meta.xml | 13
force-app/main/default/objects/Rental_Apply__c/fields/Second_level_Old_Apply__c.field-meta.xml | 2
force-app/main/default/objects/Infrastructure_Project__c/fields/StageProgress__c.field-meta.xml | 2
force-app/main/default/objects/Repair__c/validationRules/Direct_Delivery_Logic_SORC_CLVS200IR.validationRule-meta.xml | 2
force-app/main/default/objects/Visit_Report__c/fields/Submit_report_day__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/validationRules/CannotBackToOpportunity_Deleted_Reason.validationRule-meta.xml | 8
force-app/main/default/objects/Opportunity/fields/State__c.field-meta.xml | 39
force-app/main/default/objects/CampaignMember/fields/HCP__c.field-meta.xml | 11
force-app/main/default/objects/Lead/fields/CurrencyIsoCode.field-meta.xml | 6
force-app/main/default/objects/Opportunity/fields/Agency_Contract_Date_last_update__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/webLinks/Cretate_ToDo.webLink-meta.xml | 13
force-app/main/default/objects/Asset/validationRules/Last_inspection_staff_Changed.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Wholesale_Price_F_RMB__c.field-meta.xml | 16
force-app/main/default/objects/Quote/fields/AdditionalAddress.field-meta.xml | 5
force-app/main/default/objects/Opportunity/fields/End_of_this_period__c.field-meta.xml | 14
force-app/main/default/objects/Lead/fields/Energy_Assistant__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/Report_title__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/Opp_Update_Day__c.field-meta.xml | 11
force-app/main/default/objects/Infrastructure_Project__c/fields/Urgency__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/StageName_Forecast__c.field-meta.xml | 13
force-app/main/default/objects/Report__c/validationRules/WhetherRunningFollow.validationRule-meta.xml | 2
force-app/main/default/objects/Agency_Report__c/validationRules/Product_Category1_In_Department_Cateogy.validationRule-meta.xml | 2
force-app/main/default/objects/Asset/validationRules/Loaner_edit_chk.validationRule-meta.xml | 2
force-app/main/default/objects/Lead/fields/OCM_man_province_cus__c.field-meta.xml | 12
force-app/main/default/objects/Lead/fields/Purchase_Expected_Date__c.field-meta.xml | 10
force-app/main/default/objects/Lead/webLinks/Start_Trading.webLink-meta.xml | 33
force-app/main/default/objects/QIS_M_BC__c/validationRules/QIS_M_BC_answer_check.validationRule-meta.xml | 2
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Substitute_flag__c.field-meta.xml | 1
force-app/main/default/objects/Consumable_order_details2__c/listViews/All.listView-meta.xml | 4
force-app/main/default/objects/Opportunity/fields/Monthly_order_target__c.field-meta.xml | 19
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Final_reply_day_text__c.field-meta.xml | 1
force-app/main/default/objects/Repair__c/validationRules/ApplyMust_OperationOrExaminationName.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Click_Close_Date__c.field-meta.xml | 11
force-app/main/default/objects/Consumable_order_details2__c/fields/Used_date__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/WhetherTrySpareParts_1y__c.field-meta.xml | 12
force-app/main/default/objects/Asset/fields/Not_Automatic_AssignQueue__c.field-meta.xml | 2
force-app/main/default/objects/CampaignMember/fields/Phone.field-meta.xml | 4
force-app/main/default/objects/Opportunity/fields/TenderBeginDate_New__c.field-meta.xml | 11
force-app/main/default/objects/Fixture_Set_Detail__c/validationRules/ProductIsRequired.validationRule-meta.xml | 3
force-app/main/default/objects/Event__c/fields/Purpose_TypeFSE__c.field-meta.xml | 284
force-app/main/default/objects/Opportunity/fields/Proposal_check_number__c.field-meta.xml | 15
force-app/main/default/objects/Maintenance_Contract__c/listViews/X02_Selling.listView-meta.xml | 3
force-app/main/default/objects/Repair__c/listViews/All.listView-meta.xml | 1
force-app/main/default/objects/Account/recordTypes/Department.recordType-meta.xml | 34
force-app/main/default/objects/Lead/fields/Creator_Job_Category__c.field-meta.xml | 12
force-app/main/default/objects/Quote/fields/Agency2_Profit_Rate__c.field-meta.xml | 11
force-app/main/default/objects/Account/validationRules/Hosp_Effective_Check.validationRule-meta.xml | 2
force-app/main/default/objects/Lead/listViews/FOLLOW_withoutneed.listView-meta.xml | 29
force-app/main/default/objects/Quote/fields/QuoteName__c.field-meta.xml | 11
force-app/main/default/objects/Lead/fields/CampaignId.field-meta.xml | 5
force-app/main/default/objects/Opportunity/fields/Calendar_Forecast_Shipping_Date_ID__c.field-meta.xml | 15
force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Need_shipment_request_before_logistic.validationRule-meta.xml | 2
force-app/main/default/objects/Asset/validationRules/IFData_cant_Change_to_ManualEntry.validationRule-meta.xml | 4
force-app/main/default/objects/Quote/fields/Name.field-meta.xml | 5
force-app/main/default/objects/Opportunity_File__c/validationRules/SpecificInquiryFileType00.validationRule-meta.xml | 2
force-app/main/default/objects/Report__c/validationRules/SIS_Required_Operation_From.validationRule-meta.xml | 2
force-app/main/default/objects/Lead/fields/hospital__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/OCM_man_province_Snapshot__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/RANK_C__c.field-meta.xml | 16
force-app/main/default/objects/Opportunity/fields/Whether_Upload_Bidding_Document__c.field-meta.xml | 22
force-app/main/default/objects/Opportunity/fields/Stock_apply_passtime__c.field-meta.xml | 11
force-app/main/default/objects/Maintenance_Contract_Estimate__c/validationRules/When_Apply_Required.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Status6_Elapsed_Date__c.field-meta.xml | 14
force-app/main/default/objects/Account/validationRules/Postal_Code_Digits_Check.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/SAP_Send_OK_Date__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/Open_Quotation__c.field-meta.xml | 19
force-app/main/default/objects/Account/validationRules/Can_not_update_department_name.validationRule-meta.xml | 2
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Bie_Ben_Bu_Ku_Cun_Jia__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/Calendar_Forecast_Tender_Date_ID__c.field-meta.xml | 15
force-app/main/default/objects/Opportunity/fields/InquiryOwner_Department_TEXT__c.field-meta.xml | 13
force-app/main/default/objects/CampaignMember/CampaignMember.object-meta.xml | 132
force-app/main/default/objects/Opportunity/fields/LostTask_createTime__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/AccountType__c.field-meta.xml | 13
force-app/main/default/objects/Maintenance_Contract__c/validationRules/CheckDepartRecord.validationRule-meta.xml | 16
force-app/main/default/objects/Opportunity/fields/BeforeSSoppUp__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/Sales_assistantWIN_ID__c.field-meta.xml | 15
force-app/main/default/objects/Event__c/fields/Purpose_Type5__c.field-meta.xml | 20
force-app/main/default/objects/Opportunity/fields/Last_opportunity_file_time__c.field-meta.xml | 12
force-app/main/default/objects/Opportunity/fields/SAP_Province_CD__c.field-meta.xml | 56
force-app/main/default/objects/Opportunity/fields/Sales_Root__c.field-meta.xml | 26
force-app/main/default/objects/Quote/fields/Manager_Service__c.field-meta.xml | 12
force-app/main/default/objects/Lead/fields/owner_not_automatically_update__c.field-meta.xml | 10
force-app/main/default/objects/On_Call__c/fields/segment__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Important_contract__c.field-meta.xml | 31
force-app/main/default/objects/Opportunity/validationRules/SAP_Change_After_Sent.validationRule-meta.xml | 18
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Received_Confirm_Text__c.field-meta.xml | 1
force-app/main/default/objects/Agency_Opportunity__c/recordTypes/Target.recordType-meta.xml | 15
force-app/main/default/objects/Asset/fields/Not_Automatic_Reason__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/ShippedAmount__c.field-meta.xml | 16
force-app/main/default/objects/Report__c/fields/HospitalAcceptancePerson__c.field-meta.xml | 9
force-app/main/default/objects/Opportunity/fields/Product_Sales_Category__c.field-meta.xml | 22
force-app/main/default/objects/Infrastructure_Project__c/fields/IfFollow__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/DecideQuoteDate__c.field-meta.xml | 11
force-app/main/default/objects/Request_tedner_doc__c/validationRules/Request_staff_blank.validationRule-meta.xml | 2
force-app/main/default/objects/Contact/validationRules/DealerMobilePhone.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Forecast_target_ship_thismonth__c.field-meta.xml | 18
force-app/main/default/objects/Opportunity/validationRules/BidDateCanNotEarlyThanBidRequestWhenWin.validationRule-meta.xml | 9
force-app/main/default/objects/Quote/fields/Preferential_Gurantee_Period__c.field-meta.xml | 10
force-app/main/default/objects/Opportunity/fields/Inquiry_forcast_date_formular__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/OP_ThousandY_Target__c.field-meta.xml | 26
force-app/main/default/objects/eSignForm__c/validationRules/agencyAcceptanceOrRejection.validationRule-meta.xml | 2
force-app/main/default/objects/CampaignMember/fields/HasOptedOutOfEmail.field-meta.xml | 4
force-app/main/default/objects/Opportunity/fields/Input_Dealer_HP_date__c.field-meta.xml | 15
force-app/main/default/objects/Opportunity/fields/OCM_man_province_no_dealer__c.field-meta.xml | 65
force-app/main/default/objects/Account/recordTypes/Department_ENT.recordType-meta.xml | 34
force-app/main/default/objects/Opportunity/fields/Agency1_Profit__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/ShippingDate_For_Report__c.field-meta.xml | 11
force-app/main/default/objects/Lead/fields/JobCategoryOfCreator__c.field-meta.xml | 12
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Zsq_Rental_Apply__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/listViews/Opptunity_onbidblack.listView-meta.xml | 38
force-app/main/default/objects/Opportunity/fields/ShippedAmount_DN__c.field-meta.xml | 22
force-app/main/default/objects/Maintenance_Contract__c/fields/DealerType__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/NoDRMB_Without_Tax_1000TR__c.field-meta.xml | 22
force-app/main/default/objects/Opportunity/fields/Owner_F__c.field-meta.xml | 13
force-app/main/default/objects/Event__c/validationRules/location_input_check.validationRule-meta.xml | 4
force-app/main/default/objects/Opportunity/fields/Calendar_Forecast_Date_ID__c.field-meta.xml | 15
force-app/main/default/objects/Opportunity/fields/SeparateBill__c.field-meta.xml | 12
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Cancel_Mem_Name__c.field-meta.xml | 1
force-app/main/default/objects/Rental_Apply_Fault__c/fields/AttachmentImage2__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Inspection_explanation_day__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/Owner_lastmonth__c.field-meta.xml | 13
force-app/main/default/objects/Quote/fields/Agency1__c.field-meta.xml | 37
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/rentalNumReduceChk.validationRule-meta.xml | 2
force-app/main/default/objects/Account/validationRules/DeptClass_IsEquals_Parent.validationRule-meta.xml | 2
force-app/main/default/objects/Product2/fields/Image__c.field-meta.xml | 8
force-app/main/default/objects/Lead/webLinks/HooversProfile.webLink-meta.xml | 20
force-app/main/default/objects/Opportunity/fields/Sales_assistant_name_text__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/CloseDate.field-meta.xml | 7
force-app/main/default/objects/Maintenance_Contract_Estimate__c/validationRules/contactRecord_check.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/PA_PB_target__c.field-meta.xml | 36
force-app/main/default/objects/Opportunity/fields/ThisYear_Opp__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/Create_leed__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/Estimation_Decision__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/Rating01__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/Fund_Basis__c.field-meta.xml | 51
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/UniqueKey__c.field-meta.xml | 1
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/QueueShippmentDate__c.field-meta.xml | 1
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Can_Not_Change_Name.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/webLinks/Cancel_Report.webLink-meta.xml | 64
force-app/main/default/objects/Opportunity/fields/No_Parameter_date__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/If_Have_AH__c.field-meta.xml | 11
force-app/main/default/objects/Quote/fields/ExpirationDate.field-meta.xml | 5
force-app/main/default/objects/Repair__c/validationRules/ApplyMust_FailureQInHospital.validationRule-meta.xml | 18
force-app/main/default/objects/Opportunity/fields/Proportion__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/Agencies__c.field-meta.xml | 12
force-app/main/default/objects/Quote/webLinks/QuoteEdit_Blank.webLink-meta.xml | 25
force-app/main/default/objects/Opportunity/fields/Agency_Opportunity__c.field-meta.xml | 15
force-app/main/default/objects/Opportunity/fields/Bid60NextNextMonth__c.field-meta.xml | 17
force-app/main/default/objects/Opportunity/fields/OPD1__c.field-meta.xml | 11
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Inspection_result_after_OK__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/IsLoanSpare__c.field-meta.xml | 11
force-app/main/default/objects/Rental_Apply__c/validationRules/After_Inquiry_Finished.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Agency1_Profit_Rate__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/Monthly_ship_target_changed__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/Lost_Cancel_Report__c.field-meta.xml | 15
force-app/main/default/objects/Account/validationRules/Required_Parent.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/ProOER_AW_count__c.field-meta.xml | 19
force-app/main/default/objects/Infrastructure_Project__c/fields/ProjectMemo__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/IS_Price_Apply__c.field-meta.xml | 27
force-app/main/default/objects/Opportunity/fields/Tax_Foreign_F_Copy__c.field-meta.xml | 14
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Yizhouweixiu_Final_reply_day_Text__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/Contract_DB_SalesDept_complite_day__c.field-meta.xml | 11
force-app/main/default/objects/Bulletin_Board__c/listViews/All_board_Team.listView-meta.xml | 1
force-app/main/default/objects/Maintenance_Contract__c/validationRules/Need_ContractDate_When_Contract.validationRule-meta.xml | 6
force-app/main/default/objects/Opportunity/fields/OCM_man_province__c.field-meta.xml | 41
force-app/main/default/objects/Case/Case.object-meta.xml | 49
force-app/main/default/objects/Opportunity/fields/NetWorthNoProviston_DN__c.field-meta.xml | 22
force-app/main/default/objects/Opportunity/fields/Whether_FALSE_order__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/SyncedQuoteId.field-meta.xml | 8
force-app/main/default/objects/Opportunity/fieldSets/Opportunity_PCL_L.fieldSet-meta.xml | 31
force-app/main/default/objects/Opportunity/validationRules/SAP_Send_Check_Off.validationRule-meta.xml | 12
force-app/main/default/objects/Opportunity/fields/Shipping_Finished_Day_Func__c.field-meta.xml | 12
force-app/main/default/objects/Opportunity/fields/Bidding_Domestic_Or_Import__c.field-meta.xml | 12
force-app/main/default/objects/Infrastructure_Project__c/fields/IfVisited__c.field-meta.xml | 2
force-app/main/default/objects/Lead/fields/Competitor__c.field-meta.xml | 41
force-app/main/default/objects/Quote/fields/Quote_Date__c.field-meta.xml | 9
force-app/main/default/objects/CampaignMember/fields/MobilePhone__c.field-meta.xml | 8
force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Fixture_Cannot_Repair_Without_NG.validationRule-meta.xml | 2
force-app/main/default/objects/QIS_Report__c/fields/OCSM_QARA_Owner__c.field-meta.xml | 24
force-app/main/default/objects/Opportunity/fields/RANK_C_inc_tax__c.field-meta.xml | 14
force-app/main/default/objects/Quote/fields/IsSyncing.field-meta.xml | 5
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Rental_Num__c.field-meta.xml | 1
force-app/main/default/objects/Knowledge__kav/fields/Contents__c.field-meta.xml | 2
force-app/main/default/objects/Asset/validationRules/IllegalAccount.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Agency_Contract_Date1__c.field-meta.xml | 11
force-app/main/default/objects/PBIAuthorization__c/fields/MSOM_B_MarketAnalysis__c.field-meta.xml | 2
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Loaner_centre_mail_address__c.field-meta.xml | 1
force-app/main/default/objects/Account_Delay_Apply__c/Account_Delay_Apply__c.object-meta.xml | 15
force-app/main/default/objects/Asset/fieldSets/CheckAsset_Right.fieldSet-meta.xml | 15
force-app/main/default/objects/Opportunity/fields/Post__c.field-meta.xml | 13
force-app/main/default/objects/Quote/fields/Installation_location__c.field-meta.xml | 34
force-app/main/default/objects/Opportunity/fields/Opportunity_Category__c.field-meta.xml | 59
force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/rentalNumChk.validationRule-meta.xml | 2
force-app/main/default/objects/Consum_Apply__c/Consum_Apply__c.object-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/Special_Apply_Content__c.field-meta.xml | 13
force-app/main/default/objects/Report__c/fields/Submit_report_day__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Latest_progress_stage__c.field-meta.xml | 40
force-app/main/default/objects/Opportunity/fields/Monthly_ship_target_txt__c.field-meta.xml | 13
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Extend_Status__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/Purchase_Type__c.field-meta.xml | 31
force-app/main/default/objects/Agency_Report__c/validationRules/Product_Category2_In_Department_Cateogy.validationRule-meta.xml | 2
force-app/main/default/objects/Quote/fields/Fax.field-meta.xml | 5
force-app/main/default/objects/Opportunity/fields/STMS_Package_Sale__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/Opportunity__c.field-meta.xml | 44
force-app/main/default/objects/Account/fields/ChannelProgramName.field-meta.xml | 4
force-app/main/default/objects/Contact/fields/Phone_Encrypted__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Agency2_Profit_F__c.field-meta.xml | 15
force-app/main/default/objects/Opportunity/fields/Wholesale_Price_F_SAP_WIN__c.field-meta.xml | 17
force-app/main/default/objects/On_Call__c/validationRules/Request_on_call_follow_time_to.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/TAT_ContractApprove_Win__c.field-meta.xml | 15
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/Rental_Apply_Equipment_Set__c.object-meta.xml | 3
force-app/main/default/objects/Account/fields/IsPartner.field-meta.xml | 6
force-app/main/default/objects/Opportunity/fields/Close_Forecasted_Assume_Date__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/Mail_Tar_Selector__c.field-meta.xml | 14
force-app/main/default/objects/OPDPlan__c/fields/OPDLendSortBefore__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/SalesPoint_Code__c.field-meta.xml | 21
force-app/main/default/objects/Repair__c/validationRules/work_location_select_self_or_4RC.validationRule-meta.xml | 2
force-app/main/default/objects/Visit_Report__c/validationRules/Require_Evaluate1.validationRule-meta.xml | 2
force-app/main/default/objects/Consumable_order_details2__c/recordTypes/Detail2_Delivery.recordType-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/Opp_New_Mark__c.field-meta.xml | 16
force-app/main/default/objects/Quote/fields/Print_HP_Name__c.field-meta.xml | 11
force-app/main/default/objects/Quote/fields/Queto_Confirm_Date__c.field-meta.xml | 9
force-app/main/default/objects/CampaignMember/fields/ContactId.field-meta.xml | 5
force-app/main/default/objects/Repair_Quotation__c/validationRules/Service_CutPrice_apply_when.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/webLinks/BeforeOPDPDFBtn.webLink-meta.xml | 75
force-app/main/default/objects/Opportunity/fields/Target_Opportunity_c__c.field-meta.xml | 11
force-app/main/default/objects/Statu_Achievements_DN_details__c/fields/SerialNoorLotNo_Raw__c.field-meta.xml | 2
force-app/main/default/objects/OpportunityFileOrder__c/validationRules/SpecificInquiryFileType01.validationRule-meta.xml | 2
force-app/main/default/objects/TransferApplyDetail__c/validationRules/Check_NG_For_Un_Delivery.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Category__c.field-meta.xml | 32
force-app/main/default/objects/eSignForm__c/fields/skip_Hospital_Sign__c.field-meta.xml | 6
force-app/main/default/objects/Opportunity/validationRules/After_win_cannot_change_forecast_order_d.validationRule-meta.xml | 10
force-app/main/default/objects/Opportunity/fields/OCM_man_province_new__c.field-meta.xml | 20
force-app/main/default/objects/Opportunity/fields/HasType3Machine__c.field-meta.xml | 11
force-app/main/default/objects/Product2/recordTypes/Sample.recordType-meta.xml | 4
force-app/main/default/objects/Quote/fields/Preferential_Trading_Price__c.field-meta.xml | 9
force-app/main/default/objects/Opportunity/Opportunity.object-meta.xml | 202
force-app/main/default/objects/Quote/fields/Quote_CreatedDate__c.field-meta.xml | 9
force-app/main/default/objects/Opportunity/fields/Sign_Contract_Electronically__c.field-meta.xml | 11
force-app/main/default/objects/Quote/fields/quoteSavedDate__c.field-meta.xml | 9
force-app/main/default/objects/Account/recordTypes/Agency.recordType-meta.xml | 38
force-app/main/default/objects/Opportunity/webLinks/Copy_with_Asset.webLink-meta.xml | 18
force-app/main/default/objects/CampaignMember/fields/Department__c.field-meta.xml | 11
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Can_Not_Cancel_When_Have_Shipment.validationRule-meta.xml | 2
force-app/main/default/objects/Quote/fields/OCM_Sales_Forecast_F__c.field-meta.xml | 14
force-app/main/default/objects/Repair_Quotation__c/validationRules/discount_apply_when.validationRule-meta.xml | 2
force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/Cannot_Cancel_When_Application.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/New_Opportunity__c.field-meta.xml | 11
force-app/main/default/objects/Event__c/fields/Purpose_TypeFSE2__c.field-meta.xml | 282
force-app/main/default/objects/Product2/fields/ConsumCategory1__c.field-meta.xml | 2
force-app/main/default/objects/Repair__c/fields/OCSM_QARA_Owner__c.field-meta.xml | 24
force-app/main/default/objects/Opportunity/fields/Team__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/Manager_name_text__c.field-meta.xml | 14
force-app/main/default/objects/CampaignMember/fields/State.field-meta.xml | 4
force-app/main/default/objects/Opportunity/fields/LostCnt__c.field-meta.xml | 16
force-app/main/default/objects/Opportunity/fields/Whether_update_PCL_this_month__c.field-meta.xml | 15
force-app/main/default/objects/SolutionProjectRequirements__c/SolutionProjectRequirements__c.object-meta.xml | 17
force-app/main/default/objects/Lead/validationRules/LeadSource_Check.validationRule-meta.xml | 9
force-app/main/default/objects/TransferApplyDetail__c/fields/OneToOneAsset__c.field-meta.xml | 2
force-app/main/default/objects/Consum_Apply__c/validationRules/New_Request_Verify.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Estimation_Id__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/Request_quotation_update__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/NextMonthly_order_target__c.field-meta.xml | 24
force-app/main/default/objects/Lead/fields/Rating.field-meta.xml | 7
force-app/main/default/objects/Case/validationRules/Input_IT_related_information.validationRule-meta.xml | 1
force-app/main/default/objects/Infrastructure_Project__c/fields/RelatedInquiryDate__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/AgenMedical_Equipment_Num__c.field-meta.xml | 13
force-app/main/default/objects/Asset/fields/OlyAsset_ValidDate_Replenish__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/Agent1_Agent2_Price_F__c.field-meta.xml | 15
force-app/main/default/objects/Opportunity/fields/Sum_SAIsCompleted__c.field-meta.xml | 16
force-app/main/default/objects/Inspection_Item__c/Inspection_Item__c.object-meta.xml | 8
force-app/main/default/objects/Rental_Apply__c/validationRules/Repair_Ordered_Date_Must_Null.validationRule-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/LostTask_comfirmTime__c.field-meta.xml | 11
force-app/main/default/objects/CampaignMember/fields/Account_State__c.field-meta.xml | 11
force-app/main/default/objects/Quote/fields/IsQuoteTrial__c.field-meta.xml | 9
force-app/main/default/objects/Lead/fields/Account_State__c.field-meta.xml | 12
force-app/main/default/objects/Opportunity/fields/NumberOfBids__c.field-meta.xml | 15
force-app/main/default/objects/TransferApplyDetail__c/validationRules/Receive_After_NG_Aborted_Comment.validationRule-meta.xml | 2
force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Start_day_need_to_bigger_than_today.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Last_Shipping_Scheduled_Date__c.field-meta.xml | 22
force-app/main/default/objects/Opportunity/fields/SPO_URL__c.field-meta.xml | 21
force-app/main/default/objects/Account/fields/OperatingHoursId.field-meta.xml | 7
force-app/main/default/objects/meeting_delay_apply__c/validationRules/EndDateCantLessThanStartDate.validationRule-meta.xml | 2
force-app/main/default/objects/Account/validationRules/DeptClassHospital_IsEquals_Hospital.validationRule-meta.xml | 2
force-app/main/default/objects/Account/validationRules/ValidateFromCanNotLaterThanValidateTo.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/SalesdepartmentForecast_lastmonth__c.field-meta.xml | 13
force-app/main/default/objects/Account/recordTypes/Department_Class_ET.recordType-meta.xml | 34
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Return_Fedex_number2__c.field-meta.xml | 1
force-app/main/default/objects/Repair__c/validationRules/Aset_AMM_Repair_chk.validationRule-meta.xml | 2
force-app/main/default/objects/Maintenance_Contract_Asset_Estimate__c/Maintenance_Contract_Asset_Estimate__c.object-meta.xml | 4
force-app/main/default/objects/Opportunity/fields/If_Need_Authorize__c.field-meta.xml | 21
force-app/main/default/objects/Asset/fields/Uuid.field-meta.xml | 2
force-app/main/default/objects/TransferApplyDetail__c/validationRules/Cannot_Update_When_Finish.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/is_CheckTargetFormula_TF__c.field-meta.xml | 11
force-app/main/default/objects/Asset/fields/Product_Serial_No__c.field-meta.xml | 5
force-app/main/default/objects/SubAuthorized__c/validationRules/cannotChangeAfterApprovalSubAuthorized.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/validationRules/Not_Change_Chuzan_Status.validationRule-meta.xml | 10
force-app/main/default/objects/Quote/fields/Gurantee_Period__c.field-meta.xml | 39
force-app/main/default/objects/Opportunity/fields/OriginalAuthorizationApplicationCod__c.field-meta.xml | 13
force-app/main/default/objects/Rental_Apply__c/validationRules/Campaign_SubreportStatus_Confim.validationRule-meta.xml | 1
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Received_Confirm_Not_Changed.validationRule-meta.xml | 2
force-app/main/default/objects/Lead/validationRules/Need_Fill_InquiryAssistant.validationRule-meta.xml | 8
force-app/main/default/objects/Quote/fields/Discount_Amount_Calculate_F__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/Rating09__c.field-meta.xml | 13
force-app/main/default/objects/Event__c/fields/Activity_PurposeEscFSE__c.field-meta.xml | 25
force-app/main/default/objects/On_Call__c/validationRules/Is_Active_Account.validationRule-meta.xml | 2
force-app/main/default/objects/Agency_Report__c/validationRules/Product_Category3_In_Department_Cateogy.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Deleted_Reason__c.field-meta.xml | 46
force-app/main/default/objects/Lead/fields/Lead_Inquiry_form__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/Predicted_date_ChangeReason__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/LostCntNum__c.field-meta.xml | 14
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Re_Inform_Mail__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/OCM_category_HP__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/OCM_man_province_txt__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/isOwnerDiffWithAccount__c.field-meta.xml | 11
force-app/main/default/objects/Equipment_Set_Detail__c/Equipment_Set_Detail__c.object-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Bid60Date__c.field-meta.xml | 12
force-app/main/default/objects/Opportunity/fields/Sales_window_text__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/Wholesale_Price_backup__c.field-meta.xml | 14
force-app/main/default/objects/Consum_Apply__c/validationRules/Request_approval_day_earlier_14_day.validationRule-meta.xml | 2
force-app/main/default/objects/Account/recordTypes/Department_Class_GS.recordType-meta.xml | 34
force-app/main/default/objects/CampaignMember/webLinks/CreateScore.webLink-meta.xml | 12
force-app/main/default/objects/Opportunity/fields/New_department_category__c.field-meta.xml | 13
force-app/main/default/objects/PCLLostBrand__c/fields/Brand_Differentiation__c.field-meta.xml | 205
force-app/main/default/objects/Statu_Achievements__c/listViews/All_Shipwithoutpay.listView-meta.xml | 5
force-app/main/default/objects/Asset/fields/Quantity.field-meta.xml | 2
force-app/main/default/objects/AssetModifyBelongsChange__c/fields/ServiceRequestTrackingNumber__c.field-meta.xml | 11
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Bollow_Date_Add_7_WD__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/ConvertCnt__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/Last_Visit_Scheduled_Date__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/webLinks/Agency_Authorize.webLink-meta.xml | 211
force-app/main/default/objects/Lead/fields/Campaign__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/ExpectedRevenue.field-meta.xml | 5
force-app/main/default/objects/Account/validationRules/After_approved_cannot_change_FSE.validationRule-meta.xml | 2
force-app/main/default/objects/Lead/fields/CProv__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/Strategic_Department_Class_Id__c.field-meta.xml | 13
force-app/main/default/objects/Infrastructure_Project__c/fields/InfoSource__c.field-meta.xml | 2
force-app/main/default/objects/Rental_Apply__c/fields/Rental_Status__c.field-meta.xml | 5
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Min_Final_reply_day_Text__c.field-meta.xml | 1
force-app/main/default/objects/Account/fields/OCM_man_province_HP__c.field-meta.xml | 4
force-app/main/default/objects/Asset/validationRules/HospitalAsset_Cannot_Change_Scrap_Check.validationRule-meta.xml | 8
force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Receive_After_NG_Aborted.validationRule-meta.xml | 2
force-app/main/default/objects/Agency_Opportunity__c/listViews/View_Nearly_J_LastYear.listView-meta.xml | 382
force-app/main/default/objects/Opportunity/fields/Sales_forecast_YM_BA__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/AgenMedical_Equipment_Expiration_Date__c.field-meta.xml | 12
force-app/main/default/objects/Opportunity/fields/Bool_Create_Day__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/LeadSource.field-meta.xml | 8
force-app/main/default/objects/Opportunity/fields/BO_Forecast_incl_tax__c.field-meta.xml | 17
force-app/main/default/objects/Rental_Apply__c/fields/First_level_Old_Apply__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/TURis_TCRis_OPD__c.field-meta.xml | 15
force-app/main/default/objects/Opportunity/validationRules/After_win_cannotchange_ForcastingDel.validationRule-meta.xml | 11
force-app/main/default/objects/Opportunity/webLinks/Follow_up_history.webLink-meta.xml | 20
force-app/main/default/objects/Lead/fields/Pronouns.field-meta.xml | 7
force-app/main/default/objects/Lead/validationRules/Must_OppName_Check.validationRule-meta.xml | 10
force-app/main/default/objects/Repair__c/validationRules/ApplyMust_InformationFrom.validationRule-meta.xml | 2
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Extend_Date__c.field-meta.xml | 1
force-app/main/default/objects/Lead/fields/Fax.field-meta.xml | 6
force-app/main/default/objects/Opportunity/fieldSets/Opportunity_PCL_Sum.fieldSet-meta.xml | 11
force-app/main/default/objects/Report__c/validationRules/OPD_Report_need_to_Submit_within_7_days.validationRule-meta.xml | 2
force-app/main/default/objects/Lead/validationRules/CampaignSource.validationRule-meta.xml | 9
force-app/main/default/objects/Opportunity/fields/Xin_Gross_Follow_Num__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/Probability.field-meta.xml | 7
force-app/main/default/objects/Opportunity/fields/Monthly_ship_target__c.field-meta.xml | 41
force-app/main/default/objects/Opportunity/fields/SAP_Send_OK__c.field-meta.xml | 11
force-app/main/default/objects/Asset/validationRules/FSE_Cannot_change_to_other_hospital.validationRule-meta.xml | 4
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/StockDown_time__c.field-meta.xml | 1
force-app/main/default/objects/Agency_Opportunity__c/listViews/View_Nearly_J_NextYear.listView-meta.xml | 382
force-app/main/default/objects/Opportunity/fields/Promise_Class__c.field-meta.xml | 31
force-app/main/default/objects/Contact/recordTypes/Doctor.recordType-meta.xml | 222
force-app/main/default/objects/Opportunity/fields/Grade__c.field-meta.xml | 12
force-app/main/default/objects/Opportunity/fields/StageName.field-meta.xml | 8
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Request_input_extend_day.validationRule-meta.xml | 2
force-app/main/default/objects/QuoteIrai__c/fields/Agency1_entrust__c.field-meta.xml | 4
force-app/main/default/objects/Rental_Apply__c/fields/demo_purpose2__c.field-meta.xml | 48
force-app/main/default/objects/RepairSubOrder__c/listViews/RepairSubList_Pending.listView-meta.xml | 2
force-app/main/default/objects/Opportunity/listViews/AllOpportunitiesFollowRANK_ACNFORJIALI.listView-meta.xml | 41
force-app/main/default/objects/Repair_Quotation__c/fields/Usage_Ratio_Price__c.field-meta.xml | 2
force-app/main/default/objects/Tender_information__c/recordTypes/QLM.recordType-meta.xml | 54
force-app/main/default/objects/Opportunity/fields/Owner_Salesdepartment__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/SAP_Send_OK_First_Date__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/SpecialApply__c.field-meta.xml | 15
force-app/main/default/objects/Rental_Apply__c/fields/Status__c.field-meta.xml | 5
force-app/main/default/objects/Opportunity/validationRules/Cnt_Lost_cancel_Must_LTE_1.validationRule-meta.xml | 10
force-app/main/default/objects/Quote/fields/ShippingName.field-meta.xml | 5
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/applyUser__c.field-meta.xml | 1
force-app/main/default/objects/Lead/fields/Address.field-meta.xml | 6
force-app/main/default/objects/CampaignMember/fields/City.field-meta.xml | 4
force-app/main/default/objects/Lead/fields/Pastday_after_creat__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity_File__c/validationRules/SpecificInquiryFileType02.validationRule-meta.xml | 2
force-app/main/default/objects/Asset/validationRules/AnimalCheck.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/NextStep.field-meta.xml | 7
force-app/main/default/objects/LastbuyProduct__c/fields/InquiryCode__c.field-meta.xml | 19
force-app/main/default/objects/Opportunity/fields/Forecast_this_month1__c.field-meta.xml | 15
force-app/main/default/objects/Opportunity/fields/PrdCntRank__c.field-meta.xml | 15
force-app/main/default/objects/Visit_Report__c/validationRules/Require_Evaluate_And_Problem.validationRule-meta.xml | 2
force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/Cancel_reason_not_null.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/OCM_Target_period__c.field-meta.xml | 14
force-app/main/default/objects/Lead/fields/Opportunity_Division__c.field-meta.xml | 25
force-app/main/default/objects/Report__c/validationRules/VOC_finish_chk.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Amount_Without_Tax_Thousand_F__c.field-meta.xml | 16
force-app/main/default/objects/Agency_Opportunity__c/listViews/View_Nearly_J_DYear.listView-meta.xml | 382
force-app/main/default/objects/task__c/validationRules/LeadAssignmentTaskIsRecordType.validationRule-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/Budget_approval_date__c.field-meta.xml | 11
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/NG_Final_reply_day_Text_Holiday_backup__c.field-meta.xml | 1
force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/Received_Confirm_Not_Changed.validationRule-meta.xml | 2
force-app/main/default/objects/Repair__c/fields/work_location_select__c.field-meta.xml | 214
force-app/main/default/objects/Account/validationRules/Fax_Digits_Check.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Cnt_Opponent_Bid_Info__c.field-meta.xml | 11
force-app/main/default/objects/Agency_Report__c/fields/Province_Agency__c.field-meta.xml | 2
force-app/main/default/objects/Visit_Report__c/validationRules/Require_Subordinate.validationRule-meta.xml | 2
force-app/main/default/objects/AssetMaintainHeader__c/AssetMaintainHeader__c.object-meta.xml | 7
force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Request_Return_Logistic_Number.validationRule-meta.xml | 2
force-app/main/default/objects/Lead/fields/Product_Model__c.field-meta.xml | 10
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Return_delivery_company2__c.field-meta.xml | 1
force-app/main/default/objects/Lead/fields/Purchase_Reason__c.field-meta.xml | 35
force-app/main/default/objects/Opportunity/fieldSets/Opportunity_PCL_Mark.fieldSet-meta.xml | 66
force-app/main/default/objects/TemporaryFileBox__c/validationRules/Is_Active_Department_Class.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Opp_Forecast_ThousandY__c.field-meta.xml | 18
force-app/main/default/objects/eSignForm__c/validationRules/HPAcceptanceOrRejection.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/compactLayouts/SI_lightning.compactLayout-meta.xml | 15
force-app/main/default/objects/PCLLostBrand__c/fields/Agency__c.field-meta.xml | 1
force-app/main/default/objects/Quote/fields/TotalPrice.field-meta.xml | 5
force-app/main/default/objects/Repair__c/validationRules/Rental_Apply_Cannot_Modify_Model.validationRule-meta.xml | 2
force-app/main/default/objects/Case/listViews/All_CIC_Record.listView-meta.xml | 6
force-app/main/default/objects/Quote/fields/Contract__c.field-meta.xml | 9
force-app/main/default/objects/Opportunity/fields/First_Shipping_Date__c.field-meta.xml | 23
force-app/main/default/objects/TransferApply__c/TransferApply__c.object-meta.xml | 16
force-app/main/default/objects/On_Call__c/validationRules/Requst_On_call_complete_time.validationRule-meta.xml | 2
force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/fields/JumpStatus__c.field-meta.xml | 37
force-app/main/default/objects/PCLLostBrand__c/fields/LostPrice__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/validationRules/Corrosion_Trade.validationRule-meta.xml | 8
force-app/main/default/objects/Account/recordTypes/Department_Class_ENT.recordType-meta.xml | 34
force-app/main/default/objects/Lead/fields/FirstDate_Quote_Irai__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/listViews/AllOpportunitiesFollowGI_RCN.listView-meta.xml | 39
force-app/main/default/objects/Opportunity/listViews/AllOpportunitiesFollowAll.listView-meta.xml | 35
force-app/main/default/objects/Opportunity/validationRules/ImportDemonstration_Rejection_date_limit.validationRule-meta.xml | 8
force-app/main/default/objects/Lead/fields/Cancel_Reason__c.field-meta.xml | 12
force-app/main/default/objects/Quote/fields/QuoteTotal_Page__c.field-meta.xml | 12
force-app/main/default/objects/Account/validationRules/Telephone_Digits_Check.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Stock_apply_status__c.field-meta.xml | 51
force-app/main/default/objects/Opportunity/fields/IsNextMonthOfVisit__c.field-meta.xml | 11
force-app/main/default/objects/Infrastructure_Project__c/fields/Relation__c.field-meta.xml | 6
force-app/main/default/objects/Opportunity/fields/Num_Of_OPD__c.field-meta.xml | 14
force-app/main/default/objects/Tender_information__c/recordTypes/ZC.recordType-meta.xml | 54
force-app/main/default/objects/Account/fields/HP_OCM_Category_From_Dept__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Opportunity_sub_owner__c.field-meta.xml | 23
force-app/main/default/objects/Consumable_Orderdetails__c/fields/Sum_of_money__c.field-meta.xml | 2
force-app/main/default/objects/Account/validationRules/Record_Type_Change_Check.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/AcecideCntCheck__c.field-meta.xml | 11
force-app/main/default/objects/Rental_Apply__c/validationRules/Campaign_CancelingStatus_Confim.validationRule-meta.xml | 1
force-app/main/default/objects/Opportunity/validationRules/Forecast_SP_day_bigger_than_order_day.validationRule-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/StatusFormula2than__c.field-meta.xml | 15
force-app/main/default/objects/Account/validationRules/FSECannotChangeFieldinPage.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/CHECK2_baojia__c.field-meta.xml | 19
force-app/main/default/objects/Account/fields/Department_RecordType_Name__c.field-meta.xml | 4
force-app/main/default/objects/Opportunity/fields/NextMonthly_ship_target__c.field-meta.xml | 25
force-app/main/default/objects/Consum_Inventory_Detail__c/fields/Final_Quality_Check_Result__c.field-meta.xml | 4
force-app/main/default/objects/FileAddress__c/webLinks/BatchDelete.webLink-meta.xml | 41
force-app/main/default/objects/Opportunity/fields/Authorized_Finish_Sales__c.field-meta.xml | 13
force-app/main/default/objects/Asset/fields/ExternalIdentifier.field-meta.xml | 2
force-app/main/default/objects/Account/fields/Jigsaw.field-meta.xml | 6
force-app/main/default/objects/Opportunity/fields/AccountId.field-meta.xml | 22
force-app/main/default/objects/Quote/fields/OwnerId.field-meta.xml | 6
force-app/main/default/objects/PCLLostBrand__c/fields/Lost_Reason_Sub__c.field-meta.xml | 15
force-app/main/default/objects/Statu_Achievements__c/validationRules/ShippingScheduleDateNeedGreatethantoday.validationRule-meta.xml | 2
force-app/main/default/objects/Inquiry_form__c/validationRules/CampaignSource.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Closing_Bid_Date_Over_60Days__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/Owner_department__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/validationRules/Change_Close_Forecasted_Date_Warning.validationRule-meta.xml | 9
force-app/main/default/objects/Quote/fields/Pricing__c.field-meta.xml | 9
force-app/main/default/objects/Case/fields/ParentId.field-meta.xml | 2
force-app/main/default/objects/CampaignMember/fields/HasResponded.field-meta.xml | 4
force-app/main/default/objects/Opportunity/validationRules/Cannot_Change_Stage2_When_A1.validationRule-meta.xml | 10
force-app/main/default/objects/Opportunity/fields/Collect_Customer_sign__c.field-meta.xml | 11
force-app/main/default/objects/Quote/fields/QuoteToAddress.field-meta.xml | 5
force-app/main/default/objects/TransferApplyDetail__c/validationRules/Only_Can_Select_Same_asset_location.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/validationRules/Not_Update_Wholesale_Price.validationRule-meta.xml | 10
force-app/main/default/objects/Opportunity/fields/OCSMRMB_Without_Tax__c.field-meta.xml | 28
force-app/main/default/objects/Opportunity/fields/HP_Management_Code__c.field-meta.xml | 19
force-app/main/default/objects/Opportunity/fields/BusinessFileArchived__c.field-meta.xml | 11
force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/CanNotSetRDeliverySlipWhenConfirmLost.validationRule-meta.xml | 2
force-app/main/default/objects/PromotionHead__c/fields/Status__c.field-meta.xml | 2
force-app/main/default/objects/Quote/fields/GrandTotal.field-meta.xml | 5
force-app/main/default/objects/CampaignMember/fields/RecordType_ID__c.field-meta.xml | 11
force-app/main/default/objects/Repair__c/validationRules/deleate_request.validationRule-meta.xml | 2
force-app/main/default/objects/Account/fields/Salesdepartment_Dept__c.field-meta.xml | 4
force-app/main/default/objects/Opportunity/fields/CHECK1__c.field-meta.xml | 12
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Groupby_SortInt__c.field-meta.xml | 1
force-app/main/default/objects/task__c/validationRules/winBiddingLoseCancelListTask.validationRule-meta.xml | 2
force-app/main/default/objects/Account/recordTypes/Department_Class_OTH.recordType-meta.xml | 34
force-app/main/default/objects/Opportunity/fields/Department_Name__c.field-meta.xml | 12
force-app/main/default/objects/Asset/fields/Equipment_Type__c.field-meta.xml | 7
force-app/main/default/objects/Agency_Opportunity__c/fields/Hospital_Target__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/ProjectDescription__c.field-meta.xml | 68
force-app/main/default/objects/Repair__c/validationRules/NotAllowedRepairReason.validationRule-meta.xml | 2
force-app/main/default/objects/Consum_Apply__c/validationRules/Campaign_EndStatus_Confim.validationRule-meta.xml | 2
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Delay_Final_Reply_Days__c.field-meta.xml | 1
force-app/main/default/objects/TransferApplyDetail__c/validationRules/Cannot_Change_CancelANDCancelR.validationRule-meta.xml | 2
force-app/main/default/objects/Quote/fields/Dealer_Final_Price__c.field-meta.xml | 11
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Same_Accessory_flag__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/Segment__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/Bidding_Project_Name_Bid__c.field-meta.xml | 15
force-app/main/default/objects/Opportunity/fields/Informationcheck__c.field-meta.xml | 33
force-app/main/default/objects/Opportunity/fields/OrderThisYearQY__c.field-meta.xml | 15
force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Cannot_stock_when_ng.validationRule-meta.xml | 2
force-app/main/default/objects/Tender_information__c/listViews/All_011.listView-meta.xml | 2
force-app/main/default/objects/Lead/fields/Opportunity_stage__c.field-meta.xml | 55
force-app/main/default/objects/Opportunity/fields/X500_2015_1_27__c.field-meta.xml | 13
force-app/main/default/objects/Quote/fields/Agent1_Agent2_Price_Page__c.field-meta.xml | 12
force-app/main/default/objects/Asset/validationRules/Quantity_CanNot_Be_Negativenumber.validationRule-meta.xml | 4
force-app/main/default/objects/Opportunity/fields/CelonOpportunity__c.field-meta.xml | 27
force-app/main/default/objects/Visit_Report__c/validationRules/Require_Evaluate3.validationRule-meta.xml | 2
force-app/main/default/objects/Lead/webLinks/Create_Key_product_evaluation.webLink-meta.xml | 25
force-app/main/default/objects/Opportunity/fields/Important_Rroduct_Count__c.field-meta.xml | 17
force-app/main/default/objects/Quote/fields/Email.field-meta.xml | 5
force-app/main/default/objects/Opportunity/validationRules/Not_Change_HP_after_past_30days.validationRule-meta.xml | 10
force-app/main/default/objects/Opportunity/fields/Over_5million_opp__c.field-meta.xml | 11
force-app/main/default/objects/Repair__c/validationRules/Is_Active_Department_Class.validationRule-meta.xml | 2
force-app/main/default/objects/Account_Number_of_target__c/fields/Account__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/webLinks/NewOpportunityAgency.webLink-meta.xml | 85
force-app/main/default/objects/Opportunity/fields/Is_Corrosion__c.field-meta.xml | 11
force-app/main/default/objects/Repair__c/validationRules/ApplyMust_ProductFailureRelated.validationRule-meta.xml | 2
force-app/main/default/objects/Lead/fields/HasOptedOutOfFax.field-meta.xml | 6
force-app/main/default/objects/Lead/fields/Promise_Class__c.field-meta.xml | 30
force-app/main/default/objects/QIS_M_BC__c/validationRules/Request_input_accsessary_detail_info.validationRule-meta.xml | 2
force-app/main/default/objects/OPDPlan__c/validationRules/isNewCheckAccount.validationRule-meta.xml | 14
force-app/main/default/objects/Account_Delay_Apply__c/validationRules/CheckChangeReason.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Forecast_amount_last_update_day__c.field-meta.xml | 11
force-app/main/default/objects/Account/fields/Is_Active_Formula__c.field-meta.xml | 6
force-app/main/default/objects/Maintenance_Contract_Estimate__c/validationRules/Contract_Esti_Start_Date_GT_CreateDate.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Special_Stage__c.field-meta.xml | 42
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/BuchangApprovalManagerSales__c.field-meta.xml | 1
force-app/main/default/objects/Lead/fields/Title.field-meta.xml | 6
force-app/main/default/objects/Statu_Achievements__c/fields/Monthly_ship_target__c.field-meta.xml | 19
force-app/main/default/objects/Maintenance_Contract__c/fields/Contract_Type__c.field-meta.xml | 2
force-app/main/default/objects/Maintenance_Product_Data_Details__c/fields/ProductsID__c.field-meta.xml | 2
force-app/main/default/objects/Lead/fields/Contact_Name__c.field-meta.xml | 29
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Pai_Dui_Jia__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/Sales_owner_buchangID__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/Dealer_sharing__c.field-meta.xml | 15
force-app/main/default/objects/Opportunity/fields/OPD_SIS_collect_evaluation_sight__c.field-meta.xml | 34
force-app/main/default/objects/Rental_Apply__c/validationRules/IF_IsJum_Rental_Eq_True2.validationRule-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/Collect_Customer_sign_number__c.field-meta.xml | 15
force-app/main/default/objects/Opportunity/fields/Contract_recognized_day_1__c.field-meta.xml | 15
force-app/main/default/objects/OPDPlan__c/validationRules/OPDDateCheck.validationRule-meta.xml | 2
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Demo_purpose2_T__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/Department__c.field-meta.xml | 54
force-app/main/default/objects/Opportunity/fields/Update_situation__c.field-meta.xml | 51
force-app/main/default/objects/Opportunity/fields/Budget_application_date__c.field-meta.xml | 11
force-app/main/default/objects/Maintenance_Contract_Estimate__c/validationRules/Contract_Start_Date_GT_CreateDate.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Stock_Check_Leader__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/Wholesale_Price_F_backup__c.field-meta.xml | 16
force-app/main/default/objects/CampaignMember/fields/Trainees_End_Day__c.field-meta.xml | 8
force-app/main/default/objects/TransferApplyDetail__c/validationRules/Receive_After_Repair_Aborted.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Account_Is_Active__c.field-meta.xml | 12
force-app/main/default/objects/Rental_Apply__c/fields/OPDLendSortBefore__c.field-meta.xml | 2
force-app/main/default/objects/Account/recordTypes/HP.recordType-meta.xml | 30
force-app/main/default/objects/Rental_Apply__c/validationRules/Can_not_create_from_this_repair.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/AgencyDiscount__c.field-meta.xml | 13
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Loaner_cancel_reason__c.field-meta.xml | 33
force-app/main/default/objects/Opportunity/fields/Owner_System__c.field-meta.xml | 14
force-app/main/default/objects/Rental_Apply__c/recordTypes/StandardRequest.recordType-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/Target_category__c.field-meta.xml | 56
force-app/main/default/objects/Quote/fields/TOTAL__c.field-meta.xml | 9
force-app/main/default/objects/Opportunity/fields/Closing_Bid_Company__c.field-meta.xml | 13
force-app/main/default/objects/Lost_Report__c/Lost_Report__c.object-meta.xml | 6
force-app/main/default/objects/Lead/fields/Created_staff_ID__c.field-meta.xml | 12
force-app/main/default/objects/Rental_Apply__c/listViews/View100.listView-meta.xml | 9
force-app/main/default/objects/CampaignMember/fields/CompanyOrAccount.field-meta.xml | 4
force-app/main/default/objects/Opportunity/fields/Visit_Head_Doctor_Count__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/validationRules/Limit_ForecastDay.validationRule-meta.xml | 8
force-app/main/default/objects/Opportunity/fields/ET_SP_Consumption__c.field-meta.xml | 11
force-app/main/default/objects/FixtureDeliverySlip__c/validationRules/DeliveryCompany_Required.validationRule-meta.xml | 2
force-app/main/default/objects/Lead/fields/OCM_Management_Province_HP__c.field-meta.xml | 12
force-app/main/default/objects/Opportunity/fields/Goverment_Important_Department__c.field-meta.xml | 27
force-app/main/default/objects/Opportunity/fields/IsExcludedFromTerritory2Filter.field-meta.xml | 5
force-app/main/default/objects/Opportunity/fields/InquireNumberHosts__c.field-meta.xml | 15
force-app/main/default/objects/Rental_Apply__c/fields/Need_Buzhang_Sale_NewApp__c.field-meta.xml | 53
force-app/main/default/objects/TransferApply__c/fields/BeiPinWindow_F__c.field-meta.xml | 24
force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/End_day_not_null.validationRule-meta.xml | 2
force-app/main/default/objects/Repair__c/fields/Excess_check__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/LostTypeText__c.field-meta.xml | 13
force-app/main/default/objects/Report__c/fields/Manual_Name__c.field-meta.xml | 2
force-app/main/default/objects/CampaignMember/fields/FullName__c.field-meta.xml | 11
force-app/main/default/objects/PCLLostBrand__c/validationRules/SelectOtherAgent.validationRule-meta.xml | 2
force-app/main/default/objects/Request_tedner_doc__c/validationRules/Request_information_before_submit.validationRule-meta.xml | 2
force-app/main/default/objects/On_Call__c/validationRules/Request_on_call_follow_time_from.validationRule-meta.xml | 2
force-app/main/default/objects/Lead/webLinks/SendGmail.webLink-meta.xml | 20
force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Final_arrival_check.validationRule-meta.xml | 2
force-app/main/default/objects/Quote/fields/TotalPrice__c.field-meta.xml | 11
force-app/main/default/objects/FixtureDeliverySlip__c/FixtureDeliverySlip__c.object-meta.xml | 4
force-app/main/default/objects/Quote/fields/Quote_Print_Date__c.field-meta.xml | 9
force-app/main/default/objects/Opportunity/fields/Goverment_key_customer__c.field-meta.xml | 13
force-app/main/default/objects/Lead/compactLayouts/Other_intention.compactLayout-meta.xml | 15
force-app/main/default/objects/On_Call__c/validationRules/First_follow_up_time.validationRule-meta.xml | 2
force-app/main/default/objects/Quote/webLinks/CustomCreateQoute.webLink-meta.xml | 23
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Min_Final_reply_day_Text_Holiday_backup__c.field-meta.xml | 1
force-app/main/default/objects/Rental_Apply__c/recordTypes/Demo_request_past_data.recordType-meta.xml | 7
force-app/main/default/objects/Tender_information__c/validationRules/InfoType_select_resultdate_check.validationRule-meta.xml | 2
force-app/main/default/objects/Inquiry_form__c/Inquiry_form__c.object-meta.xml | 9
force-app/main/default/objects/Opportunity/fields/NextMonthly_order_target_txt__c.field-meta.xml | 13
force-app/main/default/objects/Quote/validationRules/Forbidden_When_Opp_Cancel.validationRule-meta.xml | 10
force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Cancel_reason_not_null.validationRule-meta.xml | 2
force-app/main/default/objects/Fixture_Set_Detail__c/validationRules/UniqueKey_Not_Null.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/webLinks/AssignTaskButton.webLink-meta.xml | 36
force-app/main/default/objects/Opportunity/fields/Monthly_Forecast_in_nextmonth__c.field-meta.xml | 14
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Substitute_Select_Again_text__c.field-meta.xml | 1
force-app/main/default/objects/Rental_Apply__c/validationRules/Before_Request_Apporve.validationRule-meta.xml | 7
force-app/main/default/objects/Training_test_Result__c/fields/campaign__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/SFDCLast_Process_Date__c.field-meta.xml | 22
force-app/main/default/objects/Opportunity/validationRules/Corrosion_Province.validationRule-meta.xml | 9
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Lost_item_check_OK__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/Status_Formula_Option__c.field-meta.xml | 152
force-app/main/default/objects/PCLLostProduct__c/fields/Quantity__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/OCM_department_seg__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/Stock_apply_time__c.field-meta.xml | 11
force-app/main/default/objects/Account/recordTypes/Department_Class_URO.recordType-meta.xml | 34
force-app/main/default/objects/Opportunity/fields/Description.field-meta.xml | 7
manifest/packagevalidatoinruleretrieve.xml | 22
force-app/main/default/objects/Opportunity/fields/Configuration_Suggestion_Feedback__c.field-meta.xml | 27
force-app/main/default/objects/Repair__c/validationRules/ApplyMust_SubOrderCompleteDate_Same.validationRule-meta.xml | 2
force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/Cannot_Change_CancelANDCancelR.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/webLinks/Create_Competitor_Asset.webLink-meta.xml | 28
force-app/main/default/objects/Opportunity/webLinks/LoseBid.webLink-meta.xml | 45
force-app/main/default/objects/Opportunity/fields/Sum_ContractAmount__c.field-meta.xml | 28
force-app/main/default/objects/Opportunity/fields/Group_purchased_order__c.field-meta.xml | 31
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/DataMigration_Flag__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/State_Text__c.field-meta.xml | 11
force-app/main/default/objects/TrackConsumableSalesForecast__c/listViews/All007.listView-meta.xml | 3
force-app/main/default/objects/Opportunity/webLinks/ChangeContractType.webLink-meta.xml | 50
force-app/main/default/objects/Account/validationRules/Submit_Plan_Sales_GI_BF.validationRule-meta.xml | 2
force-app/main/default/objects/CampaignMember/fields/Email__c.field-meta.xml | 9
force-app/main/default/objects/Opportunity/fields/Last_Follow_Up_Date__c.field-meta.xml | 12
force-app/main/default/objects/Opportunity/fields/City_Text__c.field-meta.xml | 13
force-app/main/default/objects/Repair__c/validationRules/ApplyMust_BreakORFallOff.validationRule-meta.xml | 18
force-app/main/default/objects/Agency_Contact__c/validationRules/Create_Agency_Contact_Name_Check.validationRule-meta.xml | 2
force-app/main/default/objects/QuoteIrai__c/fields/Account__c.field-meta.xml | 2
force-app/main/default/objects/Quote/fields/Subtotal.field-meta.xml | 5
force-app/main/default/objects/PCLLostProduct__c/fields/Opportunity_No__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/NM_Forecast_formula__c.field-meta.xml | 29
force-app/main/default/objects/CampaignMember/fields/Country.field-meta.xml | 4
force-app/main/default/objects/Contact/recordTypes/Agency.recordType-meta.xml | 50
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Bie_Sheng_Ku_Cun_jia__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/CDS_Opp__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/Weekly__c.field-meta.xml | 19
force-app/main/default/objects/Opportunity/compactLayouts/lightning_target.compactLayout-meta.xml | 12
force-app/main/default/objects/Opportunity/fields/Old_BiddingProject_Bid__c.field-meta.xml | 13
force-app/main/default/objects/SS_OPDPlan__c/fields/SSOPDLendSortDraft__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/AgencyOpp_No__c.field-meta.xml | 12
force-app/main/default/objects/Repair__c/validationRules/When_NFM103_With_Repairing.validationRule-meta.xml | 2
manifest/packagevalidatoinruledeploy.xml | 8
force-app/main/default/objects/Infrastructure_Project__c/listViews/All_006.listView-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Forecast_Collect_Money__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/Inactive_PCL__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/Lapsed_Days__c.field-meta.xml | 15
force-app/main/default/objects/Lead/webLinks/YahooMaps.webLink-meta.xml | 20
force-app/main/default/objects/Opportunity/fields/Field1__c.field-meta.xml | 11
force-app/main/default/objects/TransferApplyDetail__c/validationRules/Need_shipment_request_before_logistic.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/ContractNum__c.field-meta.xml | 15
force-app/main/default/objects/TransferApplyDetail__c/validationRules/Can_not_Delivery_By_Main_Error.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Comments_Confirmation__c.field-meta.xml | 13
force-app/main/default/objects/Account/validationRules/Submit_Plan_Sales_GS_URO_GYN_ENT.validationRule-meta.xml | 2
force-app/main/default/objects/Rental_Apply__c/fields/Apply_Look__c.field-meta.xml | 6
force-app/main/default/objects/Report__c/validationRules/SIS_Required_OPD_Summarize.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Salesdepartment_SAP__c.field-meta.xml | 128
force-app/main/default/objects/Opportunity/validationRules/ImportDemonstration_Approval_date_limit.validationRule-meta.xml | 8
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Mail_Send_Btn__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/Bidding_Project_Name__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/Special_Approval_Date__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/SalesPoint_Province_CD__c.field-meta.xml | 50
force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Need_Shippment_info_before_receive.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Bidding_Project_SFDC_No__c.field-meta.xml | 12
force-app/main/default/objects/Opportunity/fields/Bidding_Content__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/AccountParentId__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/listViews/AllOpportunitiesFollowRANK_ORDER.listView-meta.xml | 31
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/VF_Rental_Num__c.field-meta.xml | 1
force-app/main/default/objects/Lead/listViews/FOLLOW_new_sales_go.listView-meta.xml | 41
force-app/main/default/objects/Opportunity/fields/ForecastApprovalTime__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/opp_quotes_num__c.field-meta.xml | 11
force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Inspection_After_NG_Aborted_Comment.validationRule-meta.xml | 2
force-app/main/default/objects/Asset/fields/InstallDate.field-meta.xml | 2
force-app/main/default/objects/Quote/fields/Have_Virtual__c.field-meta.xml | 9
force-app/main/default/objects/Opportunity/fields/Created_Day__c.field-meta.xml | 12
force-app/main/default/objects/Opportunity/fields/Summary_Status_Total__c.field-meta.xml | 26
force-app/main/default/objects/CampaignMember/fields/CampaignId.field-meta.xml | 5
force-app/main/default/objects/Opportunity/fields/OFSHospitalLink__c.field-meta.xml | 13
force-app/main/default/objects/Report__c/fields/Technical_Category2__c.field-meta.xml | 1058
force-app/main/default/objects/Opportunity/fields/Contract_Invalid_Total__c.field-meta.xml | 16
force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Repair_For_Main_Cant_Reload.validationRule-meta.xml | 2
force-app/main/default/objects/LostReport__c/validationRules/Cannot_Submit_When_NOTHave_ManagerBuzhan.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/ShippedAmount_without_tax_ThousandY__c.field-meta.xml | 19
force-app/main/default/objects/Opportunity/fields/Installation_location__c.field-meta.xml | 13
force-app/main/default/objects/CampaignMember/fields/Opportunity_Division__c.field-meta.xml | 23
force-app/main/default/objects/CampaignMember/fields/Province__c.field-meta.xml | 12
force-app/main/default/objects/Quote/fields/Description.field-meta.xml | 5
force-app/main/default/objects/TransferApplyDetail__c/validationRules/Request_Return_Logistic_Number.validationRule-meta.xml | 2
force-app/main/default/objects/Lead/fields/Owner_Dep_txt__c.field-meta.xml | 12
force-app/main/default/objects/Opportunity/fields/M2_special_acount_opp__c.field-meta.xml | 11
force-app/main/default/objects/Quote/fields/PriceRefreshDate__c.field-meta.xml | 9
force-app/main/default/objects/CampaignMember/fields/Doctor_Division1__c.field-meta.xml | 11
force-app/main/default/objects/Account/validationRules/Ass_cannot_change_ownerfor_NoApproveHP.validationRule-meta.xml | 2
force-app/main/default/objects/Agency_Opportunity__c/validationRules/OnlyAgencyCanEditTarget.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Contract_Invalid_Date__c.field-meta.xml | 12
force-app/main/default/objects/Repair__c/validationRules/Return_without_Repair_Check.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Closing_Bid_Price_BId__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/OwnerId.field-meta.xml | 8
force-app/main/default/objects/Account/Account.object-meta.xml | 33
force-app/main/default/objects/Opportunity/fields/Account_Name_F__c.field-meta.xml | 16
force-app/main/default/objects/Quote/fields/Agency2__c.field-meta.xml | 32
force-app/main/default/objects/Opportunity/fields/Final_Contract_Proceeded_Date__c.field-meta.xml | 11
force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Cannot_check_when_no_cds.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/StageName__c.field-meta.xml | 22
force-app/main/default/objects/Opportunity/fields/Monthly_order_target_txt__c.field-meta.xml | 13
force-app/main/default/objects/Account/validationRules/DeptRecordName_IsEquals_ParentRecordName.validationRule-meta.xml | 2
force-app/main/default/objects/CampaignMember/fields/DoNotCall.field-meta.xml | 4
force-app/main/default/objects/Opportunity/fields/WhetherTrySpareParts_3m__c.field-meta.xml | 12
force-app/main/default/objects/Opportunity/fields/testUpdateQ__c.field-meta.xml | 11
force-app/main/default/objects/Bulletin_Board__c/fields/Second_category__c.field-meta.xml | 272
force-app/main/default/objects/Opportunity/fields/OCM_Agent1_Price_F__c.field-meta.xml | 15
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Return_to_office_Final_reply_day_U_RC_Ho__c.field-meta.xml | 1
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/SetOrderPoint_sum_Text__c.field-meta.xml | 1
force-app/main/default/objects/CampaignMember/fields/Request_Detail__c.field-meta.xml | 8
force-app/main/default/objects/Quote/listViews/mine.listView-meta.xml | 12
force-app/main/default/objects/Rental_Apply__c/fields/Request_shipping_day__c.field-meta.xml | 2
force-app/main/default/objects/Tender_information__c/fields/ViewWaitConfirm__c.field-meta.xml | 10
force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Cannot_Change_CancelANDCancelR.validationRule-meta.xml | 2
force-app/main/default/objects/Lead/fields/Opp_Name__c.field-meta.xml | 12
force-app/main/default/objects/Maintenance_Contract__c/fields/hospitalQuotationTextSum__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Num_Of_NTC__c.field-meta.xml | 14
force-app/main/default/objects/Asset/validationRules/Must_Input_ChangeQuantityReason.validationRule-meta.xml | 2
force-app/main/default/objects/Asset/validationRules/ProductCheck_2M2.validationRule-meta.xml | 2
force-app/main/default/objects/Maintenance_Contract__c/fields/MaintanceContractPack__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Close_Forecasted_Date__c.field-meta.xml | 16
force-app/main/default/objects/Lead/fields/ProvinceComparison__c.field-meta.xml | 14
force-app/main/default/objects/TransferApplyDetail__c/validationRules/Inspection_result_notOK_cannot_Shippment.validationRule-meta.xml | 2
force-app/main/default/objects/PCLLostProduct__c/fields/LostProductName__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/quoteSavedDate__c.field-meta.xml | 12
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Re_Delay_Apply_Date__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/Agent1_Agent2_Price__c.field-meta.xml | 13
force-app/main/default/objects/Account/validationRules/Approval_After_Assistant_Unable_Edit.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Monthly_order_target_changed__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/Estimation_Proposal_Date__c.field-meta.xml | 11
force-app/main/default/objects/Quote/fields/OCM_Sales_Forecast__c.field-meta.xml | 11
force-app/main/default/objects/Lead/validationRules/HospitalOppCheck.validationRule-meta.xml | 16
force-app/main/default/objects/Tender_information__c/fields/Strategic_department_Opp__c.field-meta.xml | 24
force-app/main/default/objects/Opportunity/fields/Owner_IsActive__c.field-meta.xml | 11
force-app/main/default/objects/Repair__c/validationRules/Incharge_Staff_invalid.validationRule-meta.xml | 2
force-app/main/default/objects/Quote/fields/OpportunityId.field-meta.xml | 6
force-app/main/default/objects/Opportunity/fields/MarketAnalysisDay__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/Sign_Time__c.field-meta.xml | 17
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Start_day_no_bigger_than_end_day.validationRule-meta.xml | 2
force-app/main/default/objects/Report__c/validationRules/ApplyMust_VOCcrectedCheck.validationRule-meta.xml | 6
force-app/main/default/objects/Report__c/validationRules/Need_to_input_all_field_before_submit.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Last_Install_Confirm_Date__c.field-meta.xml | 12
force-app/main/default/objects/Opportunity/fields/State_Owner_lastmonth__c.field-meta.xml | 13
force-app/main/default/objects/Repair__c/validationRules/Incharge_Staff_Changed.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Budget_Amount_Approval__c.field-meta.xml | 13
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Fu_Shu_Pin_Fen_Pei_Jia__c.field-meta.xml | 1
force-app/main/default/objects/Infrastructure_Project__c/fields/ProfessionalDifferentiation__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/RecordCount__c.field-meta.xml | 16
force-app/main/default/objects/Report__c/validationRules/Only_OPDtoSIS.validationRule-meta.xml | 16
force-app/main/default/objects/Opportunity/fields/ArgumentsSubmittedNumber__c.field-meta.xml | 15
force-app/main/default/objects/Asset/fields/Product2Id.field-meta.xml | 20
force-app/main/default/objects/Asset/validationRules/Cannot_change_to_other_department_class.validationRule-meta.xml | 4
force-app/main/default/objects/Opportunity/fields/Rating04__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/ShippedAmount_ThisYear_withoutax_PBCP__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/Discount__c.field-meta.xml | 13
force-app/main/default/objects/Consum_Apply__c/validationRules/Consum_Apply_Flag_Confim.validationRule-meta.xml | 4
force-app/main/default/objects/Opportunity/fields/OCM_Agent1_Price__c.field-meta.xml | 13
force-app/main/default/objects/Knowledge__kav/listViews/archived_articles.listView-meta.xml | 4
force-app/main/default/objects/Opportunity/fields/HP_ID__c.field-meta.xml | 12
force-app/main/default/objects/TransferApplySummary__c/validationRules/Need_detail_when_confirm_ng.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Note_Shipped_Residual_Total__c.field-meta.xml | 23
force-app/main/default/objects/Opportunity/fields/Rating08__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/webLinks/Predicted_Date_Change.webLink-meta.xml | 38
force-app/main/default/objects/Equipment_Set__c/fields/Return_Distributor_method__c.field-meta.xml | 16
force-app/main/default/objects/Opportunity/fieldSets/Opportunity_PCL.fieldSet-meta.xml | 116
force-app/main/default/objects/Quote/fields/Agency2_Profit_Rate_F__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/Important_Rroduct_Flg__c.field-meta.xml | 12
force-app/main/default/objects/Asset/recordTypes/HPAsset.recordType-meta.xml | 76
force-app/main/default/objects/Rental_Apply__c/fields/CL5_CL5_CL6_CL6__c.field-meta.xml | 2
force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/fields/EquipmentSet_Detail_Status_Status__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Rating10__c.field-meta.xml | 13
force-app/main/default/objects/Repair__c/validationRules/Request_input_mating_date.validationRule-meta.xml | 2
force-app/main/default/objects/Account/webLinks/P_GI_case.webLink-meta.xml | 2
force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Can_Not_Select_Cancel_Reason_Zhu.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/OperationDep__c.field-meta.xml | 49
force-app/main/default/objects/Opportunity/webLinks/Lost_Report.webLink-meta.xml | 39
force-app/main/default/objects/Tender_information__c/fields/ViewRelatedOpp__c.field-meta.xml | 12
force-app/main/default/objects/TransferApplySummary__c/validationRules/Can_Not_Cancel_When_Have_Shipment.validationRule-meta.xml | 2
force-app/main/default/objects/Account/validationRules/Can_not_update_hospital.validationRule-meta.xml | 2
force-app/main/default/objects/Lead/fields/Lead_NoDate__c.field-meta.xml | 12
force-app/main/default/objects/Opportunity/fields/opp_updated_history__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/Number_of_PCL__c.field-meta.xml | 15
force-app/main/default/objects/Opportunity/listViews/AllOpportunitiesFollowA.listView-meta.xml | 40
force-app/main/default/objects/Opportunity/fields/ContractId.field-meta.xml | 8
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Equipment_Set_Borrowed__c.field-meta.xml | 1
force-app/main/default/objects/Repair__c/validationRules/cannot_send_yanshoudan_before_return_ass.validationRule-meta.xml | 2
force-app/main/default/objects/Agency_Opportunity__c/fields/Agency_PersonName__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/if_NeedImportDemonstration__c.field-meta.xml | 11
force-app/main/default/objects/CampaignMember/fields/PostalCode.field-meta.xml | 4
force-app/main/default/objects/Account/recordTypes/Department_URO.recordType-meta.xml | 34
force-app/main/default/objects/Opportunity/fields/Tax_Intra_Changed__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/AgencyOpp_FromOCM__c.field-meta.xml | 11
force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Can_Not_Set_Asset_When_Insert.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Status_and_follow__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/Objective_Tax__c.field-meta.xml | 19
force-app/main/default/objects/Opportunity/fields/IF_Submit__c.field-meta.xml | 11
force-app/main/default/objects/Account/recordTypes/Department_OTH.recordType-meta.xml | 34
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/zsqybpyl__c.field-meta.xml | 1
force-app/main/default/objects/Agency_Opportunity__c/fields/Change_To_Opportunity__c.field-meta.xml | 20
force-app/main/default/objects/Opportunity/fields/InquiryLeadForm__c.field-meta.xml | 15
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/RcUnexpectExpiryDelay__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/Shipping_Date_For_Report__c.field-meta.xml | 23
force-app/main/default/objects/Opportunity/fields/Created_ID__c.field-meta.xml | 13
force-app/main/default/objects/Asset/fields/Status.field-meta.xml | 2
force-app/main/default/objects/Opportunity/webLinks/copy_to_base_item.webLink-meta.xml | 27
force-app/main/default/objects/Lead/fields/SendMailToOwner__c.field-meta.xml | 10
force-app/main/default/objects/Opportunity/fields/Strategic_department_Class_Name__c.field-meta.xml | 33
force-app/main/default/objects/TransferApplyDetail__c/validationRules/Can_Not_Create_Detail_Return.validationRule-meta.xml | 2
force-app/main/default/objects/TransferApplyDetail__c/validationRules/NotStockDown_cannot_Shippment.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Contract_Recieve_Date__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/DirectLossFLG__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/validationRules/Authorizing_ChangeBidDate.validationRule-meta.xml | 10
force-app/main/default/objects/Rental_Apply__c/validationRules/For_AH_only_have_contract.validationRule-meta.xml | 4
force-app/main/default/objects/Asset/fields/QRImg__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/CurrencyIsoCode.field-meta.xml | 7
force-app/main/default/objects/Opportunity/fields/Input_win_bid_date__c.field-meta.xml | 15
force-app/main/default/objects/Opportunity/fields/Estimation_No__c.field-meta.xml | 13
force-app/main/default/objects/Lead/fields/LatestQuotationEntrustment__c.field-meta.xml | 14
force-app/main/default/objects/Lead/fields/Website.field-meta.xml | 6
force-app/main/default/objects/Quote/fields/Agency1_Profit_Rate__c.field-meta.xml | 11
force-app/main/default/objects/Infrastructure_Project__c/fields/headquarters__c.field-meta.xml | 3
force-app/main/default/objects/Opportunity/fields/Amount.field-meta.xml | 7
force-app/main/default/objects/Opportunity/fields/Forecast_this_month_formula__c.field-meta.xml | 27
force-app/main/default/objects/Opportunity/fields/Status1_Elapsed_Date_Function__c.field-meta.xml | 43
force-app/main/default/objects/Opportunity/fields/Agency2__c.field-meta.xml | 28
force-app/main/default/objects/Opportunity/fields/EffectiveRentalApply__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/Agency2_Name_F__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/Cnt_Lost_cancel_report__c.field-meta.xml | 21
force-app/main/default/objects/Opportunity/fields/Rating02__c.field-meta.xml | 13
force-app/main/default/objects/Quote/fields/QuotationChange__c.field-meta.xml | 50
force-app/main/default/objects/PromotionHead__c/listViews/ViewTe.listView-meta.xml | 7
force-app/main/default/objects/Account/validationRules/Cannot_Create_Contract.validationRule-meta.xml | 2
force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/Need_detail_when_confirm_ng.validationRule-meta.xml | 2
force-app/main/default/objects/Lead/fields/Number__c.field-meta.xml | 14
force-app/main/default/objects/Agency_Hospital_Link__c/fields/Uniquekey__c.field-meta.xml | 5
force-app/main/default/objects/Lead/fields/StatusF__c.field-meta.xml | 16
force-app/main/default/objects/Opportunity/fields/ShippedAmount_All_Cost__c.field-meta.xml | 14
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Old_Rental_Apply__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/Closing_Bid_Date__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/Forecast_this_month1_copy__c.field-meta.xml | 14
force-app/main/default/objects/Contact/fields/MobilePhone.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/ShippedAmount_All_Cost_notax__c.field-meta.xml | 15
force-app/main/default/objects/LostReport__c/validationRules/Cannot_Submit_App_When_HaveNot_Detail.validationRule-meta.xml | 2
force-app/main/default/objects/SurveyTaker__c/SurveyTaker__c.object-meta.xml | 1
force-app/main/default/objects/Quote/fields/IsSelected__c.field-meta.xml | 15
force-app/main/default/objects/Opportunity/validationRules/Agency1_Change_Check.validationRule-meta.xml | 9
force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/UniqueKey_Not_Null.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity2__c/fields/StageNameDeal__c.field-meta.xml | 4
force-app/main/default/objects/Opportunity/fields/Date_InAdvance_Delay__c.field-meta.xml | 13
force-app/main/default/objects/Lead/fields/IndividualId.field-meta.xml | 7
force-app/main/default/objects/Account/fields/State_Department__c.field-meta.xml | 2
force-app/main/default/objects/Lead/fields/Product_set_LINK__c.field-meta.xml | 12
force-app/main/default/objects/QuoteIrai__c/fields/Agency2_entrust__c.field-meta.xml | 5
force-app/main/default/objects/Opportunity/fields/Important_Contract_Remark__c.field-meta.xml | 13
force-app/main/default/objects/Asset/fields/SOM_Status_2H__c.field-meta.xml | 13
force-app/main/default/objects/Repair__c/validationRules/When_NFM103_Required.validationRule-meta.xml | 2
force-app/main/default/objects/Statu_Achievements__c/listViews/All_Backorder_FirstApprovalunship1.listView-meta.xml | 8
force-app/main/default/objects/Opportunity/fields/Key_tipics_last_update_dayF__c.field-meta.xml | 39
force-app/main/default/objects/Statu_Achievements__c/fields/Reason_for_uncollect_install_document__c.field-meta.xml | 2
force-app/main/default/objects/Repair__c/validationRules/ApplyMust_Delay15Min.validationRule-meta.xml | 18
force-app/main/default/objects/Inventory_Header__c/listViews/All1.listView-meta.xml | 6
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Extend_Final_reply_day_Text_Holiday_back__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/SAP_Province__c.field-meta.xml | 193
force-app/main/default/objects/Rental_Apply__c/listViews/All_Shipped.listView-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/OlyNumberHosts__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/Infrastructure_Adjust__c.field-meta.xml | 12
force-app/main/default/objects/Advance_Payment__c/Advance_Payment__c.object-meta.xml | 4
force-app/main/default/objects/Opportunity/fields/Salesdepartment_Owner_lastmonth__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/Monthly_Forecast_in_lastmonth__c.field-meta.xml | 18
force-app/main/default/objects/Repair__c/validationRules/QIS_repair_check.validationRule-meta.xml | 2
force-app/main/default/objects/Report__c/fields/Loaner_request_no1__c.field-meta.xml | 2
force-app/main/default/objects/PCLLostProduct__c/fields/Submit_Day__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/validationRules/Cannot_Change_Stage_When_A1.validationRule-meta.xml | 10
force-app/main/default/objects/Agency_Opportunity__c/Agency_Opportunity__c.object-meta.xml | 14
force-app/main/default/objects/Account/validationRules/Assistant_only_can_select_L_forOCMhosp.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/webLinks/Contract_Authorize.webLink-meta.xml | 234
force-app/main/default/objects/Account/validationRules/Parent_must_be_DeptCl.validationRule-meta.xml | 2
force-app/main/default/objects/Lead/fields/Close_Forecasted_Date__c.field-meta.xml | 10
force-app/main/default/objects/Opportunity/fields/Elapsed_day_after_create_opportunity__c.field-meta.xml | 16
force-app/main/default/objects/Opportunity/fields/First_Review_Date_in3month__c.field-meta.xml | 15
force-app/main/default/objects/Opportunity/fields/if_Interface_Lock__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/IsImport__c.field-meta.xml | 12
force-app/main/default/objects/Bulletin_Board__c/fields/First_category__c.field-meta.xml | 48
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Received_Confirm_NG_Not_Return_Text__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/Goverment_important_dept__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/AgenTax_Practice_Expiration_Date__c.field-meta.xml | 12
force-app/main/default/objects/Opportunity/fields/Reason_Cancel_WIN__c.field-meta.xml | 27
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Fixture_Set__c.field-meta.xml | 1
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/cannot_update2.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Tender_Number__c.field-meta.xml | 14
force-app/main/default/objects/CampaignMember/fields/Fax.field-meta.xml | 4
force-app/main/default/objects/Opportunity/fields/Closing_Bid_Price__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/validationRules/Limitation_Of_Num_Of_Opportunity_Name.validationRule-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/Stock_Confrim_Date__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/Estimation_Confirm_Date__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/validationRules/Sales_Root_ChangeRule.validationRule-meta.xml | 13
force-app/main/default/objects/Rental_Apply__c/validationRules/For_contract_loaner_only_have_contract.validationRule-meta.xml | 4
force-app/main/default/objects/Lead/fields/Contact__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/Assistant_Applied_Date__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/MultiYearWarrantyTotalPrice__c.field-meta.xml | 13
force-app/main/default/objects/Agency_Opportunity__c/fields/NeedShareBatch__c.field-meta.xml | 12
force-app/main/default/objects/Opportunity/fields/Opportunity_No_read__c.field-meta.xml | 12
force-app/main/default/objects/Consum_Apply__c/validationRules/Cannot_change_PIC.validationRule-meta.xml | 2
force-app/main/default/objects/Quote/fields/Quote_Decision__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/OP_ThousandY__c.field-meta.xml | 31
force-app/main/default/objects/Opportunity/fields/ShippedAmount153P_DN__c.field-meta.xml | 23
force-app/main/default/objects/Lead/fields/Company.field-meta.xml | 7
force-app/main/default/objects/Opportunity/fields/Town__c.field-meta.xml | 20
force-app/main/default/objects/Opportunity/webLinks/Copy_without_Asset.webLink-meta.xml | 12
force-app/main/default/objects/Fixture_Set__c/listViews/View.listView-meta.xml | 6
force-app/main/default/objects/Opportunity/fields/Forecast_Amount_All_withouttax_F_TY__c.field-meta.xml | 15
force-app/main/default/objects/Quote/fields/Quote_No__c.field-meta.xml | 12
force-app/main/default/objects/AssetMaintainHeader__c/validationRules/Cannot_Change_Name.validationRule-meta.xml | 2
force-app/main/default/objects/AssessmentReportStaff__c/fields/HomeworkFeedback__c.field-meta.xml | 1
force-app/main/default/objects/Rental_Apply__c/validationRules/Repair_Create_RAC_Rule.validationRule-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/If_Need_PriceApply__c.field-meta.xml | 24
force-app/main/default/objects/Maintenance_Contract__c/fields/Negotiation_Start_Date__c.field-meta.xml | 2
force-app/main/default/objects/Repair__c/validationRules/isCelon.validationRule-meta.xml | 2
force-app/main/default/objects/Report__c/validationRules/Required_Date.validationRule-meta.xml | 6
force-app/main/default/objects/Opportunity/fields/Today_Rate__c.field-meta.xml | 15
force-app/main/default/objects/Lead/fields/Name_Encrypted__c.field-meta.xml | 11
force-app/main/default/objects/Quote/fields/TotalPrice_F__c.field-meta.xml | 14
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Rental_Apply__c.field-meta.xml | 1
force-app/main/default/objects/CampaignMember/fields/Hospital_name__c.field-meta.xml | 11
force-app/main/default/objects/CampaignMember/fields/FirstName.field-meta.xml | 4
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/LendNum__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/Follow_Start_Date__c.field-meta.xml | 11
force-app/main/default/objects/CampaignMember/fields/Province_HP__c.field-meta.xml | 11
force-app/main/default/objects/TransferApplyDetail__c/validationRules/CanNotSetRDeliverySlipWhenConfirmLost.validationRule-meta.xml | 2
force-app/main/default/objects/Account/validationRules/Can_not_update_department_class.validationRule-meta.xml | 2
force-app/main/default/objects/Consumable_order_details2__c/listViews/All_rens.listView-meta.xml | 3
force-app/main/default/objects/Opportunity/fields/AccountParentParentId__c.field-meta.xml | 13
force-app/main/default/objects/Rental_Apply__c/validationRules/Campaign_EndStatus_Confim.validationRule-meta.xml | 3
force-app/main/default/objects/Maintenance_Contract_Estimate__c/fields/Estimate_Price_range__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/Authorized_DB_No__c.field-meta.xml | 13
force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Cannot_Change_Asset.validationRule-meta.xml | 2
force-app/main/default/objects/Quote/webLinks/Decide.webLink-meta.xml | 37
force-app/main/default/objects/On_Line_Survey__c/fields/Case_category2__c.field-meta.xml | 12
force-app/main/default/objects/Opponent_Bid_Information__c/validationRules/Dummy_product_brand_request.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Lost_Opportunity_Date__c.field-meta.xml | 12
force-app/main/default/objects/Opportunity/fields/Status1_Elapsed_Date__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/ossibility_mark_link__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/CloseDate_in3month__c.field-meta.xml | 14
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Condition_Seven_Days__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/OPP_rank_Last_update_day__c.field-meta.xml | 11
force-app/main/default/objects/Lead/fields/Infrastructure_Project__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/Monthly3_ship_target__c.field-meta.xml | 26
force-app/main/default/objects/Event__c/fields/Activity_Purpose__c.field-meta.xml | 5
force-app/main/default/objects/Opportunity/fields/Sales_assistant_ID__c.field-meta.xml | 13
force-app/main/default/objects/Agency_Contact__c/fields/Agency_ID__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Contract_DB_Finalcomplite_day__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/Install_Status__c.field-meta.xml | 31
force-app/main/default/objects/Opportunity/fields/Agency2_Profit_Rate_F__c.field-meta.xml | 15
force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Cannot_Update_When_Finish.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Forecast_last_month__c.field-meta.xml | 36
force-app/main/default/objects/PCLLostBrand__c/fields/Lost_cancel_report__c.field-meta.xml | 1
force-app/main/default/objects/task__c/validationRules/YouCanNotEditTaskDifferent.validationRule-meta.xml | 2
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Add_Day_For_RC__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/Follow_up_plan_last_update__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/validationRules/ImportDemonstrationRejectiondate_sametim.validationRule-meta.xml | 8
force-app/main/default/objects/Quote/fields/Quote_Expiration_Date__c.field-meta.xml | 9
force-app/main/default/objects/AssetMaintainHeader__c/validationRules/Cannot_Change_Date.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/SI_Decide_ID__c.field-meta.xml | 15
force-app/main/default/objects/On_Call__c/fields/Oncall_Equipment__c.field-meta.xml | 2
force-app/main/default/objects/Quote/webLinks/QuoteSelect.webLink-meta.xml | 36
force-app/main/default/objects/Account/validationRules/Manager_check_for_sale_plan.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Shipping_Finished_Day__c.field-meta.xml | 11
force-app/main/default/objects/Quote/fields/Tax.field-meta.xml | 5
force-app/main/default/objects/Consumable_order_details2__c/recordTypes/Detail2_ReturnGoods.recordType-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/Key_tipics_last_update_day__c.field-meta.xml | 11
force-app/main/default/objects/CampaignMember/fields/LeadId.field-meta.xml | 5
force-app/main/default/objects/Opportunity/fields/Inquiry_Num__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/webLinks/Create_Event.webLink-meta.xml | 11
force-app/main/default/objects/Infrastructure_Project__c/fields/InvestmentAmount__c.field-meta.xml | 2
force-app/main/default/objects/Lead/webLinks/Quotation_request.webLink-meta.xml | 18
force-app/main/default/objects/Opportunity/validationRules/CampaignSource.validationRule-meta.xml | 10
force-app/main/default/objects/Opportunity/fields/Amount_F__c.field-meta.xml | 15
force-app/main/default/objects/BatchIF_Log__c/listViews/NFM109.listView-meta.xml | 10
force-app/main/default/objects/Opportunity/fields/Sales_Shop_Class__c.field-meta.xml | 25
force-app/main/default/objects/Repair__c/fields/FSE_ownerid__c.field-meta.xml | 20
force-app/main/default/objects/Case/fields/Language.field-meta.xml | 7
force-app/main/default/objects/Asset/validationRules/Manual_Entry_Product_NG.validationRule-meta.xml | 4
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/allow_second_delay.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Status7_Elapsed_Date_Function__c.field-meta.xml | 19
force-app/main/default/objects/Infrastructure_Project__c/fields/Node_Options__c.field-meta.xml | 34
force-app/main/default/objects/Lead/fields/MeetingApprovedNo__c.field-meta.xml | 11
force-app/main/default/objects/Quote/fields/Quote_Decision_Date__c.field-meta.xml | 9
force-app/main/default/objects/Agency_Contact__c/Agency_Contact__c.object-meta.xml | 12
force-app/main/default/objects/Opportunity/fields/CampaignId.field-meta.xml | 8
force-app/main/default/objects/Opportunity/fields/Amount_Without_Tax__c.field-meta.xml | 25
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Yizhouweixiu_Final_reply_day_TextHoliday__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/validationRules/Close_Forecasted_Date_Is_Must.validationRule-meta.xml | 8
force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Can_Not_Create_Detail_Return.validationRule-meta.xml | 2
force-app/main/default/objects/Rental_Apply__c/fields/QRImg__c.field-meta.xml | 2
force-app/main/default/objects/Agency_Report__c/validationRules/Report_Date_Must_This_Week.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/TenderBeginDate__c.field-meta.xml | 15
force-app/main/default/objects/Lead/fields/Agency_Opportunity__c.field-meta.xml | 14
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Bollow_Date_Add_10_WD__c.field-meta.xml | 1
force-app/main/default/objects/TrackConsumableSalesForecast__c/fields/Packing_list_manual__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/ShippedAmount_ThisYear_withoutax_PACP__c.field-meta.xml | 14
force-app/main/default/objects/Lead/fields/Email.field-meta.xml | 6
force-app/main/default/objects/Asset/fields/LocationId.field-meta.xml | 7
force-app/main/default/objects/Opportunity/fields/Bidding_Company__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/ConfirmationofAward_createTime__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/RANK_A_inc_tax__c.field-meta.xml | 22
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/JingliApprovalManager__c.field-meta.xml | 1
force-app/main/default/objects/Repair_Quotation__c/validationRules/need_discount_price_Greaterthan_Zero.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Visit_President_Count__c.field-meta.xml | 14
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Extend_workday__c.field-meta.xml | 1
force-app/main/default/objects/Rental_Apply_Fault__c/validationRules/NOT_TO_CHANGE_UseExplain.validationRule-meta.xml | 2
force-app/main/default/objects/Product_Set__c/Product_Set__c.object-meta.xml | 6
force-app/main/default/objects/Inventory_Header__c/validationRules/Cannot_Submit_App_When_Have_Dot_Inventor.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/ShippedAmount_ThisYear_PATxt__c.field-meta.xml | 14
force-app/main/default/objects/Quote/fields/Stock_Pre_Arrangement__c.field-meta.xml | 9
force-app/main/default/objects/Opportunity/fields/LTV_Account_tax__c.field-meta.xml | 15
force-app/main/default/objects/Report__c/Report__c.object-meta.xml | 16
force-app/main/default/objects/Opportunity/fields/Target_Source__c.field-meta.xml | 36
force-app/main/default/objects/CampaignMember/fields/Department_name__c.field-meta.xml | 11
force-app/main/default/objects/Rental_Apply__c/Rental_Apply__c.object-meta.xml | 8
force-app/main/default/objects/Infrastructure_Project__c/fields/hospitalLevel__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/RetentionCnt__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/From_Lead_TF__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/webLinks/Quotation_Product_New.webLink-meta.xml | 28
force-app/main/default/objects/Repair_Quotation__c/validationRules/Service_CutPrice.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Agency2_Profit_Rate__c.field-meta.xml | 13
force-app/main/default/objects/Lost_Report__c/validationRules/Other_Reasons_Is.validationRule-meta.xml | 2
force-app/main/default/objects/Tender_information__c/Tender_information__c.object-meta.xml | 16
force-app/main/default/objects/Opportunity/validationRules/Not_Update_Objective.validationRule-meta.xml | 38
force-app/main/default/objects/Lead/fields/OCM_man_province_cus_txt__c.field-meta.xml | 12
force-app/main/default/objects/Lead/fields/Description.field-meta.xml | 6
force-app/main/default/objects/Opportunity/fields/Rating06__c.field-meta.xml | 13
force-app/main/default/objects/Lead/fields/ForLossReport__c.field-meta.xml | 10
force-app/main/default/objects/SurveyQuestionResponse__c/SurveyQuestionResponse__c.object-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/OCM_man_province_cus__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/validationRules/Corrosion_Check_Not.validationRule-meta.xml | 7
force-app/main/default/objects/Opportunity/fields/InquiryOwner_Department__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/listViews/AllOpportunitiesFollowbiding.listView-meta.xml | 54
force-app/main/default/objects/Lead/webLinks/GoogleMaps.webLink-meta.xml | 20
force-app/main/default/objects/Opportunity/fields/Determine_competitor_parameter_date__c.field-meta.xml | 11
force-app/main/default/objects/Inspection_Report__c/validationRules/InputFinishRPCheck.validationRule-meta.xml | 2
force-app/main/default/objects/Asset/fields/Asset_owner_delaer_name__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Task_createTime__c.field-meta.xml | 11
force-app/main/default/objects/Product2/fields/ProductCategory__c.field-meta.xml | 339
force-app/main/default/objects/Opportunity/fields/Rating11__c.field-meta.xml | 13
force-app/main/default/objects/Repair__c/validationRules/Request_input_collect_money_date.validationRule-meta.xml | 2
force-app/main/default/objects/Lost_Report__c/validationRules/To_Where_Other.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Rating07__c.field-meta.xml | 13
force-app/main/default/objects/Repair__c/validationRules/ApplyMust_ProblemOccurredOther.validationRule-meta.xml | 2
force-app/main/default/objects/Quote/fields/Dealer_Final_Price_F__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/webLinks/enquiryNoBidding.webLink-meta.xml | 17
force-app/main/default/objects/Opportunity/fields/OP_ThousandY_Order__c.field-meta.xml | 42
force-app/main/default/objects/Opportunity/fields/SightSendEmail_flag__c.field-meta.xml | 11
force-app/main/default/objects/Report__c/validationRules/VOC_follow_chk1.validationRule-meta.xml | 10
force-app/main/default/objects/Opportunity/fields/NoDWithout_Tax_Thousand__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/InyiteSendEmail_flag__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/Sales_assistantWIN_Mail__c.field-meta.xml | 13
force-app/main/default/objects/Account/validationRules/Manager_check_for_FSE_plan.validationRule-meta.xml | 3
force-app/main/default/objects/Contact/Contact.object-meta.xml | 52
force-app/main/default/objects/Opportunity/fields/AdvanceTarget__c.field-meta.xml | 27
force-app/main/default/objects/Agency_Contact__c/validationRules/NameCannotStart_Olympus.validationRule-meta.xml | 2
force-app/main/default/objects/Inquiry_form__c/validationRules/Product_Null.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Rating05__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/Sales_Speciality__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/OpportunitySource__c.field-meta.xml | 27
force-app/main/default/objects/Opportunity/fields/SalesdepartmentForecast__c.field-meta.xml | 54
force-app/main/default/objects/Infrastructure_Project__c/fields/DoNotknowtheday__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Assistant_Applied__c.field-meta.xml | 18
force-app/main/default/objects/Product2/validationRules/GuaranteeTypeError.validationRule-meta.xml | 2
force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Receive_After_NG_Aborted_Comment.validationRule-meta.xml | 2
force-app/main/default/objects/Repair__c/validationRules/Not_Update_Asset.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/validationRules/Stage_check.validationRule-meta.xml | 8
force-app/main/default/objects/Opportunity/fields/Calendar_Created_Date_ID__c.field-meta.xml | 15
force-app/main/default/objects/Opportunity/fields/Infrastructure_Project__c.field-meta.xml | 15
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/SalesManager__c.field-meta.xml | 1
force-app/main/default/objects/Lead/fields/FirstOffer_IntervalDays__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/BidWinningNumber__c.field-meta.xml | 14
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Need_detail_when_confirm_ng.validationRule-meta.xml | 2
force-app/main/default/objects/Lead/fields/no_need_date__c.field-meta.xml | 10
force-app/main/default/objects/Opportunity/webLinks/Stock_apply.webLink-meta.xml | 60
force-app/main/default/objects/Statu_Achievements__c/listViews/All_Backorder_OrderCompleted.listView-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/Hospital_Budget__c.field-meta.xml | 13
force-app/main/default/objects/Lead/fields/Wholesale_Price__c.field-meta.xml | 12
force-app/main/default/objects/Opportunity/listViews/taget_PROVINCE1.listView-meta.xml | 34
force-app/main/default/objects/Quote/fields/Agency2_Profit_F__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/Configuration_Suggestions__c.field-meta.xml | 11
force-app/main/default/objects/Lead/fields/OwnerId.field-meta.xml | 7
force-app/main/default/objects/Account/validationRules/canNotUpdateHospitalOwner.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/ShippedAmount_All_backup__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/Note_shipped_residual__c.field-meta.xml | 26
force-app/main/default/objects/Account/fields/Infrastructure_Project__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Contract_DB_request_reason__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/multiYearWarranty__c.field-meta.xml | 11
force-app/main/default/objects/Maintenance_Contract_Estimate__c/validationRules/ContractAmountDecimalCheck.validationRule-meta.xml | 2
force-app/main/default/objects/QIS_Report__c/listViews/status_QIS.listView-meta.xml | 3
force-app/main/default/objects/Account/fields/DealerTypeSum__c.field-meta.xml | 2
force-app/main/default/objects/Asset/fields/ManufactureDate.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Bid_Publish_Date__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/response__c.field-meta.xml | 12
force-app/main/default/objects/Opportunity/fields/Cnt_Lost_cancel_Draft__c.field-meta.xml | 26
force-app/main/default/objects/Opportunity/validationRules/Opportunity_File_Closing_Bid_Date_Check.validationRule-meta.xml | 10
force-app/main/default/objects/Opportunity/fields/Stock_Submit_Date__c.field-meta.xml | 11
force-app/main/default/objects/Account/validationRules/Loaner_edit_chk.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Name.field-meta.xml | 7
force-app/main/default/objects/Lead/fields/Opp_Name_Search__c.field-meta.xml | 34
force-app/main/default/objects/Repair_Quotation__c/validationRules/Service_CutPrice_Reason.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Stock_cancel_reason__c.field-meta.xml | 31
force-app/main/default/objects/Lead/listViews/FOLLOWEDdA.listView-meta.xml | 25
force-app/main/default/objects/Opportunity/validationRules/OCM_expected_data_check.validationRule-meta.xml | 13
force-app/main/default/objects/Maintenance_Contract__c/validationRules/Estimate_Target_Agency_Require.validationRule-meta.xml | 4
force-app/main/default/objects/Rental_Apply__c/fields/Shippment_adress_detail__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/fields/SP_Imaging_OPD_target__c.field-meta.xml | 15
force-app/main/default/objects/Opportunity/fields/Status5_Elapsed_Date__c.field-meta.xml | 14
force-app/main/default/objects/solutionClosingAttachment__c/fields/Solution_Programme__c.field-meta.xml | 2
force-app/main/default/objects/Maintenance_Contract__c/fields/Abandonment_Number_Summary__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Agency1_ID_18__c.field-meta.xml | 12
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Inspection_before_ng__c.field-meta.xml | 1
force-app/main/default/objects/Lead/fields/Industry.field-meta.xml | 7
force-app/main/default/objects/Report__c/validationRules/Request_dairy_report_no.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Sum_ContractAmount_F__c.field-meta.xml | 16
force-app/main/default/objects/Opportunity/fields/Pricebook2Id.field-meta.xml | 6
force-app/main/default/objects/Lead/fields/begin_opp_name__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/webLinks/Stock_cancel.webLink-meta.xml | 70
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Cancel_reason_not_null.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Visit_Head_Doctor_Flag__c.field-meta.xml | 15
force-app/main/default/objects/Opportunity/validationRules/Corrosion_Root.validationRule-meta.xml | 8
force-app/main/default/objects/Asset/validationRules/Request_asset_deleate_Reason.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/Rating12__c.field-meta.xml | 13
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/asset_extend_approval_time__c.field-meta.xml | 1
force-app/main/default/objects/TransferApply__c/fields/QRImg__c.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/If_UploadT1Detailed__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/Status7_Elapsed_Date__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/AgencyBid_Planned_Date__c.field-meta.xml | 12
force-app/main/default/objects/Opportunity/fields/Salesdepartment_Owner__c.field-meta.xml | 13
force-app/main/default/objects/CampaignMember/fields/Contact_Method__c.field-meta.xml | 33
force-app/main/default/objects/CampaignMember/fields/Street.field-meta.xml | 4
force-app/main/default/objects/PCLLostBrand__c/fields/Lost_By_Company_Mannual__c.field-meta.xml | 1
force-app/main/default/objects/Lead/fields/Lead_status__c.field-meta.xml | 18
force-app/main/default/objects/Account/validationRules/Can_input_after_sales_update_status.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/AgencyOpp_StageName__c.field-meta.xml | 13
force-app/main/default/objects/Opportunity/fields/Last_Delivery_Date__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/ShippedAmount_ThisYear_PBTxt__c.field-meta.xml | 14
force-app/main/default/objects/Opportunity/fields/ImportDemonstration_Filing_date__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/Agent_Hospital_Contract_day_last_update__c.field-meta.xml | 11
force-app/main/default/objects/Opportunity/fields/BO_Forecast__c.field-meta.xml | 15
force-app/main/default/objects/Opportunity/fields/Xin_Last_Follow_Up_Date_For_Report__c.field-meta.xml | 11
force-app/main/default/objects/Asset/fields/StatusReason.field-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/OppAdvanceTarget__c.field-meta.xml | 13
force-app/main/default/objects/CampaignMember/recordTypes/Workshop.recordType-meta.xml | 132
force-app/main/default/objects/Lead/fields/AWS_Data_Id__c.field-meta.xml | 12
force-app/main/default/objects/Opportunity/fields/Order_status__c.field-meta.xml | 20
force-app/main/default/objects/Opportunity/fields/Opp_Changed_Field__c.field-meta.xml | 36
force-app/main/default/objects/TransferApplyDetail__c/validationRules/Delivery_Before_Repair_Aborted.validationRule-meta.xml | 2
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Final_reply_day_text_for_sum__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity2__c/fields/StageNameDiff__c.field-meta.xml | 20
/dev/null | 12
force-app/main/default/objects/Opportunity/fields/Status5_Elapsed_Date_Function__c.field-meta.xml | 27
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/cannot_hospital_sign_without_site_time.validationRule-meta.xml | 2
force-app/main/default/objects/Repair__c/validationRules/DateReceiptQuestionsAndFailureDate.validationRule-meta.xml | 2
force-app/main/default/objects/Opportunity/fields/TAT_Augthorization_Bid__c.field-meta.xml | 17
force-app/main/default/objects/CampaignMember/fields/urgent__c.field-meta.xml | 8
force-app/main/default/objects/Repair__c/validationRules/Direct_Delivery_Logic_SORC.validationRule-meta.xml | 2
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Rental_End_Date__c.field-meta.xml | 1
force-app/main/default/objects/Opportunity/validationRules/Lost_or_Cancel_PCL_cannot_Check_WIN.validationRule-meta.xml | 9
2,339 files changed, 35,162 insertions(+), 5,463 deletions(-)
diff --git a/force-app/main/default/objects/ASEActivity__c/ASEActivity__c.object-meta.xml b/force-app/main/default/objects/ASEActivity__c/ASEActivity__c.object-meta.xml
index 3ad2efc..367cfd5 100644
--- a/force-app/main/default/objects/ASEActivity__c/ASEActivity__c.object-meta.xml
+++ b/force-app/main/default/objects/ASEActivity__c/ASEActivity__c.object-meta.xml
@@ -58,11 +58,13 @@
</actionOverrides>
<actionOverrides>
<actionName>Edit</actionName>
- <type>Default</type>
+ <content>LexASEActivityPIPLAura</content>
+ <formFactor>Large</formFactor>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>LightningComponent</type>
</actionOverrides>
<actionOverrides>
<actionName>Edit</actionName>
- <formFactor>Large</formFactor>
<type>Default</type>
</actionOverrides>
<actionOverrides>
@@ -86,11 +88,13 @@
</actionOverrides>
<actionOverrides>
<actionName>New</actionName>
- <type>Default</type>
+ <content>LexASEActivityPIPLAura</content>
+ <formFactor>Large</formFactor>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>LightningComponent</type>
</actionOverrides>
<actionOverrides>
<actionName>New</actionName>
- <formFactor>Large</formFactor>
<type>Default</type>
</actionOverrides>
<actionOverrides>
diff --git a/force-app/main/default/objects/Account/Account.object-meta.xml b/force-app/main/default/objects/Account/Account.object-meta.xml
index 851d245..720656c 100644
--- a/force-app/main/default/objects/Account/Account.object-meta.xml
+++ b/force-app/main/default/objects/Account/Account.object-meta.xml
@@ -184,12 +184,17 @@
</actionOverrides>
<actionOverrides>
<actionName>View</actionName>
- <type>Default</type>
+ <content>NewAccount</content>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>Visualforce</type>
</actionOverrides>
<actionOverrides>
<actionName>View</actionName>
+ <comment>Action override created by Lightning App Builder during activation.</comment>
+ <content>FlexiPage5</content>
<formFactor>Large</formFactor>
- <type>Default</type>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>Flexipage</type>
</actionOverrides>
<actionOverrides>
<actionName>View</actionName>
@@ -233,34 +238,46 @@
<recordTypeTrackHistory>false</recordTypeTrackHistory>
<searchLayouts>
<customTabListAdditionalFields>ACCOUNT.NAME</customTabListAdditionalFields>
- <customTabListAdditionalFields>ACCOUNT.ADDRESS1_CITY</customTabListAdditionalFields>
+ <customTabListAdditionalFields>ACCOUNT.RECORDTYPE</customTabListAdditionalFields>
+ <customTabListAdditionalFields>HP_146POCM_Category_From_Dept__c</customTabListAdditionalFields>
+ <customTabListAdditionalFields>Grade__c</customTabListAdditionalFields>
<customTabListAdditionalFields>ACCOUNT.PHONE1</customTabListAdditionalFields>
<excludedStandardButtons>OpenListInQuip</excludedStandardButtons>
<excludedStandardButtons>NewFromDocument</excludedStandardButtons>
<excludedStandardButtons>DataDotComGetAccountsMultiAddAction</excludedStandardButtons>
<excludedStandardButtons>DiscoveryGetAccountsAction</excludedStandardButtons>
- <excludedStandardButtons>Import</excludedStandardButtons>
+ <excludedStandardButtons>NavigateToAccountDiscoveryDashboard</excludedStandardButtons>
<excludedStandardButtons>MassCreateCallList</excludedStandardButtons>
<excludedStandardButtons>PrintableListView</excludedStandardButtons>
<excludedStandardButtons>SendBulkMessageAction</excludedStandardButtons>
<excludedStandardButtons>MassAddToActionableList</excludedStandardButtons>
- <excludedStandardButtons>NavigateToAccountDiscoveryDashboard</excludedStandardButtons>
+ <excludedStandardButtons>Import</excludedStandardButtons>
<lookupDialogsAdditionalFields>ACCOUNT.NAME</lookupDialogsAdditionalFields>
+ <lookupDialogsAdditionalFields>ACCOUNT.RECORDTYPE</lookupDialogsAdditionalFields>
+ <lookupDialogsAdditionalFields>HP_146POCM_Category_From_Dept__c</lookupDialogsAdditionalFields>
<lookupDialogsAdditionalFields>CORE.USERS.ALIAS</lookupDialogsAdditionalFields>
- <lookupDialogsAdditionalFields>ACCOUNT.TYPE</lookupDialogsAdditionalFields>
+ <lookupDialogsAdditionalFields>Sales_Shop_Class__c</lookupDialogsAdditionalFields>
+ <lookupDialogsAdditionalFields>Is_Active_Formula__c</lookupDialogsAdditionalFields>
<lookupPhoneDialogsAdditionalFields>ACCOUNT.NAME</lookupPhoneDialogsAdditionalFields>
+ <lookupPhoneDialogsAdditionalFields>ACCOUNT.SITE</lookupPhoneDialogsAdditionalFields>
<lookupPhoneDialogsAdditionalFields>CORE.USERS.ALIAS</lookupPhoneDialogsAdditionalFields>
<lookupPhoneDialogsAdditionalFields>ACCOUNT.TYPE</lookupPhoneDialogsAdditionalFields>
<lookupPhoneDialogsAdditionalFields>ACCOUNT.PHONE1</lookupPhoneDialogsAdditionalFields>
+ <lookupPhoneDialogsAdditionalFields>PhoneCall__c</lookupPhoneDialogsAdditionalFields>
+ <searchFilterFields>State_Master__c</searchFilterFields>
+ <searchFilterFields>OCM_Category__c</searchFilterFields>
+ <searchFilterFields>ACCOUNT.RECORDTYPE</searchFilterFields>
+ <searchFilterFields>CREATEDBY_USER.ALIAS</searchFilterFields>
+ <searchFilterFields>Is_Active__c</searchFilterFields>
<searchResultsAdditionalFields>ACCOUNT.NAME</searchResultsAdditionalFields>
<searchResultsAdditionalFields>Management_Code__c</searchResultsAdditionalFields>
<searchResultsAdditionalFields>ACCOUNT.RECORDTYPE</searchResultsAdditionalFields>
<searchResultsAdditionalFields>Grade__c</searchResultsAdditionalFields>
- <searchResultsAdditionalFields>OCM_Category__c</searchResultsAdditionalFields>
+ <searchResultsAdditionalFields>HP_146POCM_Category_From_Dept__c</searchResultsAdditionalFields>
<searchResultsAdditionalFields>Is_Active_Formula__c</searchResultsAdditionalFields>
<searchResultsAdditionalFields>OCM_man_province_HP__c</searchResultsAdditionalFields>
<searchResultsAdditionalFields>City_Master__c</searchResultsAdditionalFields>
- <searchResultsAdditionalFields>Address_Together__c</searchResultsAdditionalFields>
+ <searchResultsAdditionalFields>Address__c</searchResultsAdditionalFields>
<searchResultsAdditionalFields>Sales_Shop_Class__c</searchResultsAdditionalFields>
</searchLayouts>
<sharingModel>Private</sharingModel>
diff --git a/force-app/main/default/objects/Account/fields/Aim_Price__c.field-meta.xml b/force-app/main/default/objects/Account/fields/Aim_Price__c.field-meta.xml
index 57b9f5a..d3e4cb8 100644
--- a/force-app/main/default/objects/Account/fields/Aim_Price__c.field-meta.xml
+++ b/force-app/main/default/objects/Account/fields/Aim_Price__c.field-meta.xml
@@ -3,7 +3,7 @@
<fullName>Aim_Price__c</fullName>
<description>鐗圭磩璨╁２搴椼伄鐩</description>
<externalId>false</externalId>
- <inlineHelpText>Agreed aim of authorized dealer</inlineHelpText>
+ <inlineHelpText>鐗圭害缁忛攢鍟嗗崗璁洰鏍�</inlineHelpText>
<label>鐩爣閲戦(涓嶅惈绋�,鍏�)</label>
<precision>18</precision>
<required>false</required>
diff --git a/force-app/main/default/objects/Account/fields/ChannelProgramLevelName.field-meta.xml b/force-app/main/default/objects/Account/fields/ChannelProgramLevelName.field-meta.xml
new file mode 100644
index 0000000..bb9c36e
--- /dev/null
+++ b/force-app/main/default/objects/Account/fields/ChannelProgramLevelName.field-meta.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ChannelProgramLevelName</fullName>
+</CustomField>
diff --git a/force-app/main/default/objects/Account/fields/ChannelProgramName.field-meta.xml b/force-app/main/default/objects/Account/fields/ChannelProgramName.field-meta.xml
new file mode 100644
index 0000000..b0294b8
--- /dev/null
+++ b/force-app/main/default/objects/Account/fields/ChannelProgramName.field-meta.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ChannelProgramName</fullName>
+</CustomField>
diff --git a/force-app/main/default/objects/Account/fields/DealerTypeSum__c.field-meta.xml b/force-app/main/default/objects/Account/fields/DealerTypeSum__c.field-meta.xml
index 7783877..17446c9 100644
--- a/force-app/main/default/objects/Account/fields/DealerTypeSum__c.field-meta.xml
+++ b/force-app/main/default/objects/Account/fields/DealerTypeSum__c.field-meta.xml
@@ -2,7 +2,7 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>DealerTypeSum__c</fullName>
<externalId>false</externalId>
- <formula>if(RecordTypeId != '012C600000003HF','',
+ <formula>if(RecordTypeId != '01210000000Qem1','',
if(Or(Text(Sales_Shop_Class__c) = '鐗圭磩璨╁２搴楋紙鍖哄煙锛�',Text(Sales_Shop_Class__c) = '鐗圭磩璨╁２搴楋紙瑁藉搧+鍖哄煙锛�',Text(Sales_Shop_Class__c) = '鐗圭害缁忛攢鍟嗭紙鍖哄煙锛�',Text(Sales_Shop_Class__c) = '鐗圭害缁忛攢鍟嗭紙鍖哄煙+浜у搧锛�'),'鐗圭害缁忛攢鍟�','涓�鑸粡閿�鍟�')
)</formula>
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
diff --git a/force-app/main/default/objects/Account/fields/Department_Class_Wd__c.field-meta.xml b/force-app/main/default/objects/Account/fields/Department_Class_Wd__c.field-meta.xml
index 9aa1784..4b12017 100644
--- a/force-app/main/default/objects/Account/fields/Department_Class_Wd__c.field-meta.xml
+++ b/force-app/main/default/objects/Account/fields/Department_Class_Wd__c.field-meta.xml
@@ -2,7 +2,7 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Department_Class_Wd__c</fullName>
<externalId>false</externalId>
- <formula>IF(Parent.Parent.RecordTypeId = '012C600000003HZ',
+ <formula>IF(Parent.Parent.RecordTypeId = '01210000000QemG',
Case(Parent.Department_Class_Label__c,
"娑堝寲绉�","GI",
"鍛煎惛绉�","BF",
diff --git a/force-app/main/default/objects/Account/fields/Department_RecordType_Name__c.field-meta.xml b/force-app/main/default/objects/Account/fields/Department_RecordType_Name__c.field-meta.xml
index 403bf85..ecd30e1 100644
--- a/force-app/main/default/objects/Account/fields/Department_RecordType_Name__c.field-meta.xml
+++ b/force-app/main/default/objects/Account/fields/Department_RecordType_Name__c.field-meta.xml
@@ -1,10 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Department_RecordType_Name__c</fullName>
- <description>GLOBAL:01210000000QemG
-ALI: 012C600000003HZ</description>
<externalId>false</externalId>
- <formula>IF(Parent.Parent.RecordTypeId = '012C600000003HZ',
+ <formula>IF(Parent.Parent.RecordTypeId = '01210000000QemG',
Case(RecordType.Name,
"瑷虹檪绉� 娑堝寲绉�","1.娑堝寲绉�",
"瑷虹檪绉� 鍛煎惛绉�","2.鍛煎惛绉�",
diff --git a/force-app/main/default/objects/Account/fields/HP_OCM_Category_From_Class__c.field-meta.xml b/force-app/main/default/objects/Account/fields/HP_OCM_Category_From_Class__c.field-meta.xml
index dc5c18c..b3ae532 100644
--- a/force-app/main/default/objects/Account/fields/HP_OCM_Category_From_Class__c.field-meta.xml
+++ b/force-app/main/default/objects/Account/fields/HP_OCM_Category_From_Class__c.field-meta.xml
@@ -3,7 +3,7 @@
<fullName>HP_OCM_Category_From_Class__c</fullName>
<description>鎴︾暐绉戝銇嬨倝銇裤仧鐥呴櫌銇甇CM鍒嗛 / 鍦ㄦ垬鐣ョ瀹ゅ弬鑰冨尰闄㈢殑OCM绛夌骇</description>
<externalId>false</externalId>
- <formula>IF(Parent.RecordTypeId = '012C600000003HZ',
+ <formula>IF(Parent.RecordTypeId = '01210000000QemG',
Text(Parent.OCM_Category__c),
''
)</formula>
diff --git a/force-app/main/default/objects/Account/fields/HP_OCM_Category_From_Dept__c.field-meta.xml b/force-app/main/default/objects/Account/fields/HP_OCM_Category_From_Dept__c.field-meta.xml
index 0e910ac..dbaa742 100644
--- a/force-app/main/default/objects/Account/fields/HP_OCM_Category_From_Dept__c.field-meta.xml
+++ b/force-app/main/default/objects/Account/fields/HP_OCM_Category_From_Dept__c.field-meta.xml
@@ -3,7 +3,7 @@
<fullName>HP_OCM_Category_From_Dept__c</fullName>
<description>瑷虹檪绉戙亱銈夈伩銇烵CM鍒嗛 / 鍦ㄧ瀹ゅ弬鑰冨尰闄㈢殑OCM绛夌骇</description>
<externalId>false</externalId>
- <formula>IF(Parent.Parent.RecordTypeId = '012C600000003HZ',
+ <formula>IF(Parent.Parent.RecordTypeId = '01210000000QemG',
Text(Parent.Parent.OCM_Category__c),
''
)</formula>
diff --git a/force-app/main/default/objects/Account/fields/Ideal_Image_Sales__c.field-meta.xml b/force-app/main/default/objects/Account/fields/Ideal_Image_Sales__c.field-meta.xml
index 7ac55ab..a1855f4 100644
--- a/force-app/main/default/objects/Account/fields/Ideal_Image_Sales__c.field-meta.xml
+++ b/force-app/main/default/objects/Account/fields/Ideal_Image_Sales__c.field-meta.xml
@@ -3,7 +3,7 @@
<fullName>Ideal_Image_Sales__c</fullName>
<externalId>false</externalId>
<inlineHelpText>璇峰～鍐�148P鏈杈惧埌鐨勭姸鎬侊紙5/25鍓嶅彲淇敼锛�
-渚嬶細鏇存柊 浜у搧锛涜揪鍒板湴鍖� 姘村钩鍖婚櫌閰嶇疆绛�</inlineHelpText>
+渚嬶細鏇存柊****浜у搧锛涜揪鍒板湴鍖�****姘村钩鍖婚櫌閰嶇疆绛�</inlineHelpText>
<label>***鎷撳睍銉诲紑鎷撹鍒�/钀ラ攢鏂规(閿�鍞�)</label>
<required>false</required>
<trackFeedHistory>false</trackFeedHistory>
diff --git a/force-app/main/default/objects/Account/fields/Infrastructure_Project__c.field-meta.xml b/force-app/main/default/objects/Account/fields/Infrastructure_Project__c.field-meta.xml
index 505d957..f4e8cdc 100644
--- a/force-app/main/default/objects/Account/fields/Infrastructure_Project__c.field-meta.xml
+++ b/force-app/main/default/objects/Account/fields/Infrastructure_Project__c.field-meta.xml
@@ -6,7 +6,7 @@
<label>鍩哄缓椤圭洰</label>
<referenceTo>Infrastructure_Project__c</referenceTo>
<relationshipLabel>瀹㈡埛</relationshipLabel>
- <relationshipName>Infrastructure_Project</relationshipName>
+ <relationshipName>HMcq</relationshipName>
<required>false</required>
<trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
diff --git a/force-app/main/default/objects/Account/fields/IsPartner.field-meta.xml b/force-app/main/default/objects/Account/fields/IsPartner.field-meta.xml
new file mode 100644
index 0000000..df56f6c
--- /dev/null
+++ b/force-app/main/default/objects/Account/fields/IsPartner.field-meta.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>IsPartner</fullName>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+</CustomField>
diff --git a/force-app/main/default/objects/Account/fields/Is_Active_Formula__c.field-meta.xml b/force-app/main/default/objects/Account/fields/Is_Active_Formula__c.field-meta.xml
index c3cf10a..c155ff6 100644
--- a/force-app/main/default/objects/Account/fields/Is_Active_Formula__c.field-meta.xml
+++ b/force-app/main/default/objects/Account/fields/Is_Active_Formula__c.field-meta.xml
@@ -12,11 +12,11 @@
Parent.Tax_Practice_Expiration_Date__c < Today(),Parent.Medical_Equipment_Expiration_Date__c < Today(),Parent.Ban_On_Use_Date__c < Today(), Contract_Decide_End_Date__c < Today()), '鏃犳晥', '鏈夋晥'),'')))))</description>
<externalId>false</externalId>
<formula>/*鍖婚櫌*/
-IF(contains(RecordTypeId,'012C600000003HZ'), CASE(text(Is_Active__c), '鐒″姽', '鏃犳晥', '鏈夊姽', '鏈夋晥','鐢宠涓�', '鐢宠涓�','鑽夋涓�', '鑽夋涓�','椹冲洖', '椹冲洖',''),IF(contains(Parent.RecordTypeId,'012C600000003HZ'), IF((text(Parent.Is_Active__c) <> '鐒″姽' && text(Parent.Is_Active__c) <> '椹冲洖'), '鏈夋晥', '鏃犳晥'),IF(contains(Parent.Parent.RecordTypeId,'012C600000003HZ'),IF((text(Parent.Parent.Is_Active__c) <> '鐒″姽' && text(Parent.Parent.Is_Active__c) <> '椹冲洖'), IF(text(Is_Active__c) <> '鏈夊姽', '鏃犳晥', '鏈夋晥'), '鏃犳晥'),
+IF(RecordTypeId = '01210000000QemG', CASE(text(Is_Active__c), '鐒″姽', '鏃犳晥', '鏈夊姽', '鏈夋晥','鐢宠涓�', '鐢宠涓�','鑽夋涓�', '鑽夋涓�','椹冲洖', '椹冲洖',''),IF(Parent.RecordTypeId = '01210000000QemG', IF((text(Parent.Is_Active__c) <> '鐒″姽' && text(Parent.Is_Active__c) <> '椹冲洖'), '鏈夋晥', '鏃犳晥'),IF(Parent.Parent.RecordTypeId = '01210000000QemG',IF((text(Parent.Parent.Is_Active__c) <> '鐒″姽' && text(Parent.Parent.Is_Active__c) <> '椹冲洖'), IF(text(Is_Active__c) <> '鏈夊姽', '鏃犳晥', '鏈夋晥'), '鏃犳晥'),
/*缁忛攢鍟�*/
-IF(contains(RecordTypeId,'012C600000003HF'),IF(OR(Delete_Flag__c,Ban_On_Use_Date__c < Today(),Business_Paper_Expiration_Date__c <Today(),Tax_Practice_Expiration_Date__c < Today(),Medical_Equipment_Expiration_Date__c < Today(),
+IF(RecordTypeId = '01210000000Qem1',IF(OR(Delete_Flag__c,Ban_On_Use_Date__c < Today(),Business_Paper_Expiration_Date__c <Today(),Tax_Practice_Expiration_Date__c < Today(),Medical_Equipment_Expiration_Date__c < Today(),
DGLicenseTo__c < Today()
-),'鏃犳晥','鏈夋晥'),IF(contains(Parent.RecordTypeId ,'012C600000003HF'), IF(OR(Delete_Flag__c,
+),'鏃犳晥','鏈夋晥'),IF(Parent.RecordTypeId = '01210000000Qem1', IF(OR(Delete_Flag__c,
Parent.Delete_Flag__c,Parent.Business_Paper_Expiration_Date__c < Today(),
Parent.Tax_Practice_Expiration_Date__c < Today(),Parent.Medical_Equipment_Expiration_Date__c < Today(),Parent.Ban_On_Use_Date__c < Today(), Contract_Decide_End_Date__c < Today()), '鏃犳晥', '鏈夋晥'),'')))))</formula>
<label>鏈夋晥/鏃犳晥锛堝叕寮忥級</label>
diff --git a/force-app/main/default/objects/Account/fields/Jigsaw.field-meta.xml b/force-app/main/default/objects/Account/fields/Jigsaw.field-meta.xml
new file mode 100644
index 0000000..0c9e6b7
--- /dev/null
+++ b/force-app/main/default/objects/Account/fields/Jigsaw.field-meta.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Jigsaw</fullName>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+</CustomField>
diff --git a/force-app/main/default/objects/Account/fields/Key_hospital__c.field-meta.xml b/force-app/main/default/objects/Account/fields/Key_hospital__c.field-meta.xml
index e756ef5..b2cd57f 100644
--- a/force-app/main/default/objects/Account/fields/Key_hospital__c.field-meta.xml
+++ b/force-app/main/default/objects/Account/fields/Key_hospital__c.field-meta.xml
@@ -3,7 +3,7 @@
<fullName>Key_hospital__c</fullName>
<defaultValue>false</defaultValue>
<externalId>false</externalId>
- <label>閲嶇偣鍖婚櫌</label>
+ <label>瀛橀噺鐩爣</label>
<trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<type>Checkbox</type>
diff --git a/force-app/main/default/objects/Account/fields/OCM_man_province_HP__c.field-meta.xml b/force-app/main/default/objects/Account/fields/OCM_man_province_HP__c.field-meta.xml
index df14194..c5d5358 100644
--- a/force-app/main/default/objects/Account/fields/OCM_man_province_HP__c.field-meta.xml
+++ b/force-app/main/default/objects/Account/fields/OCM_man_province_HP__c.field-meta.xml
@@ -5,7 +5,7 @@
===2017-02-16===绉戝涔熷彲浠ヤ娇鐢紙CHAN-AJB4PQ锛�
/*20230407 lt update 澧炲姞閿﹀窞甯傚拰闈掑矝鐩稿叧*/</description>
<externalId>false</externalId>
- <formula>IF(Parent.Parent.RecordTypeId = '012C600000003HZ',
+ <formula>IF(Parent.Parent.RecordTypeId = '01210000000QemG',
CASE(Parent.Parent.State_Master__r.Name,
"鍐呰挋鍙よ嚜娌诲尯","鍐呰挋鍙�",
@@ -41,7 +41,7 @@
"瑗胯棌鑷不鍖�","鍥涘窛/瑗胯棌",
if(LEN(Parent.Parent.State_Master__r.Name)=3,LEFT(Parent.Parent.State_Master__r.Name,2),Parent.Parent.State_Master__r.Name)),
-IF(Parent.RecordTypeId = '012C600000003HZ',
+IF(Parent.RecordTypeId = '01210000000QemG',
CASE(Parent.State_Master__r.Name,
"鍐呰挋鍙よ嚜娌诲尯","鍐呰挋鍙�",
diff --git a/force-app/main/default/objects/Account/fields/OperatingHoursId.field-meta.xml b/force-app/main/default/objects/Account/fields/OperatingHoursId.field-meta.xml
new file mode 100644
index 0000000..4e5de57
--- /dev/null
+++ b/force-app/main/default/objects/Account/fields/OperatingHoursId.field-meta.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OperatingHoursId</fullName>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Account/fields/Salesdepartment_Dept__c.field-meta.xml b/force-app/main/default/objects/Account/fields/Salesdepartment_Dept__c.field-meta.xml
index d373bac..9a56e3b 100644
--- a/force-app/main/default/objects/Account/fields/Salesdepartment_Dept__c.field-meta.xml
+++ b/force-app/main/default/objects/Account/fields/Salesdepartment_Dept__c.field-meta.xml
@@ -13,10 +13,10 @@
))</description>
<externalId>false</externalId>
<formula>/* 瑕伄瑕亴鐥呴櫌 */
-IF(Parent.Parent.RecordTypeId = '012C600000003HZ',
+IF(Parent.Parent.RecordTypeId = '01210000000QemG',
Parent.Parent.Salesdepartment_HP__c,
/* 瑕亴璨╁２搴� */
-IF(Parent.RecordTypeId = '012C600000003HF',
+IF(Parent.RecordTypeId = '01210000000Qem1',
Salesdepartment_HP__c,
/* else */
""
diff --git a/force-app/main/default/objects/Account/fields/State_Department__c.field-meta.xml b/force-app/main/default/objects/Account/fields/State_Department__c.field-meta.xml
index 3208de9..ad3ec8b 100644
--- a/force-app/main/default/objects/Account/fields/State_Department__c.field-meta.xml
+++ b/force-app/main/default/objects/Account/fields/State_Department__c.field-meta.xml
@@ -2,7 +2,7 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>State_Department__c</fullName>
<externalId>false</externalId>
- <formula>IF(Parent.Parent.RecordTypeId = '012C600000003HZ',
+ <formula>IF(Parent.Parent.RecordTypeId = '01210000000QemG',
Parent.Parent.State_Master__r.Name,
''
)</formula>
diff --git a/force-app/main/default/objects/Account/recordTypes/Agency.recordType-meta.xml b/force-app/main/default/objects/Account/recordTypes/Agency.recordType-meta.xml
index 5d38da1..82efe78 100644
--- a/force-app/main/default/objects/Account/recordTypes/Agency.recordType-meta.xml
+++ b/force-app/main/default/objects/Account/recordTypes/Agency.recordType-meta.xml
@@ -504,6 +504,10 @@
<picklistValues>
<picklist>Hospital_Source__c</picklist>
<values>
+ <fullName>鎷滆</fullName>
+ <default>false</default>
+ </values>
+ <values>
<fullName>鏅烘収鍖荤枟</fullName>
<default>false</default>
</values>
@@ -707,17 +711,6 @@
</values>
<values>
<fullName>椋熷搧</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>Infrastructure_status__c</picklist>
- <values>
- <fullName>寤鸿涓�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>绔ｅ伐</fullName>
<default>false</default>
</values>
</picklistValues>
@@ -980,10 +973,6 @@
<fullName>Submit</fullName>
<default>false</default>
</values>
- <values>
- <fullName>宸叉彁浜よ嚦SPO</fullName>
- <default>false</default>
- </values>
</picklistValues>
<picklistValues>
<picklist>Rating</picklist>
@@ -1165,25 +1154,6 @@
</values>
<values>
<fullName>鑲涜偁涓撶</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>Status__c</picklist>
- <values>
- <fullName>鏃犳晥</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鏈夋晥</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鐢宠涓�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鑽夋涓�</fullName>
<default>false</default>
</values>
</picklistValues>
diff --git a/force-app/main/default/objects/Account/recordTypes/AgencyContact.recordType-meta.xml b/force-app/main/default/objects/Account/recordTypes/AgencyContact.recordType-meta.xml
index c3d95c8..c4d027e 100644
--- a/force-app/main/default/objects/Account/recordTypes/AgencyContact.recordType-meta.xml
+++ b/force-app/main/default/objects/Account/recordTypes/AgencyContact.recordType-meta.xml
@@ -503,6 +503,10 @@
<picklistValues>
<picklist>Hospital_Source__c</picklist>
<values>
+ <fullName>鎷滆</fullName>
+ <default>false</default>
+ </values>
+ <values>
<fullName>鏅烘収鍖荤枟</fullName>
<default>false</default>
</values>
@@ -706,17 +710,6 @@
</values>
<values>
<fullName>椋熷搧</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>Infrastructure_status__c</picklist>
- <values>
- <fullName>寤鸿涓�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>绔ｅ伐</fullName>
<default>false</default>
</values>
</picklistValues>
@@ -1148,25 +1141,6 @@
</values>
<values>
<fullName>鑲涜偁涓撶</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>Status__c</picklist>
- <values>
- <fullName>鏃犳晥</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鏈夋晥</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鐢宠涓�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鑽夋涓�</fullName>
<default>false</default>
</values>
</picklistValues>
diff --git a/force-app/main/default/objects/Account/recordTypes/AgencyContract.recordType-meta.xml b/force-app/main/default/objects/Account/recordTypes/AgencyContract.recordType-meta.xml
index c8f123a..298d704 100644
--- a/force-app/main/default/objects/Account/recordTypes/AgencyContract.recordType-meta.xml
+++ b/force-app/main/default/objects/Account/recordTypes/AgencyContract.recordType-meta.xml
@@ -503,6 +503,10 @@
<picklistValues>
<picklist>Hospital_Source__c</picklist>
<values>
+ <fullName>鎷滆</fullName>
+ <default>false</default>
+ </values>
+ <values>
<fullName>鏅烘収鍖荤枟</fullName>
<default>false</default>
</values>
@@ -706,17 +710,6 @@
</values>
<values>
<fullName>椋熷搧</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>Infrastructure_status__c</picklist>
- <values>
- <fullName>寤鸿涓�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>绔ｅ伐</fullName>
<default>false</default>
</values>
</picklistValues>
@@ -1148,25 +1141,6 @@
</values>
<values>
<fullName>鑲涜偁涓撶</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>Status__c</picklist>
- <values>
- <fullName>鏃犳晥</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鏈夋晥</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鐢宠涓�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鑽夋涓�</fullName>
<default>false</default>
</values>
</picklistValues>
diff --git a/force-app/main/default/objects/Account/recordTypes/Department.recordType-meta.xml b/force-app/main/default/objects/Account/recordTypes/Department.recordType-meta.xml
index 194a70e..f155cc8 100644
--- a/force-app/main/default/objects/Account/recordTypes/Department.recordType-meta.xml
+++ b/force-app/main/default/objects/Account/recordTypes/Department.recordType-meta.xml
@@ -504,6 +504,10 @@
<picklistValues>
<picklist>Hospital_Source__c</picklist>
<values>
+ <fullName>鎷滆</fullName>
+ <default>false</default>
+ </values>
+ <values>
<fullName>鏅烘収鍖荤枟</fullName>
<default>false</default>
</values>
@@ -707,17 +711,6 @@
</values>
<values>
<fullName>椋熷搧</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>Infrastructure_status__c</picklist>
- <values>
- <fullName>寤鸿涓�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>绔ｅ伐</fullName>
<default>false</default>
</values>
</picklistValues>
@@ -1161,25 +1154,6 @@
</values>
<values>
<fullName>鑲涜偁涓撶</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>Status__c</picklist>
- <values>
- <fullName>鏃犳晥</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鏈夋晥</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鐢宠涓�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鑽夋涓�</fullName>
<default>false</default>
</values>
</picklistValues>
diff --git a/force-app/main/default/objects/Account/recordTypes/Department_BF.recordType-meta.xml b/force-app/main/default/objects/Account/recordTypes/Department_BF.recordType-meta.xml
index 37caf9c..58b1ead 100644
--- a/force-app/main/default/objects/Account/recordTypes/Department_BF.recordType-meta.xml
+++ b/force-app/main/default/objects/Account/recordTypes/Department_BF.recordType-meta.xml
@@ -508,6 +508,10 @@
<picklistValues>
<picklist>Hospital_Source__c</picklist>
<values>
+ <fullName>鎷滆</fullName>
+ <default>false</default>
+ </values>
+ <values>
<fullName>鏅烘収鍖荤枟</fullName>
<default>false</default>
</values>
@@ -711,17 +715,6 @@
</values>
<values>
<fullName>椋熷搧</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>Infrastructure_status__c</picklist>
- <values>
- <fullName>寤鸿涓�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>绔ｅ伐</fullName>
<default>false</default>
</values>
</picklistValues>
@@ -1165,25 +1158,6 @@
</values>
<values>
<fullName>鑲涜偁涓撶</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>Status__c</picklist>
- <values>
- <fullName>鏃犳晥</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鏈夋晥</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鐢宠涓�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鑽夋涓�</fullName>
<default>false</default>
</values>
</picklistValues>
diff --git a/force-app/main/default/objects/Account/recordTypes/Department_Class_BF.recordType-meta.xml b/force-app/main/default/objects/Account/recordTypes/Department_Class_BF.recordType-meta.xml
index d71e05a..c268cc3 100644
--- a/force-app/main/default/objects/Account/recordTypes/Department_Class_BF.recordType-meta.xml
+++ b/force-app/main/default/objects/Account/recordTypes/Department_Class_BF.recordType-meta.xml
@@ -512,6 +512,10 @@
<picklistValues>
<picklist>Hospital_Source__c</picklist>
<values>
+ <fullName>鎷滆</fullName>
+ <default>false</default>
+ </values>
+ <values>
<fullName>鏅烘収鍖荤枟</fullName>
<default>false</default>
</values>
@@ -715,17 +719,6 @@
</values>
<values>
<fullName>椋熷搧</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>Infrastructure_status__c</picklist>
- <values>
- <fullName>寤鸿涓�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>绔ｅ伐</fullName>
<default>false</default>
</values>
</picklistValues>
@@ -1177,25 +1170,6 @@
</values>
<values>
<fullName>鑲涜偁涓撶</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>Status__c</picklist>
- <values>
- <fullName>鏃犳晥</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鏈夋晥</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鐢宠涓�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鑽夋涓�</fullName>
<default>false</default>
</values>
</picklistValues>
diff --git a/force-app/main/default/objects/Account/recordTypes/Department_Class_ENT.recordType-meta.xml b/force-app/main/default/objects/Account/recordTypes/Department_Class_ENT.recordType-meta.xml
index 7e2c054..21e5167 100644
--- a/force-app/main/default/objects/Account/recordTypes/Department_Class_ENT.recordType-meta.xml
+++ b/force-app/main/default/objects/Account/recordTypes/Department_Class_ENT.recordType-meta.xml
@@ -512,6 +512,10 @@
<picklistValues>
<picklist>Hospital_Source__c</picklist>
<values>
+ <fullName>鎷滆</fullName>
+ <default>false</default>
+ </values>
+ <values>
<fullName>鏅烘収鍖荤枟</fullName>
<default>false</default>
</values>
@@ -715,17 +719,6 @@
</values>
<values>
<fullName>椋熷搧</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>Infrastructure_status__c</picklist>
- <values>
- <fullName>寤鸿涓�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>绔ｅ伐</fullName>
<default>false</default>
</values>
</picklistValues>
@@ -1177,25 +1170,6 @@
</values>
<values>
<fullName>鑲涜偁涓撶</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>Status__c</picklist>
- <values>
- <fullName>鏃犳晥</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鏈夋晥</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鐢宠涓�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鑽夋涓�</fullName>
<default>false</default>
</values>
</picklistValues>
diff --git a/force-app/main/default/objects/Account/recordTypes/Department_Class_ET.recordType-meta.xml b/force-app/main/default/objects/Account/recordTypes/Department_Class_ET.recordType-meta.xml
index 3cb2a18..9ba70f0 100644
--- a/force-app/main/default/objects/Account/recordTypes/Department_Class_ET.recordType-meta.xml
+++ b/force-app/main/default/objects/Account/recordTypes/Department_Class_ET.recordType-meta.xml
@@ -512,6 +512,10 @@
<picklistValues>
<picklist>Hospital_Source__c</picklist>
<values>
+ <fullName>鎷滆</fullName>
+ <default>false</default>
+ </values>
+ <values>
<fullName>鏅烘収鍖荤枟</fullName>
<default>false</default>
</values>
@@ -715,17 +719,6 @@
</values>
<values>
<fullName>椋熷搧</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>Infrastructure_status__c</picklist>
- <values>
- <fullName>寤鸿涓�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>绔ｅ伐</fullName>
<default>false</default>
</values>
</picklistValues>
@@ -1173,25 +1166,6 @@
</values>
<values>
<fullName>鑲涜偁涓撶</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>Status__c</picklist>
- <values>
- <fullName>鏃犳晥</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鏈夋晥</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鐢宠涓�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鑽夋涓�</fullName>
<default>false</default>
</values>
</picklistValues>
diff --git a/force-app/main/default/objects/Account/recordTypes/Department_Class_GI.recordType-meta.xml b/force-app/main/default/objects/Account/recordTypes/Department_Class_GI.recordType-meta.xml
index 5bbc01f..b38dde8 100644
--- a/force-app/main/default/objects/Account/recordTypes/Department_Class_GI.recordType-meta.xml
+++ b/force-app/main/default/objects/Account/recordTypes/Department_Class_GI.recordType-meta.xml
@@ -512,6 +512,10 @@
<picklistValues>
<picklist>Hospital_Source__c</picklist>
<values>
+ <fullName>鎷滆</fullName>
+ <default>false</default>
+ </values>
+ <values>
<fullName>鏅烘収鍖荤枟</fullName>
<default>false</default>
</values>
@@ -715,17 +719,6 @@
</values>
<values>
<fullName>椋熷搧</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>Infrastructure_status__c</picklist>
- <values>
- <fullName>寤鸿涓�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>绔ｅ伐</fullName>
<default>false</default>
</values>
</picklistValues>
@@ -1177,25 +1170,6 @@
</values>
<values>
<fullName>鑲涜偁涓撶</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>Status__c</picklist>
- <values>
- <fullName>鏃犳晥</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鏈夋晥</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鐢宠涓�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鑽夋涓�</fullName>
<default>false</default>
</values>
</picklistValues>
diff --git a/force-app/main/default/objects/Account/recordTypes/Department_Class_GS.recordType-meta.xml b/force-app/main/default/objects/Account/recordTypes/Department_Class_GS.recordType-meta.xml
index ea8a523..d168a1a 100644
--- a/force-app/main/default/objects/Account/recordTypes/Department_Class_GS.recordType-meta.xml
+++ b/force-app/main/default/objects/Account/recordTypes/Department_Class_GS.recordType-meta.xml
@@ -512,6 +512,10 @@
<picklistValues>
<picklist>Hospital_Source__c</picklist>
<values>
+ <fullName>鎷滆</fullName>
+ <default>false</default>
+ </values>
+ <values>
<fullName>鏅烘収鍖荤枟</fullName>
<default>false</default>
</values>
@@ -715,17 +719,6 @@
</values>
<values>
<fullName>椋熷搧</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>Infrastructure_status__c</picklist>
- <values>
- <fullName>寤鸿涓�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>绔ｅ伐</fullName>
<default>false</default>
</values>
</picklistValues>
@@ -1177,25 +1170,6 @@
</values>
<values>
<fullName>鑲涜偁涓撶</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>Status__c</picklist>
- <values>
- <fullName>鏃犳晥</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鏈夋晥</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鐢宠涓�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鑽夋涓�</fullName>
<default>false</default>
</values>
</picklistValues>
diff --git a/force-app/main/default/objects/Account/recordTypes/Department_Class_GYN.recordType-meta.xml b/force-app/main/default/objects/Account/recordTypes/Department_Class_GYN.recordType-meta.xml
index 7eccb22..d091d27 100644
--- a/force-app/main/default/objects/Account/recordTypes/Department_Class_GYN.recordType-meta.xml
+++ b/force-app/main/default/objects/Account/recordTypes/Department_Class_GYN.recordType-meta.xml
@@ -512,6 +512,10 @@
<picklistValues>
<picklist>Hospital_Source__c</picklist>
<values>
+ <fullName>鎷滆</fullName>
+ <default>false</default>
+ </values>
+ <values>
<fullName>鏅烘収鍖荤枟</fullName>
<default>false</default>
</values>
@@ -715,17 +719,6 @@
</values>
<values>
<fullName>椋熷搧</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>Infrastructure_status__c</picklist>
- <values>
- <fullName>寤鸿涓�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>绔ｅ伐</fullName>
<default>false</default>
</values>
</picklistValues>
@@ -1177,25 +1170,6 @@
</values>
<values>
<fullName>鑲涜偁涓撶</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>Status__c</picklist>
- <values>
- <fullName>鏃犳晥</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鏈夋晥</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鐢宠涓�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鑽夋涓�</fullName>
<default>false</default>
</values>
</picklistValues>
diff --git a/force-app/main/default/objects/Account/recordTypes/Department_Class_OTH.recordType-meta.xml b/force-app/main/default/objects/Account/recordTypes/Department_Class_OTH.recordType-meta.xml
index f2f9433..9650ead 100644
--- a/force-app/main/default/objects/Account/recordTypes/Department_Class_OTH.recordType-meta.xml
+++ b/force-app/main/default/objects/Account/recordTypes/Department_Class_OTH.recordType-meta.xml
@@ -512,6 +512,10 @@
<picklistValues>
<picklist>Hospital_Source__c</picklist>
<values>
+ <fullName>鎷滆</fullName>
+ <default>false</default>
+ </values>
+ <values>
<fullName>鏅烘収鍖荤枟</fullName>
<default>false</default>
</values>
@@ -715,17 +719,6 @@
</values>
<values>
<fullName>椋熷搧</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>Infrastructure_status__c</picklist>
- <values>
- <fullName>寤鸿涓�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>绔ｅ伐</fullName>
<default>false</default>
</values>
</picklistValues>
@@ -1173,25 +1166,6 @@
</values>
<values>
<fullName>鑲涜偁涓撶</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>Status__c</picklist>
- <values>
- <fullName>鏃犳晥</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鏈夋晥</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鐢宠涓�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鑽夋涓�</fullName>
<default>false</default>
</values>
</picklistValues>
diff --git a/force-app/main/default/objects/Account/recordTypes/Department_Class_URO.recordType-meta.xml b/force-app/main/default/objects/Account/recordTypes/Department_Class_URO.recordType-meta.xml
index 1213e0f..db1e9da 100644
--- a/force-app/main/default/objects/Account/recordTypes/Department_Class_URO.recordType-meta.xml
+++ b/force-app/main/default/objects/Account/recordTypes/Department_Class_URO.recordType-meta.xml
@@ -512,6 +512,10 @@
<picklistValues>
<picklist>Hospital_Source__c</picklist>
<values>
+ <fullName>鎷滆</fullName>
+ <default>false</default>
+ </values>
+ <values>
<fullName>鏅烘収鍖荤枟</fullName>
<default>false</default>
</values>
@@ -715,17 +719,6 @@
</values>
<values>
<fullName>椋熷搧</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>Infrastructure_status__c</picklist>
- <values>
- <fullName>寤鸿涓�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>绔ｅ伐</fullName>
<default>false</default>
</values>
</picklistValues>
@@ -1177,25 +1170,6 @@
</values>
<values>
<fullName>鑲涜偁涓撶</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>Status__c</picklist>
- <values>
- <fullName>鏃犳晥</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鏈夋晥</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鐢宠涓�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鑽夋涓�</fullName>
<default>false</default>
</values>
</picklistValues>
diff --git a/force-app/main/default/objects/Account/recordTypes/Department_Class_Unification.recordType-meta.xml b/force-app/main/default/objects/Account/recordTypes/Department_Class_Unification.recordType-meta.xml
index d655340..ce4920b 100644
--- a/force-app/main/default/objects/Account/recordTypes/Department_Class_Unification.recordType-meta.xml
+++ b/force-app/main/default/objects/Account/recordTypes/Department_Class_Unification.recordType-meta.xml
@@ -512,6 +512,10 @@
<picklistValues>
<picklist>Hospital_Source__c</picklist>
<values>
+ <fullName>鎷滆</fullName>
+ <default>false</default>
+ </values>
+ <values>
<fullName>鏅烘収鍖荤枟</fullName>
<default>false</default>
</values>
@@ -715,17 +719,6 @@
</values>
<values>
<fullName>椋熷搧</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>Infrastructure_status__c</picklist>
- <values>
- <fullName>寤鸿涓�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>绔ｅ伐</fullName>
<default>false</default>
</values>
</picklistValues>
@@ -1173,25 +1166,6 @@
</values>
<values>
<fullName>鑲涜偁涓撶</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>Status__c</picklist>
- <values>
- <fullName>鏃犳晥</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鏈夋晥</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鐢宠涓�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鑽夋涓�</fullName>
<default>false</default>
</values>
</picklistValues>
diff --git a/force-app/main/default/objects/Account/recordTypes/Department_ENT.recordType-meta.xml b/force-app/main/default/objects/Account/recordTypes/Department_ENT.recordType-meta.xml
index 24e10e9..426c596 100644
--- a/force-app/main/default/objects/Account/recordTypes/Department_ENT.recordType-meta.xml
+++ b/force-app/main/default/objects/Account/recordTypes/Department_ENT.recordType-meta.xml
@@ -508,6 +508,10 @@
<picklistValues>
<picklist>Hospital_Source__c</picklist>
<values>
+ <fullName>鎷滆</fullName>
+ <default>false</default>
+ </values>
+ <values>
<fullName>鏅烘収鍖荤枟</fullName>
<default>false</default>
</values>
@@ -711,17 +715,6 @@
</values>
<values>
<fullName>椋熷搧</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>Infrastructure_status__c</picklist>
- <values>
- <fullName>寤鸿涓�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>绔ｅ伐</fullName>
<default>false</default>
</values>
</picklistValues>
@@ -1165,25 +1158,6 @@
</values>
<values>
<fullName>鑲涜偁涓撶</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>Status__c</picklist>
- <values>
- <fullName>鏃犳晥</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鏈夋晥</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鐢宠涓�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鑽夋涓�</fullName>
<default>false</default>
</values>
</picklistValues>
diff --git a/force-app/main/default/objects/Account/recordTypes/Department_GI.recordType-meta.xml b/force-app/main/default/objects/Account/recordTypes/Department_GI.recordType-meta.xml
index 4fa37cd..fda748f 100644
--- a/force-app/main/default/objects/Account/recordTypes/Department_GI.recordType-meta.xml
+++ b/force-app/main/default/objects/Account/recordTypes/Department_GI.recordType-meta.xml
@@ -516,6 +516,10 @@
<picklistValues>
<picklist>Hospital_Source__c</picklist>
<values>
+ <fullName>鎷滆</fullName>
+ <default>false</default>
+ </values>
+ <values>
<fullName>鏅烘収鍖荤枟</fullName>
<default>false</default>
</values>
@@ -719,17 +723,6 @@
</values>
<values>
<fullName>椋熷搧</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>Infrastructure_status__c</picklist>
- <values>
- <fullName>寤鸿涓�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>绔ｅ伐</fullName>
<default>false</default>
</values>
</picklistValues>
@@ -1173,25 +1166,6 @@
</values>
<values>
<fullName>鑲涜偁涓撶</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>Status__c</picklist>
- <values>
- <fullName>鏃犳晥</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鏈夋晥</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鐢宠涓�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鑽夋涓�</fullName>
<default>false</default>
</values>
</picklistValues>
diff --git a/force-app/main/default/objects/Account/recordTypes/Department_GS.recordType-meta.xml b/force-app/main/default/objects/Account/recordTypes/Department_GS.recordType-meta.xml
index 13590ac..d5dc90d 100644
--- a/force-app/main/default/objects/Account/recordTypes/Department_GS.recordType-meta.xml
+++ b/force-app/main/default/objects/Account/recordTypes/Department_GS.recordType-meta.xml
@@ -508,6 +508,10 @@
<picklistValues>
<picklist>Hospital_Source__c</picklist>
<values>
+ <fullName>鎷滆</fullName>
+ <default>false</default>
+ </values>
+ <values>
<fullName>鏅烘収鍖荤枟</fullName>
<default>false</default>
</values>
@@ -711,17 +715,6 @@
</values>
<values>
<fullName>椋熷搧</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>Infrastructure_status__c</picklist>
- <values>
- <fullName>寤鸿涓�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>绔ｅ伐</fullName>
<default>false</default>
</values>
</picklistValues>
@@ -1165,25 +1158,6 @@
</values>
<values>
<fullName>鑲涜偁涓撶</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>Status__c</picklist>
- <values>
- <fullName>鏃犳晥</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鏈夋晥</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鐢宠涓�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鑽夋涓�</fullName>
<default>false</default>
</values>
</picklistValues>
diff --git a/force-app/main/default/objects/Account/recordTypes/Department_GYN.recordType-meta.xml b/force-app/main/default/objects/Account/recordTypes/Department_GYN.recordType-meta.xml
index da89bbd..dd4c948 100644
--- a/force-app/main/default/objects/Account/recordTypes/Department_GYN.recordType-meta.xml
+++ b/force-app/main/default/objects/Account/recordTypes/Department_GYN.recordType-meta.xml
@@ -508,6 +508,10 @@
<picklistValues>
<picklist>Hospital_Source__c</picklist>
<values>
+ <fullName>鎷滆</fullName>
+ <default>false</default>
+ </values>
+ <values>
<fullName>鏅烘収鍖荤枟</fullName>
<default>false</default>
</values>
@@ -711,17 +715,6 @@
</values>
<values>
<fullName>椋熷搧</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>Infrastructure_status__c</picklist>
- <values>
- <fullName>寤鸿涓�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>绔ｅ伐</fullName>
<default>false</default>
</values>
</picklistValues>
@@ -1165,25 +1158,6 @@
</values>
<values>
<fullName>鑲涜偁涓撶</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>Status__c</picklist>
- <values>
- <fullName>鏃犳晥</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鏈夋晥</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鐢宠涓�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鑽夋涓�</fullName>
<default>false</default>
</values>
</picklistValues>
diff --git a/force-app/main/default/objects/Account/recordTypes/Department_OTH.recordType-meta.xml b/force-app/main/default/objects/Account/recordTypes/Department_OTH.recordType-meta.xml
index 77b20c3..21d8b56 100644
--- a/force-app/main/default/objects/Account/recordTypes/Department_OTH.recordType-meta.xml
+++ b/force-app/main/default/objects/Account/recordTypes/Department_OTH.recordType-meta.xml
@@ -508,6 +508,10 @@
<picklistValues>
<picklist>Hospital_Source__c</picklist>
<values>
+ <fullName>鎷滆</fullName>
+ <default>false</default>
+ </values>
+ <values>
<fullName>鏅烘収鍖荤枟</fullName>
<default>false</default>
</values>
@@ -711,17 +715,6 @@
</values>
<values>
<fullName>椋熷搧</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>Infrastructure_status__c</picklist>
- <values>
- <fullName>寤鸿涓�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>绔ｅ伐</fullName>
<default>false</default>
</values>
</picklistValues>
@@ -1169,25 +1162,6 @@
</values>
<values>
<fullName>鑲涜偁涓撶</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>Status__c</picklist>
- <values>
- <fullName>鏃犳晥</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鏈夋晥</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鐢宠涓�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鑽夋涓�</fullName>
<default>false</default>
</values>
</picklistValues>
diff --git a/force-app/main/default/objects/Account/recordTypes/Department_URO.recordType-meta.xml b/force-app/main/default/objects/Account/recordTypes/Department_URO.recordType-meta.xml
index 1adb1b2..43ce65b 100644
--- a/force-app/main/default/objects/Account/recordTypes/Department_URO.recordType-meta.xml
+++ b/force-app/main/default/objects/Account/recordTypes/Department_URO.recordType-meta.xml
@@ -508,6 +508,10 @@
<picklistValues>
<picklist>Hospital_Source__c</picklist>
<values>
+ <fullName>鎷滆</fullName>
+ <default>false</default>
+ </values>
+ <values>
<fullName>鏅烘収鍖荤枟</fullName>
<default>false</default>
</values>
@@ -711,17 +715,6 @@
</values>
<values>
<fullName>椋熷搧</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>Infrastructure_status__c</picklist>
- <values>
- <fullName>寤鸿涓�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>绔ｅ伐</fullName>
<default>false</default>
</values>
</picklistValues>
@@ -1165,25 +1158,6 @@
</values>
<values>
<fullName>鑲涜偁涓撶</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>Status__c</picklist>
- <values>
- <fullName>鏃犳晥</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鏈夋晥</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鐢宠涓�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鑽夋涓�</fullName>
<default>false</default>
</values>
</picklistValues>
diff --git a/force-app/main/default/objects/Account/recordTypes/HP.recordType-meta.xml b/force-app/main/default/objects/Account/recordTypes/HP.recordType-meta.xml
index 38bec38..8f44161 100644
--- a/force-app/main/default/objects/Account/recordTypes/HP.recordType-meta.xml
+++ b/force-app/main/default/objects/Account/recordTypes/HP.recordType-meta.xml
@@ -727,17 +727,6 @@
</values>
</picklistValues>
<picklistValues>
- <picklist>Infrastructure_status__c</picklist>
- <values>
- <fullName>寤鸿涓�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>绔ｅ伐</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
<picklist>Inspection_plan_month__c</picklist>
<values>
<fullName>10鏈�</fullName>
@@ -1201,25 +1190,6 @@
</values>
<values>
<fullName>鑲涜偁涓撶</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>Status__c</picklist>
- <values>
- <fullName>鏃犳晥</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鏈夋晥</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鐢宠涓�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鑽夋涓�</fullName>
<default>false</default>
</values>
</picklistValues>
diff --git a/force-app/main/default/objects/Account/recordTypes/RecordType_8.recordType-meta.xml b/force-app/main/default/objects/Account/recordTypes/RecordType_8.recordType-meta.xml
index eb9b48e..4cbb258 100644
--- a/force-app/main/default/objects/Account/recordTypes/RecordType_8.recordType-meta.xml
+++ b/force-app/main/default/objects/Account/recordTypes/RecordType_8.recordType-meta.xml
@@ -512,6 +512,10 @@
<picklistValues>
<picklist>Hospital_Source__c</picklist>
<values>
+ <fullName>鎷滆</fullName>
+ <default>false</default>
+ </values>
+ <values>
<fullName>鏅烘収鍖荤枟</fullName>
<default>false</default>
</values>
@@ -715,17 +719,6 @@
</values>
<values>
<fullName>椋熷搧</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>Infrastructure_status__c</picklist>
- <values>
- <fullName>寤鸿涓�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>绔ｅ伐</fullName>
<default>false</default>
</values>
</picklistValues>
@@ -1173,25 +1166,6 @@
</values>
<values>
<fullName>鑲涜偁涓撶</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>Status__c</picklist>
- <values>
- <fullName>鏃犳晥</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鏈夋晥</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鐢宠涓�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鑽夋涓�</fullName>
<default>false</default>
</values>
</picklistValues>
diff --git a/force-app/main/default/objects/Account/recordTypes/Training.recordType-meta.xml b/force-app/main/default/objects/Account/recordTypes/Training.recordType-meta.xml
index 1872556..270d071 100644
--- a/force-app/main/default/objects/Account/recordTypes/Training.recordType-meta.xml
+++ b/force-app/main/default/objects/Account/recordTypes/Training.recordType-meta.xml
@@ -503,6 +503,10 @@
<picklistValues>
<picklist>Hospital_Source__c</picklist>
<values>
+ <fullName>鎷滆</fullName>
+ <default>false</default>
+ </values>
+ <values>
<fullName>鏅烘収鍖荤枟</fullName>
<default>false</default>
</values>
@@ -706,17 +710,6 @@
</values>
<values>
<fullName>椋熷搧</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>Infrastructure_status__c</picklist>
- <values>
- <fullName>寤鸿涓�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>绔ｅ伐</fullName>
<default>false</default>
</values>
</picklistValues>
@@ -1160,25 +1153,6 @@
</values>
<values>
<fullName>鑲涜偁涓撶</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>Status__c</picklist>
- <values>
- <fullName>鏃犳晥</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鏈夋晥</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鐢宠涓�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鑽夋涓�</fullName>
<default>false</default>
</values>
</picklistValues>
diff --git a/force-app/main/default/objects/Account/recordTypes/office.recordType-meta.xml b/force-app/main/default/objects/Account/recordTypes/office.recordType-meta.xml
index 3e0e126..5a861e8 100644
--- a/force-app/main/default/objects/Account/recordTypes/office.recordType-meta.xml
+++ b/force-app/main/default/objects/Account/recordTypes/office.recordType-meta.xml
@@ -551,6 +551,10 @@
<picklistValues>
<picklist>Hospital_Source__c</picklist>
<values>
+ <fullName>鎷滆</fullName>
+ <default>false</default>
+ </values>
+ <values>
<fullName>鏅烘収鍖荤枟</fullName>
<default>false</default>
</values>
@@ -754,17 +758,6 @@
</values>
<values>
<fullName>椋熷搧</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>Infrastructure_status__c</picklist>
- <values>
- <fullName>寤鸿涓�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>绔ｅ伐</fullName>
<default>false</default>
</values>
</picklistValues>
diff --git a/force-app/main/default/objects/Account/validationRules/After_approved_cannot_change_FSE.validationRule-meta.xml b/force-app/main/default/objects/Account/validationRules/After_approved_cannot_change_FSE.validationRule-meta.xml
index 27912da..7b50cfe 100644
--- a/force-app/main/default/objects/Account/validationRules/After_approved_cannot_change_FSE.validationRule-meta.xml
+++ b/force-app/main/default/objects/Account/validationRules/After_approved_cannot_change_FSE.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>After_approved_cannot_change_FSE</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>AND(Plan_approved_FSE__c=TRUE,
input_again_FSE__c=false,
OR(
diff --git a/force-app/main/default/objects/Account/validationRules/Approval_After_Assistant_Unable_Edit.validationRule-meta.xml b/force-app/main/default/objects/Account/validationRules/Approval_After_Assistant_Unable_Edit.validationRule-meta.xml
index 9ae16d2..4451d3c 100644
--- a/force-app/main/default/objects/Account/validationRules/Approval_After_Assistant_Unable_Edit.validationRule-meta.xml
+++ b/force-app/main/default/objects/Account/validationRules/Approval_After_Assistant_Unable_Edit.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Approval_After_Assistant_Unable_Edit</fullName>
- <active>false</active>
+ <active>true</active>
<description>鍙厑璁稿姪鐞嗗湪鍖婚櫌鎵瑰噯鍚庡～鍐� 鍖荤枟琛屼笟鎵т笟璧勬牸璇佷俊鎭�佽惀涓氭墽鐓т俊鎭�
澧炲姞IsUnlock__c <>true 锛屽尰闄㈠彉鏇翠俊鎭鎵归�氳繃鏃跺彲浠ュ悓姝ユ洿鏂板鎴�</description>
<errorConditionFormula>AND(AND(IsUnlock__c <>true, LEFT($User.ProfileId,15)<>'00e10000000Y3o5', LEFT($User.ProfileId,15)<>'00e10000000dzzG', LEFT($User.ProfileId,15)<>'00e10000000dEQx'),OR(AND(TEXT(Is_Active__c) <> '鑽夋涓�', TEXT(Is_Active__c) <> '鐢宠涓�'), NOT(ISBLANK(Approved_Confirm_Date__c))),RecordType.DeveloperName='HP', OR(ISCHANGED(SpecialDealerName__c), ISCHANGED(Website), ISCHANGED(State_Master__c), ISCHANGED(City_Master__c), ISCHANGED(Street__c), ISCHANGED(Phone), ISCHANGED(Fax), ISCHANGED(Hospita_Salesdepartment_Text__c), ISCHANGED(Income__c), ISCHANGED(Num_Of_Beds__c), ISCHANGED(Ope_Room_Sum_Num__c), ISCHANGED(Ope_Sum_Num__c), ISCHANGED(Num_Of_Beds_in_Endscope_Room__c), ISCHANGED(ERCP_room_category__c), ISCHANGED(Out_Dep_Inspection_Num__c), ISCHANGED(Training_Center_Item__c), ISCHANGED(Scale__c)))</errorConditionFormula>
diff --git a/force-app/main/default/objects/Account/validationRules/Asistant_can_not_change_OCM_hospital_cat.validationRule-meta.xml b/force-app/main/default/objects/Account/validationRules/Asistant_can_not_change_OCM_hospital_cat.validationRule-meta.xml
index 0d50ea0..596203e 100644
--- a/force-app/main/default/objects/Account/validationRules/Asistant_can_not_change_OCM_hospital_cat.validationRule-meta.xml
+++ b/force-app/main/default/objects/Account/validationRules/Asistant_can_not_change_OCM_hospital_cat.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Asistant_can_not_change_OCM_hospital_cat</fullName>
- <active>false</active>
+ <active>true</active>
<description>鍔╃悊涓嶈兘淇敼鍖婚櫌瀛楁OCSM鍒嗙被(鍖婚櫌)
//20220331
NOT(ISNEW()) && ($User.ProfileId = '00e10000000xnpR' || $User.ProfileId = '00e10000000xyK6')&&
diff --git a/force-app/main/default/objects/Account/validationRules/Ass_cannot_change_ownerfor_NoApproveHP.validationRule-meta.xml b/force-app/main/default/objects/Account/validationRules/Ass_cannot_change_ownerfor_NoApproveHP.validationRule-meta.xml
index a2f3011..a417ad9 100644
--- a/force-app/main/default/objects/Account/validationRules/Ass_cannot_change_ownerfor_NoApproveHP.validationRule-meta.xml
+++ b/force-app/main/default/objects/Account/validationRules/Ass_cannot_change_ownerfor_NoApproveHP.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Ass_cannot_change_ownerfor_NoApproveHP</fullName>
- <active>false</active>
+ <active>true</active>
<description>鍔╃悊涓嶈兘淇敼娌℃湁瀹℃壒瀹岀殑鍖婚櫌鐨勬墍鏈変汉</description>
<errorConditionFormula>NOT(ISNEW()) && ISCHANGED(AccountOwnerID__c) &&
RecordType.Id = '01210000000QemG' &&
diff --git a/force-app/main/default/objects/Account/validationRules/Assistant_only_can_select_L_forOCMhosp.validationRule-meta.xml b/force-app/main/default/objects/Account/validationRules/Assistant_only_can_select_L_forOCMhosp.validationRule-meta.xml
index b9d4e13..c6b2306 100644
--- a/force-app/main/default/objects/Account/validationRules/Assistant_only_can_select_L_forOCMhosp.validationRule-meta.xml
+++ b/force-app/main/default/objects/Account/validationRules/Assistant_only_can_select_L_forOCMhosp.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Assistant_only_can_select_L_forOCMhosp</fullName>
- <active>false</active>
+ <active>true</active>
<description>鍔╃悊鍦ㄦ柊寤哄尰闄㈢殑鏃跺�欏彧鑳介�夋嫨L鍒嗙被鐨勫尰闄�
//20220231
ISNEW() && ($User.ProfileId = '00e10000000xnpR' || $User.ProfileId = '00e10000000xyK6') &&
diff --git a/force-app/main/default/objects/Account/validationRules/Can_input_after_sales_update_status.validationRule-meta.xml b/force-app/main/default/objects/Account/validationRules/Can_input_after_sales_update_status.validationRule-meta.xml
index 6d0a3bc..5bc1375 100644
--- a/force-app/main/default/objects/Account/validationRules/Can_input_after_sales_update_status.validationRule-meta.xml
+++ b/force-app/main/default/objects/Account/validationRules/Can_input_after_sales_update_status.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Can_input_after_sales_update_status</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>AND(ISBLANK(Review_Sales__c),NOT(ISBLANK(Manager_feedback_check__c)))</errorConditionFormula>
<errorMessage>閿�鍞媴褰撴病鏇存柊杩涘睍鎯呭喌涔嬪墠锛屼笉鍏佽濉啓杩涘睍纭鎯呭喌</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Account/validationRules/Can_not_update_department_class.validationRule-meta.xml b/force-app/main/default/objects/Account/validationRules/Can_not_update_department_class.validationRule-meta.xml
index e52dd63..9ebfedb 100644
--- a/force-app/main/default/objects/Account/validationRules/Can_not_update_department_class.validationRule-meta.xml
+++ b/force-app/main/default/objects/Account/validationRules/Can_not_update_department_class.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Can_not_update_department_class</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>($User.ProfileId != '00e10000000xo1D' && $User.ProfileId !='00e10000000Y3o5') && ISCHANGED(Department_Class__c)</errorConditionFormula>
<errorDisplayField>Department_Class__c</errorDisplayField>
<errorMessage>鍙湁绯荤粺绠＄悊鍛樺拰鏈夋潈闄愮殑浜猴紝鎵嶈兘鏇存柊鎴樼暐绉戝鍒嗙被銆�</errorMessage>
diff --git a/force-app/main/default/objects/Account/validationRules/Can_not_update_department_name.validationRule-meta.xml b/force-app/main/default/objects/Account/validationRules/Can_not_update_department_name.validationRule-meta.xml
index 3753487..2bbae70 100644
--- a/force-app/main/default/objects/Account/validationRules/Can_not_update_department_name.validationRule-meta.xml
+++ b/force-app/main/default/objects/Account/validationRules/Can_not_update_department_name.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Can_not_update_department_name</fullName>
- <active>false</active>
+ <active>true</active>
<description>鍙湁绯荤粺绠＄悊鍛樺拰鏈夋潈闄愮殑浜猴紝鎵嶈兘鏇存柊瀹㈡埛鍚嶃��</description>
<errorConditionFormula>($User.ProfileId != '00e10000000xo1D' && $User.ProfileId !='00e10000000Y3o5' && $User.ProfileId !='00e10000000xnpR'
&& $User.ProfileId !='00e10000000xyK6' && $User.ProfileId !='00e10000000NbCE' && $User.ProfileId !='00e10000000xnpb') && ISCHANGED(Department_Name__c)</errorConditionFormula>
diff --git a/force-app/main/default/objects/Account/validationRules/Can_not_update_hospital.validationRule-meta.xml b/force-app/main/default/objects/Account/validationRules/Can_not_update_hospital.validationRule-meta.xml
index 66d174d..9afa59a 100644
--- a/force-app/main/default/objects/Account/validationRules/Can_not_update_hospital.validationRule-meta.xml
+++ b/force-app/main/default/objects/Account/validationRules/Can_not_update_hospital.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Can_not_update_hospital</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>($User.ProfileId != '00e10000000xo1D' && $User.ProfileId !='00e10000000Y3o5') && ISCHANGED(Hospital__c)</errorConditionFormula>
<errorDisplayField>Hospital__c</errorDisplayField>
<errorMessage>鍙湁绯荤粺绠＄悊鍛樺拰鏈夋潈闄愮殑浜猴紝鎵嶈兘鏇存柊鍖婚櫌(绉戝)銆�</errorMessage>
diff --git a/force-app/main/default/objects/Account/validationRules/Cannot_Create_Contract.validationRule-meta.xml b/force-app/main/default/objects/Account/validationRules/Cannot_Create_Contract.validationRule-meta.xml
index 9540685..a1ba868 100644
--- a/force-app/main/default/objects/Account/validationRules/Cannot_Create_Contract.validationRule-meta.xml
+++ b/force-app/main/default/objects/Account/validationRules/Cannot_Create_Contract.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Cannot_Create_Contract</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>$Profile.Id != '00e10000000dzzG' && $Profile.Id !='00e10000000Y3o5'
&& $Profile.Id != '00e10000000dEQx' && $Profile.Id != '00e10000000Nab7' && RecordTypeId == '01210000000QjCN' && isNew()</errorConditionFormula>
<errorDisplayField>MaxActivityDate__c</errorDisplayField>
diff --git a/force-app/main/default/objects/Account/validationRules/Cannot_update_name.validationRule-meta.xml b/force-app/main/default/objects/Account/validationRules/Cannot_update_name.validationRule-meta.xml
index 9033a94..56590c4 100644
--- a/force-app/main/default/objects/Account/validationRules/Cannot_update_name.validationRule-meta.xml
+++ b/force-app/main/default/objects/Account/validationRules/Cannot_update_name.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Cannot_update_name</fullName>
- <active>false</active>
+ <active>true</active>
<description>鍙湁绯荤粺绠＄悊鍛樺拰鏈夋潈闄愮殑浜猴紝鎵嶈兘鏇存柊瀹㈡埛鍚嶃��
$User.Account_Name_Update__c = false && $User.ProfileId != '00e10000000Y3o5' && $User.ProfileId != '00e10000000dzzG' && ISCHANGED(Name)
澧炲姞IsUnlock__c <>true 锛屽尰闄㈠彉鏇翠俊鎭鎵归�氳繃鏃跺彲浠ュ悓姝ユ洿鏂板鎴�</description>
diff --git a/force-app/main/default/objects/Account/validationRules/Department_Name_Check.validationRule-meta.xml b/force-app/main/default/objects/Account/validationRules/Department_Name_Check.validationRule-meta.xml
index 9ce5e5f..fabf122 100644
--- a/force-app/main/default/objects/Account/validationRules/Department_Name_Check.validationRule-meta.xml
+++ b/force-app/main/default/objects/Account/validationRules/Department_Name_Check.validationRule-meta.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Department_Name_Check</fullName>
- <active>false</active>
+ <active>true</active>
<description>鎴︾暐绉戝銇悕绉般伅澶夋洿銇с亶銇俱仜銈�</description>
<errorConditionFormula>RecordTypeId != '01210000000QemG' && ISBLANK(Parent.ParentId) && Parent.RecordTypeId = '01210000000QemG' && ISCHANGED(Name) && !Sys_Dept_Name_Change_Chk__c</errorConditionFormula>
- <errorDisplayField>MaxActivityDate__c</errorDisplayField>
+ <errorDisplayField>Name</errorDisplayField>
<errorMessage>涓嶈兘鏇存敼鎴樼暐绉戝鐨勫鎴峰悕</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Account/validationRules/DeptClassHospital_IsEquals_Hospital.validationRule-meta.xml b/force-app/main/default/objects/Account/validationRules/DeptClassHospital_IsEquals_Hospital.validationRule-meta.xml
index 38aed6a..da747ff 100644
--- a/force-app/main/default/objects/Account/validationRules/DeptClassHospital_IsEquals_Hospital.validationRule-meta.xml
+++ b/force-app/main/default/objects/Account/validationRules/DeptClassHospital_IsEquals_Hospital.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>DeptClassHospital_IsEquals_Hospital</fullName>
- <active>false</active>
+ <active>true</active>
<description>鎴樼暐绉戝鐨勫尰闄㈣鍜岀瀹ょ殑鍖婚櫌涓�鑷�</description>
<errorConditionFormula>IF(
Parent.Parent.RecordTypeId = '01210000000QemG',
diff --git a/force-app/main/default/objects/Account/validationRules/DeptClass_IsEquals_Parent.validationRule-meta.xml b/force-app/main/default/objects/Account/validationRules/DeptClass_IsEquals_Parent.validationRule-meta.xml
index c7c7244..69ff1ed 100644
--- a/force-app/main/default/objects/Account/validationRules/DeptClass_IsEquals_Parent.validationRule-meta.xml
+++ b/force-app/main/default/objects/Account/validationRules/DeptClass_IsEquals_Parent.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>DeptClass_IsEquals_Parent</fullName>
- <active>false</active>
+ <active>true</active>
<description>// TODO Department_Class__r.Parent.RecordTypeId ==> Parent.Parent.RecordTypeId</description>
<errorConditionFormula>Not(IsBlank(Hospital__c)) && Parent.Parent.RecordTypeId = '01210000000QemG' && Department_Class__c <> ParentId</errorConditionFormula>
<errorMessage>鎴樼暐绉戝鍒嗙被瑕佸拰姣嶅叕鍙镐竴鏍�</errorMessage>
diff --git a/force-app/main/default/objects/Account/validationRules/DeptRecordName_IsEquals_ParentRecordName.validationRule-meta.xml b/force-app/main/default/objects/Account/validationRules/DeptRecordName_IsEquals_ParentRecordName.validationRule-meta.xml
index 972f318..6cf92f0 100644
--- a/force-app/main/default/objects/Account/validationRules/DeptRecordName_IsEquals_ParentRecordName.validationRule-meta.xml
+++ b/force-app/main/default/objects/Account/validationRules/DeptRecordName_IsEquals_ParentRecordName.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>DeptRecordName_IsEquals_ParentRecordName</fullName>
- <active>false</active>
+ <active>true</active>
<description>鎴樼暐绉戝鍒嗙被鐨勭被鍨嬭鍜岀瀹ょ殑瀹㈡埛璁板綍绫诲瀷涓�鑷淬��</description>
<errorConditionFormula>IF(
Parent.Parent.RecordTypeId = '01210000000QemG',
diff --git a/force-app/main/default/objects/Account/validationRules/Dept_Effective_Check.validationRule-meta.xml b/force-app/main/default/objects/Account/validationRules/Dept_Effective_Check.validationRule-meta.xml
index 4c0b636..c21c332 100644
--- a/force-app/main/default/objects/Account/validationRules/Dept_Effective_Check.validationRule-meta.xml
+++ b/force-app/main/default/objects/Account/validationRules/Dept_Effective_Check.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Dept_Effective_Check</fullName>
- <active>false</active>
+ <active>true</active>
<description>瑷虹檪绉戠劇鍔广伄鍫村悎銆佽ê鐧傜鏇存柊銇с亶銇俱仜銈�</description>
<errorConditionFormula>$Profile.Id != "00e10000000Y3o5"
&&
diff --git a/force-app/main/default/objects/Account/validationRules/FSECannotChangeFieldinPage.validationRule-meta.xml b/force-app/main/default/objects/Account/validationRules/FSECannotChangeFieldinPage.validationRule-meta.xml
index 4566df6..9a7a5f1 100644
--- a/force-app/main/default/objects/Account/validationRules/FSECannotChangeFieldinPage.validationRule-meta.xml
+++ b/force-app/main/default/objects/Account/validationRules/FSECannotChangeFieldinPage.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>FSECannotChangeFieldinPage</fullName>
- <active>false</active>
+ <active>true</active>
<description>閿�鍞媴褰�2S1,2S4涓嶈兘鏇存敼椤甸潰涓婄殑瀛楁</description>
<errorConditionFormula>($User.ProfileId = "00e10000000xnp2" ||
$User.ProfileId = "00e10000000hkas" ||
diff --git a/force-app/main/default/objects/Account/validationRules/Fax_Digits_Check.validationRule-meta.xml b/force-app/main/default/objects/Account/validationRules/Fax_Digits_Check.validationRule-meta.xml
index b9b6008..32029ac 100644
--- a/force-app/main/default/objects/Account/validationRules/Fax_Digits_Check.validationRule-meta.xml
+++ b/force-app/main/default/objects/Account/validationRules/Fax_Digits_Check.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Fax_Digits_Check</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>LEN(Fax) > 15</errorConditionFormula>
<errorMessage>Fax銇�15妗佷互涓嬨伀鍏ュ姏銇椼仸銇忋仩銇曘亜</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Account/validationRules/Hosp_Effective_Check.validationRule-meta.xml b/force-app/main/default/objects/Account/validationRules/Hosp_Effective_Check.validationRule-meta.xml
index 9f7cb37..4c06261 100644
--- a/force-app/main/default/objects/Account/validationRules/Hosp_Effective_Check.validationRule-meta.xml
+++ b/force-app/main/default/objects/Account/validationRules/Hosp_Effective_Check.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Hosp_Effective_Check</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>AND(Opportunity_on_count__c > 0,
Parent.Parent.RecordTypeId = '01210000000QemG',
ISCHANGED(Is_Active__c),
diff --git a/force-app/main/default/objects/Account/validationRules/Hospital_Effective_Check.validationRule-meta.xml b/force-app/main/default/objects/Account/validationRules/Hospital_Effective_Check.validationRule-meta.xml
index dc33168..c68b129 100644
--- a/force-app/main/default/objects/Account/validationRules/Hospital_Effective_Check.validationRule-meta.xml
+++ b/force-app/main/default/objects/Account/validationRules/Hospital_Effective_Check.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Hospital_Effective_Check</fullName>
- <active>false</active>
+ <active>true</active>
<description>鐥呴櫌鐒″姽銇牬鍚堛�佹垿鐣ョ銆佽ê鐧傜鏇存柊銇с亶銇俱仜銈撱�傦紙銇熴仩銇椼�佽í鍟忎欢鏁般仾銇┿伄绌嶄笂銇掗爡鐩亴鏇存柊銇с亶銈嬶級</description>
<errorConditionFormula>$Profile.Id != "00e10000000Y3o5"
&&
diff --git a/force-app/main/default/objects/Account/validationRules/Loaner_edit_chk.validationRule-meta.xml b/force-app/main/default/objects/Account/validationRules/Loaner_edit_chk.validationRule-meta.xml
index 2797680..479f2c9 100644
--- a/force-app/main/default/objects/Account/validationRules/Loaner_edit_chk.validationRule-meta.xml
+++ b/force-app/main/default/objects/Account/validationRules/Loaner_edit_chk.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Loaner_edit_chk</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>OR(Management_Code_Auto__c="7271439",AgentCode_Ext__c="9999998",AgentCode_Ext__c="9999999")
&&
$Profile.Id != "00e10000000Y3o5"
diff --git a/force-app/main/default/objects/Account/validationRules/Manager_check_for_FSE_plan.validationRule-meta.xml b/force-app/main/default/objects/Account/validationRules/Manager_check_for_FSE_plan.validationRule-meta.xml
index 804fafe..83fd7b5 100644
--- a/force-app/main/default/objects/Account/validationRules/Manager_check_for_FSE_plan.validationRule-meta.xml
+++ b/force-app/main/default/objects/Account/validationRules/Manager_check_for_FSE_plan.validationRule-meta.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Manager_check_for_FSE_plan</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>AND(Plan_approved_FSE__c=TRUE,ISBLANK(FSE_Manager_check_comment__c))</errorConditionFormula>
- <errorDisplayField>MaxActivityDate__c</errorDisplayField>
<errorMessage>CL6 缁忕悊绾ф壒鍑嗘椿鍔ㄨ鍒掓椂鍊欙紝闇�瑕佸～鍐欏弽棣堝缓璁�</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Account/validationRules/Manager_check_for_sale_plan.validationRule-meta.xml b/force-app/main/default/objects/Account/validationRules/Manager_check_for_sale_plan.validationRule-meta.xml
index 0894df3..6356a12 100644
--- a/force-app/main/default/objects/Account/validationRules/Manager_check_for_sale_plan.validationRule-meta.xml
+++ b/force-app/main/default/objects/Account/validationRules/Manager_check_for_sale_plan.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Manager_check_for_sale_plan</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>AND(Plan_approved__c=TRUE,ISBLANK(Manager_check_comment__c))</errorConditionFormula>
<errorMessage>CL6 缁忕悊绾ф壒鍑嗘椿鍔ㄨ鍒掓椂鍊欙紝闇�瑕佸～鍐欏弽棣堝缓璁�</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Account/validationRules/Not_Modify_Alias_Name2.validationRule-meta.xml b/force-app/main/default/objects/Account/validationRules/Not_Modify_Alias_Name2.validationRule-meta.xml
index 7596aaa..f5d10e8 100644
--- a/force-app/main/default/objects/Account/validationRules/Not_Modify_Alias_Name2.validationRule-meta.xml
+++ b/force-app/main/default/objects/Account/validationRules/Not_Modify_Alias_Name2.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Not_Modify_Alias_Name2</fullName>
- <active>false</active>
+ <active>true</active>
<description>鍖婚櫌鎵瑰噯鍚庡姪鐞嗕笉鑳戒慨鏀瑰埆鍚�1鍜屽埆鍚�2</description>
<errorConditionFormula>AND (
ISCHANGED(Alias_Name2__c) ,
diff --git a/force-app/main/default/objects/Account/validationRules/Not_Modify_Site.validationRule-meta.xml b/force-app/main/default/objects/Account/validationRules/Not_Modify_Site.validationRule-meta.xml
index 2ac4896..299a061 100644
--- a/force-app/main/default/objects/Account/validationRules/Not_Modify_Site.validationRule-meta.xml
+++ b/force-app/main/default/objects/Account/validationRules/Not_Modify_Site.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Not_Modify_Site</fullName>
- <active>false</active>
+ <active>true</active>
<description>鍖婚櫌鎵瑰噯鍚庡姪鐞嗕笉鑳戒慨鏀瑰埆鍚�1鍜屽埆鍚�2</description>
<errorConditionFormula>AND (
ISCHANGED(Site),
diff --git a/force-app/main/default/objects/Account/validationRules/Not_Modify_sparepartsdeliveryaddress.validationRule-meta.xml b/force-app/main/default/objects/Account/validationRules/Not_Modify_sparepartsdeliveryaddress.validationRule-meta.xml
index 29fc1f8..0ce05ec 100644
--- a/force-app/main/default/objects/Account/validationRules/Not_Modify_sparepartsdeliveryaddress.validationRule-meta.xml
+++ b/force-app/main/default/objects/Account/validationRules/Not_Modify_sparepartsdeliveryaddress.validationRule-meta.xml
@@ -16,8 +16,8 @@
ISCHANGED(Sparepartsdeliveryaddress10__c)
),
-$User.ProfileId !='00eC600000003SX',
-$User.ProfileId !='00eC800000005Cb',
+$User.ProfileId !='00e10000000dEQx',
+$User.ProfileId !='00e10000000Y3o5',
Text(Is_Active__c )!= '鑽夋涓�'
)</errorConditionFormula>
<errorMessage>鍖婚櫌鎵瑰噯鍚庡姪鐞嗕笉鑳戒慨鏀瑰鍝佸湴鍧�淇℃伅</errorMessage>
diff --git a/force-app/main/default/objects/Account/validationRules/Parent_must_be_DeptCl.validationRule-meta.xml b/force-app/main/default/objects/Account/validationRules/Parent_must_be_DeptCl.validationRule-meta.xml
index 656b76a..d190d3a 100644
--- a/force-app/main/default/objects/Account/validationRules/Parent_must_be_DeptCl.validationRule-meta.xml
+++ b/force-app/main/default/objects/Account/validationRules/Parent_must_be_DeptCl.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Parent_must_be_DeptCl</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>OR(RecordTypeId = '01210000000Qfmb',
RecordTypeId = '01210000000QfmR',
RecordTypeId = '01210000000QfmM',
diff --git a/force-app/main/default/objects/Account/validationRules/Postal_Code_Digits_Check.validationRule-meta.xml b/force-app/main/default/objects/Account/validationRules/Postal_Code_Digits_Check.validationRule-meta.xml
index 396e260..e8e88d2 100644
--- a/force-app/main/default/objects/Account/validationRules/Postal_Code_Digits_Check.validationRule-meta.xml
+++ b/force-app/main/default/objects/Account/validationRules/Postal_Code_Digits_Check.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Postal_Code_Digits_Check</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>LEN(Postal_Code__c) > 6</errorConditionFormula>
<errorMessage>閮典究鐣彿銇�6妗佷互涓嬨伀鍏ュ姏銇椼仸銇忋仩銇曘亜</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Account/validationRules/Qualifying_Check.validationRule-meta.xml b/force-app/main/default/objects/Account/validationRules/Qualifying_Check.validationRule-meta.xml
index e30835f..751e7c6 100644
--- a/force-app/main/default/objects/Account/validationRules/Qualifying_Check.validationRule-meta.xml
+++ b/force-app/main/default/objects/Account/validationRules/Qualifying_Check.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Qualifying_Check</fullName>
- <active>false</active>
+ <active>true</active>
<description>澧炲姞IsUnlock__c <>true 锛屽尰闄㈠彉鏇翠俊鎭鎵归�氳繃鏃跺彲浠ュ悓姝ユ洿鏂板鎴�</description>
<errorConditionFormula>!$User.Batch_User__c &&
(If_Qualifying__c = true) && IsUnlock__c <>true &&
diff --git a/force-app/main/default/objects/Account/validationRules/Record_Type_Change_Check.validationRule-meta.xml b/force-app/main/default/objects/Account/validationRules/Record_Type_Change_Check.validationRule-meta.xml
index e934cac..17e0f9f 100644
--- a/force-app/main/default/objects/Account/validationRules/Record_Type_Change_Check.validationRule-meta.xml
+++ b/force-app/main/default/objects/Account/validationRules/Record_Type_Change_Check.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Record_Type_Change_Check</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>IF ( $User.ProfileId = "00e10000000Y3o5", false, ISCHANGED( Acc_Record_Type__c ))</errorConditionFormula>
<errorMessage>椤у銇儸銈炽兗銉夈偪銈ゃ儣銇鏇淬仹銇嶃伨銇涖倱</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Account/validationRules/Required_Parent.validationRule-meta.xml b/force-app/main/default/objects/Account/validationRules/Required_Parent.validationRule-meta.xml
index 491d245..61b8791 100644
--- a/force-app/main/default/objects/Account/validationRules/Required_Parent.validationRule-meta.xml
+++ b/force-app/main/default/objects/Account/validationRules/Required_Parent.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Required_Parent</fullName>
- <active>false</active>
+ <active>true</active>
<description>閰嶄笅闅庡堡銇瓵ccout銇仱銇勩仸銆丳arent蹇呴爤銇仐銇俱仚銆�</description>
<errorConditionFormula>/*鍖婚櫌锛岀粡閿�鍟嗭紝鑷ぞ銉堛儸銉笺儖銉炽偘鏂借ō 浠ュ涓嶈兘绌�*/
RecordTypeId <> '01210000000QemG' && RecordTypeId <> '01210000000Qem1' && RecordTypeId <> '01210000000QgFi' && RecordTypeId <> '01210000000aLzZ' && IsBlank(ParentId)</errorConditionFormula>
diff --git a/force-app/main/default/objects/Account/validationRules/Submit_Plan_Sales_GI_BF.validationRule-meta.xml b/force-app/main/default/objects/Account/validationRules/Submit_Plan_Sales_GI_BF.validationRule-meta.xml
index 1921c87..4ade307 100644
--- a/force-app/main/default/objects/Account/validationRules/Submit_Plan_Sales_GI_BF.validationRule-meta.xml
+++ b/force-app/main/default/objects/Account/validationRules/Submit_Plan_Sales_GI_BF.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Submit_Plan_Sales_GI_BF</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>AND(Submit_Customer_target__c=TRUE,
Is_Active_Formula__c != "鏃犳晥",
/*鎴︾暐绉戝鍒嗛 娑堝寲绉�, 鎴︾暐绉戝鍒嗛 鍛煎惛绉� */
diff --git a/force-app/main/default/objects/Account/validationRules/Submit_Plan_Sales_GS_URO_GYN_ENT.validationRule-meta.xml b/force-app/main/default/objects/Account/validationRules/Submit_Plan_Sales_GS_URO_GYN_ENT.validationRule-meta.xml
index 42272c9..a7fcded 100644
--- a/force-app/main/default/objects/Account/validationRules/Submit_Plan_Sales_GS_URO_GYN_ENT.validationRule-meta.xml
+++ b/force-app/main/default/objects/Account/validationRules/Submit_Plan_Sales_GS_URO_GYN_ENT.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Submit_Plan_Sales_GS_URO_GYN_ENT</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>AND(Submit_Customer_target__c=TRUE,
Is_Active_Formula__c != "鏃犳晥",
OR(RecordType.Id = "01210000000Qeze",RecordType.Id = "01210000000Qezj",RecordType.Id = "01210000000Qezo",RecordType.Id = "01210000000Qezt"),
diff --git a/force-app/main/default/objects/Account/validationRules/Suggest_Hospital_Source.validationRule-meta.xml b/force-app/main/default/objects/Account/validationRules/Suggest_Hospital_Source.validationRule-meta.xml
index a13e78f..e3851bf 100644
--- a/force-app/main/default/objects/Account/validationRules/Suggest_Hospital_Source.validationRule-meta.xml
+++ b/force-app/main/default/objects/Account/validationRules/Suggest_Hospital_Source.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Suggest_Hospital_Source</fullName>
- <active>false</active>
+ <active>true</active>
<description>褰撴嫑鏍囬」鐩笉涓虹┖鏃讹紝鍖婚櫌鏉ユ簮涓嶇瓑浜庢嫑鏍囬」鐩�</description>
<errorConditionFormula>AND(Tender_information__c != null ,TEXT(Hospital_Source__c ) != '鎷涙爣椤圭洰')</errorConditionFormula>
<errorMessage>鍖婚櫌鏉ユ簮涓嶇瓑浜庢嫑鏍囬」鐩�</errorMessage>
diff --git a/force-app/main/default/objects/Account/validationRules/System_Stop_Account.validationRule-meta.xml b/force-app/main/default/objects/Account/validationRules/System_Stop_Account.validationRule-meta.xml
index e0f5464..f18d704 100644
--- a/force-app/main/default/objects/Account/validationRules/System_Stop_Account.validationRule-meta.xml
+++ b/force-app/main/default/objects/Account/validationRules/System_Stop_Account.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>System_Stop_Account</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>$Label.System_Stop == '1'&& Acc_Record_Type__c!='璨╁２搴�'&& $User.Batch_User__c != true</errorConditionFormula>
<errorMessage>绯荤粺缁存姢鏈熼棿锛屽鎴蜂俊鎭姝㈢紪杈戙��</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Account/validationRules/Telephone_Digits_Check.validationRule-meta.xml b/force-app/main/default/objects/Account/validationRules/Telephone_Digits_Check.validationRule-meta.xml
index e084d36..47c17ee 100644
--- a/force-app/main/default/objects/Account/validationRules/Telephone_Digits_Check.validationRule-meta.xml
+++ b/force-app/main/default/objects/Account/validationRules/Telephone_Digits_Check.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Telephone_Digits_Check</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>AND(OR(RecordTypeId='01210000000QemG'
,Parent.RecordTypeId='01210000000QemG'
,Parent.Parent.RecordTypeId='01210000000QemG'
diff --git a/force-app/main/default/objects/Account/validationRules/ValidateFromCanNotLaterThanValidateTo.validationRule-meta.xml b/force-app/main/default/objects/Account/validationRules/ValidateFromCanNotLaterThanValidateTo.validationRule-meta.xml
index 689cce2..a9c7de6 100644
--- a/force-app/main/default/objects/Account/validationRules/ValidateFromCanNotLaterThanValidateTo.validationRule-meta.xml
+++ b/force-app/main/default/objects/Account/validationRules/ValidateFromCanNotLaterThanValidateTo.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>ValidateFromCanNotLaterThanValidateTo</fullName>
- <active>false</active>
+ <active>true</active>
<description>璧勮川鐨勬湁鏁堟湡寮�濮嬫棩涓嶈兘鏅氫簬缁撴潫鏃�</description>
<errorConditionFormula>Valid_From__c > Valid_To__c</errorConditionFormula>
<errorDisplayField>Valid_From__c</errorDisplayField>
diff --git a/force-app/main/default/objects/Account/validationRules/canNotUpdateHospitalOwner.validationRule-meta.xml b/force-app/main/default/objects/Account/validationRules/canNotUpdateHospitalOwner.validationRule-meta.xml
index 6403983..983c66f 100644
--- a/force-app/main/default/objects/Account/validationRules/canNotUpdateHospitalOwner.validationRule-meta.xml
+++ b/force-app/main/default/objects/Account/validationRules/canNotUpdateHospitalOwner.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>canNotUpdateHospitalOwner</fullName>
- <active>false</active>
+ <active>true</active>
<description>鍙湁绯荤粺绠＄悊鍛樸�乥atch鐢ㄦ埛銆佹帴鍙ｇ敤鎴枫�佸弽鏄犲尰闄㈡潈闄愭寜閽彲浠ユ洿鏀瑰尰闄㈡墍鏈変汉</description>
<errorConditionFormula>ISCHANGED(OwnerId) && RecordType_DeveloperName__c = 'HP' && $Profile.Id != '00e10000000Y3o5' && $Profile.Id != '00e10000000dzzG' && $Profile.Id != '00e10000000dEQx' && HosipitalToDept__c = false</errorConditionFormula>
<errorMessage>闇�瑕佷慨鏀瑰尰闄㈡墍鏈変汉鐨勮瘽锛岃鑱旂郴绯荤粺绠＄悊鍛�</errorMessage>
diff --git a/force-app/main/default/objects/Account/webLinks/N_CIC_B.webLink-meta.xml b/force-app/main/default/objects/Account/webLinks/N_CIC_B.webLink-meta.xml
index 80aa9ed..4a8078f 100644
--- a/force-app/main/default/objects/Account/webLinks/N_CIC_B.webLink-meta.xml
+++ b/force-app/main/default/objects/Account/webLinks/N_CIC_B.webLink-meta.xml
@@ -16,5 +16,5 @@
<protected>false</protected>
<showsLocation>false</showsLocation>
<showsStatus>false</showsStatus>
- <url>/00OC60000000WfaMAE?pv1={! Account.Id}</url>
+ <url>/00O10000003LrYE?pv1={! Account.Id}</url>
</WebLink>
diff --git a/force-app/main/default/objects/Account/webLinks/P_GI_case.webLink-meta.xml b/force-app/main/default/objects/Account/webLinks/P_GI_case.webLink-meta.xml
index 15a75e3..4a6e489 100644
--- a/force-app/main/default/objects/Account/webLinks/P_GI_case.webLink-meta.xml
+++ b/force-app/main/default/objects/Account/webLinks/P_GI_case.webLink-meta.xml
@@ -16,5 +16,5 @@
<protected>false</protected>
<showsLocation>false</showsLocation>
<showsStatus>false</showsStatus>
- <url>/00OC60000000WfWMAU?pv1={!Account.Id}</url>
+ <url>/00O10000003qY9J?pv1={!Account.Id}</url>
</WebLink>
diff --git a/force-app/main/default/objects/Account_Delay_Apply__c/Account_Delay_Apply__c.object-meta.xml b/force-app/main/default/objects/Account_Delay_Apply__c/Account_Delay_Apply__c.object-meta.xml
index a60a050..c514193 100644
--- a/force-app/main/default/objects/Account_Delay_Apply__c/Account_Delay_Apply__c.object-meta.xml
+++ b/force-app/main/default/objects/Account_Delay_Apply__c/Account_Delay_Apply__c.object-meta.xml
@@ -128,22 +128,21 @@
</actionOverrides>
<actionOverrides>
<actionName>View</actionName>
+ <content>UpdAccount</content>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>Visualforce</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>View</actionName>
<comment>Action override created by Lightning App Builder during activation.</comment>
- <content>FlexiPage11213343</content>
+ <content>FlexiPage7</content>
<formFactor>Large</formFactor>
<skipRecordTypeSelect>false</skipRecordTypeSelect>
<type>Flexipage</type>
</actionOverrides>
<actionOverrides>
<actionName>View</actionName>
- <comment>Action override created by Lightning App Builder during activation.</comment>
- <content>FlexiPage11213343</content>
<formFactor>Small</formFactor>
- <skipRecordTypeSelect>false</skipRecordTypeSelect>
- <type>Flexipage</type>
- </actionOverrides>
- <actionOverrides>
- <actionName>View</actionName>
<type>Default</type>
</actionOverrides>
<allowInChatterGroups>true</allowInChatterGroups>
diff --git a/force-app/main/default/objects/Account_Delay_Apply__c/listViews/MYView.listView-meta.xml b/force-app/main/default/objects/Account_Delay_Apply__c/listViews/MYView.listView-meta.xml
index 7e201a7..8ba5327 100644
--- a/force-app/main/default/objects/Account_Delay_Apply__c/listViews/MYView.listView-meta.xml
+++ b/force-app/main/default/objects/Account_Delay_Apply__c/listViews/MYView.listView-meta.xml
@@ -11,4 +11,5 @@
<columns>LAST_UPDATE</columns>
<filterScope>Mine</filterScope>
<label>鎴戠殑鍙樻洿鐢宠</label>
+ <language>zh_CN</language>
</ListView>
diff --git a/force-app/main/default/objects/Account_Delay_Apply__c/validationRules/CheckChangeReason.validationRule-meta.xml b/force-app/main/default/objects/Account_Delay_Apply__c/validationRules/CheckChangeReason.validationRule-meta.xml
index 93b6c90..ff5b4e5 100644
--- a/force-app/main/default/objects/Account_Delay_Apply__c/validationRules/CheckChangeReason.validationRule-meta.xml
+++ b/force-app/main/default/objects/Account_Delay_Apply__c/validationRules/CheckChangeReason.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>CheckChangeReason</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>ISBLANK(ChangeReason__c)</errorConditionFormula>
<errorDisplayField>ChangeReason__c</errorDisplayField>
<errorMessage>鑷冲皯閫夋嫨涓�椤瑰鎴峰彉鏇寸悊鐢憋紒</errorMessage>
diff --git a/force-app/main/default/objects/Account_Number_of_case__c/Account_Number_of_case__c.object-meta.xml b/force-app/main/default/objects/Account_Number_of_case__c/Account_Number_of_case__c.object-meta.xml
index 68a180c..5fa4ee5 100644
--- a/force-app/main/default/objects/Account_Number_of_case__c/Account_Number_of_case__c.object-meta.xml
+++ b/force-app/main/default/objects/Account_Number_of_case__c/Account_Number_of_case__c.object-meta.xml
@@ -162,13 +162,13 @@
</nameField>
<recordTypeTrackHistory>false</recordTypeTrackHistory>
<searchLayouts>
+ <excludedStandardButtons>PrintableListView</excludedStandardButtons>
<excludedStandardButtons>OpenListInQuip</excludedStandardButtons>
<excludedStandardButtons>NewFromDocument</excludedStandardButtons>
- <excludedStandardButtons>Accept</excludedStandardButtons>
<excludedStandardButtons>ChangeOwner</excludedStandardButtons>
<excludedStandardButtons>Import</excludedStandardButtons>
<excludedStandardButtons>MassChangeOwner</excludedStandardButtons>
- <excludedStandardButtons>PrintableListView</excludedStandardButtons>
+ <excludedStandardButtons>Accept</excludedStandardButtons>
</searchLayouts>
<sharingModel>ControlledByParent</sharingModel>
<visibility>Public</visibility>
diff --git a/force-app/main/default/objects/Account_Number_of_target__c/fields/Account_HP__c.field-meta.xml b/force-app/main/default/objects/Account_Number_of_target__c/fields/Account_HP__c.field-meta.xml
index 64ef140..31bc174 100644
--- a/force-app/main/default/objects/Account_Number_of_target__c/fields/Account_HP__c.field-meta.xml
+++ b/force-app/main/default/objects/Account_Number_of_target__c/fields/Account_HP__c.field-meta.xml
@@ -5,7 +5,7 @@
<externalId>false</externalId>
<label>鍖婚櫌鍚�</label>
<lookupFilter>
- <active>false</active>
+ <active>true</active>
<filterItems>
<field>Account.RecordTypeId</field>
<operation>equals</operation>
diff --git a/force-app/main/default/objects/Account_Number_of_target__c/fields/Account__c.field-meta.xml b/force-app/main/default/objects/Account_Number_of_target__c/fields/Account__c.field-meta.xml
index b17ccf6..4a9731c 100644
--- a/force-app/main/default/objects/Account_Number_of_target__c/fields/Account__c.field-meta.xml
+++ b/force-app/main/default/objects/Account_Number_of_target__c/fields/Account__c.field-meta.xml
@@ -4,7 +4,7 @@
<externalId>false</externalId>
<label>鎴樼暐绉戝鍚�</label>
<lookupFilter>
- <active>false</active>
+ <active>true</active>
<filterItems>
<field>Account.Parent.RecordTypeId</field>
<operation>equals</operation>
diff --git a/force-app/main/default/objects/Address__c/Address__c.object-meta.xml b/force-app/main/default/objects/Address__c/Address__c.object-meta.xml
index 2ca84a0..3377393 100644
--- a/force-app/main/default/objects/Address__c/Address__c.object-meta.xml
+++ b/force-app/main/default/objects/Address__c/Address__c.object-meta.xml
@@ -58,11 +58,13 @@
</actionOverrides>
<actionOverrides>
<actionName>Edit</actionName>
- <type>Default</type>
+ <content>LexAddressPIPLAura</content>
+ <formFactor>Large</formFactor>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>LightningComponent</type>
</actionOverrides>
<actionOverrides>
<actionName>Edit</actionName>
- <formFactor>Large</formFactor>
<type>Default</type>
</actionOverrides>
<actionOverrides>
@@ -86,11 +88,13 @@
</actionOverrides>
<actionOverrides>
<actionName>New</actionName>
- <type>Default</type>
+ <content>LexAddressPIPLAura</content>
+ <formFactor>Large</formFactor>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>LightningComponent</type>
</actionOverrides>
<actionOverrides>
<actionName>New</actionName>
- <formFactor>Large</formFactor>
<type>Default</type>
</actionOverrides>
<actionOverrides>
diff --git a/force-app/main/default/objects/Advance_Payment__c/Advance_Payment__c.object-meta.xml b/force-app/main/default/objects/Advance_Payment__c/Advance_Payment__c.object-meta.xml
index b4629ab..da44725 100644
--- a/force-app/main/default/objects/Advance_Payment__c/Advance_Payment__c.object-meta.xml
+++ b/force-app/main/default/objects/Advance_Payment__c/Advance_Payment__c.object-meta.xml
@@ -161,13 +161,13 @@
<type>AutoNumber</type>
</nameField>
<searchLayouts>
+ <excludedStandardButtons>ChangeOwner</excludedStandardButtons>
<excludedStandardButtons>OpenListInQuip</excludedStandardButtons>
<excludedStandardButtons>NewFromDocument</excludedStandardButtons>
- <excludedStandardButtons>Accept</excludedStandardButtons>
<excludedStandardButtons>PrintableListView</excludedStandardButtons>
<excludedStandardButtons>Import</excludedStandardButtons>
<excludedStandardButtons>MassChangeOwner</excludedStandardButtons>
- <excludedStandardButtons>ChangeOwner</excludedStandardButtons>
+ <excludedStandardButtons>Accept</excludedStandardButtons>
</searchLayouts>
<sharingModel>ReadWrite</sharingModel>
<visibility>Public</visibility>
diff --git a/force-app/main/default/objects/Agency_Contact__c/Agency_Contact__c.object-meta.xml b/force-app/main/default/objects/Agency_Contact__c/Agency_Contact__c.object-meta.xml
index 0727d30..4b27317 100644
--- a/force-app/main/default/objects/Agency_Contact__c/Agency_Contact__c.object-meta.xml
+++ b/force-app/main/default/objects/Agency_Contact__c/Agency_Contact__c.object-meta.xml
@@ -58,11 +58,13 @@
</actionOverrides>
<actionOverrides>
<actionName>Edit</actionName>
- <type>Default</type>
+ <content>LexAgencyContactPIPLAura</content>
+ <formFactor>Large</formFactor>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>LightningComponent</type>
</actionOverrides>
<actionOverrides>
<actionName>Edit</actionName>
- <formFactor>Large</formFactor>
<type>Default</type>
</actionOverrides>
<actionOverrides>
@@ -86,11 +88,13 @@
</actionOverrides>
<actionOverrides>
<actionName>New</actionName>
- <type>Default</type>
+ <content>LexAgencyContactPIPLAura</content>
+ <formFactor>Large</formFactor>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>LightningComponent</type>
</actionOverrides>
<actionOverrides>
<actionName>New</actionName>
- <formFactor>Large</formFactor>
<type>Default</type>
</actionOverrides>
<actionOverrides>
diff --git a/force-app/main/default/objects/Agency_Contact__c/fields/Agency_ID__c.field-meta.xml b/force-app/main/default/objects/Agency_Contact__c/fields/Agency_ID__c.field-meta.xml
index 65a8e64..5809f2b 100644
--- a/force-app/main/default/objects/Agency_Contact__c/fields/Agency_ID__c.field-meta.xml
+++ b/force-app/main/default/objects/Agency_Contact__c/fields/Agency_ID__c.field-meta.xml
@@ -3,7 +3,7 @@
<fullName>Agency_ID__c</fullName>
<externalId>false</externalId>
<label>缁忛攢鍟咺D</label>
- <length>18</length>
+ <length>15</length>
<required>false</required>
<trackTrending>false</trackTrending>
<type>Text</type>
diff --git a/force-app/main/default/objects/Agency_Contact__c/validationRules/Create_Agency_Contact_Name_Check.validationRule-meta.xml b/force-app/main/default/objects/Agency_Contact__c/validationRules/Create_Agency_Contact_Name_Check.validationRule-meta.xml
index b2c6b9a..80c489c 100644
--- a/force-app/main/default/objects/Agency_Contact__c/validationRules/Create_Agency_Contact_Name_Check.validationRule-meta.xml
+++ b/force-app/main/default/objects/Agency_Contact__c/validationRules/Create_Agency_Contact_Name_Check.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Create_Agency_Contact_Name_Check</fullName>
- <active>false</active>
+ <active>true</active>
<description>妫�鏌�.瀹㈡埛浜哄憳鍚嶅瓧鍚堟硶鎬�</description>
<errorConditionFormula>isnew()&&
$User.ProfileId <>'00e10000000Y3o5'
diff --git a/force-app/main/default/objects/Agency_Contact__c/validationRules/NameCannotStart_Olympus.validationRule-meta.xml b/force-app/main/default/objects/Agency_Contact__c/validationRules/NameCannotStart_Olympus.validationRule-meta.xml
index 44ee5dc..f6c2091 100644
--- a/force-app/main/default/objects/Agency_Contact__c/validationRules/NameCannotStart_Olympus.validationRule-meta.xml
+++ b/force-app/main/default/objects/Agency_Contact__c/validationRules/NameCannotStart_Olympus.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>NameCannotStart_Olympus</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>IF(Isblank(Agency_Hospital__c) == false
, CONTAINS(Name, '(OLYMPUS)')
, False
diff --git a/force-app/main/default/objects/Agency_Hospital_Link__c/fields/Agency_ID__c.field-meta.xml b/force-app/main/default/objects/Agency_Hospital_Link__c/fields/Agency_ID__c.field-meta.xml
index 4a71b30..cbb7f08 100644
--- a/force-app/main/default/objects/Agency_Hospital_Link__c/fields/Agency_ID__c.field-meta.xml
+++ b/force-app/main/default/objects/Agency_Hospital_Link__c/fields/Agency_ID__c.field-meta.xml
@@ -3,7 +3,7 @@
<fullName>Agency_ID__c</fullName>
<externalId>false</externalId>
<label>缁忛攢鍟咺D</label>
- <length>18</length>
+ <length>15</length>
<required>false</required>
<trackFeedHistory>false</trackFeedHistory>
<trackTrending>false</trackTrending>
diff --git a/force-app/main/default/objects/Agency_Hospital_Link__c/fields/Uniquekey__c.field-meta.xml b/force-app/main/default/objects/Agency_Hospital_Link__c/fields/Uniquekey__c.field-meta.xml
index a021834..b326fbe 100644
--- a/force-app/main/default/objects/Agency_Hospital_Link__c/fields/Uniquekey__c.field-meta.xml
+++ b/force-app/main/default/objects/Agency_Hospital_Link__c/fields/Uniquekey__c.field-meta.xml
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Uniquekey__c</fullName>
- <externalId>false</externalId>
+ <caseSensitive>true</caseSensitive>
+ <externalId>true</externalId>
<label>Uniquekey</label>
<length>255</length>
<required>false</required>
<trackFeedHistory>false</trackFeedHistory>
<trackTrending>false</trackTrending>
<type>Text</type>
- <unique>false</unique>
+ <unique>true</unique>
</CustomField>
diff --git a/force-app/main/default/objects/Agency_Opportunity__c/Agency_Opportunity__c.object-meta.xml b/force-app/main/default/objects/Agency_Opportunity__c/Agency_Opportunity__c.object-meta.xml
index ecbc189..71e3476 100644
--- a/force-app/main/default/objects/Agency_Opportunity__c/Agency_Opportunity__c.object-meta.xml
+++ b/force-app/main/default/objects/Agency_Opportunity__c/Agency_Opportunity__c.object-meta.xml
@@ -58,11 +58,13 @@
</actionOverrides>
<actionOverrides>
<actionName>Edit</actionName>
- <type>Default</type>
+ <content>NewAgencyOpportunity</content>
+ <formFactor>Large</formFactor>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>LightningComponent</type>
</actionOverrides>
<actionOverrides>
<actionName>Edit</actionName>
- <formFactor>Large</formFactor>
<type>Default</type>
</actionOverrides>
<actionOverrides>
@@ -86,11 +88,13 @@
</actionOverrides>
<actionOverrides>
<actionName>New</actionName>
- <type>Default</type>
+ <content>NewAgencyOpportunity</content>
+ <formFactor>Large</formFactor>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>LightningComponent</type>
</actionOverrides>
<actionOverrides>
<actionName>New</actionName>
- <formFactor>Large</formFactor>
<type>Default</type>
</actionOverrides>
<actionOverrides>
@@ -129,7 +133,7 @@
<actionOverrides>
<actionName>View</actionName>
<comment>Action override created by Lightning App Builder during activation.</comment>
- <content>FlexiPage11213338</content>
+ <content>FlexiPage11213319</content>
<formFactor>Large</formFactor>
<skipRecordTypeSelect>false</skipRecordTypeSelect>
<type>Flexipage</type>
diff --git a/force-app/main/default/objects/Agency_Opportunity__c/fields/Agency_PersonName__c.field-meta.xml b/force-app/main/default/objects/Agency_Opportunity__c/fields/Agency_PersonName__c.field-meta.xml
index da0f781..d7e9dd8 100644
--- a/force-app/main/default/objects/Agency_Opportunity__c/fields/Agency_PersonName__c.field-meta.xml
+++ b/force-app/main/default/objects/Agency_Opportunity__c/fields/Agency_PersonName__c.field-meta.xml
@@ -6,7 +6,7 @@
<length>255</length>
<required>false</required>
<trackFeedHistory>false</trackFeedHistory>
- <trackHistory>true</trackHistory>
+ <trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Text</type>
<unique>false</unique>
diff --git a/force-app/main/default/objects/Agency_Opportunity__c/fields/Agency_Person__c.field-meta.xml b/force-app/main/default/objects/Agency_Opportunity__c/fields/Agency_Person__c.field-meta.xml
index 914ec6d..7c0c7a6 100644
--- a/force-app/main/default/objects/Agency_Opportunity__c/fields/Agency_Person__c.field-meta.xml
+++ b/force-app/main/default/objects/Agency_Opportunity__c/fields/Agency_Person__c.field-meta.xml
@@ -5,7 +5,7 @@
<externalId>false</externalId>
<label>閿�鍞媴褰�</label>
<lookupFilter>
- <active>false</active>
+ <active>true</active>
<booleanFilter>1 OR 2</booleanFilter>
<filterItems>
<field>Contact.Isactive__c</field>
@@ -24,7 +24,7 @@
<relationshipName>Agency_Person</relationshipName>
<required>false</required>
<trackFeedHistory>false</trackFeedHistory>
- <trackHistory>false</trackHistory>
+ <trackHistory>true</trackHistory>
<trackTrending>false</trackTrending>
<type>Lookup</type>
</CustomField>
diff --git a/force-app/main/default/objects/Agency_Opportunity__c/fields/Change_To_Opportunity__c.field-meta.xml b/force-app/main/default/objects/Agency_Opportunity__c/fields/Change_To_Opportunity__c.field-meta.xml
index 79cf194..77c4a7e 100644
--- a/force-app/main/default/objects/Agency_Opportunity__c/fields/Change_To_Opportunity__c.field-meta.xml
+++ b/force-app/main/default/objects/Agency_Opportunity__c/fields/Change_To_Opportunity__c.field-meta.xml
@@ -4,7 +4,27 @@
<deleteConstraint>SetNull</deleteConstraint>
<externalId>false</externalId>
<label>OCSM璇环</label>
+ <lookupFilter>
+ <active>true</active>
+ <filterItems>
+ <field>$Source.Account_Opp__c</field>
+ <operation>equals</operation>
+ <valueField>Opportunity.Hospital__c</valueField>
+ </filterItems>
+ <filterItems>
+ <field>Opportunity.StageName</field>
+ <operation>equals</operation>
+ <value>璇环</value>
+ </filterItems>
+ <filterItems>
+ <field>Opportunity.ThisYear_Opp__c</field>
+ <operation>equals</operation>
+ <value>True</value>
+ </filterItems>
+ <isOptional>true</isOptional>
+ </lookupFilter>
<referenceTo>Opportunity</referenceTo>
+ <relationshipLabel>缁忛攢鍟嗚浠�</relationshipLabel>
<relationshipName>Agency_Opportunity</relationshipName>
<required>false</required>
<trackFeedHistory>false</trackFeedHistory>
diff --git a/force-app/main/default/objects/Agency_Opportunity__c/fields/Hospital_Target__c.field-meta.xml b/force-app/main/default/objects/Agency_Opportunity__c/fields/Hospital_Target__c.field-meta.xml
index 5b285e0..a97c87d 100644
--- a/force-app/main/default/objects/Agency_Opportunity__c/fields/Hospital_Target__c.field-meta.xml
+++ b/force-app/main/default/objects/Agency_Opportunity__c/fields/Hospital_Target__c.field-meta.xml
@@ -15,7 +15,6 @@
<isOptional>false</isOptional>
</lookupFilter>
<referenceTo>Account</referenceTo>
- <relationshipLabel>缁忛攢鍟嗚浠� (鍖婚櫌)</relationshipLabel>
<relationshipName>testAcc2</relationshipName>
<required>false</required>
<trackFeedHistory>false</trackFeedHistory>
diff --git a/force-app/main/default/objects/Agency_Opportunity__c/fields/NeedShareBatch__c.field-meta.xml b/force-app/main/default/objects/Agency_Opportunity__c/fields/NeedShareBatch__c.field-meta.xml
index c7ace3c..af1f4d5 100644
--- a/force-app/main/default/objects/Agency_Opportunity__c/fields/NeedShareBatch__c.field-meta.xml
+++ b/force-app/main/default/objects/Agency_Opportunity__c/fields/NeedShareBatch__c.field-meta.xml
@@ -1,14 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>NeedShareBatch__c</fullName>
- <description>鏈浆鍖朞CM璇环鐨勭粡閿�鍟嗚浠凤紝骞朵笖鍏变韩鐢ㄦ埛涓庢垬鐣ョ瀹ゆ墍鏈変汉涓嶅悓鐨勬儏鍐甸渶瑕佹洿鏂�</description>
- <externalId>false</externalId>
- <formula>IF (ISBLANK(Change_To_Opportunity__c),
+ <description>鏈浆鍖朞CM璇环鐨勭粡閿�鍟嗚浠凤紝骞朵笖鍏变韩鐢ㄦ埛涓庢垬鐣ョ瀹ゆ墍鏈変汉涓嶅悓鐨勬儏鍐甸渶瑕佹洿鏂�
+20231115ws淇敼鍓�:
+IF (ISBLANK(Change_To_Opportunity__c),
IF (ISBLANK(Department_Class_Opp__c),
false,
OCSM_Owner__c != Department_Class_Opp__r.OwnerId),
false
-)</formula>
+)</description>
+ <externalId>false</externalId>
+ <formula>IF (ISBLANK(Department_Class_Opp__c),
+ false,
+ OCSM_Owner__c != Department_Class_Opp__r.OwnerId)</formula>
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
<label>闇�瑕佹洿鏂板叡浜�</label>
<trackHistory>false</trackHistory>
diff --git a/force-app/main/default/objects/Agency_Opportunity__c/fields/No_Convert_Reason__c.field-meta.xml b/force-app/main/default/objects/Agency_Opportunity__c/fields/No_Convert_Reason__c.field-meta.xml
index 445d61f..55a2088 100644
--- a/force-app/main/default/objects/Agency_Opportunity__c/fields/No_Convert_Reason__c.field-meta.xml
+++ b/force-app/main/default/objects/Agency_Opportunity__c/fields/No_Convert_Reason__c.field-meta.xml
@@ -48,12 +48,6 @@
<default>false</default>
<label>7.绔炲搧鍙傛暟</label>
</value>
- <value>
- <fullName>3.璇环閲嶅</fullName>
- <default>false</default>
- <isActive>false</isActive>
- <label>3.璇环閲嶅</label>
- </value>
</valueSetDefinition>
</valueSet>
</CustomField>
diff --git a/force-app/main/default/objects/Agency_Opportunity__c/listViews/View_Nearly_J_DYear.listView-meta.xml b/force-app/main/default/objects/Agency_Opportunity__c/listViews/View_Nearly_J_DYear.listView-meta.xml
index d12f661..6579c42 100644
--- a/force-app/main/default/objects/Agency_Opportunity__c/listViews/View_Nearly_J_DYear.listView-meta.xml
+++ b/force-app/main/default/objects/Agency_Opportunity__c/listViews/View_Nearly_J_DYear.listView-meta.xml
@@ -29,4 +29,386 @@
</filters>
<label>01.璇环鍒涘缓-鏈储骞�</label>
<language>zh_CN</language>
+ <sharedTo>
+ <portalRoleAndSubordinates>CustomerUser</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser1</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser10</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser100</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser101</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser102</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser103</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser104</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser105</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser106</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser107</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser108</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser109</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser11</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser110</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser111</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser112</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser113</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser114</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser115</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser116</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser117</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser118</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser119</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser12</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser120</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser121</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser122</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser123</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser124</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser125</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser126</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser127</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser128</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser129</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser130</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser131</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser132</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser133</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser134</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser135</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser136</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser137</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser138</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser139</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser14</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser140</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser141</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser142</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser143</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser144</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser145</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser146</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser147</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser148</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser149</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser15</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser150</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser151</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser152</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser153</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser154</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser155</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser156</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser157</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser158</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser159</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser16</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser160</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser161</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser162</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser163</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser164</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser165</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser166</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser167</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser168</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser169</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser17</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser170</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser171</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser172</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser173</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser174</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser175</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser176</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser177</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser178</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser179</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser18</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser180</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser181</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser182</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser183</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser184</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser185</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser186</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser187</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser188</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser189</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser19</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser190</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser191</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser192</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser193</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser194</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser195</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser196</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser197</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser198</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser199</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser2</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser20</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser200</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser201</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser202</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser203</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser204</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser205</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser206</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser207</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser208</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser209</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser21</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser210</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser211</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser212</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser213</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser214</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser215</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser216</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser217</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser218</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser219</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser22</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser220</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser221</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser222</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser223</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser224</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser225</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser226</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser227</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser228</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser229</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser23</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser230</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser231</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser232</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser233</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser234</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser235</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser236</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser237</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser238</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser239</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser24</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser240</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser241</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser242</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser243</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser244</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser245</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser246</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser247</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser248</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser249</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser25</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser250</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser251</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser252</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser253</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser254</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser255</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser256</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser257</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser258</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser259</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser26</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser260</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser261</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser262</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser263</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser264</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser265</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser266</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser267</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser268</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser269</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser27</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser270</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser271</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser272</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser273</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser274</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser275</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser276</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser277</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser278</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser279</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser28</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser280</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser281</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser282</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser283</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser284</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser285</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser286</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser287</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser288</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser289</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser29</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser290</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser291</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser292</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser293</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser294</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser295</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser296</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser297</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser298</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser299</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser3</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser30</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser300</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser301</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser302</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser303</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser304</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser305</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser306</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser307</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser308</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser309</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser31</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser310</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser311</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser312</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser313</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser314</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser315</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser316</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser317</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser318</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser319</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser32</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser320</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser321</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser322</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser323</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser324</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser325</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser326</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser327</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser328</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser329</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser33</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser330</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser331</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser332</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser333</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser334</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser335</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser336</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser337</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser338</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser339</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser34</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser340</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser341</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser342</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser343</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser344</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser345</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser346</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser347</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser348</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser349</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser35</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser350</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser351</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser352</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser353</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser354</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser355</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser356</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser357</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser358</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser359</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser36</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser360</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser361</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser362</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser363</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser364</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser365</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser366</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser367</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser368</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser369</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser37</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser370</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser371</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser372</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser373</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser374</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser375</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser376</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser377</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser378</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser38</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser39</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser4</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser40</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser41</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser42</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser43</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser44</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser45</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser46</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser47</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser48</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser49</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser5</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser50</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser51</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser52</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser53</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser54</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser55</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser56</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser57</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser58</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser59</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser6</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser60</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser61</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser62</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser63</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser64</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser65</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser66</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser67</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser68</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser69</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser7</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser70</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser71</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser72</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser73</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser74</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser75</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser76</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser77</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser78</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser79</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser8</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser80</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser81</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser82</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser83</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser84</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser85</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser86</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser87</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser88</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser89</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser9</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser90</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser91</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser92</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser93</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser94</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser95</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser96</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser97</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser98</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser99</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>TEST</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>x149PDB023</portalRoleAndSubordinates>
+ </sharedTo>
</ListView>
diff --git a/force-app/main/default/objects/Agency_Opportunity__c/listViews/View_Nearly_J_LYear.listView-meta.xml b/force-app/main/default/objects/Agency_Opportunity__c/listViews/View_Nearly_J_LYear.listView-meta.xml
index 2da7bd0..024836e 100644
--- a/force-app/main/default/objects/Agency_Opportunity__c/listViews/View_Nearly_J_LYear.listView-meta.xml
+++ b/force-app/main/default/objects/Agency_Opportunity__c/listViews/View_Nearly_J_LYear.listView-meta.xml
@@ -28,4 +28,386 @@
</filters>
<label>00.璇环鍒涘缓-涓婁竴璐㈠勾</label>
<language>zh_CN</language>
+ <sharedTo>
+ <portalRoleAndSubordinates>CustomerUser</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser1</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser10</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser100</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser101</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser102</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser103</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser104</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser105</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser106</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser107</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser108</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser109</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser11</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser110</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser111</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser112</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser113</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser114</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser115</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser116</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser117</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser118</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser119</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser12</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser120</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser121</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser122</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser123</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser124</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser125</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser126</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser127</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser128</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser129</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser130</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser131</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser132</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser133</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser134</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser135</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser136</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser137</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser138</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser139</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser14</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser140</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser141</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser142</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser143</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser144</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser145</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser146</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser147</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser148</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser149</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser15</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser150</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser151</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser152</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser153</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser154</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser155</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser156</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser157</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser158</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser159</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser16</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser160</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser161</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser162</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser163</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser164</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser165</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser166</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser167</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser168</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser169</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser17</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser170</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser171</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser172</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser173</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser174</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser175</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser176</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser177</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser178</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser179</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser18</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser180</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser181</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser182</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser183</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser184</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser185</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser186</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser187</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser188</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser189</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser19</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser190</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser191</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser192</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser193</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser194</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser195</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser196</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser197</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser198</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser199</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser2</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser20</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser200</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser201</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser202</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser203</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser204</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser205</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser206</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser207</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser208</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser209</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser21</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser210</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser211</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser212</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser213</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser214</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser215</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser216</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser217</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser218</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser219</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser22</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser220</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser221</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser222</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser223</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser224</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser225</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser226</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser227</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser228</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser229</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser23</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser230</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser231</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser232</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser233</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser234</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser235</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser236</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser237</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser238</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser239</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser24</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser240</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser241</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser242</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser243</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser244</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser245</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser246</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser247</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser248</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser249</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser25</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser250</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser251</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser252</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser253</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser254</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser255</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser256</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser257</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser258</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser259</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser26</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser260</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser261</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser262</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser263</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser264</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser265</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser266</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser267</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser268</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser269</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser27</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser270</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser271</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser272</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser273</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser274</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser275</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser276</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser277</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser278</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser279</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser28</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser280</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser281</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser282</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser283</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser284</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser285</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser286</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser287</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser288</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser289</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser29</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser290</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser291</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser292</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser293</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser294</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser295</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser296</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser297</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser298</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser299</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser3</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser30</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser300</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser301</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser302</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser303</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser304</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser305</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser306</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser307</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser308</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser309</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser31</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser310</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser311</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser312</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser313</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser314</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser315</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser316</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser317</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser318</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser319</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser32</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser320</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser321</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser322</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser323</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser324</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser325</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser326</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser327</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser328</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser329</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser33</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser330</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser331</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser332</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser333</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser334</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser335</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser336</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser337</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser338</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser339</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser34</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser340</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser341</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser342</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser343</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser344</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser345</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser346</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser347</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser348</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser349</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser35</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser350</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser351</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser352</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser353</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser354</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser355</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser356</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser357</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser358</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser359</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser36</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser360</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser361</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser362</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser363</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser364</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser365</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser366</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser367</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser368</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser369</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser37</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser370</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser371</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser372</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser373</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser374</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser375</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser376</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser377</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser378</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser38</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser39</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser4</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser40</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser41</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser42</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser43</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser44</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser45</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser46</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser47</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser48</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser49</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser5</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser50</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser51</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser52</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser53</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser54</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser55</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser56</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser57</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser58</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser59</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser6</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser60</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser61</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser62</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser63</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser64</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser65</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser66</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser67</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser68</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser69</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser7</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser70</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser71</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser72</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser73</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser74</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser75</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser76</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser77</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser78</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser79</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser8</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser80</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser81</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser82</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser83</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser84</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser85</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser86</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser87</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser88</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser89</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser9</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser90</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser91</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser92</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser93</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser94</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser95</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser96</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser97</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser98</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser99</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>TEST</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>x149PDB023</portalRoleAndSubordinates>
+ </sharedTo>
</ListView>
diff --git a/force-app/main/default/objects/Agency_Opportunity__c/listViews/View_Nearly_J_LastYear.listView-meta.xml b/force-app/main/default/objects/Agency_Opportunity__c/listViews/View_Nearly_J_LastYear.listView-meta.xml
index 4e5d9b5..59a192d 100644
--- a/force-app/main/default/objects/Agency_Opportunity__c/listViews/View_Nearly_J_LastYear.listView-meta.xml
+++ b/force-app/main/default/objects/Agency_Opportunity__c/listViews/View_Nearly_J_LastYear.listView-meta.xml
@@ -28,4 +28,386 @@
</filters>
<label>02.棰勬祴涓嶰CSM绛剧害-涓婁竴璐㈠勾</label>
<language>zh_CN</language>
+ <sharedTo>
+ <portalRoleAndSubordinates>CustomerUser</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser1</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser10</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser100</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser101</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser102</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser103</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser104</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser105</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser106</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser107</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser108</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser109</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser11</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser110</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser111</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser112</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser113</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser114</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser115</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser116</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser117</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser118</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser119</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser12</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser120</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser121</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser122</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser123</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser124</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser125</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser126</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser127</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser128</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser129</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser130</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser131</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser132</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser133</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser134</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser135</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser136</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser137</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser138</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser139</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser14</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser140</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser141</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser142</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser143</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser144</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser145</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser146</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser147</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser148</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser149</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser15</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser150</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser151</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser152</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser153</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser154</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser155</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser156</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser157</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser158</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser159</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser16</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser160</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser161</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser162</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser163</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser164</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser165</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser166</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser167</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser168</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser169</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser17</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser170</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser171</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser172</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser173</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser174</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser175</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser176</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser177</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser178</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser179</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser18</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser180</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser181</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser182</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser183</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser184</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser185</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser186</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser187</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser188</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser189</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser19</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser190</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser191</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser192</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser193</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser194</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser195</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser196</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser197</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser198</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser199</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser2</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser20</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser200</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser201</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser202</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser203</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser204</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser205</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser206</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser207</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser208</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser209</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser21</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser210</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser211</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser212</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser213</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser214</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser215</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser216</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser217</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser218</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser219</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser22</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser220</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser221</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser222</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser223</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser224</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser225</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser226</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser227</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser228</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser229</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser23</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser230</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser231</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser232</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser233</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser234</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser235</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser236</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser237</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser238</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser239</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser24</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser240</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser241</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser242</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser243</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser244</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser245</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser246</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser247</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser248</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser249</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser25</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser250</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser251</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser252</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser253</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser254</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser255</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser256</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser257</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser258</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser259</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser26</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser260</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser261</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser262</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser263</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser264</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser265</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser266</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser267</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser268</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser269</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser27</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser270</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser271</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser272</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser273</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser274</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser275</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser276</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser277</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser278</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser279</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser28</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser280</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser281</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser282</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser283</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser284</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser285</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser286</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser287</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser288</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser289</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser29</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser290</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser291</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser292</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser293</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser294</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser295</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser296</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser297</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser298</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser299</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser3</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser30</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser300</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser301</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser302</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser303</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser304</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser305</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser306</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser307</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser308</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser309</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser31</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser310</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser311</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser312</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser313</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser314</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser315</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser316</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser317</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser318</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser319</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser32</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser320</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser321</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser322</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser323</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser324</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser325</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser326</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser327</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser328</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser329</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser33</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser330</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser331</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser332</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser333</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser334</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser335</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser336</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser337</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser338</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser339</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser34</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser340</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser341</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser342</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser343</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser344</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser345</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser346</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser347</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser348</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser349</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser35</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser350</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser351</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser352</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser353</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser354</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser355</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser356</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser357</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser358</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser359</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser36</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser360</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser361</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser362</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser363</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser364</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser365</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser366</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser367</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser368</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser369</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser37</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser370</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser371</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser372</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser373</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser374</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser375</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser376</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser377</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser378</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser38</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser39</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser4</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser40</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser41</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser42</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser43</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser44</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser45</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser46</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser47</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser48</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser49</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser5</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser50</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser51</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser52</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser53</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser54</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser55</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser56</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser57</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser58</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser59</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser6</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser60</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser61</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser62</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser63</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser64</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser65</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser66</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser67</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser68</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser69</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser7</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser70</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser71</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser72</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser73</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser74</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser75</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser76</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser77</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser78</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser79</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser8</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser80</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser81</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser82</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser83</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser84</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser85</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser86</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser87</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser88</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser89</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser9</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser90</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser91</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser92</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser93</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser94</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser95</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser96</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser97</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser98</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser99</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>TEST</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>x149PDB023</portalRoleAndSubordinates>
+ </sharedTo>
</ListView>
diff --git a/force-app/main/default/objects/Agency_Opportunity__c/listViews/View_Nearly_J_NextYear.listView-meta.xml b/force-app/main/default/objects/Agency_Opportunity__c/listViews/View_Nearly_J_NextYear.listView-meta.xml
index a6d2c3c..a0c3c59 100644
--- a/force-app/main/default/objects/Agency_Opportunity__c/listViews/View_Nearly_J_NextYear.listView-meta.xml
+++ b/force-app/main/default/objects/Agency_Opportunity__c/listViews/View_Nearly_J_NextYear.listView-meta.xml
@@ -28,4 +28,386 @@
</filters>
<label>04.棰勬祴涓嶰CSM绛剧害-涓嬩竴璐㈠勾</label>
<language>zh_CN</language>
+ <sharedTo>
+ <portalRoleAndSubordinates>CustomerUser</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser1</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser10</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser100</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser101</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser102</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser103</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser104</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser105</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser106</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser107</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser108</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser109</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser11</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser110</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser111</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser112</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser113</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser114</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser115</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser116</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser117</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser118</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser119</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser12</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser120</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser121</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser122</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser123</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser124</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser125</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser126</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser127</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser128</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser129</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser130</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser131</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser132</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser133</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser134</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser135</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser136</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser137</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser138</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser139</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser14</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser140</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser141</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser142</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser143</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser144</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser145</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser146</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser147</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser148</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser149</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser15</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser150</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser151</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser152</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser153</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser154</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser155</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser156</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser157</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser158</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser159</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser16</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser160</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser161</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser162</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser163</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser164</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser165</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser166</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser167</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser168</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser169</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser17</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser170</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser171</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser172</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser173</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser174</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser175</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser176</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser177</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser178</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser179</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser18</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser180</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser181</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser182</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser183</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser184</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser185</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser186</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser187</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser188</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser189</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser19</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser190</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser191</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser192</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser193</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser194</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser195</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser196</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser197</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser198</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser199</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser2</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser20</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser200</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser201</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser202</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser203</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser204</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser205</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser206</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser207</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser208</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser209</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser21</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser210</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser211</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser212</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser213</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser214</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser215</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser216</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser217</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser218</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser219</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser22</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser220</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser221</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser222</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser223</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser224</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser225</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser226</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser227</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser228</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser229</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser23</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser230</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser231</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser232</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser233</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser234</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser235</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser236</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser237</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser238</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser239</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser24</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser240</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser241</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser242</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser243</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser244</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser245</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser246</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser247</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser248</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser249</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser25</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser250</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser251</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser252</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser253</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser254</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser255</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser256</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser257</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser258</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser259</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser26</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser260</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser261</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser262</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser263</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser264</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser265</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser266</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser267</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser268</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser269</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser27</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser270</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser271</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser272</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser273</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser274</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser275</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser276</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser277</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser278</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser279</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser28</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser280</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser281</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser282</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser283</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser284</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser285</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser286</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser287</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser288</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser289</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser29</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser290</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser291</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser292</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser293</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser294</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser295</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser296</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser297</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser298</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser299</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser3</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser30</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser300</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser301</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser302</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser303</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser304</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser305</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser306</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser307</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser308</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser309</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser31</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser310</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser311</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser312</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser313</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser314</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser315</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser316</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser317</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser318</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser319</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser32</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser320</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser321</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser322</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser323</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser324</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser325</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser326</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser327</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser328</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser329</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser33</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser330</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser331</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser332</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser333</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser334</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser335</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser336</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser337</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser338</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser339</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser34</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser340</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser341</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser342</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser343</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser344</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser345</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser346</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser347</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser348</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser349</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser35</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser350</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser351</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser352</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser353</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser354</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser355</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser356</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser357</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser358</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser359</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser36</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser360</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser361</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser362</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser363</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser364</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser365</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser366</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser367</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser368</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser369</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser37</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser370</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser371</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser372</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser373</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser374</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser375</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser376</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser377</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser378</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser38</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser39</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser4</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser40</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser41</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser42</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser43</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser44</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser45</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser46</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser47</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser48</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser49</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser5</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser50</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser51</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser52</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser53</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser54</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser55</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser56</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser57</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser58</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser59</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser6</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser60</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser61</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser62</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser63</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser64</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser65</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser66</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser67</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser68</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser69</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser7</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser70</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser71</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser72</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser73</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser74</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser75</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser76</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser77</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser78</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser79</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser8</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser80</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser81</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser82</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser83</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser84</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser85</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser86</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser87</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser88</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser89</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser9</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser90</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser91</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser92</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser93</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser94</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser95</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser96</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser97</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser98</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser99</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>TEST</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>x149PDB023</portalRoleAndSubordinates>
+ </sharedTo>
</ListView>
diff --git a/force-app/main/default/objects/Agency_Opportunity__c/listViews/View_Nearly_J_Year.listView-meta.xml b/force-app/main/default/objects/Agency_Opportunity__c/listViews/View_Nearly_J_Year.listView-meta.xml
index 96a47c0..723930e 100644
--- a/force-app/main/default/objects/Agency_Opportunity__c/listViews/View_Nearly_J_Year.listView-meta.xml
+++ b/force-app/main/default/objects/Agency_Opportunity__c/listViews/View_Nearly_J_Year.listView-meta.xml
@@ -28,4 +28,386 @@
</filters>
<label>03.棰勬祴涓嶰CSM绛剧害-鏈储骞�</label>
<language>zh_CN</language>
+ <sharedTo>
+ <portalRoleAndSubordinates>CustomerUser</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser1</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser10</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser100</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser101</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser102</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser103</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser104</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser105</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser106</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser107</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser108</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser109</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser11</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser110</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser111</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser112</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser113</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser114</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser115</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser116</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser117</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser118</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser119</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser12</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser120</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser121</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser122</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser123</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser124</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser125</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser126</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser127</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser128</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser129</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser130</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser131</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser132</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser133</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser134</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser135</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser136</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser137</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser138</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser139</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser14</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser140</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser141</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser142</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser143</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser144</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser145</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser146</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser147</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser148</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser149</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser15</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser150</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser151</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser152</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser153</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser154</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser155</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser156</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser157</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser158</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser159</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser16</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser160</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser161</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser162</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser163</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser164</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser165</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser166</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser167</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser168</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser169</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser17</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser170</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser171</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser172</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser173</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser174</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser175</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser176</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser177</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser178</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser179</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser18</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser180</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser181</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser182</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser183</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser184</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser185</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser186</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser187</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser188</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser189</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser19</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser190</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser191</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser192</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser193</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser194</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser195</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser196</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser197</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser198</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser199</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser2</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser20</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser200</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser201</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser202</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser203</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser204</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser205</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser206</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser207</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser208</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser209</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser21</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser210</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser211</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser212</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser213</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser214</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser215</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser216</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser217</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser218</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser219</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser22</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser220</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser221</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser222</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser223</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser224</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser225</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser226</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser227</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser228</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser229</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser23</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser230</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser231</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser232</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser233</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser234</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser235</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser236</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser237</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser238</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser239</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser24</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser240</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser241</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser242</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser243</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser244</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser245</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser246</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser247</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser248</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser249</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser25</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser250</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser251</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser252</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser253</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser254</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser255</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser256</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser257</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser258</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser259</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser26</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser260</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser261</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser262</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser263</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser264</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser265</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser266</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser267</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser268</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser269</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser27</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser270</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser271</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser272</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser273</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser274</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser275</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser276</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser277</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser278</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser279</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser28</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser280</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser281</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser282</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser283</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser284</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser285</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser286</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser287</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser288</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser289</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser29</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser290</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser291</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser292</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser293</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser294</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser295</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser296</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser297</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser298</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser299</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser3</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser30</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser300</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser301</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser302</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser303</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser304</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser305</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser306</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser307</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser308</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser309</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser31</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser310</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser311</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser312</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser313</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser314</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser315</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser316</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser317</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser318</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser319</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser32</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser320</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser321</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser322</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser323</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser324</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser325</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser326</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser327</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser328</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser329</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser33</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser330</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser331</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser332</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser333</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser334</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser335</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser336</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser337</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser338</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser339</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser34</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser340</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser341</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser342</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser343</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser344</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser345</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser346</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser347</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser348</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser349</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser35</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser350</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser351</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser352</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser353</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser354</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser355</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser356</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser357</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser358</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser359</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser36</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser360</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser361</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser362</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser363</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser364</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser365</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser366</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser367</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser368</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser369</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser37</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser370</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser371</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser372</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser373</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser374</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser375</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser376</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser377</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser378</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser38</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser39</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser4</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser40</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser41</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser42</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser43</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser44</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser45</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser46</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser47</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser48</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser49</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser5</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser50</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser51</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser52</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser53</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser54</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser55</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser56</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser57</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser58</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser59</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser6</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser60</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser61</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser62</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser63</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser64</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser65</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser66</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser67</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser68</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser69</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser7</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser70</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser71</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser72</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser73</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser74</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser75</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser76</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser77</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser78</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser79</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser8</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser80</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser81</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser82</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser83</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser84</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser85</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser86</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser87</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser88</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser89</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser9</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser90</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser91</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser92</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser93</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser94</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser95</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser96</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser97</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser98</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>CustomerUser99</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>TEST</portalRoleAndSubordinates>
+ <portalRoleAndSubordinates>x149PDB023</portalRoleAndSubordinates>
+ </sharedTo>
</ListView>
diff --git a/force-app/main/default/objects/Agency_Opportunity__c/recordTypes/Opportunity.recordType-meta.xml b/force-app/main/default/objects/Agency_Opportunity__c/recordTypes/Opportunity.recordType-meta.xml
index 85d2cd5..3a6c87a 100644
--- a/force-app/main/default/objects/Agency_Opportunity__c/recordTypes/Opportunity.recordType-meta.xml
+++ b/force-app/main/default/objects/Agency_Opportunity__c/recordTypes/Opportunity.recordType-meta.xml
@@ -119,6 +119,10 @@
<default>false</default>
</values>
<values>
+ <fullName>3%2E璇环閲嶅%28浠呯粡閿�鍟嗛噸澶嶅垱寤�%EF%BC%8C闈濷CSM宸叉湁璇环%29</fullName>
+ <default>false</default>
+ </values>
+ <values>
<fullName>4%2E璇环宸插彇娑�</fullName>
<default>false</default>
</values>
diff --git a/force-app/main/default/objects/Agency_Opportunity__c/recordTypes/Target.recordType-meta.xml b/force-app/main/default/objects/Agency_Opportunity__c/recordTypes/Target.recordType-meta.xml
index f18a89f..123f374 100644
--- a/force-app/main/default/objects/Agency_Opportunity__c/recordTypes/Target.recordType-meta.xml
+++ b/force-app/main/default/objects/Agency_Opportunity__c/recordTypes/Target.recordType-meta.xml
@@ -114,6 +114,10 @@
<default>false</default>
</values>
<values>
+ <fullName>3%2E璇环閲嶅%28浠呯粡閿�鍟嗛噸澶嶅垱寤�%EF%BC%8C闈濷CSM宸叉湁璇环%29</fullName>
+ <default>false</default>
+ </values>
+ <values>
<fullName>4%2E璇环宸插彇娑�</fullName>
<default>false</default>
</values>
@@ -772,17 +776,6 @@
<picklist>StageName__c</picklist>
<values>
<fullName>涓爣绛剧害</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>Trade__c</picklist>
- <values>
- <fullName>鍐呰部</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>澶栬部</fullName>
<default>false</default>
</values>
</picklistValues>
diff --git a/force-app/main/default/objects/Agency_Opportunity__c/validationRules/OnlyAgencyCanEditTarget.validationRule-meta.xml b/force-app/main/default/objects/Agency_Opportunity__c/validationRules/OnlyAgencyCanEditTarget.validationRule-meta.xml
index dab2b91..ca6a6ea 100644
--- a/force-app/main/default/objects/Agency_Opportunity__c/validationRules/OnlyAgencyCanEditTarget.validationRule-meta.xml
+++ b/force-app/main/default/objects/Agency_Opportunity__c/validationRules/OnlyAgencyCanEditTarget.validationRule-meta.xml
@@ -5,6 +5,6 @@
<errorConditionFormula>RecordType.DeveloperName == 'Target'
&& IsBlank($User.ContactId)
&& Not($User.Batch_User__c)
-&& Not(IsBlank(Agency_Hospital_Target__c)) && $User.ProfileId <>'00eC800000005Cb'</errorConditionFormula>
+&& Not(IsBlank(Agency_Hospital_Target__c)) && $User.ProfileId <>'00e10000000Y3o5'</errorConditionFormula>
<errorMessage>鍙湁缁忛攢鍟嗗彲浠ヤ慨鏀圭洰鏍�</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Agency_Report_Header__c/validationRules/monday.validationRule-meta.xml b/force-app/main/default/objects/Agency_Report_Header__c/validationRules/monday.validationRule-meta.xml
index 1973a41..47b8209 100644
--- a/force-app/main/default/objects/Agency_Report_Header__c/validationRules/monday.validationRule-meta.xml
+++ b/force-app/main/default/objects/Agency_Report_Header__c/validationRules/monday.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>monday</fullName>
- <active>false</active>
+ <active>true</active>
<description>鏈堟洔鏃ャ仩銇�</description>
<errorConditionFormula>CASE(MOD( Week__c - DATE(1900, 1, 7), 7),
1, 0,
diff --git a/force-app/main/default/objects/Agency_Report__c/fields/Province_Agency__c.field-meta.xml b/force-app/main/default/objects/Agency_Report__c/fields/Province_Agency__c.field-meta.xml
index 0410717..e33a673 100644
--- a/force-app/main/default/objects/Agency_Report__c/fields/Province_Agency__c.field-meta.xml
+++ b/force-app/main/default/objects/Agency_Report__c/fields/Province_Agency__c.field-meta.xml
@@ -2,7 +2,7 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Province_Agency__c</fullName>
<externalId>false</externalId>
- <formula>Province__c & '-' & Agency__r.Name</formula>
+ <formula>Province__c & '-' & Agency__r.Name</formula>
<label>鐪�+缁忛攢鍟�</label>
<required>false</required>
<trackHistory>false</trackHistory>
diff --git a/force-app/main/default/objects/Agency_Report__c/validationRules/Product_Category1_In_Department_Cateogy.validationRule-meta.xml b/force-app/main/default/objects/Agency_Report__c/validationRules/Product_Category1_In_Department_Cateogy.validationRule-meta.xml
index 8dc56bd..6008c33 100644
--- a/force-app/main/default/objects/Agency_Report__c/validationRules/Product_Category1_In_Department_Cateogy.validationRule-meta.xml
+++ b/force-app/main/default/objects/Agency_Report__c/validationRules/Product_Category1_In_Department_Cateogy.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Product_Category1_In_Department_Cateogy</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>AND(NOT(ISBLANK(Product_Category1__c)),
IF(RIGHT(TEXT(Purpose_Type__c), 3)='OPD',
NOT(Product_Category1__r.OPD_Flg__c),
diff --git a/force-app/main/default/objects/Agency_Report__c/validationRules/Product_Category1_required_when_OPD_SIS.validationRule-meta.xml b/force-app/main/default/objects/Agency_Report__c/validationRules/Product_Category1_required_when_OPD_SIS.validationRule-meta.xml
index 745f88b..bf1dfc0 100644
--- a/force-app/main/default/objects/Agency_Report__c/validationRules/Product_Category1_required_when_OPD_SIS.validationRule-meta.xml
+++ b/force-app/main/default/objects/Agency_Report__c/validationRules/Product_Category1_required_when_OPD_SIS.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Product_Category1_required_when_OPD_SIS</fullName>
- <active>false</active>
+ <active>true</active>
<description>褰撴椿鍔ㄥ尯鍒嗘槸OPD 鎴� SIS 鐨勬椂鍊欙紝浜у搧鍖哄垎1 蹇呭～</description>
<errorConditionFormula>if(TEXT(Agency_Report_Header__r.WeeklyReportClassification__c) =='缁忛攢鍟�',Isblank(Product_Category1__c),false)</errorConditionFormula>
<errorDisplayField>Product_Category1__c</errorDisplayField>
diff --git a/force-app/main/default/objects/Agency_Report__c/validationRules/Product_Category2_In_Department_Cateogy.validationRule-meta.xml b/force-app/main/default/objects/Agency_Report__c/validationRules/Product_Category2_In_Department_Cateogy.validationRule-meta.xml
index 3653e59..c2f768c 100644
--- a/force-app/main/default/objects/Agency_Report__c/validationRules/Product_Category2_In_Department_Cateogy.validationRule-meta.xml
+++ b/force-app/main/default/objects/Agency_Report__c/validationRules/Product_Category2_In_Department_Cateogy.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Product_Category2_In_Department_Cateogy</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>AND(NOT(ISBLANK(Product_Category2__c)),
IF(RIGHT(TEXT(Purpose_Type__c), 3)='OPD',
NOT(Product_Category2__r.OPD_Flg__c),
diff --git a/force-app/main/default/objects/Agency_Report__c/validationRules/Product_Category3_In_Department_Cateogy.validationRule-meta.xml b/force-app/main/default/objects/Agency_Report__c/validationRules/Product_Category3_In_Department_Cateogy.validationRule-meta.xml
index 83e116b..6748516 100644
--- a/force-app/main/default/objects/Agency_Report__c/validationRules/Product_Category3_In_Department_Cateogy.validationRule-meta.xml
+++ b/force-app/main/default/objects/Agency_Report__c/validationRules/Product_Category3_In_Department_Cateogy.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Product_Category3_In_Department_Cateogy</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>AND(NOT(ISBLANK(Product_Category3__c)),
IF(RIGHT(TEXT(Purpose_Type__c), 3)='OPD',
NOT(Product_Category3__r.OPD_Flg__c),
diff --git a/force-app/main/default/objects/Agency_Report__c/validationRules/Report_Date_Must_This_Week.validationRule-meta.xml b/force-app/main/default/objects/Agency_Report__c/validationRules/Report_Date_Must_This_Week.validationRule-meta.xml
index 4643db2..d66c88b 100644
--- a/force-app/main/default/objects/Agency_Report__c/validationRules/Report_Date_Must_This_Week.validationRule-meta.xml
+++ b/force-app/main/default/objects/Agency_Report__c/validationRules/Report_Date_Must_This_Week.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Report_Date_Must_This_Week</fullName>
- <active>false</active>
+ <active>true</active>
<description>娲诲姩鏃ュ繀椤绘槸鏈懆锛丼ubmit_date__c Report_Date__c</description>
<errorConditionFormula>(Report_Date__c>= Submit_date__c + 6) || (Report_Date__c < Submit_date__c - 1)</errorConditionFormula>
<errorDisplayField>Report_Date__c</errorDisplayField>
diff --git a/force-app/main/default/objects/AssessmentReportStaff__c/fields/HomeworkFeedback__c.field-meta.xml b/force-app/main/default/objects/AssessmentReportStaff__c/fields/HomeworkFeedback__c.field-meta.xml
index 13a53fd..6d048b4 100644
--- a/force-app/main/default/objects/AssessmentReportStaff__c/fields/HomeworkFeedback__c.field-meta.xml
+++ b/force-app/main/default/objects/AssessmentReportStaff__c/fields/HomeworkFeedback__c.field-meta.xml
@@ -7,6 +7,7 @@
<trackTrending>false</trackTrending>
<type>Picklist</type>
<valueSet>
+ <restricted>true</restricted>
<valueSetDefinition>
<sorted>false</sorted>
<value>
diff --git a/force-app/main/default/objects/Asset/Asset.object-meta.xml b/force-app/main/default/objects/Asset/Asset.object-meta.xml
index 8eb9005..24257a9 100644
--- a/force-app/main/default/objects/Asset/Asset.object-meta.xml
+++ b/force-app/main/default/objects/Asset/Asset.object-meta.xml
@@ -87,7 +87,7 @@
<actionOverrides>
<actionName>View</actionName>
<comment>Action override created by Lightning App Builder during activation.</comment>
- <content>FlexiPage11213325</content>
+ <content>FlexiPage12</content>
<formFactor>Large</formFactor>
<skipRecordTypeSelect>false</skipRecordTypeSelect>
<type>Flexipage</type>
@@ -101,11 +101,11 @@
<formFactor>Small</formFactor>
<type>Default</type>
</actionOverrides>
- <compactLayoutAssignment>SYSTEM</compactLayoutAssignment>
+ <compactLayoutAssignment>hospitalAssetLayout</compactLayoutAssignment>
<enableFeeds>true</enableFeeds>
<externalSharingModel>ControlledByParent</externalSharingModel>
<recordTypeTrackFeedHistory>false</recordTypeTrackFeedHistory>
- <recordTypeTrackHistory>false</recordTypeTrackHistory>
+ <recordTypeTrackHistory>true</recordTypeTrackHistory>
<searchLayouts>
<customTabListAdditionalFields>ASSET.NAME</customTabListAdditionalFields>
<customTabListAdditionalFields>ASSET.SERIAL_NUMBER</customTabListAdditionalFields>
@@ -113,21 +113,39 @@
<customTabListAdditionalFields>ACCOUNT.NAME</customTabListAdditionalFields>
<customTabListAdditionalFields>CONTACT.NAME</customTabListAdditionalFields>
<customTabListAdditionalFields>PRODUCT2.NAME</customTabListAdditionalFields>
+ <excludedStandardButtons>NewFromDocument</excludedStandardButtons>
+ <excludedStandardButtons>OpenListInQuip</excludedStandardButtons>
<lookupDialogsAdditionalFields>ASSET.NAME</lookupDialogsAdditionalFields>
+ <lookupDialogsAdditionalFields>ASSET.STATUS</lookupDialogsAdditionalFields>
<lookupDialogsAdditionalFields>ASSET.SERIAL_NUMBER</lookupDialogsAdditionalFields>
<lookupDialogsAdditionalFields>ASSET.INSTALL_DATE</lookupDialogsAdditionalFields>
+ <lookupDialogsAdditionalFields>Information_From__c</lookupDialogsAdditionalFields>
<lookupDialogsAdditionalFields>ACCOUNT.NAME</lookupDialogsAdditionalFields>
- <lookupDialogsAdditionalFields>CONTACT.NAME</lookupDialogsAdditionalFields>
+ <lookupDialogsAdditionalFields>OT_CODE__c</lookupDialogsAdditionalFields>
+ <lookupDialogsAdditionalFields>Internal_Asset_number__c</lookupDialogsAdditionalFields>
<lookupPhoneDialogsAdditionalFields>ASSET.NAME</lookupPhoneDialogsAdditionalFields>
<lookupPhoneDialogsAdditionalFields>ASSET.SERIAL_NUMBER</lookupPhoneDialogsAdditionalFields>
<lookupPhoneDialogsAdditionalFields>ASSET.INSTALL_DATE</lookupPhoneDialogsAdditionalFields>
<lookupPhoneDialogsAdditionalFields>ACCOUNT.NAME</lookupPhoneDialogsAdditionalFields>
<lookupPhoneDialogsAdditionalFields>CONTACT.NAME</lookupPhoneDialogsAdditionalFields>
+ <searchFilterFields>ACCOUNT.NAME</searchFilterFields>
+ <searchFilterFields>ASSET.SERIAL_NUMBER</searchFilterFields>
+ <searchFilterFields>Internal_Asset_number__c</searchFilterFields>
+ <searchFilterFields>ASSET.INSTALL_DATE</searchFilterFields>
+ <searchFilterFields>ASSET.STATUS</searchFilterFields>
+ <searchFilterFields>ASSET.NAME</searchFilterFields>
+ <searchFilterFields>PRODUCT2.CUSTOMER_PRODUCT_ID</searchFilterFields>
+ <searchFilterFields>OT_CODE__c</searchFilterFields>
<searchResultsAdditionalFields>ASSET.NAME</searchResultsAdditionalFields>
+ <searchResultsAdditionalFields>OwnershipMachine_No__c</searchResultsAdditionalFields>
<searchResultsAdditionalFields>ASSET.SERIAL_NUMBER</searchResultsAdditionalFields>
- <searchResultsAdditionalFields>ASSET.INSTALL_DATE</searchResultsAdditionalFields>
+ <searchResultsAdditionalFields>AssetManageConfirm__c</searchResultsAdditionalFields>
+ <searchResultsAdditionalFields>Product_Serial_No__c</searchResultsAdditionalFields>
+ <searchResultsAdditionalFields>Information_From__c</searchResultsAdditionalFields>
+ <searchResultsAdditionalFields>Posting_Date__c</searchResultsAdditionalFields>
+ <searchResultsAdditionalFields>guarantee_period__c</searchResultsAdditionalFields>
+ <searchResultsAdditionalFields>ASSET.STATUS</searchResultsAdditionalFields>
<searchResultsAdditionalFields>ACCOUNT.NAME</searchResultsAdditionalFields>
- <searchResultsAdditionalFields>CONTACT.NAME</searchResultsAdditionalFields>
</searchLayouts>
<sharingModel>ControlledByParent</sharingModel>
</CustomObject>
diff --git a/force-app/main/default/objects/Asset/fieldSets/CheckAsset_Right.fieldSet-meta.xml b/force-app/main/default/objects/Asset/fieldSets/CheckAsset_Right.fieldSet-meta.xml
index 7f7eec8..23ca1d0 100644
--- a/force-app/main/default/objects/Asset/fieldSets/CheckAsset_Right.fieldSet-meta.xml
+++ b/force-app/main/default/objects/Asset/fieldSets/CheckAsset_Right.fieldSet-meta.xml
@@ -117,5 +117,20 @@
<isFieldManaged>false</isFieldManaged>
<isRequired>false</isRequired>
</displayedFields>
+ <displayedFields>
+ <field>Not_Automatic_AssignQueue__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>Not_Automatic_Reason__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>Recall_Asset__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
<label>鏌ョ湅淇濇湁璁惧_鍙宠竟</label>
</FieldSet>
diff --git a/force-app/main/default/objects/Asset/fields/Asset_OwnerNew__c.field-meta.xml b/force-app/main/default/objects/Asset/fields/Asset_OwnerNew__c.field-meta.xml
index 5655553..85c68b7 100644
--- a/force-app/main/default/objects/Asset/fields/Asset_OwnerNew__c.field-meta.xml
+++ b/force-app/main/default/objects/Asset/fields/Asset_OwnerNew__c.field-meta.xml
@@ -2,10 +2,10 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Asset_OwnerNew__c</fullName>
<externalId>false</externalId>
- <formula>IF(RecordTypeId = '012C600000003Hv', '濂ユ灄宸存柉',
-IF(RecordTypeId = '012C600000003Hu',
- IF( Hospital__r.RecordTypeId = '012C600000003HZ','鍖婚櫌璧勪骇',
-IF(Hospital__r.RecordTypeId = '012C600000003HF','缁忛攢鍟嗚祫浜�','')
+ <formula>IF(RecordTypeId = '01210000000kOPR', '濂ユ灄宸存柉',
+IF(RecordTypeId = '01210000000kOPM',
+ IF( Hospital__r.RecordTypeId = '01210000000QemG','鍖婚櫌璧勪骇',
+IF(Hospital__r.RecordTypeId = '01210000000Qem1','缁忛攢鍟嗚祫浜�','')
)
,'')
)</formula>
diff --git a/force-app/main/default/objects/Asset/fields/Asset_owner_delaer_name__c.field-meta.xml b/force-app/main/default/objects/Asset/fields/Asset_owner_delaer_name__c.field-meta.xml
index 696f848..35d98b7 100644
--- a/force-app/main/default/objects/Asset/fields/Asset_owner_delaer_name__c.field-meta.xml
+++ b/force-app/main/default/objects/Asset/fields/Asset_owner_delaer_name__c.field-meta.xml
@@ -5,7 +5,7 @@
<externalId>false</externalId>
<label>缁忛攢鍟嗚祫浜ф墍鏈夊叕鍙稿悕</label>
<lookupFilter>
- <active>false</active>
+ <active>true</active>
<filterItems>
<field>Account.RecordType.Id</field>
<operation>equals</operation>
diff --git a/force-app/main/default/objects/Asset/fields/CurrentSOM_Status_2H__c.field-meta.xml b/force-app/main/default/objects/Asset/fields/CurrentSOM_Status_2H__c.field-meta.xml
index eb3d6c0..13e80c7 100644
--- a/force-app/main/default/objects/Asset/fields/CurrentSOM_Status_2H__c.field-meta.xml
+++ b/force-app/main/default/objects/Asset/fields/CurrentSOM_Status_2H__c.field-meta.xml
@@ -2,7 +2,7 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>CurrentSOM_Status_2H__c</fullName>
<externalId>false</externalId>
- <label>褰撴湡2H鏈熸湯SOM鐘舵��</label>
+ <label>BK褰撴湡2H鏈熸湯SOM鐘舵��</label>
<length>100</length>
<required>false</required>
<trackFeedHistory>false</trackFeedHistory>
diff --git a/force-app/main/default/objects/Asset/fields/Equipment_Type__c.field-meta.xml b/force-app/main/default/objects/Asset/fields/Equipment_Type__c.field-meta.xml
index b474981..96b3e7c 100644
--- a/force-app/main/default/objects/Asset/fields/Equipment_Type__c.field-meta.xml
+++ b/force-app/main/default/objects/Asset/fields/Equipment_Type__c.field-meta.xml
@@ -8,6 +8,7 @@
<trackHistory>false</trackHistory>
<type>Picklist</type>
<valueSet>
+ <restricted>true</restricted>
<valueSetDefinition>
<sorted>false</sorted>
<value>
@@ -40,6 +41,12 @@
<default>false</default>
<label>鍗忚鍊熺敤</label>
</value>
+ <value>
+ <fullName>鍔ㄧ墿璇曢獙鐢�</fullName>
+ <default>false</default>
+ <isActive>false</isActive>
+ <label>鍔ㄧ墿璇曢獙鐢�</label>
+ </value>
</valueSetDefinition>
</valueSet>
</CustomField>
diff --git a/force-app/main/default/objects/Asset/fields/ExternalIdentifier.field-meta.xml b/force-app/main/default/objects/Asset/fields/ExternalIdentifier.field-meta.xml
index d1518dd..6f82994 100644
--- a/force-app/main/default/objects/Asset/fields/ExternalIdentifier.field-meta.xml
+++ b/force-app/main/default/objects/Asset/fields/ExternalIdentifier.field-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>ExternalIdentifier</fullName>
- <inlineHelpText>ID of matching record in an external system.</inlineHelpText>
+ <inlineHelpText>澶栭儴绯荤粺涓尮閰嶈褰曠殑 URL銆�</inlineHelpText>
<trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
</CustomField>
diff --git a/force-app/main/default/objects/Asset/fields/InstallDate.field-meta.xml b/force-app/main/default/objects/Asset/fields/InstallDate.field-meta.xml
index 147835e..8a7ddc2 100644
--- a/force-app/main/default/objects/Asset/fields/InstallDate.field-meta.xml
+++ b/force-app/main/default/objects/Asset/fields/InstallDate.field-meta.xml
@@ -2,5 +2,5 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>InstallDate</fullName>
<trackFeedHistory>false</trackFeedHistory>
- <trackHistory>false</trackHistory>
+ <trackHistory>true</trackHistory>
</CustomField>
diff --git a/force-app/main/default/objects/Asset/fields/LocationId.field-meta.xml b/force-app/main/default/objects/Asset/fields/LocationId.field-meta.xml
new file mode 100644
index 0000000..d67488e
--- /dev/null
+++ b/force-app/main/default/objects/Asset/fields/LocationId.field-meta.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>LocationId</fullName>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Asset/fields/ManufactureDate.field-meta.xml b/force-app/main/default/objects/Asset/fields/ManufactureDate.field-meta.xml
index e0f68aa..71403a4 100644
--- a/force-app/main/default/objects/Asset/fields/ManufactureDate.field-meta.xml
+++ b/force-app/main/default/objects/Asset/fields/ManufactureDate.field-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>ManufactureDate</fullName>
- <inlineHelpText>Date when the asset was manufactured.</inlineHelpText>
+ <inlineHelpText>璧勪骇鐢熶骇鐨勬棩鏈熴��</inlineHelpText>
<trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
</CustomField>
diff --git a/force-app/main/default/objects/Asset/fields/Not_Automatic_AssignQueue__c.field-meta.xml b/force-app/main/default/objects/Asset/fields/Not_Automatic_AssignQueue__c.field-meta.xml
index 999349f..fe83fc6 100644
--- a/force-app/main/default/objects/Asset/fields/Not_Automatic_AssignQueue__c.field-meta.xml
+++ b/force-app/main/default/objects/Asset/fields/Not_Automatic_AssignQueue__c.field-meta.xml
@@ -3,7 +3,7 @@
<fullName>Not_Automatic_AssignQueue__c</fullName>
<defaultValue>false</defaultValue>
<externalId>false</externalId>
- <label>涓嶅弬涓庤嚜鍔ㄥ垎閰嶆帓闃�</label>
+ <label>涓撶敤鏍囪瘑</label>
<trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<type>Checkbox</type>
diff --git a/force-app/main/default/objects/Asset/fields/Not_Automatic_Reason__c.field-meta.xml b/force-app/main/default/objects/Asset/fields/Not_Automatic_Reason__c.field-meta.xml
index 2663511..2138f60 100644
--- a/force-app/main/default/objects/Asset/fields/Not_Automatic_Reason__c.field-meta.xml
+++ b/force-app/main/default/objects/Asset/fields/Not_Automatic_Reason__c.field-meta.xml
@@ -2,7 +2,7 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Not_Automatic_Reason__c</fullName>
<externalId>false</externalId>
- <label>涓嶅弬涓庤嚜鍔ㄥ垎閰嶆帓闃熷師鍥�</label>
+ <label>涓撶敤鏍囪瘑鍘熷洜</label>
<required>false</required>
<trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
diff --git a/force-app/main/default/objects/Asset/fields/OlyAsset_ValidDate_Replenish__c.field-meta.xml b/force-app/main/default/objects/Asset/fields/OlyAsset_ValidDate_Replenish__c.field-meta.xml
index dc16319..7106b5c 100644
--- a/force-app/main/default/objects/Asset/fields/OlyAsset_ValidDate_Replenish__c.field-meta.xml
+++ b/force-app/main/default/objects/Asset/fields/OlyAsset_ValidDate_Replenish__c.field-meta.xml
@@ -8,6 +8,7 @@
<trackHistory>false</trackHistory>
<type>Picklist</type>
<valueSet>
+ <restricted>true</restricted>
<valueSetDefinition>
<sorted>false</sorted>
<value>
diff --git a/force-app/main/default/objects/Asset/fields/Product2Id.field-meta.xml b/force-app/main/default/objects/Asset/fields/Product2Id.field-meta.xml
index e8f493d..09c7fbb 100644
--- a/force-app/main/default/objects/Asset/fields/Product2Id.field-meta.xml
+++ b/force-app/main/default/objects/Asset/fields/Product2Id.field-meta.xml
@@ -1,6 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Product2Id</fullName>
+ <lookupFilter>
+ <active>true</active>
+ <booleanFilter>(1 AND 2) OR 3</booleanFilter>
+ <filterItems>
+ <field>$Profile.Id</field>
+ <operation>equals</operation>
+ <value>00e10000000u47b</value>
+ </filterItems>
+ <filterItems>
+ <field>Product2.RecordTypeId</field>
+ <operation>equals</operation>
+ <value>绔炲搧-鑰楁潗</value>
+ </filterItems>
+ <filterItems>
+ <field>$Profile.Id</field>
+ <operation>notEqual</operation>
+ <value>00e10000000u47b</value>
+ </filterItems>
+ <isOptional>true</isOptional>
+ </lookupFilter>
<trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<type>Lookup</type>
diff --git a/force-app/main/default/objects/Asset/fields/Product_Serial_No__c.field-meta.xml b/force-app/main/default/objects/Asset/fields/Product_Serial_No__c.field-meta.xml
index 401255c..cfa9923 100644
--- a/force-app/main/default/objects/Asset/fields/Product_Serial_No__c.field-meta.xml
+++ b/force-app/main/default/objects/Asset/fields/Product_Serial_No__c.field-meta.xml
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Product_Serial_No__c</fullName>
- <externalId>false</externalId>
+ <caseSensitive>false</caseSensitive>
+ <externalId>true</externalId>
<label>浜у搧 + 鏈轰綋缂栫爜</label>
<length>255</length>
<required>false</required>
<trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<type>Text</type>
- <unique>false</unique>
+ <unique>true</unique>
</CustomField>
diff --git a/force-app/main/default/objects/Asset/fields/QRImg__c.field-meta.xml b/force-app/main/default/objects/Asset/fields/QRImg__c.field-meta.xml
index 6f0369e..6dde79f 100644
--- a/force-app/main/default/objects/Asset/fields/QRImg__c.field-meta.xml
+++ b/force-app/main/default/objects/Asset/fields/QRImg__c.field-meta.xml
@@ -2,7 +2,7 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>QRImg__c</fullName>
<externalId>false</externalId>
- <formula>IMAGE("/servlet/servlet.FileDownload?file=" & QRId__c, "qrcode")</formula>
+ <formula>IMAGE("/sfc/servlet.shepherd/version/download/" & QRId__c, "qrcode")</formula>
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
<label>QRImg</label>
<required>false</required>
diff --git a/force-app/main/default/objects/Asset/fields/Quantity.field-meta.xml b/force-app/main/default/objects/Asset/fields/Quantity.field-meta.xml
index f105b9c..0be2707 100644
--- a/force-app/main/default/objects/Asset/fields/Quantity.field-meta.xml
+++ b/force-app/main/default/objects/Asset/fields/Quantity.field-meta.xml
@@ -2,5 +2,5 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Quantity</fullName>
<trackFeedHistory>false</trackFeedHistory>
- <trackHistory>false</trackHistory>
+ <trackHistory>true</trackHistory>
</CustomField>
diff --git a/force-app/main/default/objects/Asset/fields/SN_BACKUP__c.field-meta.xml b/force-app/main/default/objects/Asset/fields/SN_BACKUP__c.field-meta.xml
index 30db7e3..b97f467 100644
--- a/force-app/main/default/objects/Asset/fields/SN_BACKUP__c.field-meta.xml
+++ b/force-app/main/default/objects/Asset/fields/SN_BACKUP__c.field-meta.xml
@@ -3,7 +3,7 @@
<fullName>SN_BACKUP__c</fullName>
<description>寮�濮嬭繍鐢ㄤ笉鏄庣殑SN鍙风爜涔嬪墠锛岀櫥闄嗕簡SN鍙风爜</description>
<externalId>false</externalId>
- <inlineHelpText>SN Number Has Been Logged In before Usin</inlineHelpText>
+ <inlineHelpText>寮�濮嬭繍鐢ㄤ笉鏄庣殑SN鍙风爜涔嬪墠锛岀櫥闄嗕簡SN鍙风爜</inlineHelpText>
<label>鎵嬪姩鐧诲綍SN鍙风爜(BACKUP)</label>
<length>80</length>
<required>false</required>
diff --git a/force-app/main/default/objects/Asset/fields/SOM_Status_2H__c.field-meta.xml b/force-app/main/default/objects/Asset/fields/SOM_Status_2H__c.field-meta.xml
index 12a2c3b..2937ad7 100644
--- a/force-app/main/default/objects/Asset/fields/SOM_Status_2H__c.field-meta.xml
+++ b/force-app/main/default/objects/Asset/fields/SOM_Status_2H__c.field-meta.xml
@@ -1,13 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>SOM_Status_2H__c</fullName>
- <description>鏈熸湯SOM鐘舵��2H</description>
- <externalId>false</externalId>
- <formula>IF(CurrentTarget_Asset__c=='1.鏃㈡湁璁惧'||CurrentTarget_Asset__c=='2.褰撴湡鍙戣揣璁惧',IF(HP_Name__c =='Olympus绀惧唴','4.鏈鐩�',
+ <description>鏈熸湯SOM鐘舵��2H
+IF(CurrentTarget_Asset__c=='1.鏃㈡湁璁惧'||CurrentTarget_Asset__c=='2.褰撴湡鍙戣揣璁惧',IF(HP_Name__c =='Olympus绀惧唴','4.鏈鐩�',
IF(CurrentContract_Start_Date__c<=DATE(YEAR(TODAY())+1,3,31)&&CurrentContract_End_Date__c>=DATE(YEAR(TODAY())+1,3,1)
&& currentContract_Conclusion_Date__c<= DATE(YEAR(TODAY())+1,3,31), '1.鍚堝悓',
IF(SerMarGuranteeType__c=='甯傚満澶氬勾淇濅慨' && Extend_Gurantee_DateTo__c>=DATE(YEAR(TODAY())+1,3,1), '2.甯傚満澶氬勾淇濅慨',
-IF(SerMarGuranteeType__c=='鏈嶅姟澶氬勾淇濅慨' && Extend_Gurantee_DateTo__c >=DATE(YEAR(TODAY())+1,3,1), '3.鏈嶅姟澶氬勾淇濅慨', '4.鏈鐩�') ) )),null)</formula>
+IF(SerMarGuranteeType__c=='鏈嶅姟澶氬勾淇濅慨' && Extend_Gurantee_DateTo__c >=DATE(YEAR(TODAY())+1,3,1), '3.鏈嶅姟澶氬勾淇濅慨', '4.鏈鐩�') ) )),null)</description>
+ <externalId>false</externalId>
+ <formula>IF(CurrentTarget_Asset__c=='1.鏃㈡湁璁惧'||CurrentTarget_Asset__c=='2.褰撴湡鍙戣揣璁惧',IF(HP_Name__c =='Olympus绀惧唴','4.鏈鐩�',
+IF(CurrentContract_Start_Date__c<=DATE(FYYear__c,3,31)&&CurrentContract_End_Date__c>=DATE(FYYear__c,3,1)
+&& currentContract_Conclusion_Date__c<= DATE(FYYear__c,3,31), '1.鍚堝悓',
+IF(SerMarGuranteeType__c=='甯傚満澶氬勾淇濅慨' && Extend_Gurantee_DateTo__c>=DATE(FYYear__c,3,1), '2.甯傚満澶氬勾淇濅慨',
+IF(SerMarGuranteeType__c=='鏈嶅姟澶氬勾淇濅慨' && Extend_Gurantee_DateTo__c >=DATE(FYYear__c,3,1), '3.鏈嶅姟澶氬勾淇濅慨', '4.鏈鐩�') ) )),null)</formula>
<label>褰撴湡2H鏈熸湯SOM鐘舵��</label>
<required>false</required>
<trackHistory>false</trackHistory>
diff --git a/force-app/main/default/objects/Asset/fields/SerialNumber.field-meta.xml b/force-app/main/default/objects/Asset/fields/SerialNumber.field-meta.xml
index 26eb5d4..552721d 100644
--- a/force-app/main/default/objects/Asset/fields/SerialNumber.field-meta.xml
+++ b/force-app/main/default/objects/Asset/fields/SerialNumber.field-meta.xml
@@ -2,5 +2,5 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>SerialNumber</fullName>
<trackFeedHistory>false</trackFeedHistory>
- <trackHistory>false</trackHistory>
+ <trackHistory>true</trackHistory>
</CustomField>
diff --git a/force-app/main/default/objects/Asset/fields/Status.field-meta.xml b/force-app/main/default/objects/Asset/fields/Status.field-meta.xml
index 0156b61..6f29d53 100644
--- a/force-app/main/default/objects/Asset/fields/Status.field-meta.xml
+++ b/force-app/main/default/objects/Asset/fields/Status.field-meta.xml
@@ -2,6 +2,6 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Status</fullName>
<trackFeedHistory>false</trackFeedHistory>
- <trackHistory>false</trackHistory>
+ <trackHistory>true</trackHistory>
<type>Picklist</type>
</CustomField>
diff --git a/force-app/main/default/objects/Asset/fields/StatusReason.field-meta.xml b/force-app/main/default/objects/Asset/fields/StatusReason.field-meta.xml
index f3848d3..9092307 100644
--- a/force-app/main/default/objects/Asset/fields/StatusReason.field-meta.xml
+++ b/force-app/main/default/objects/Asset/fields/StatusReason.field-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>StatusReason</fullName>
- <inlineHelpText>Explanation of the device status.</inlineHelpText>
+ <inlineHelpText>璁惧鐘舵�佽В閲娿��</inlineHelpText>
<trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<type>Picklist</type>
diff --git a/force-app/main/default/objects/Asset/fields/Uuid.field-meta.xml b/force-app/main/default/objects/Asset/fields/Uuid.field-meta.xml
index 0cbc115..c40a98c 100644
--- a/force-app/main/default/objects/Asset/fields/Uuid.field-meta.xml
+++ b/force-app/main/default/objects/Asset/fields/Uuid.field-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Uuid</fullName>
- <inlineHelpText>Unique string identifying the asset.</inlineHelpText>
+ <inlineHelpText>璇嗗埆璧勪骇鐨勫敮涓�瀛楃涓层��</inlineHelpText>
<trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
</CustomField>
diff --git a/force-app/main/default/objects/Asset/recordTypes/HPAsset.recordType-meta.xml b/force-app/main/default/objects/Asset/recordTypes/HPAsset.recordType-meta.xml
index 02b28f8..0661b37 100644
--- a/force-app/main/default/objects/Asset/recordTypes/HPAsset.recordType-meta.xml
+++ b/force-app/main/default/objects/Asset/recordTypes/HPAsset.recordType-meta.xml
@@ -65,48 +65,6 @@
</values>
</picklistValues>
<picklistValues>
- <picklist>ConsequenceOfFailure</picklist>
- <values>
- <fullName>Critical</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>Insignificant</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>Major</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>Minor</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>Moderate</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>DigitalAssetStatus</picklist>
- <values>
- <fullName>鍏抽棴</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鎵撳紑</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>璀﹀憡</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>閿欒</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
<picklist>Equipment_Type__c</picklist>
<values>
<fullName>浜у搧璇曠敤</fullName>
@@ -881,33 +839,6 @@
</values>
</picklistValues>
<picklistValues>
- <picklist>StatusReason</picklist>
- <values>
- <fullName>鍏抽棴</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鍦ㄧ嚎</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>澶囩敤</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>宸叉殏鍋�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鏈噯澶�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>绂荤嚎</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
<picklist>Storage_Conditions_Met_Status__c</picklist>
<values>
<fullName>N%2FA</fullName>
@@ -935,13 +866,6 @@
<values>
<fullName>C鍖�</fullName>
<default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>photoType__c</picklist>
- <values>
- <fullName>setup_confirmation</fullName>
- <default>true</default>
</values>
</picklistValues>
<picklistValues>
diff --git a/force-app/main/default/objects/Asset/recordTypes/Shipment.recordType-meta.xml b/force-app/main/default/objects/Asset/recordTypes/Shipment.recordType-meta.xml
index e0c2e40..8a84d35 100644
--- a/force-app/main/default/objects/Asset/recordTypes/Shipment.recordType-meta.xml
+++ b/force-app/main/default/objects/Asset/recordTypes/Shipment.recordType-meta.xml
@@ -81,48 +81,6 @@
</values>
</picklistValues>
<picklistValues>
- <picklist>ConsequenceOfFailure</picklist>
- <values>
- <fullName>Critical</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>Insignificant</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>Major</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>Minor</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>Moderate</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>DigitalAssetStatus</picklist>
- <values>
- <fullName>鍏抽棴</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鎵撳紑</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>璀﹀憡</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>閿欒</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
<picklist>Equipment_Type__c</picklist>
<values>
<fullName>浜у搧璇曠敤</fullName>
@@ -1089,33 +1047,6 @@
</values>
</picklistValues>
<picklistValues>
- <picklist>StatusReason</picklist>
- <values>
- <fullName>鍏抽棴</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鍦ㄧ嚎</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>澶囩敤</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>宸叉殏鍋�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鏈噯澶�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>绂荤嚎</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
<picklist>Storage_Conditions_Met_Status__c</picklist>
<values>
<fullName>N%2FA</fullName>
@@ -1143,13 +1074,6 @@
<values>
<fullName>C鍖�</fullName>
<default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>photoType__c</picklist>
- <values>
- <fullName>setup_confirmation</fullName>
- <default>true</default>
</values>
</picklistValues>
<picklistValues>
diff --git a/force-app/main/default/objects/Asset/validationRules/AnimalCheck.validationRule-meta.xml b/force-app/main/default/objects/Asset/validationRules/AnimalCheck.validationRule-meta.xml
index 63081ac..855d008 100644
--- a/force-app/main/default/objects/Asset/validationRules/AnimalCheck.validationRule-meta.xml
+++ b/force-app/main/default/objects/Asset/validationRules/AnimalCheck.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>AnimalCheck</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>PRIORVALUE( AnimalExperiment__c ) && ISCHANGED(AnimalExperiment__c )</errorConditionFormula>
<errorDisplayField>AnimalExperiment__c</errorDisplayField>
<errorMessage>鍔ㄧ墿瀹為獙瀛楁 鍕句笂鍚庝笉鍏佽鍙栨秷</errorMessage>
diff --git a/force-app/main/default/objects/Asset/validationRules/CannotChangeColumnFromIF.validationRule-meta.xml b/force-app/main/default/objects/Asset/validationRules/CannotChangeColumnFromIF.validationRule-meta.xml
index 32cc377..13fcdf1 100644
--- a/force-app/main/default/objects/Asset/validationRules/CannotChangeColumnFromIF.validationRule-meta.xml
+++ b/force-app/main/default/objects/Asset/validationRules/CannotChangeColumnFromIF.validationRule-meta.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>CannotChangeColumnFromIF</fullName>
- <active>false</active>
+ <active>true</active>
<description>SAP銇嬨倝銇磵鍏ユ鍣ㄣ伄鍫村悎銈枫儶銈€儷No銇仼I/F銇爡鐩倰澶夋洿銇с亶銇俱仜銈�</description>
- <errorConditionFormula>$User.UserRoleId <> LEFT('00EC600000009L8', 15) &&
+ <errorConditionFormula>$User.UserRoleId <> LEFT('00E10000000e30A', 15) &&
$User.ProfileId <> LEFT($Label.ProfileId_SystemAdmin, 15)&&
$User.Id <> LEFT('00510000004rbs0', 15)
&& text($User.UserType) <> 'PowerCustomerSuccess'
@@ -12,7 +12,7 @@
&& (ISCHANGED(Posting_Date__c)
|| ISCHANGED(Product2Id)
|| ISCHANGED(SerialNumber)
- || ISCHANGED(InstallDate)
+ || (ISCHANGED(InstallDate) && $Profile.Id <> '00e10000000edWm')
|| ISCHANGED(SLMark__c)
|| ISCHANGED(Guarantee_period_for_products__c)
)</errorConditionFormula>
diff --git a/force-app/main/default/objects/Asset/validationRules/Cannot_change_to_other_department_class.validationRule-meta.xml b/force-app/main/default/objects/Asset/validationRules/Cannot_change_to_other_department_class.validationRule-meta.xml
index 9467906..9a035a7 100644
--- a/force-app/main/default/objects/Asset/validationRules/Cannot_change_to_other_department_class.validationRule-meta.xml
+++ b/force-app/main/default/objects/Asset/validationRules/Cannot_change_to_other_department_class.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Cannot_change_to_other_department_class</fullName>
- <active>false</active>
+ <active>true</active>
<description>HWAG-AUA5GR
SWAG-C67ASQ 鏉冮檺鍏堢粰鍔╃悊2S6/2S8/2S9
1208 鍚屾椂涔熺粰2S5</description>
@@ -9,7 +9,7 @@
$User.ProfileId <> LEFT($Label.ProfileId_SystemAdmin, 15) &&
NOT(ISNEW()) && ISCHANGED(AccountId) &&
Account.ParentId <> PRIORVALUE(Department_Class__c) && NOT( OR( Product2.Dealer_special_Object__c , Product2.Dealer_Object__c, Product2.ENG_DeaerProFlag__c )) &&
-Account.RecordTypeId <> '012C600000003HG' && RecordTypeId <> '012C600000003Hv'
+Account.RecordTypeId <> '01210000000gT1X' && RecordTypeId <> '01210000000kOPR'
&& !CONTAINS($Profile.Name, '2S5') &&!CONTAINS($Profile.Name, '2S6') &&
!CONTAINS($Profile.Name, '2S8') &&
!CONTAINS($Profile.Name, '2S9')&&
diff --git a/force-app/main/default/objects/Asset/validationRules/Compeitor_and_UnknownSerial_Competitor.validationRule-meta.xml b/force-app/main/default/objects/Asset/validationRules/Compeitor_and_UnknownSerial_Competitor.validationRule-meta.xml
index 58a9c27..6687640 100644
--- a/force-app/main/default/objects/Asset/validationRules/Compeitor_and_UnknownSerial_Competitor.validationRule-meta.xml
+++ b/force-app/main/default/objects/Asset/validationRules/Compeitor_and_UnknownSerial_Competitor.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Compeitor_and_UnknownSerial_Competitor</fullName>
- <active>false</active>
+ <active>true</active>
<description>绔炰簤瀵规墜浜у搧鍜屾棤鏈鸿韩鍙风爜璁惧鍚屾椂涓嶈兘鐪熸</description>
<errorConditionFormula>and( IsCompetitorProduct = true, unknow_serial_NO_product__c = true)</errorConditionFormula>
<errorDisplayField>unknow_serial_NO_product__c</errorDisplayField>
diff --git a/force-app/main/default/objects/Asset/validationRules/Compeitor_and_UnknownSerial_Serial.validationRule-meta.xml b/force-app/main/default/objects/Asset/validationRules/Compeitor_and_UnknownSerial_Serial.validationRule-meta.xml
index f847ee6..e327b46 100644
--- a/force-app/main/default/objects/Asset/validationRules/Compeitor_and_UnknownSerial_Serial.validationRule-meta.xml
+++ b/force-app/main/default/objects/Asset/validationRules/Compeitor_and_UnknownSerial_Serial.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Compeitor_and_UnknownSerial_Serial</fullName>
- <active>false</active>
+ <active>true</active>
<description>绔炰簤瀵规墜浜у搧鍜屾棤鏈鸿韩鍙风爜璁惧鍚屾椂涓嶈兘鐪熸</description>
<errorConditionFormula>and( IsCompetitorProduct = true, unknow_serial_NO_product__c = true)</errorConditionFormula>
<errorDisplayField>IsCompetitorProduct</errorDisplayField>
diff --git a/force-app/main/default/objects/Asset/validationRules/Delete_Manual_asset_request.validationRule-meta.xml b/force-app/main/default/objects/Asset/validationRules/Delete_Manual_asset_request.validationRule-meta.xml
index a3526ad..8d2d76d 100644
--- a/force-app/main/default/objects/Asset/validationRules/Delete_Manual_asset_request.validationRule-meta.xml
+++ b/force-app/main/default/objects/Asset/validationRules/Delete_Manual_asset_request.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Delete_Manual_asset_request</fullName>
- <active>false</active>
+ <active>true</active>
<description>鎵嬪姩鐧诲綍淇濇湁璁惧鍒犻櫎鐢宠鏃跺�欙紝闇�瑕佹妸鐘舵�佸簾寮冦��</description>
<errorConditionFormula>AND(Request_manager_deleter_manaual_input__c = TRUE,
diff --git a/force-app/main/default/objects/Asset/validationRules/Dummy_product_request_product_info.validationRule-meta.xml b/force-app/main/default/objects/Asset/validationRules/Dummy_product_request_product_info.validationRule-meta.xml
index 7c137b4..45b53ce 100644
--- a/force-app/main/default/objects/Asset/validationRules/Dummy_product_request_product_info.validationRule-meta.xml
+++ b/force-app/main/default/objects/Asset/validationRules/Dummy_product_request_product_info.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Dummy_product_request_product_info</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>OR(ISBLANK(Manual_competitor_product_code__c), ISBLANK(Manual_competitor_product_company__c)) && Product2.Competitor_product_dummy__c && Information_From__c != '澶卞崟'&& $User.Batch_User__c != true</errorConditionFormula>
<errorMessage>鍦ㄦ墜鍔ㄧ櫥褰曠珵浜夊鎵嬩骇鍝佸搴斾腑锛岃杈撳叆姝ゆ鐧诲綍鐨勭珵浜夊鎵嬪钩鐗屽悕鍙婁骇鍝佸瀷鍙�</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Asset/validationRules/FSE_Cannot_change_to_other_hospital.validationRule-meta.xml b/force-app/main/default/objects/Asset/validationRules/FSE_Cannot_change_to_other_hospital.validationRule-meta.xml
index 4534bad..347370c 100644
--- a/force-app/main/default/objects/Asset/validationRules/FSE_Cannot_change_to_other_hospital.validationRule-meta.xml
+++ b/force-app/main/default/objects/Asset/validationRules/FSE_Cannot_change_to_other_hospital.validationRule-meta.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>FSE_Cannot_change_to_other_hospital</fullName>
- <active>false</active>
+ <active>true</active>
<description>SWAG-C8MB5U</description>
<errorConditionFormula>$User.Batch_User__c = false &&
$User.ProfileId <> LEFT($Label.ProfileId_SystemAdmin, 15) && OR(CONTAINS($Profile.Name, '2S5'),CONTAINS($Profile.Name, '2S6'),CONTAINS($Profile.Name, '2S8'),CONTAINS($Profile.Name, '2S9'),CONTAINS($Profile.Name, '2S1')) &&
NOT(ISNEW()) &&
Account.Parent.ParentId <> PRIORVALUE( Hospital__c ) && NOT( OR( Product2.Dealer_special_Object__c , Product2.Dealer_Object__c, Product2.ENG_DeaerProFlag__c )) &&
-Account.RecordTypeId <> '012C600000003HG' && RecordTypeId <> '012C600000003Hv'</errorConditionFormula>
+Account.RecordTypeId <> '01210000000gT1X' && RecordTypeId <> '01210000000kOPR'</errorConditionFormula>
<errorDisplayField>AccountId</errorDisplayField>
<errorMessage>涓嶈兘淇敼涓哄叾浠栧尰闄㈢殑绉戝銆�</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Asset/validationRules/Fixture_OneToOne_Link_Should_Delete.validationRule-meta.xml b/force-app/main/default/objects/Asset/validationRules/Fixture_OneToOne_Link_Should_Delete.validationRule-meta.xml
index 42f0288..6dfd0a1 100644
--- a/force-app/main/default/objects/Asset/validationRules/Fixture_OneToOne_Link_Should_Delete.validationRule-meta.xml
+++ b/force-app/main/default/objects/Asset/validationRules/Fixture_OneToOne_Link_Should_Delete.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Fixture_OneToOne_Link_Should_Delete</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>IsBlank(Fixture_OneToOne_Link__c) = false
&& Not(IsNew())
&& (Delete_Flag__c == true || Freeze_sign_Abandoned_Flag__c == true)
diff --git a/force-app/main/default/objects/Asset/validationRules/HospitalAsset_Cannot_Change_Scrap_Check.validationRule-meta.xml b/force-app/main/default/objects/Asset/validationRules/HospitalAsset_Cannot_Change_Scrap_Check.validationRule-meta.xml
index f0a3237..05c70ed 100644
--- a/force-app/main/default/objects/Asset/validationRules/HospitalAsset_Cannot_Change_Scrap_Check.validationRule-meta.xml
+++ b/force-app/main/default/objects/Asset/validationRules/HospitalAsset_Cannot_Change_Scrap_Check.validationRule-meta.xml
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>HospitalAsset_Cannot_Change_Scrap_Check</fullName>
- <active>false</active>
+ <active>true</active>
<description>20220331 gzw 璺宠繃绠＄悊鍛�</description>
<errorConditionFormula>$Profile.Id != '00e10000000dzzG' /* GPI_绯荤粺绠＄悊鍛楴ew 涓嶆姤閿� */
&&
-$Profile.Id != '00eC600000003SX'/* GPI_绯荤粺绠＄悊鍛� 涓嶆姤閿� */
+$Profile.Id != '00e10000000dEQx'/* GPI_绯荤粺绠＄悊鍛� 涓嶆姤閿� */
&&
-$Profile.Id != '00eC800000005Cb' /* 绯荤粺绠＄悊鍛� 涓嶆姤閿� */
+$Profile.Id != '00e10000000Y3o5' /* 绯荤粺绠＄悊鍛� 涓嶆姤閿� */
&&
-$User.Id != '005C60000001UFN' /* Batch User 涓嶆姤閿� */
+$User.Id != '00510000000fSYI' /* Batch User 涓嶆姤閿� */
&&
TEXT(Asset_Owner__c) = "鐥呴櫌璩囩敚"
&& TEXT(Status) = "寰呮姤搴�"</errorConditionFormula>
diff --git a/force-app/main/default/objects/Asset/validationRules/IFData_cant_Change_to_CopetitorData.validationRule-meta.xml b/force-app/main/default/objects/Asset/validationRules/IFData_cant_Change_to_CopetitorData.validationRule-meta.xml
index 4ef38ab..bd760f8 100644
--- a/force-app/main/default/objects/Asset/validationRules/IFData_cant_Change_to_CopetitorData.validationRule-meta.xml
+++ b/force-app/main/default/objects/Asset/validationRules/IFData_cant_Change_to_CopetitorData.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>IFData_cant_Change_to_CopetitorData</fullName>
- <active>false</active>
+ <active>true</active>
<description>IF銇嬨倝鏉ャ仧銉囥兗銈裤伅銆併�岀珵浜夊鎵嬩骇鍝併�嶃倰銉併偋銉冦偗鍑烘潵銇俱仜銈撱��</description>
<errorConditionFormula>and( IF_Information_From__c = true, IsCompetitorProduct = true)</errorConditionFormula>
<errorDisplayField>IsCompetitorProduct</errorDisplayField>
diff --git a/force-app/main/default/objects/Asset/validationRules/IFData_cant_Change_to_ManualEntry.validationRule-meta.xml b/force-app/main/default/objects/Asset/validationRules/IFData_cant_Change_to_ManualEntry.validationRule-meta.xml
index 3f480db..97ee8ec 100644
--- a/force-app/main/default/objects/Asset/validationRules/IFData_cant_Change_to_ManualEntry.validationRule-meta.xml
+++ b/force-app/main/default/objects/Asset/validationRules/IFData_cant_Change_to_ManualEntry.validationRule-meta.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>IFData_cant_Change_to_ManualEntry</fullName>
- <active>false</active>
+ <active>true</active>
<description>IF銇嬨倝鏉ャ仧銉囥兗銈裤伅銆併�屾棤鏈鸿韩鍙风爜璁惧銆嶃倰銉併偋銉冦偗鍑烘潵銇俱仜銈撱��</description>
- <errorConditionFormula>and( IF_Information_From__c = true, unknow_serial_NO_product__c = true , RecordTypeId <> '012C600000003Hv')</errorConditionFormula>
+ <errorConditionFormula>and( IF_Information_From__c = true, unknow_serial_NO_product__c = true , RecordTypeId <> '01210000000kOPR')</errorConditionFormula>
<errorDisplayField>unknow_serial_NO_product__c</errorDisplayField>
<errorMessage>IF銇嬨倝鏉ャ仧銉囥兗銈裤伅銆併�屾棤鏈鸿韩鍙风爜璁惧銆嶃倰銉併偋銉冦偗鍑烘潵銇俱仜銈撱��
2019-12-25涔嬪墠
diff --git a/force-app/main/default/objects/Asset/validationRules/IF_IsBody_Need_SerialManageType.validationRule-meta.xml b/force-app/main/default/objects/Asset/validationRules/IF_IsBody_Need_SerialManageType.validationRule-meta.xml
index 9500d96..0d52b72 100644
--- a/force-app/main/default/objects/Asset/validationRules/IF_IsBody_Need_SerialManageType.validationRule-meta.xml
+++ b/force-app/main/default/objects/Asset/validationRules/IF_IsBody_Need_SerialManageType.validationRule-meta.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>IF_IsBody_Need_SerialManageType</fullName>
- <active>false</active>
+ <active>true</active>
<description>20171128璇ヨ鍒欏彧閽堝浜庡鍝�</description>
- <errorConditionFormula>RecordTypeId = '012C600000003Hv' && Loaner_accsessary__c == False && Text(Manage_type__c) <> '涓綋绠＄悊' && AssetManageConfirm__c = TRUE && NOT($User.Batch_User__c)&& $User.ProfileId <>'00eC600000003SX'
-&& $User.ProfileId <>'00eC600000003SX'
+ <errorConditionFormula>RecordTypeId = '01210000000kOPR' && Loaner_accsessary__c == False && Text(Manage_type__c) <> '涓綋绠＄悊' && AssetManageConfirm__c = TRUE && NOT($User.Batch_User__c)&& $User.ProfileId <>'00e10000000dEQx'
+&& $User.ProfileId <>'00e10000000dEQx'
&& Account.AgentCode_Ext__c != $Label.Account_Asset_FJZ</errorConditionFormula>
<errorDisplayField>Manage_type__c</errorDisplayField>
<errorMessage>涓讳綋闄勫睘鍝佸繀椤绘槸 [涓綋绠＄悊]</errorMessage>
diff --git a/force-app/main/default/objects/Asset/validationRules/IllegalAccount.validationRule-meta.xml b/force-app/main/default/objects/Asset/validationRules/IllegalAccount.validationRule-meta.xml
index 8869f92..c2bace8 100644
--- a/force-app/main/default/objects/Asset/validationRules/IllegalAccount.validationRule-meta.xml
+++ b/force-app/main/default/objects/Asset/validationRules/IllegalAccount.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>IllegalAccount</fullName>
- <active>false</active>
+ <active>true</active>
<description>鏈儴涓庡姙浜嬪涓嶅尮閰�</description>
<errorConditionFormula>!ISBLANK(OlympusAccShareName__c)
&& OR(TEXT(Salesdepartment__c)=='1.鍗庡寳钀ヤ笟鏈儴',
diff --git a/force-app/main/default/objects/Asset/validationRules/Last_Reserve_RAESD_Not_Null.validationRule-meta.xml b/force-app/main/default/objects/Asset/validationRules/Last_Reserve_RAESD_Not_Null.validationRule-meta.xml
index af51209..93f36f4 100644
--- a/force-app/main/default/objects/Asset/validationRules/Last_Reserve_RAESD_Not_Null.validationRule-meta.xml
+++ b/force-app/main/default/objects/Asset/validationRules/Last_Reserve_RAESD_Not_Null.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Last_Reserve_RAESD_Not_Null</fullName>
- <active>false</active>
+ <active>true</active>
<description>涓綋绠＄悊璁惧鐨勩�愬�熷嚭_鍒嗛厤_鏁般�戞垨銆愬凡鍊熷嚭鏁般�戝ぇ浜�0鏃讹紝銆愭渶鏂板鍝佺敵璇峰�熷嚭鏄庣粏銆戜笉鍙负绌�</description>
<errorConditionFormula>ISPICKVAL(Manage_type__c, '涓綋绠＄悊')
&& ISBLANK(Last_Reserve_RAES_Detail__c)
diff --git a/force-app/main/default/objects/Asset/validationRules/Last_Reserve_Valitaion.validationRule-meta.xml b/force-app/main/default/objects/Asset/validationRules/Last_Reserve_Valitaion.validationRule-meta.xml
index 1bd5a78..46bd474 100644
--- a/force-app/main/default/objects/Asset/validationRules/Last_Reserve_Valitaion.validationRule-meta.xml
+++ b/force-app/main/default/objects/Asset/validationRules/Last_Reserve_Valitaion.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Last_Reserve_Valitaion</fullName>
- <active>false</active>
+ <active>true</active>
<description>涓讳綋銇ㄥ�嬩綋闄勫睘鍝併伄鍫村悎銆�
鏈�鏂板鍝佺敵璇峰�熷嚭鏄庣粏鍘嗗彶銇畍alitaion rule, 浠庣┖鍙樻湁鍊� OK锛屾湁鍊煎埌鏈夊�� 锛堝�煎彉鍖栫殑璇濓級NG</description>
<errorConditionFormula>/* 涓讳綋涔熸槸'涓綋绠＄悊' 鐨� */
@@ -18,8 +18,8 @@
&& NOT( TEXT(Last_Reserve_RAES_Detail__r.Rental_Apply__r.Routine_Check_Status__c) = 'OK' )
&& AssetManageConfirm__c = TRUE
&& NOT($User.Batch_User__c)
-&& $User.ProfileId <>'00eC600000003SX' &&
-$User.ProfileId <>'00eC800000005Cb'</errorConditionFormula>
+&& $User.ProfileId <>'00e10000000dEQx' &&
+$User.ProfileId <>'00e10000000Y3o5'</errorConditionFormula>
<errorDisplayField>Last_Reserve_RAES_Detail__c</errorDisplayField>
<errorMessage>涓嬫灦鍚庛�屾渶鏂板鍝佺敵璇峰�熷嚭鏄庣粏銆嶄笉鑳戒慨鏀瑰垎閰�</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Asset/validationRules/Last_inspection_staff_Changed.validationRule-meta.xml b/force-app/main/default/objects/Asset/validationRules/Last_inspection_staff_Changed.validationRule-meta.xml
index 8828b35..9452ac2 100644
--- a/force-app/main/default/objects/Asset/validationRules/Last_inspection_staff_Changed.validationRule-meta.xml
+++ b/force-app/main/default/objects/Asset/validationRules/Last_inspection_staff_Changed.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Last_inspection_staff_Changed</fullName>
- <active>false</active>
+ <active>true</active>
<description>鏈�鍚庣偣妫�浜恒倰鍏ュ姏銇椼仧銇傘倠銇勩伅鍊ゃ倰澶夋洿銇椼仧鍫村悎銉併偋銉冦偗</description>
<errorConditionFormula>(Isnew() || Ischanged(Last_inspection_staff__c ))
&&
diff --git a/force-app/main/default/objects/Asset/validationRules/Loaner_edit_chk.validationRule-meta.xml b/force-app/main/default/objects/Asset/validationRules/Loaner_edit_chk.validationRule-meta.xml
index 4a9f1af..77a792b 100644
--- a/force-app/main/default/objects/Asset/validationRules/Loaner_edit_chk.validationRule-meta.xml
+++ b/force-app/main/default/objects/Asset/validationRules/Loaner_edit_chk.validationRule-meta.xml
@@ -5,6 +5,6 @@
<description>NFM105浼氭姤閿欙紝鐜板湪涓嶅惎鐢�</description>
<errorConditionFormula>Account.AgentCode_Ext__c = "9999998"
&&
-AND($Profile.Id != "00eC800000005Cb", $Profile.Id != "00e10000000xnoT")</errorConditionFormula>
+AND($Profile.Id != "00e10000000Y3o5", $Profile.Id != "00e10000000xnoT")</errorConditionFormula>
<errorMessage>浣犳病鏈変慨鏀瑰鍝佽祫浜х殑鏉冮檺</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Asset/validationRules/Manual_Entry_Product_NG.validationRule-meta.xml b/force-app/main/default/objects/Asset/validationRules/Manual_Entry_Product_NG.validationRule-meta.xml
index d1f7f7c..6e9f38b 100644
--- a/force-app/main/default/objects/Asset/validationRules/Manual_Entry_Product_NG.validationRule-meta.xml
+++ b/force-app/main/default/objects/Asset/validationRules/Manual_Entry_Product_NG.validationRule-meta.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Manual_Entry_Product_NG</fullName>
- <active>false</active>
+ <active>true</active>
<description>7.28 杩藉姞鏉′欢
- && RecordTypeId <> '012C600000003Hv'</description>
+ && RecordTypeId <> '01210000000kOPR'</description>
<errorConditionFormula>IsCompetitorProduct = False && Product2.Manual_Entry__c && Loaner_accsessary__c = FALSE && RecordTypeId <> '01210000000kOPR'</errorConditionFormula>
<errorDisplayField>Product2Id</errorDisplayField>
<errorMessage>涓嶈兘閫夋嫨鎵嬪姩杈撳叆鐨勪骇鍝�</errorMessage>
diff --git a/force-app/main/default/objects/Asset/validationRules/Must_Input_ChangeQuantityReason.validationRule-meta.xml b/force-app/main/default/objects/Asset/validationRules/Must_Input_ChangeQuantityReason.validationRule-meta.xml
index 67b457c..3d6f2cf 100644
--- a/force-app/main/default/objects/Asset/validationRules/Must_Input_ChangeQuantityReason.validationRule-meta.xml
+++ b/force-app/main/default/objects/Asset/validationRules/Must_Input_ChangeQuantityReason.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Must_Input_ChangeQuantityReason</fullName>
- <active>false</active>
+ <active>true</active>
<description>鐪� ISCHANGED(ChangeQuantityHistory__c)</description>
<errorConditionFormula>Not(IsNew())
&& PRIORVALUE(Quantity) != Quantity
diff --git a/force-app/main/default/objects/Asset/validationRules/Must_Input_InspectionNo.validationRule-meta.xml b/force-app/main/default/objects/Asset/validationRules/Must_Input_InspectionNo.validationRule-meta.xml
index 26ddcfe..58cc859 100644
--- a/force-app/main/default/objects/Asset/validationRules/Must_Input_InspectionNo.validationRule-meta.xml
+++ b/force-app/main/default/objects/Asset/validationRules/Must_Input_InspectionNo.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Must_Input_InspectionNo</fullName>
- <active>false</active>
+ <active>true</active>
<description>鐐规銇�4闋呯洰銈掑鏇淬仐銇熷牬鍚堛�併亱銇� 鐐规鐣彿銇屻仾銇勩�併亗銈嬨亜銇�孫CM-銆嶃伄鍫村悎銆併偍銉┿兗銇仐銇俱仚銆�</description>
<errorConditionFormula>(ISBLANK(Inspection_report_number__c) || Inspection_report_number__c == "OCM-" || Inspection_report_number__c == "OCM" || Inspection_report_number__c == "OCSM-" || Inspection_report_number__c == "OCSM")&&
((NOT(ISBLANK(TEXT(Inspection_Result__c))) && ISCHANGED(Inspection_Result__c))
diff --git a/force-app/main/default/objects/Asset/validationRules/Out_of_wh_CanNot_Be_Negativenumber.validationRule-meta.xml b/force-app/main/default/objects/Asset/validationRules/Out_of_wh_CanNot_Be_Negativenumber.validationRule-meta.xml
index 7f2f5ed..6f23ae2 100644
--- a/force-app/main/default/objects/Asset/validationRules/Out_of_wh_CanNot_Be_Negativenumber.validationRule-meta.xml
+++ b/force-app/main/default/objects/Asset/validationRules/Out_of_wh_CanNot_Be_Negativenumber.validationRule-meta.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Out_of_wh_CanNot_Be_Negativenumber</fullName>
- <active>false</active>
- <errorConditionFormula>RecordTypeId = '012C600000003Hv' && Out_of_wh__c < 0
+ <active>true</active>
+ <errorConditionFormula>RecordTypeId = '01210000000kOPR' && Out_of_wh__c < 0
&& AssetManageConfirm__c = TRUE
&& NOT($User.Batch_User__c)
&& $User.ProfileId <>'00e10000000dEQx'</errorConditionFormula>
diff --git a/force-app/main/default/objects/Asset/validationRules/Out_of_wh_ge_Rental_Count.validationRule-meta.xml b/force-app/main/default/objects/Asset/validationRules/Out_of_wh_ge_Rental_Count.validationRule-meta.xml
index 3224641..7adfa5f 100644
--- a/force-app/main/default/objects/Asset/validationRules/Out_of_wh_ge_Rental_Count.validationRule-meta.xml
+++ b/force-app/main/default/objects/Asset/validationRules/Out_of_wh_ge_Rental_Count.validationRule-meta.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Out_of_wh_ge_Rental_Count</fullName>
- <active>false</active>
- <errorConditionFormula>RecordTypeId = '012C600000003Hv'
+ <active>true</active>
+ <errorConditionFormula>RecordTypeId = '01210000000kOPR'
&& Out_of_wh__c < Rental_Count__c
&& AssetManageConfirm__c = TRUE
&& (ISCHANGED(Out_of_wh__c) || ISCHANGED(Rental_Count__c))</errorConditionFormula>
diff --git a/force-app/main/default/objects/Asset/validationRules/ProductCheck_2M2.validationRule-meta.xml b/force-app/main/default/objects/Asset/validationRules/ProductCheck_2M2.validationRule-meta.xml
index 73d791a..e12f5ef 100644
--- a/force-app/main/default/objects/Asset/validationRules/ProductCheck_2M2.validationRule-meta.xml
+++ b/force-app/main/default/objects/Asset/validationRules/ProductCheck_2M2.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>ProductCheck_2M2</fullName>
- <active>false</active>
+ <active>true</active>
<description>2M2鍙兘鏂板缓绔炲搧鑰楁潗鐨勪繚鏈夎澶�</description>
<errorConditionFormula>(ISNEW() || ISCHANGED(Product2Id)) && $Profile.Id = '00e10000000u47b' && Product2.RecordTypeId != '01210000000aMAD'</errorConditionFormula>
<errorDisplayField>Product2Id</errorDisplayField>
diff --git a/force-app/main/default/objects/Asset/validationRules/Quantity_CanNot_Be_Negativenumber.validationRule-meta.xml b/force-app/main/default/objects/Asset/validationRules/Quantity_CanNot_Be_Negativenumber.validationRule-meta.xml
index 6f43937..45121a1 100644
--- a/force-app/main/default/objects/Asset/validationRules/Quantity_CanNot_Be_Negativenumber.validationRule-meta.xml
+++ b/force-app/main/default/objects/Asset/validationRules/Quantity_CanNot_Be_Negativenumber.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Quantity_CanNot_Be_Negativenumber</fullName>
- <active>false</active>
- <errorConditionFormula>RecordTypeId = '012C600000003Hv' && Quantity < 0 && AssetManageConfirm__c = TRUE && $User.ProfileId <>'00e10000000dEQx' && NOT($User.Batch_User__c)</errorConditionFormula>
+ <active>true</active>
+ <errorConditionFormula>RecordTypeId = '01210000000kOPR' && Quantity < 0 && AssetManageConfirm__c = TRUE && $User.ProfileId <>'00e10000000dEQx' && NOT($User.Batch_User__c)</errorConditionFormula>
<errorMessage>澶囧搧鏁伴噺涓嶅彲浠ュ皬浜�0</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Asset/validationRules/Request_asset_deleate_Reason.validationRule-meta.xml b/force-app/main/default/objects/Asset/validationRules/Request_asset_deleate_Reason.validationRule-meta.xml
index 9fc440d..737320c 100644
--- a/force-app/main/default/objects/Asset/validationRules/Request_asset_deleate_Reason.validationRule-meta.xml
+++ b/force-app/main/default/objects/Asset/validationRules/Request_asset_deleate_Reason.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Request_asset_deleate_Reason</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>and( Request_manager_deleter_manaual_input__c = true,
ISBLANK(Asset_delete__c) )</errorConditionFormula>
<errorMessage>璇峰繀椤诲～鍐欎竴涓嬩繚鏈夎澶囧垹闄ょ悊鐢�</errorMessage>
diff --git a/force-app/main/default/objects/Asset/validationRules/Request_input_dealer_name.validationRule-meta.xml b/force-app/main/default/objects/Asset/validationRules/Request_input_dealer_name.validationRule-meta.xml
index ce6fe6f..8635af4 100644
--- a/force-app/main/default/objects/Asset/validationRules/Request_input_dealer_name.validationRule-meta.xml
+++ b/force-app/main/default/objects/Asset/validationRules/Request_input_dealer_name.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Request_input_dealer_name</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>AND($User.ProfileId != '00e10000000Y3o5' ,
ISPICKVAL(Asset_Owner__c, "缁忛攢鍟嗚祫浜�"),
ISBLANK(Asset_owner_delaer_name__c))</errorConditionFormula>
diff --git a/force-app/main/default/objects/Asset/validationRules/RequireSerialNumber.validationRule-meta.xml b/force-app/main/default/objects/Asset/validationRules/RequireSerialNumber.validationRule-meta.xml
index f6eea21..85585aa 100644
--- a/force-app/main/default/objects/Asset/validationRules/RequireSerialNumber.validationRule-meta.xml
+++ b/force-app/main/default/objects/Asset/validationRules/RequireSerialNumber.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>RequireSerialNumber</fullName>
- <active>false</active>
+ <active>true</active>
<description>and( OR(IsCompetitorProduct = False,
unknow_serial_NO_product__c = false),Loaner_accsessary__c=FALSE )&& ISBLANK(SerialNumber)
diff --git a/force-app/main/default/objects/Asset/validationRules/You_Xiao_Ku_Cun_chk.validationRule-meta.xml b/force-app/main/default/objects/Asset/validationRules/You_Xiao_Ku_Cun_chk.validationRule-meta.xml
index c9f8959..8be5960 100644
--- a/force-app/main/default/objects/Asset/validationRules/You_Xiao_Ku_Cun_chk.validationRule-meta.xml
+++ b/force-app/main/default/objects/Asset/validationRules/You_Xiao_Ku_Cun_chk.validationRule-meta.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>You_Xiao_Ku_Cun_chk</fullName>
- <active>false</active>
+ <active>true</active>
<description>鏈夋晥搴撳瓨涓嶈兘灏忎簬0
2018/09/14淇敼鍓嶏細
-RecordTypeId = '012C600000003Hv' && Quantity > 0
+RecordTypeId = '01210000000kOPR' && Quantity > 0
&& You_Xiao_Ku_Cun__c < 0 && AssetManageConfirm__c = TRUE
&& NOT($User.Batch_User__c)
&& $User.ProfileId <>'00e10000000dEQx'</description>
diff --git a/force-app/main/default/objects/Asset/validationRules/You_Xiao_Ku_Cun_ge0.validationRule-meta.xml b/force-app/main/default/objects/Asset/validationRules/You_Xiao_Ku_Cun_ge0.validationRule-meta.xml
index 2ac977b..7ea61b4 100644
--- a/force-app/main/default/objects/Asset/validationRules/You_Xiao_Ku_Cun_ge0.validationRule-meta.xml
+++ b/force-app/main/default/objects/Asset/validationRules/You_Xiao_Ku_Cun_ge0.validationRule-meta.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>You_Xiao_Ku_Cun_ge0</fullName>
- <active>false</active>
+ <active>true</active>
<description>1/20 鍋滅敤鍚庨噸鏂板惎鐢�</description>
- <errorConditionFormula>RecordTypeId = '012C600000003Hv' && You_Xiao_Ku_Cun__c < 0
+ <errorConditionFormula>RecordTypeId = '01210000000kOPR' && You_Xiao_Ku_Cun__c < 0
&& AssetManageConfirm__c = TRUE
&& (ISCHANGED(Out_of_wh__c) || ISCHANGED(Quantity))
&& Account.Management_Code__c != $Label.Account_Asset_FJZ</errorConditionFormula>
diff --git a/force-app/main/default/objects/AssetMaintainDetail__c/validationRules/MaintainType_Cannot_Change.validationRule-meta.xml b/force-app/main/default/objects/AssetMaintainDetail__c/validationRules/MaintainType_Cannot_Change.validationRule-meta.xml
index 302adf5..8672ea3 100644
--- a/force-app/main/default/objects/AssetMaintainDetail__c/validationRules/MaintainType_Cannot_Change.validationRule-meta.xml
+++ b/force-app/main/default/objects/AssetMaintainDetail__c/validationRules/MaintainType_Cannot_Change.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>MaintainType_Cannot_Change</fullName>
- <active>false</active>
+ <active>true</active>
<description>缁存姢绫诲瀷涓嶅彲淇敼</description>
<errorConditionFormula>TEXT(MaintainType__c) != TEXT(AssetMaintainHeader__r.MaintainType__c)</errorConditionFormula>
<errorMessage>缁存姢绫诲瀷涓嶅彲淇敼</errorMessage>
diff --git a/force-app/main/default/objects/AssetMaintainHeader__c/AssetMaintainHeader__c.object-meta.xml b/force-app/main/default/objects/AssetMaintainHeader__c/AssetMaintainHeader__c.object-meta.xml
index ad78ed1..f4c62e6 100644
--- a/force-app/main/default/objects/AssetMaintainHeader__c/AssetMaintainHeader__c.object-meta.xml
+++ b/force-app/main/default/objects/AssetMaintainHeader__c/AssetMaintainHeader__c.object-meta.xml
@@ -128,11 +128,14 @@
</actionOverrides>
<actionOverrides>
<actionName>View</actionName>
- <type>Default</type>
+ <comment>Action override created by Lightning App Builder during activation.</comment>
+ <content>FlexiPage914005</content>
+ <formFactor>Large</formFactor>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>Flexipage</type>
</actionOverrides>
<actionOverrides>
<actionName>View</actionName>
- <formFactor>Large</formFactor>
<type>Default</type>
</actionOverrides>
<actionOverrides>
diff --git a/force-app/main/default/objects/AssetMaintainHeader__c/validationRules/Cannot_Change_Date.validationRule-meta.xml b/force-app/main/default/objects/AssetMaintainHeader__c/validationRules/Cannot_Change_Date.validationRule-meta.xml
index 0de929d..3cb616e 100644
--- a/force-app/main/default/objects/AssetMaintainHeader__c/validationRules/Cannot_Change_Date.validationRule-meta.xml
+++ b/force-app/main/default/objects/AssetMaintainHeader__c/validationRules/Cannot_Change_Date.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Cannot_Change_Date</fullName>
- <active>false</active>
+ <active>true</active>
<description>缁存姢鏃ユ湡涓嶅彲淇敼</description>
<errorConditionFormula>!ISNEW() && ISCHANGED(Date__c)</errorConditionFormula>
<errorMessage>缁存姢鏃ユ湡涓嶅彲淇敼</errorMessage>
diff --git a/force-app/main/default/objects/AssetMaintainHeader__c/validationRules/Cannot_Change_MaintainType.validationRule-meta.xml b/force-app/main/default/objects/AssetMaintainHeader__c/validationRules/Cannot_Change_MaintainType.validationRule-meta.xml
index 7661ed2..cbcbda5 100644
--- a/force-app/main/default/objects/AssetMaintainHeader__c/validationRules/Cannot_Change_MaintainType.validationRule-meta.xml
+++ b/force-app/main/default/objects/AssetMaintainHeader__c/validationRules/Cannot_Change_MaintainType.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Cannot_Change_MaintainType</fullName>
- <active>false</active>
+ <active>true</active>
<description>缁存姢绫诲瀷涓嶅彲淇敼</description>
<errorConditionFormula>!ISNEW() && ISCHANGED( MaintainType__c)</errorConditionFormula>
<errorMessage>缁存姢绫诲瀷涓嶅彲淇敼</errorMessage>
diff --git a/force-app/main/default/objects/AssetMaintainHeader__c/validationRules/Cannot_Change_Name.validationRule-meta.xml b/force-app/main/default/objects/AssetMaintainHeader__c/validationRules/Cannot_Change_Name.validationRule-meta.xml
index 9a2db76..08d0257 100644
--- a/force-app/main/default/objects/AssetMaintainHeader__c/validationRules/Cannot_Change_Name.validationRule-meta.xml
+++ b/force-app/main/default/objects/AssetMaintainHeader__c/validationRules/Cannot_Change_Name.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Cannot_Change_Name</fullName>
- <active>false</active>
+ <active>true</active>
<description>缁存姢鍗曠紪鍙蜂笉鍙慨鏀�</description>
<errorConditionFormula>!ISNEW() && ISCHANGED(Name)</errorConditionFormula>
<errorMessage>缁存姢鍗曠紪鍙蜂笉鍙慨鏀�</errorMessage>
diff --git a/force-app/main/default/objects/AssetMaintainHeader__c/validationRules/Cannot_Submit_Without_BuzhangZongjian.validationRule-meta.xml b/force-app/main/default/objects/AssetMaintainHeader__c/validationRules/Cannot_Submit_Without_BuzhangZongjian.validationRule-meta.xml
index c99e352..24ab195 100644
--- a/force-app/main/default/objects/AssetMaintainHeader__c/validationRules/Cannot_Submit_Without_BuzhangZongjian.validationRule-meta.xml
+++ b/force-app/main/default/objects/AssetMaintainHeader__c/validationRules/Cannot_Submit_Without_BuzhangZongjian.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Cannot_Submit_Without_BuzhangZongjian</fullName>
- <active>false</active>
+ <active>true</active>
<description>姝ゆ壒鍑嗚姹傞渶瑕� 閮ㄩ暱 鎴� 鎬荤洃 瀛楁纭畾鐨勪笅涓�涓鎵逛汉銆傛鍊间负绌恒�傛湁鍏宠鎯咃紝璇蜂笌鎮ㄧ殑绠＄悊鍛樺彇寰楄仈绯汇��</description>
<errorConditionFormula>ISPICKVAL(Status__c, '濉啓瀹屾瘯')
&& ISBLANK(Buzhang__c)
diff --git a/force-app/main/default/objects/AssetMaintainHeader__c/validationRules/Scrap_Only.validationRule-meta.xml b/force-app/main/default/objects/AssetMaintainHeader__c/validationRules/Scrap_Only.validationRule-meta.xml
index 4d0a434..5a2bc1a 100644
--- a/force-app/main/default/objects/AssetMaintainHeader__c/validationRules/Scrap_Only.validationRule-meta.xml
+++ b/force-app/main/default/objects/AssetMaintainHeader__c/validationRules/Scrap_Only.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Scrap_Only</fullName>
- <active>false</active>
+ <active>true</active>
<description>鍙湁銆�2B3_澶囧搧涓績绠＄悊鑰�(鐓х墖)銆戠畝妗ｇ殑鐢ㄦ埛鍙互鍋氬疄鐗╂姤搴熶互澶栫殑缁存姢</description>
<errorConditionFormula>ISNEW() && !ISPICKVAL(MaintainType__c, '瀹炵墿鎶ュ簾')
&& !CONTAINS($Label.ProfileId_EquCenAdminPic, Owner:User.ProfileId)
diff --git a/force-app/main/default/objects/AssetModifyBelongsChange__c/fields/AccountField__c.field-meta.xml b/force-app/main/default/objects/AssetModifyBelongsChange__c/fields/AccountField__c.field-meta.xml
index f18bef4..57038f6 100644
--- a/force-app/main/default/objects/AssetModifyBelongsChange__c/fields/AccountField__c.field-meta.xml
+++ b/force-app/main/default/objects/AssetModifyBelongsChange__c/fields/AccountField__c.field-meta.xml
@@ -9,7 +9,7 @@
<filterItems>
<field>Account.RecordTypeId</field>
<operation>equals</operation>
- <value>012C600000003HJIAY,012C600000003HTIAY,012C600000003HUIAY,012C600000003HVIAY,012C600000003HWIAY,012C600000003HXIAY,012C600000003HYIAY,012C600000003HMIAY</value>
+ <value>01210000000Qfmb,01210000000QfmR,01210000000QfmM,01210000000QfmH,01210000000QfmC,01210000000Qfm7,01210000000Qfm2,01210000000QemQ</value>
</filterItems>
<isOptional>false</isOptional>
</lookupFilter>
diff --git a/force-app/main/default/objects/AssetModifyBelongsChange__c/fields/SPOLink__c.field-meta.xml b/force-app/main/default/objects/AssetModifyBelongsChange__c/fields/SPOLink__c.field-meta.xml
index 59d3837..e1a860b 100644
--- a/force-app/main/default/objects/AssetModifyBelongsChange__c/fields/SPOLink__c.field-meta.xml
+++ b/force-app/main/default/objects/AssetModifyBelongsChange__c/fields/SPOLink__c.field-meta.xml
@@ -2,7 +2,7 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>SPOLink__c</fullName>
<externalId>false</externalId>
- <label>SPO琛ㄥ崟鍙�</label>
+ <label>鍚堝悓鐢宠缂栫爜</label>
<length>255</length>
<required>false</required>
<trackTrending>false</trackTrending>
diff --git a/force-app/main/default/objects/AssetModifyBelongsChange__c/fields/ServiceRequestTrackingNumber__c.field-meta.xml b/force-app/main/default/objects/AssetModifyBelongsChange__c/fields/ServiceRequestTrackingNumber__c.field-meta.xml
new file mode 100644
index 0000000..09f5ed8
--- /dev/null
+++ b/force-app/main/default/objects/AssetModifyBelongsChange__c/fields/ServiceRequestTrackingNumber__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ServiceRequestTrackingNumber__c</fullName>
+ <externalId>false</externalId>
+ <label>ServiceRequest鍗曞彿</label>
+ <length>255</length>
+ <required>false</required>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/BatchIF_Log__c/listViews/NFM109.listView-meta.xml b/force-app/main/default/objects/BatchIF_Log__c/listViews/NFM109.listView-meta.xml
index 9e50030..db92051 100644
--- a/force-app/main/default/objects/BatchIF_Log__c/listViews/NFM109.listView-meta.xml
+++ b/force-app/main/default/objects/BatchIF_Log__c/listViews/NFM109.listView-meta.xml
@@ -4,10 +4,11 @@
<columns>NAME</columns>
<columns>MessageGroupNumber__c</columns>
<columns>Type__c</columns>
- <columns>retry_cnt__c</columns>
<columns>Log__c</columns>
- <columns>ErrorLog__c</columns>
+ <columns>CREATED_DATE</columns>
<columns>Last_Update_Date2__c</columns>
+ <columns>retry_cnt__c</columns>
+ <columns>ErrorLog__c</columns>
<columns>UPDATEDBY_USER</columns>
<filterScope>Everything</filterScope>
<filters>
@@ -15,6 +16,11 @@
<operation>equals</operation>
<value>NFM109</value>
</filters>
+ <filters>
+ <field>RowDataFlg__c</field>
+ <operation>equals</operation>
+ <value>1</value>
+ </filters>
<label>NFM109</label>
<language>ja</language>
</ListView>
diff --git a/force-app/main/default/objects/BatchIF_Log__c/listViews/NFM110_Veiwer.listView-meta.xml b/force-app/main/default/objects/BatchIF_Log__c/listViews/NFM110_Veiwer.listView-meta.xml
index 9246b37..05989a4 100644
--- a/force-app/main/default/objects/BatchIF_Log__c/listViews/NFM110_Veiwer.listView-meta.xml
+++ b/force-app/main/default/objects/BatchIF_Log__c/listViews/NFM110_Veiwer.listView-meta.xml
@@ -3,9 +3,11 @@
<fullName>NFM110_Veiwer</fullName>
<columns>NAME</columns>
<columns>MessageGroupNumber__c</columns>
+ <columns>RequestStatus__c</columns>
<columns>Last_Update_Date2__c</columns>
<columns>Type__c</columns>
<columns>Log__c</columns>
+ <columns>CREATEDBY_USER</columns>
<columns>createdDate__c</columns>
<columns>CREATED_DATE</columns>
<filterScope>Everything</filterScope>
diff --git a/force-app/main/default/objects/BatchIF_Log__c/listViews/NFM705_Veiwer.listView-meta.xml b/force-app/main/default/objects/BatchIF_Log__c/listViews/NFM705_Veiwer.listView-meta.xml
index faec6c3..7344d06 100644
--- a/force-app/main/default/objects/BatchIF_Log__c/listViews/NFM705_Veiwer.listView-meta.xml
+++ b/force-app/main/default/objects/BatchIF_Log__c/listViews/NFM705_Veiwer.listView-meta.xml
@@ -14,11 +14,6 @@
<operation>equals</operation>
<value>NFM705</value>
</filters>
- <filters>
- <field>RowDataFlg__c</field>
- <operation>equals</operation>
- <value>1</value>
- </filters>
<label>NFM705 鍐宠鏁版嵁</label>
<language>zh_CN</language>
</ListView>
diff --git a/force-app/main/default/objects/BatchIF_Log__c/listViews/OTS005.listView-meta.xml b/force-app/main/default/objects/BatchIF_Log__c/listViews/OTS005.listView-meta.xml
index 1c7316b..cc388e9 100644
--- a/force-app/main/default/objects/BatchIF_Log__c/listViews/OTS005.listView-meta.xml
+++ b/force-app/main/default/objects/BatchIF_Log__c/listViews/OTS005.listView-meta.xml
@@ -16,5 +16,4 @@
<value>OTS005</value>
</filters>
<label>OTS005-鐢靛瓙绛炬敹鐗╂祦淇℃伅</label>
- <language>zh_CN</language>
</ListView>
diff --git a/force-app/main/default/objects/Bulletin_Board__c/fields/First_category__c.field-meta.xml b/force-app/main/default/objects/Bulletin_Board__c/fields/First_category__c.field-meta.xml
index 949ba37..6ce7a88 100644
--- a/force-app/main/default/objects/Bulletin_Board__c/fields/First_category__c.field-meta.xml
+++ b/force-app/main/default/objects/Bulletin_Board__c/fields/First_category__c.field-meta.xml
@@ -299,9 +299,9 @@
</valueSettings>
<valueSettings>
<controllingFieldValue>澶囧搧涓績鍐呴儴鎻ず鏉�</controllingFieldValue>
- <controllingFieldValue>澶囧搧涓績鍏ㄥ浗鎻ず鏉�</controllingFieldValue>
- <controllingFieldValue>ENDOPARTNER鏈儴</controllingFieldValue>
<controllingFieldValue>UDI鏁版嵁绠＄悊</controllingFieldValue>
+ <controllingFieldValue>ENDOPARTNER鏈儴</controllingFieldValue>
+ <controllingFieldValue>澶囧搧涓績鍏ㄥ浗鎻ず鏉�</controllingFieldValue>
<valueName>鍏朵粬</valueName>
</valueSettings>
<valueSettings>
@@ -334,6 +334,14 @@
<valueSettings>
<controllingFieldValue>鍘傚鍙戝竷鍙樻洿淇℃伅绠＄悊鎻ず鏉�</controllingFieldValue>
<valueName>鍙樻洿淇℃伅</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鍘傚鍙戝竷璐ㄩ噺淇℃伅鎻ず鏉�</controllingFieldValue>
+ <valueName>璐ㄩ噺淇℃伅</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鍘傚鍙戝竷璐ㄩ噺淇℃伅鎻ず鏉�</controllingFieldValue>
+ <valueName>鍑哄簱鍋滄</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>GI鏈儴鎺茬ず鏉�</controllingFieldValue>
@@ -399,6 +407,10 @@
<valueName>鎻ず鏉跨鐞�</valueName>
</valueSettings>
<valueSettings>
+ <controllingFieldValue>Te2am鎺茬ず鏉�</controllingFieldValue>
+ <valueName>Ipad鐩稿叧</valueName>
+ </valueSettings>
+ <valueSettings>
<controllingFieldValue>Compliance鎺茬ず鏉�</controllingFieldValue>
<valueName>鍚堣SOP</valueName>
</valueSettings>
@@ -447,8 +459,16 @@
<valueName>鍏朵粬(OTH)</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>Te2am鎺茬ず鏉�</controllingFieldValue>
- <valueName>Ipad鐩稿叧</valueName>
+ <controllingFieldValue>UDI鏁版嵁绠＄悊</controllingFieldValue>
+ <valueName>鏂板缓</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>UDI鏁版嵁绠＄悊</controllingFieldValue>
+ <valueName>MBC鍙樻洿</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>UDI鏁版嵁绠＄悊</controllingFieldValue>
+ <valueName>SBC鍙樻洿</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>ENDOPARTNER鏈儴</controllingFieldValue>
@@ -461,26 +481,6 @@
<valueSettings>
<controllingFieldValue>ENDOPARTNER鏈儴</controllingFieldValue>
<valueName>浜у搧璧勬枡</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鍘傚鍙戝竷璐ㄩ噺淇℃伅鎻ず鏉�</controllingFieldValue>
- <valueName>璐ㄩ噺淇℃伅</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鍘傚鍙戝竷璐ㄩ噺淇℃伅鎻ず鏉�</controllingFieldValue>
- <valueName>鍑哄簱鍋滄</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>UDI鏁版嵁绠＄悊</controllingFieldValue>
- <valueName>鏂板缓</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>UDI鏁版嵁绠＄悊</controllingFieldValue>
- <valueName>MBC鍙樻洿</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>UDI鏁版嵁绠＄悊</controllingFieldValue>
- <valueName>SBC鍙樻洿</valueName>
</valueSettings>
</valueSet>
</CustomField>
diff --git a/force-app/main/default/objects/Bulletin_Board__c/fields/Second_category__c.field-meta.xml b/force-app/main/default/objects/Bulletin_Board__c/fields/Second_category__c.field-meta.xml
index bac4b0e..20d6ddf 100644
--- a/force-app/main/default/objects/Bulletin_Board__c/fields/Second_category__c.field-meta.xml
+++ b/force-app/main/default/objects/Bulletin_Board__c/fields/Second_category__c.field-meta.xml
@@ -378,6 +378,7 @@
</value>
</valueSetDefinition>
<valueSettings>
+ <controllingFieldValue>涓�鑸競鍦哄搴�</controllingFieldValue>
<controllingFieldValue>鍙樻洿淇℃伅</controllingFieldValue>
<controllingFieldValue>璐ㄩ噺淇℃伅</controllingFieldValue>
<controllingFieldValue>鍑哄簱鍋滄</controllingFieldValue>
@@ -390,10 +391,10 @@
<controllingFieldValue>涓婃捣</controllingFieldValue>
<controllingFieldValue>骞垮窞</controllingFieldValue>
<controllingFieldValue>鍙洖</controllingFieldValue>
- <controllingFieldValue>涓�鑸競鍦哄搴�</controllingFieldValue>
<valueName>OMSC</valueName>
</valueSettings>
<valueSettings>
+ <controllingFieldValue>涓�鑸競鍦哄搴�</controllingFieldValue>
<controllingFieldValue>鍙樻洿淇℃伅</controllingFieldValue>
<controllingFieldValue>璐ㄩ噺淇℃伅</controllingFieldValue>
<controllingFieldValue>鍑哄簱鍋滄</controllingFieldValue>
@@ -406,10 +407,10 @@
<controllingFieldValue>涓婃捣</controllingFieldValue>
<controllingFieldValue>骞垮窞</controllingFieldValue>
<controllingFieldValue>鍙洖</controllingFieldValue>
- <controllingFieldValue>涓�鑸競鍦哄搴�</controllingFieldValue>
<valueName>OSTE</valueName>
</valueSettings>
<valueSettings>
+ <controllingFieldValue>涓�鑸競鍦哄搴�</controllingFieldValue>
<controllingFieldValue>鍙樻洿淇℃伅</controllingFieldValue>
<controllingFieldValue>璐ㄩ噺淇℃伅</controllingFieldValue>
<controllingFieldValue>鍑哄簱鍋滄</controllingFieldValue>
@@ -422,10 +423,10 @@
<controllingFieldValue>涓婃捣</controllingFieldValue>
<controllingFieldValue>骞垮窞</controllingFieldValue>
<controllingFieldValue>鍙洖</controllingFieldValue>
- <controllingFieldValue>涓�鑸競鍦哄搴�</controllingFieldValue>
<valueName>OSTA</valueName>
</valueSettings>
<valueSettings>
+ <controllingFieldValue>涓�鑸競鍦哄搴�</controllingFieldValue>
<controllingFieldValue>鍙樻洿淇℃伅</controllingFieldValue>
<controllingFieldValue>璐ㄩ噺淇℃伅</controllingFieldValue>
<controllingFieldValue>鍑哄簱鍋滄</controllingFieldValue>
@@ -438,10 +439,10 @@
<controllingFieldValue>涓婃捣</controllingFieldValue>
<controllingFieldValue>骞垮窞</controllingFieldValue>
<controllingFieldValue>鍙洖</controllingFieldValue>
- <controllingFieldValue>涓�鑸競鍦哄搴�</controllingFieldValue>
<valueName>OKM</valueName>
</valueSettings>
<valueSettings>
+ <controllingFieldValue>涓�鑸競鍦哄搴�</controllingFieldValue>
<controllingFieldValue>鍙樻洿淇℃伅</controllingFieldValue>
<controllingFieldValue>璐ㄩ噺淇℃伅</controllingFieldValue>
<controllingFieldValue>鍑哄簱鍋滄</controllingFieldValue>
@@ -454,139 +455,7 @@
<controllingFieldValue>涓婃捣</controllingFieldValue>
<controllingFieldValue>骞垮窞</controllingFieldValue>
<controllingFieldValue>鍙洖</controllingFieldValue>
- <controllingFieldValue>涓�鑸競鍦哄搴�</controllingFieldValue>
<valueName>鍏朵粬</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>缁忚惀绠＄悊(MAG)</controllingFieldValue>
- <valueName>缁忚惀绠＄悊</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>閬电邯瀹堟硶(COM)</controllingFieldValue>
- <valueName>閬电邯瀹堟硶</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>甯傚満(MRT)</controllingFieldValue>
- <valueName>甯傚満</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>閿�鍞�(SAL)</controllingFieldValue>
- <valueName>钀ヤ笟娲诲姩绠＄悊</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>閿�鍞�(SAL)</controllingFieldValue>
- <valueName>缁忛攢鍟嗙鐞�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>閿�鍞�(SAL)</controllingFieldValue>
- <valueName>閿�鍞鐞�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>閿�鍞�(SAL)</controllingFieldValue>
- <valueName>搴撳瓨绠＄悊</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>璐ㄩ噺娉曡(Q)</controllingFieldValue>
- <valueName>璐ㄩ噺娉曡</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鍞悗鏈嶅姟(RS)</controllingFieldValue>
- <valueName>缁翠慨涓氬姟绠＄悊</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鍞悗鏈嶅姟(RS)</controllingFieldValue>
- <valueName>浜у搧璐ㄩ噺绱㈣禂</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鍞悗鏈嶅姟(RS)</controllingFieldValue>
- <valueName>缁翠慨鍚堝悓绠＄悊</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鍞悗鏈嶅姟(RS)</controllingFieldValue>
- <valueName>閿�鍞湇鍔＄鐞�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鍞悗鏈嶅姟(RS)</controllingFieldValue>
- <valueName>瀹㈡埛鏈嶅姟绠＄悊</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>閲囪喘(PUR)</controllingFieldValue>
- <valueName>閲囪喘</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鏁欒偛鍩硅(EDU)</controllingFieldValue>
- <valueName>鏁欒偛鍩硅</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>浜哄姏璧勬簮(HR)</controllingFieldValue>
- <valueName>浜哄姏璧勬簮</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>GI/EUS</controllingFieldValue>
- <controllingFieldValue>ET</controllingFieldValue>
- <controllingFieldValue>BF</controllingFieldValue>
- <controllingFieldValue>鍛ㄨ竟璁惧</controllingFieldValue>
- <valueName>NPR</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>GI/EUS</controllingFieldValue>
- <controllingFieldValue>ET</controllingFieldValue>
- <controllingFieldValue>BF</controllingFieldValue>
- <controllingFieldValue>鍛ㄨ竟璁惧</controllingFieldValue>
- <valueName>鍋滀骇閫氱煡</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>GI/EUS</controllingFieldValue>
- <controllingFieldValue>ET</controllingFieldValue>
- <controllingFieldValue>BF</controllingFieldValue>
- <controllingFieldValue>鍛ㄨ竟璁惧</controllingFieldValue>
- <valueName>绔炰簤瀵规墜淇℃伅</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>GI/EUS</controllingFieldValue>
- <controllingFieldValue>ET</controllingFieldValue>
- <controllingFieldValue>BF</controllingFieldValue>
- <controllingFieldValue>鍛ㄨ竟璁惧</controllingFieldValue>
- <valueName>娉ㄦ剰浜嬮」鍙婇�氱煡</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>GI/EUS</controllingFieldValue>
- <controllingFieldValue>ET</controllingFieldValue>
- <controllingFieldValue>BF</controllingFieldValue>
- <controllingFieldValue>鍛ㄨ竟璁惧</controllingFieldValue>
- <valueName>CIC淇℃伅</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>浜у搧璧勬枡</controllingFieldValue>
- <valueName>闈㈠悜鍖婚櫌鐨勪骇鍝佷粙缁�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>浜у搧璧勬枡</controllingFieldValue>
- <valueName>绠�鏄撳畨瑁呮寚鍗�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>浜у搧璧勬枡</controllingFieldValue>
- <valueName>蹇�熸搷浣滄寚鍗�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>浜у搧璧勬枡</controllingFieldValue>
- <valueName>OPD鎵嬪唽</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>浜у搧璧勬枡</controllingFieldValue>
- <valueName>鐢靛瓙鏍锋湰涔�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>浜у搧璧勬枡</controllingFieldValue>
- <valueName>涓村簥浣跨敤鏁堟灉</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>浜у搧璧勬枡</controllingFieldValue>
- <valueName>甯歌闂涓庤В绛�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>浜у搧璧勬枡</controllingFieldValue>
- <valueName>绔炲搧浠嬬粛</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>娉曞姟,璐㈠姟,IT(IEG/FIN/IT)</controllingFieldValue>
@@ -702,6 +571,70 @@
<valueName>杩涘害绠＄悊</valueName>
</valueSettings>
<valueSettings>
+ <controllingFieldValue>缁忚惀绠＄悊(MAG)</controllingFieldValue>
+ <valueName>缁忚惀绠＄悊</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>閬电邯瀹堟硶(COM)</controllingFieldValue>
+ <valueName>閬电邯瀹堟硶</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>甯傚満(MRT)</controllingFieldValue>
+ <valueName>甯傚満</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>閿�鍞�(SAL)</controllingFieldValue>
+ <valueName>钀ヤ笟娲诲姩绠＄悊</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>閿�鍞�(SAL)</controllingFieldValue>
+ <valueName>缁忛攢鍟嗙鐞�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>閿�鍞�(SAL)</controllingFieldValue>
+ <valueName>閿�鍞鐞�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>閿�鍞�(SAL)</controllingFieldValue>
+ <valueName>搴撳瓨绠＄悊</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>璐ㄩ噺娉曡(Q)</controllingFieldValue>
+ <valueName>璐ㄩ噺娉曡</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鍞悗鏈嶅姟(RS)</controllingFieldValue>
+ <valueName>缁翠慨涓氬姟绠＄悊</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鍞悗鏈嶅姟(RS)</controllingFieldValue>
+ <valueName>浜у搧璐ㄩ噺绱㈣禂</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鍞悗鏈嶅姟(RS)</controllingFieldValue>
+ <valueName>缁翠慨鍚堝悓绠＄悊</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鍞悗鏈嶅姟(RS)</controllingFieldValue>
+ <valueName>閿�鍞湇鍔＄鐞�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鍞悗鏈嶅姟(RS)</controllingFieldValue>
+ <valueName>瀹㈡埛鏈嶅姟绠＄悊</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>閲囪喘(PUR)</controllingFieldValue>
+ <valueName>閲囪喘</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鏁欒偛鍩硅(EDU)</controllingFieldValue>
+ <valueName>鏁欒偛鍩硅</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>浜哄姏璧勬簮(HR)</controllingFieldValue>
+ <valueName>浜哄姏璧勬簮</valueName>
+ </valueSettings>
+ <valueSettings>
<controllingFieldValue>鍩硅绠＄悊</controllingFieldValue>
<valueName>鎶�鑳借祫璐ㄧ鐞�</valueName>
</valueSettings>
@@ -714,6 +647,73 @@
<valueName>瑙勫畾娴佺▼</valueName>
</valueSettings>
<valueSettings>
+ <controllingFieldValue>GI/EUS</controllingFieldValue>
+ <controllingFieldValue>ET</controllingFieldValue>
+ <controllingFieldValue>BF</controllingFieldValue>
+ <controllingFieldValue>鍛ㄨ竟璁惧</controllingFieldValue>
+ <valueName>NPR</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>GI/EUS</controllingFieldValue>
+ <controllingFieldValue>ET</controllingFieldValue>
+ <controllingFieldValue>BF</controllingFieldValue>
+ <controllingFieldValue>鍛ㄨ竟璁惧</controllingFieldValue>
+ <valueName>鍋滀骇閫氱煡</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>GI/EUS</controllingFieldValue>
+ <controllingFieldValue>ET</controllingFieldValue>
+ <controllingFieldValue>BF</controllingFieldValue>
+ <controllingFieldValue>鍛ㄨ竟璁惧</controllingFieldValue>
+ <valueName>绔炰簤瀵规墜淇℃伅</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>GI/EUS</controllingFieldValue>
+ <controllingFieldValue>ET</controllingFieldValue>
+ <controllingFieldValue>BF</controllingFieldValue>
+ <controllingFieldValue>鍛ㄨ竟璁惧</controllingFieldValue>
+ <valueName>娉ㄦ剰浜嬮」鍙婇�氱煡</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>GI/EUS</controllingFieldValue>
+ <controllingFieldValue>ET</controllingFieldValue>
+ <controllingFieldValue>BF</controllingFieldValue>
+ <controllingFieldValue>鍛ㄨ竟璁惧</controllingFieldValue>
+ <valueName>CIC淇℃伅</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>浜у搧璧勬枡</controllingFieldValue>
+ <valueName>闈㈠悜鍖婚櫌鐨勪骇鍝佷粙缁�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>浜у搧璧勬枡</controllingFieldValue>
+ <valueName>绠�鏄撳畨瑁呮寚鍗�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>浜у搧璧勬枡</controllingFieldValue>
+ <valueName>蹇�熸搷浣滄寚鍗�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>浜у搧璧勬枡</controllingFieldValue>
+ <valueName>OPD鎵嬪唽</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>浜у搧璧勬枡</controllingFieldValue>
+ <valueName>鐢靛瓙鏍锋湰涔�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>浜у搧璧勬枡</controllingFieldValue>
+ <valueName>涓村簥浣跨敤鏁堟灉</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>浜у搧璧勬枡</controllingFieldValue>
+ <valueName>甯歌闂涓庤В绛�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>浜у搧璧勬枡</controllingFieldValue>
+ <valueName>绔炲搧浠嬬粛</valueName>
+ </valueSettings>
+ <valueSettings>
<controllingFieldValue>2銆佷笟鍔℃帹杩�</controllingFieldValue>
<valueName>a銆� 瀹ｄ紶璧勬枡</valueName>
</valueSettings>
diff --git a/force-app/main/default/objects/Bulletin_Board__c/listViews/All_board_Team.listView-meta.xml b/force-app/main/default/objects/Bulletin_Board__c/listViews/All_board_Team.listView-meta.xml
index 74860c4..ec87686 100644
--- a/force-app/main/default/objects/Bulletin_Board__c/listViews/All_board_Team.listView-meta.xml
+++ b/force-app/main/default/objects/Bulletin_Board__c/listViews/All_board_Team.listView-meta.xml
@@ -17,5 +17,4 @@
<value>Te2am鎺茬ず鏉�</value>
</filters>
<label>15.浜嬩笟鎺ㄨ繘閮ㄦ彮绀烘澘</label>
- <language>zh_CN</language>
</ListView>
diff --git a/force-app/main/default/objects/CampaignMember/CampaignMember.object-meta.xml b/force-app/main/default/objects/CampaignMember/CampaignMember.object-meta.xml
new file mode 100644
index 0000000..721cb06
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/CampaignMember.object-meta.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomObject xmlns="http://soap.sforce.com/2006/04/metadata">
+ <actionOverrides>
+ <actionName>AddCampaign</actionName>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>AddCampaign</actionName>
+ <formFactor>Large</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>AddCampaign</actionName>
+ <formFactor>Small</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>CancelEdit</actionName>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>CancelEdit</actionName>
+ <formFactor>Large</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>CancelEdit</actionName>
+ <formFactor>Small</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>Clone</actionName>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>Clone</actionName>
+ <formFactor>Large</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>Clone</actionName>
+ <formFactor>Small</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>ConvertLead</actionName>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>ConvertLead</actionName>
+ <formFactor>Large</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>ConvertLead</actionName>
+ <formFactor>Small</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>CreateOpportunity</actionName>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>CreateOpportunity</actionName>
+ <formFactor>Large</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>CreateOpportunity</actionName>
+ <formFactor>Small</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>Delete</actionName>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>Delete</actionName>
+ <formFactor>Large</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>Delete</actionName>
+ <formFactor>Small</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>Edit</actionName>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>Edit</actionName>
+ <formFactor>Large</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>Edit</actionName>
+ <formFactor>Small</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>SaveEdit</actionName>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>SaveEdit</actionName>
+ <formFactor>Large</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>SaveEdit</actionName>
+ <formFactor>Small</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>View</actionName>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>View</actionName>
+ <formFactor>Large</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>View</actionName>
+ <formFactor>Small</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <compactLayoutAssignment>SYSTEM</compactLayoutAssignment>
+ <enableFeeds>false</enableFeeds>
+ <sharingModel>ControlledByCampaign</sharingModel>
+</CustomObject>
diff --git a/force-app/main/default/objects/CampaignMember/fields/Account_Salesdepartment__c.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/Account_Salesdepartment__c.field-meta.xml
new file mode 100644
index 0000000..2db0f33
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/Account_Salesdepartment__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Account_Salesdepartment__c</fullName>
+ <externalId>false</externalId>
+ <formula>Contact.Account.Salesdepartment_Dept__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>閿�鍞湰閮�</label>
+ <required>false</required>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/Account_State__c.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/Account_State__c.field-meta.xml
new file mode 100644
index 0000000..3e6612e
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/Account_State__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Account_State__c</fullName>
+ <externalId>false</externalId>
+ <formula>Contact.Account.State_Master__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鐪�-鍖婚櫌</label>
+ <required>false</required>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/CalculationExcludes__c.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/CalculationExcludes__c.field-meta.xml
new file mode 100644
index 0000000..acb14e2
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/CalculationExcludes__c.field-meta.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>CalculationExcludes__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>涓嶈绠�</label>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/CampaignId.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/CampaignId.field-meta.xml
new file mode 100644
index 0000000..0219b5a
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/CampaignId.field-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>CampaignId</fullName>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/City.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/City.field-meta.xml
new file mode 100644
index 0000000..a7414b3
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/City.field-meta.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>City</fullName>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/Comments_Participation__c.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/Comments_Participation__c.field-meta.xml
new file mode 100644
index 0000000..a15db48
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/Comments_Participation__c.field-meta.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Comments_Participation__c</fullName>
+ <externalId>false</externalId>
+ <label>鍙傚姞銈炽儭銉炽儓</label>
+ <required>false</required>
+ <type>TextArea</type>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/CompanyOrAccount.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/CompanyOrAccount.field-meta.xml
new file mode 100644
index 0000000..993c67f
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/CompanyOrAccount.field-meta.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>CompanyOrAccount</fullName>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/ContactId.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/ContactId.field-meta.xml
new file mode 100644
index 0000000..1331caf
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/ContactId.field-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ContactId</fullName>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/Contact_Method__c.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/Contact_Method__c.field-meta.xml
new file mode 100644
index 0000000..a791044
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/Contact_Method__c.field-meta.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Contact_Method__c</fullName>
+ <externalId>false</externalId>
+ <label>鑱旂粶鏂规硶</label>
+ <required>false</required>
+ <type>Picklist</type>
+ <valueSet>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>鎷滆</fullName>
+ <default>false</default>
+ <label>鎷滆</label>
+ </value>
+ <value>
+ <fullName>閭欢</fullName>
+ <default>false</default>
+ <label>閭欢</label>
+ </value>
+ <value>
+ <fullName>鐢佃瘽</fullName>
+ <default>false</default>
+ <label>鐢佃瘽</label>
+ </value>
+ <value>
+ <fullName>鍏朵粬</fullName>
+ <default>false</default>
+ <label>鍏朵粬</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/Country.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/Country.field-meta.xml
new file mode 100644
index 0000000..761f183
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/Country.field-meta.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Country</fullName>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/Decision_Maker_Type__c.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/Decision_Maker_Type__c.field-meta.xml
new file mode 100644
index 0000000..a63d00c
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/Decision_Maker_Type__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Decision_Maker_Type__c</fullName>
+ <externalId>false</externalId>
+ <formula>text(Contact.Decision_Maker_Type__c)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鍐崇瓥鑰呭垎绫�</label>
+ <required>false</required>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/Department__c.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/Department__c.field-meta.xml
new file mode 100644
index 0000000..c87492a
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/Department__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Department__c</fullName>
+ <externalId>false</externalId>
+ <formula>Contact.Department__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>绉戝</label>
+ <required>false</required>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/Department_name__c.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/Department_name__c.field-meta.xml
new file mode 100644
index 0000000..79a70fd
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/Department_name__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Department_name__c</fullName>
+ <externalId>false</externalId>
+ <formula>Contact.Account.Name</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>绉戝</label>
+ <required>false</required>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/Description.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/Description.field-meta.xml
new file mode 100644
index 0000000..054471b
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/Description.field-meta.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Description</fullName>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/DoNotCall.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/DoNotCall.field-meta.xml
new file mode 100644
index 0000000..e571d21
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/DoNotCall.field-meta.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>DoNotCall</fullName>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/Doctor_Division1__c.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/Doctor_Division1__c.field-meta.xml
new file mode 100644
index 0000000..179a98d
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/Doctor_Division1__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Doctor_Division1__c</fullName>
+ <externalId>false</externalId>
+ <formula>text(Contact.Doctor_Division1__c)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鍖荤敓鍖哄垎(鑱屽姟)</label>
+ <required>false</required>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/Email.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/Email.field-meta.xml
new file mode 100644
index 0000000..92f4b61
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/Email.field-meta.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Email</fullName>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/Email__c.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/Email__c.field-meta.xml
new file mode 100644
index 0000000..10b1007
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/Email__c.field-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Email__c</fullName>
+ <externalId>false</externalId>
+ <label>鐢靛瓙閭欢</label>
+ <required>false</required>
+ <type>Email</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/Favorite_Equipment__c.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/Favorite_Equipment__c.field-meta.xml
new file mode 100644
index 0000000..e55fd35
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/Favorite_Equipment__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Favorite_Equipment__c</fullName>
+ <externalId>false</externalId>
+ <formula>Contact.Favorite_Equipment__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>璁惧鍝佺墝</label>
+ <required>false</required>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/Fax.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/Fax.field-meta.xml
new file mode 100644
index 0000000..cd42d09
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/Fax.field-meta.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Fax</fullName>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/FirstName.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/FirstName.field-meta.xml
new file mode 100644
index 0000000..203d0e2
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/FirstName.field-meta.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>FirstName</fullName>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/FirstRespondedDate.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/FirstRespondedDate.field-meta.xml
new file mode 100644
index 0000000..8d253a4
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/FirstRespondedDate.field-meta.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>FirstRespondedDate</fullName>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/FullName__c.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/FullName__c.field-meta.xml
new file mode 100644
index 0000000..80745c2
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/FullName__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>FullName__c</fullName>
+ <externalId>false</externalId>
+ <formula>Contact.MedicalStaff_Full_name__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>濮撳悕</label>
+ <required>false</required>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/HCP__c.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/HCP__c.field-meta.xml
new file mode 100644
index 0000000..1a79b45
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/HCP__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>HCP__c</fullName>
+ <externalId>false</externalId>
+ <formula>text(Contact.HCP__c)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>HCP鍖哄垎</label>
+ <required>false</required>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/HasOptedOutOfEmail.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/HasOptedOutOfEmail.field-meta.xml
new file mode 100644
index 0000000..ed7645a
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/HasOptedOutOfEmail.field-meta.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>HasOptedOutOfEmail</fullName>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/HasOptedOutOfFax.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/HasOptedOutOfFax.field-meta.xml
new file mode 100644
index 0000000..d73b566
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/HasOptedOutOfFax.field-meta.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>HasOptedOutOfFax</fullName>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/HasResponded.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/HasResponded.field-meta.xml
new file mode 100644
index 0000000..567174e
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/HasResponded.field-meta.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>HasResponded</fullName>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/Hospital_name__c.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/Hospital_name__c.field-meta.xml
new file mode 100644
index 0000000..7e24da0
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/Hospital_name__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Hospital_name__c</fullName>
+ <externalId>false</externalId>
+ <formula>Contact.Account.Hospital__r.Name</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鍖婚櫌</label>
+ <required>false</required>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/LastName.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/LastName.field-meta.xml
new file mode 100644
index 0000000..1825979
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/LastName.field-meta.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>LastName</fullName>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/LeadId.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/LeadId.field-meta.xml
new file mode 100644
index 0000000..c3590eb
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/LeadId.field-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>LeadId</fullName>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/LeadSource.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/LeadSource.field-meta.xml
new file mode 100644
index 0000000..b13f178
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/LeadSource.field-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>LeadSource</fullName>
+ <type>Picklist</type>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/LeadSource__c.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/LeadSource__c.field-meta.xml
new file mode 100644
index 0000000..653abd8
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/LeadSource__c.field-meta.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>LeadSource__c</fullName>
+ <externalId>false</externalId>
+ <label>娼滃湪瀹㈡埛鏉ユ簮</label>
+ <required>false</required>
+ <type>Picklist</type>
+ <valueSet>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>鐩存帴鎷滆</fullName>
+ <default>false</default>
+ <label>鐩存帴鎷滆</label>
+ </value>
+ <value>
+ <fullName>缁忛攢鍟�</fullName>
+ <default>false</default>
+ <label>缁忛攢鍟�</label>
+ </value>
+ <value>
+ <fullName>瀛︿細/娌欓緳</fullName>
+ <default>true</default>
+ <label>瀛︿細/娌欓緳</label>
+ </value>
+ <value>
+ <fullName>绉戝鎻愭</fullName>
+ <default>false</default>
+ <label>绉戝鎻愭</label>
+ </value>
+ <value>
+ <fullName>OPD/SIS</fullName>
+ <default>false</default>
+ <label>OPD/SIS</label>
+ </value>
+ <value>
+ <fullName>鏈熷垵鐩爣璇环</fullName>
+ <default>false</default>
+ <label>鏈熷垵鐩爣璇环</label>
+ </value>
+ <value>
+ <fullName>鐢佃瘽</fullName>
+ <default>false</default>
+ <label>鐢佃瘽</label>
+ </value>
+ <value>
+ <fullName>CIC</fullName>
+ <default>false</default>
+ <label>CIC</label>
+ </value>
+ <value>
+ <fullName>鍖绘嫇缃�</fullName>
+ <default>false</default>
+ <label>鍖绘嫇缃�</label>
+ </value>
+ <value>
+ <fullName>鎷涙爣缃戝潃</fullName>
+ <default>false</default>
+ <label>鎷涙爣缃戝潃</label>
+ </value>
+ <value>
+ <fullName>鍏朵粬</fullName>
+ <default>false</default>
+ <label>鍏朵粬</label>
+ </value>
+ <value>
+ <fullName>闈掑勾鍖荤敓鍩瑰吇</fullName>
+ <default>false</default>
+ <label>闈掑勾鍖荤敓鍩瑰吇</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/MobilePhone.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/MobilePhone.field-meta.xml
new file mode 100644
index 0000000..8ed26cb
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/MobilePhone.field-meta.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>MobilePhone</fullName>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/MobilePhone__c.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/MobilePhone__c.field-meta.xml
new file mode 100644
index 0000000..1012ff8
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/MobilePhone__c.field-meta.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>MobilePhone__c</fullName>
+ <externalId>false</externalId>
+ <label>鐢佃瘽</label>
+ <required>false</required>
+ <type>Phone</type>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/OCM_segmentation__c.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/OCM_segmentation__c.field-meta.xml
new file mode 100644
index 0000000..179b579
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/OCM_segmentation__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OCM_segmentation__c</fullName>
+ <externalId>false</externalId>
+ <formula>Contact.OCM_segmentation__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>OCSM鍒嗙被</label>
+ <required>false</required>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/Opportunity_Division__c.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/Opportunity_Division__c.field-meta.xml
new file mode 100644
index 0000000..3af6019
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/Opportunity_Division__c.field-meta.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Opportunity_Division__c</fullName>
+ <externalId>false</externalId>
+ <label>鎰忓悜鍖哄垎</label>
+ <required>false</required>
+ <type>Picklist</type>
+ <valueSet>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>璇环</fullName>
+ <default>false</default>
+ <label>璇环</label>
+ </value>
+ <value>
+ <fullName>淇℃伅</fullName>
+ <default>false</default>
+ <label>淇℃伅</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/Phone.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/Phone.field-meta.xml
new file mode 100644
index 0000000..2d3dc65
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/Phone.field-meta.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Phone</fullName>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/PostalCode.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/PostalCode.field-meta.xml
new file mode 100644
index 0000000..dc5f9a5
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/PostalCode.field-meta.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>PostalCode</fullName>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/Product_Model__c.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/Product_Model__c.field-meta.xml
new file mode 100644
index 0000000..a4ffd52
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/Product_Model__c.field-meta.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Product_Model__c</fullName>
+ <externalId>false</externalId>
+ <label>瀵硅薄浜у搧鍨嬪彿</label>
+ <required>false</required>
+ <type>TextArea</type>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/Province_HP__c.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/Province_HP__c.field-meta.xml
new file mode 100644
index 0000000..f085f89
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/Province_HP__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Province_HP__c</fullName>
+ <externalId>false</externalId>
+ <formula>Contact.State__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鐪�(瀹㈡埛)</label>
+ <required>false</required>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/Province__c.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/Province__c.field-meta.xml
new file mode 100644
index 0000000..1c28ea3
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/Province__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Province__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>涓嶄娇鐢細鐪� (璐拱鎰忓悜鍒嗛厤瀵硅薄)</label>
+ <referenceTo>Address_Level__c</referenceTo>
+ <relationshipLabel>甯傚満娲诲姩鎴愬憳</relationshipLabel>
+ <relationshipName>Marketing_provincec4OH</relationshipName>
+ <required>false</required>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/Purchase_Plan__c.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/Purchase_Plan__c.field-meta.xml
new file mode 100644
index 0000000..ca0ad46
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/Purchase_Plan__c.field-meta.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Purchase_Plan__c</fullName>
+ <externalId>false</externalId>
+ <label>鏈夋棤璐拱璁″垝</label>
+ <required>false</required>
+ <type>Picklist</type>
+ <valueSet>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>鏈�(鏃犻绠�)</fullName>
+ <default>false</default>
+ <label>鏈�(鏃犻绠�)</label>
+ </value>
+ <value>
+ <fullName>鏈�(鏈夐绠�)</fullName>
+ <default>false</default>
+ <label>鏈�(鏈夐绠�)</label>
+ </value>
+ <value>
+ <fullName>涓嶆槑</fullName>
+ <default>true</default>
+ <label>涓嶆槑</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/RecordType_ID__c.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/RecordType_ID__c.field-meta.xml
new file mode 100644
index 0000000..99c3b2d
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/RecordType_ID__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>RecordType_ID__c</fullName>
+ <externalId>false</externalId>
+ <formula>RecordType.Id</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>璁板綍绫诲瀷ID</label>
+ <required>false</required>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/Request_Detail__c.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/Request_Detail__c.field-meta.xml
new file mode 100644
index 0000000..da7b926
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/Request_Detail__c.field-meta.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Request_Detail__c</fullName>
+ <externalId>false</externalId>
+ <label>濮旀墭浜嬮」璇︾粏</label>
+ <required>false</required>
+ <type>TextArea</type>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/Request__c.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/Request__c.field-meta.xml
new file mode 100644
index 0000000..f6fb7e8
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/Request__c.field-meta.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Request__c</fullName>
+ <externalId>false</externalId>
+ <label>濮旀墭浜嬮」</label>
+ <required>false</required>
+ <type>MultiselectPicklist</type>
+ <valueSet>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>闇�瑕佹姤浠�</fullName>
+ <default>false</default>
+ <label>闇�瑕佹姤浠�</label>
+ </value>
+ <value>
+ <fullName>OPD</fullName>
+ <default>false</default>
+ <label>OPD</label>
+ </value>
+ <value>
+ <fullName>浜у搧璇存槑</fullName>
+ <default>false</default>
+ <label>浜у搧璇存槑</label>
+ </value>
+ <value>
+ <fullName>瀵勯�佷骇鍝佽祫鏂�</fullName>
+ <default>false</default>
+ <label>瀵勯�佷骇鍝佽祫鏂�</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+ <visibleLines>4</visibleLines>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/Sales_lead__c.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/Sales_lead__c.field-meta.xml
new file mode 100644
index 0000000..2bc1f5c
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/Sales_lead__c.field-meta.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Sales_lead__c</fullName>
+ <externalId>false</externalId>
+ <label>鏄惁鍒涘缓璐拱鎰忓悜</label>
+ <required>false</required>
+ <type>Picklist</type>
+ <valueSet>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>鍒涘缓璐拱鎰忓悜</fullName>
+ <default>true</default>
+ <label>鍒涘缓璐拱鎰忓悜</label>
+ </value>
+ <value>
+ <fullName>涓嶈鍒涘缓</fullName>
+ <default>false</default>
+ <label>涓嶈鍒涘缓</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/Salutation.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/Salutation.field-meta.xml
new file mode 100644
index 0000000..1f39fa7
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/Salutation.field-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Salutation</fullName>
+ <type>Picklist</type>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/Speciality__c.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/Speciality__c.field-meta.xml
new file mode 100644
index 0000000..9d53881
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/Speciality__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Speciality__c</fullName>
+ <externalId>false</externalId>
+ <formula>Contact.Speciality__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>涓撲笟鎵嬫湳</label>
+ <required>false</required>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/State.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/State.field-meta.xml
new file mode 100644
index 0000000..3d6491e
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/State.field-meta.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>State</fullName>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/Status.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/Status.field-meta.xml
new file mode 100644
index 0000000..0cd1bc2
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/Status.field-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Status</fullName>
+ <type>Picklist</type>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/Strategic_dept_name__c.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/Strategic_dept_name__c.field-meta.xml
new file mode 100644
index 0000000..326d312
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/Strategic_dept_name__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Strategic_dept_name__c</fullName>
+ <externalId>false</externalId>
+ <formula>Contact.Strategic_dept_Class__r.Name</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鎴樼暐绉戝鍚�</label>
+ <required>false</required>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/Street.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/Street.field-meta.xml
new file mode 100644
index 0000000..b05ae9d
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/Street.field-meta.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Street</fullName>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/Title.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/Title.field-meta.xml
new file mode 100644
index 0000000..cb5a847
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/Title.field-meta.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Title</fullName>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/Trainees_End_Day__c.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/Trainees_End_Day__c.field-meta.xml
new file mode 100644
index 0000000..57377d8
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/Trainees_End_Day__c.field-meta.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Trainees_End_Day__c</fullName>
+ <externalId>false</externalId>
+ <label>鐮斾慨绲備簡鏃�</label>
+ <required>false</required>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/Trainees_Participate_Day__c.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/Trainees_Participate_Day__c.field-meta.xml
new file mode 100644
index 0000000..e528154
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/Trainees_Participate_Day__c.field-meta.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Trainees_Participate_Day__c</fullName>
+ <externalId>false</externalId>
+ <label>鐮斾慨鍙傚姞鏃�</label>
+ <required>false</required>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/type__c.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/type__c.field-meta.xml
new file mode 100644
index 0000000..fa3e18e
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/type__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>type__c</fullName>
+ <externalId>false</externalId>
+ <formula>text(Contact.Type__c)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鍒嗙被</label>
+ <required>false</required>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/fields/urgent__c.field-meta.xml b/force-app/main/default/objects/CampaignMember/fields/urgent__c.field-meta.xml
new file mode 100644
index 0000000..059d99d
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/fields/urgent__c.field-meta.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>urgent__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>绱ф��</label>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/CampaignMember/recordTypes/Internal_training_participants.recordType-meta.xml b/force-app/main/default/objects/CampaignMember/recordTypes/Internal_training_participants.recordType-meta.xml
new file mode 100644
index 0000000..53e38db
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/recordTypes/Internal_training_participants.recordType-meta.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<RecordType xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Internal_training_participants</fullName>
+ <active>true</active>
+ <label>绀惧唴鍙傚姞浜�</label>
+ <picklistValues>
+ <picklist>Contact_Method__c</picklist>
+ <values>
+ <fullName>鍏朵粬</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鎷滆</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鐢佃瘽</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閭欢</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>LeadSource__c</picklist>
+ <values>
+ <fullName>CIC</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>OPD%2FSIS</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍏朵粬</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍖绘嫇缃�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>瀛︿細%2F娌欓緳</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鎷涙爣缃戝潃</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏈熷垵鐩爣璇环</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鐢佃瘽</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鐩存帴鎷滆</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>绉戝鎻愭</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>缁忛攢鍟�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>闈掑勾鍖荤敓鍩瑰吇</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Opportunity_Division__c</picklist>
+ <values>
+ <fullName>淇℃伅</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>璇环</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Purchase_Plan__c</picklist>
+ <values>
+ <fullName>涓嶆槑</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏈�%28鏃犻绠�%29</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏈�%28鏈夐绠�%29</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Request__c</picklist>
+ <values>
+ <fullName>OPD</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>浜у搧璇存槑</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>瀵勯�佷骇鍝佽祫鏂�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>闇�瑕佹姤浠�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Sales_lead__c</picklist>
+ <values>
+ <fullName>涓嶈鍒涘缓</fullName>
+ <default>true</default>
+ </values>
+ </picklistValues>
+</RecordType>
diff --git a/force-app/main/default/objects/CampaignMember/recordTypes/Workshop.recordType-meta.xml b/force-app/main/default/objects/CampaignMember/recordTypes/Workshop.recordType-meta.xml
new file mode 100644
index 0000000..4a677d7
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/recordTypes/Workshop.recordType-meta.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<RecordType xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Workshop</fullName>
+ <active>true</active>
+ <label>绀惧鍙傚姞浜�</label>
+ <picklistValues>
+ <picklist>Contact_Method__c</picklist>
+ <values>
+ <fullName>鍏朵粬</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鎷滆</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鐢佃瘽</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閭欢</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>LeadSource__c</picklist>
+ <values>
+ <fullName>CIC</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>OPD%2FSIS</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍏朵粬</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍖绘嫇缃�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>瀛︿細%2F娌欓緳</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鎷涙爣缃戝潃</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏈熷垵鐩爣璇环</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鐢佃瘽</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鐩存帴鎷滆</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>绉戝鎻愭</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>缁忛攢鍟�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>闈掑勾鍖荤敓鍩瑰吇</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Opportunity_Division__c</picklist>
+ <values>
+ <fullName>淇℃伅</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>璇环</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Purchase_Plan__c</picklist>
+ <values>
+ <fullName>涓嶆槑</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏈�%28鏃犻绠�%29</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏈�%28鏈夐绠�%29</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Request__c</picklist>
+ <values>
+ <fullName>OPD</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>浜у搧璇存槑</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>瀵勯�佷骇鍝佽祫鏂�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>闇�瑕佹姤浠�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Sales_lead__c</picklist>
+ <values>
+ <fullName>涓嶈鍒涘缓</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍒涘缓璐拱鎰忓悜</fullName>
+ <default>true</default>
+ </values>
+ </picklistValues>
+</RecordType>
diff --git a/force-app/main/default/objects/CampaignMember/webLinks/CreateScore.webLink-meta.xml b/force-app/main/default/objects/CampaignMember/webLinks/CreateScore.webLink-meta.xml
new file mode 100644
index 0000000..ab16526
--- /dev/null
+++ b/force-app/main/default/objects/CampaignMember/webLinks/CreateScore.webLink-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>CreateScore</fullName>
+ <availability>online</availability>
+ <displayType>button</displayType>
+ <encodingKey>UTF-8</encodingKey>
+ <linkType>url</linkType>
+ <masterLabel>鍒涘缓鑰冭瘯缁撴灉</masterLabel>
+ <openType>replace</openType>
+ <protected>false</protected>
+ <url>/a1e/e?CF00N10000005aAox={!CampaignMember.Campaign}&CF00N10000005aAox_lkid={!CampaignMember.CampaignId}&CF00N10000005aApC={!CampaignMember.Contact}&CF00N10000005aApC_lkid={!CampaignMember.ContactId}</url>
+</WebLink>
diff --git a/force-app/main/default/objects/CancelPostponePlan__c/fields/Status__c.field-meta.xml b/force-app/main/default/objects/CancelPostponePlan__c/fields/Status__c.field-meta.xml
index 84e6a5f..a5fe4fe 100644
--- a/force-app/main/default/objects/CancelPostponePlan__c/fields/Status__c.field-meta.xml
+++ b/force-app/main/default/objects/CancelPostponePlan__c/fields/Status__c.field-meta.xml
@@ -8,6 +8,7 @@
<trackTrending>false</trackTrending>
<type>Picklist</type>
<valueSet>
+ <restricted>true</restricted>
<valueSetDefinition>
<sorted>false</sorted>
<value>
diff --git a/force-app/main/default/objects/CancelPostponePlan__c/listViews/All.listView-meta.xml b/force-app/main/default/objects/CancelPostponePlan__c/listViews/All.listView-meta.xml
index b4b39b2..eb854ab 100644
--- a/force-app/main/default/objects/CancelPostponePlan__c/listViews/All.listView-meta.xml
+++ b/force-app/main/default/objects/CancelPostponePlan__c/listViews/All.listView-meta.xml
@@ -5,8 +5,7 @@
<columns>CancelOPDPlan__c</columns>
<columns>cancelReasonCombobox__c</columns>
<columns>Status__c</columns>
- <columns>CREATEDBY_USER</columns>
- <columns>UPDATEDBY_USER</columns>
<filterScope>Everything</filterScope>
<label>鍏ㄩ儴</label>
+ <language>zh_CN</language>
</ListView>
diff --git a/force-app/main/default/objects/CancelPostponePlan__c/validationRules/NextPlanDateCheck.validationRule-meta.xml b/force-app/main/default/objects/CancelPostponePlan__c/validationRules/NextPlanDateCheck.validationRule-meta.xml
index c7f1684..5db9a1a 100644
--- a/force-app/main/default/objects/CancelPostponePlan__c/validationRules/NextPlanDateCheck.validationRule-meta.xml
+++ b/force-app/main/default/objects/CancelPostponePlan__c/validationRules/NextPlanDateCheck.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>NextPlanDateCheck</fullName>
- <active>false</active>
+ <active>true</active>
<description>璺宠繃绯荤粺绠＄悊鍛�</description>
<errorConditionFormula>$User.ProfileId <> "00e10000000Y3o5" && Text(CancelOPDPlan__r.OPDType__c) != '瀛︿細' &&((NextPlanDate__c - TODAY() > 60)||(NextPlanDate__c - TODAY() < 1))</errorConditionFormula>
<errorMessage>璁″垝鏃ユ湡鍙兘鍦�60澶╁唴</errorMessage>
diff --git a/force-app/main/default/objects/CancelPostponePlan__c/validationRules/NextPlanDateMustMaxToday.validationRule-meta.xml b/force-app/main/default/objects/CancelPostponePlan__c/validationRules/NextPlanDateMustMaxToday.validationRule-meta.xml
index c1564e1..1c3b55b 100644
--- a/force-app/main/default/objects/CancelPostponePlan__c/validationRules/NextPlanDateMustMaxToday.validationRule-meta.xml
+++ b/force-app/main/default/objects/CancelPostponePlan__c/validationRules/NextPlanDateMustMaxToday.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>NextPlanDateMustMaxToday</fullName>
- <active>false</active>
+ <active>true</active>
<description>涓嬫璁″垝鏃ユ湡 蹇呴』鍦� 浠婂ぉ浠ュ悗
鎺掗櫎绯荤粺绠＄悊鍛�</description>
<errorConditionFormula>AND($User.ProfileId <> "00e10000000Y3o5",NextPlanDate__c <= TODAY(),$User.Batch_User__c=false)</errorConditionFormula>
diff --git a/force-app/main/default/objects/Case/Case.object-meta.xml b/force-app/main/default/objects/Case/Case.object-meta.xml
index 6c6bd33..fec0496 100644
--- a/force-app/main/default/objects/Case/Case.object-meta.xml
+++ b/force-app/main/default/objects/Case/Case.object-meta.xml
@@ -100,11 +100,13 @@
</actionOverrides>
<actionOverrides>
<actionName>Edit</actionName>
- <type>Default</type>
+ <content>LexCasePIPLAura</content>
+ <formFactor>Large</formFactor>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>LightningComponent</type>
</actionOverrides>
<actionOverrides>
<actionName>Edit</actionName>
- <formFactor>Large</formFactor>
<type>Default</type>
</actionOverrides>
<actionOverrides>
@@ -142,11 +144,13 @@
</actionOverrides>
<actionOverrides>
<actionName>NewCase</actionName>
- <type>Default</type>
+ <content>LexCasePIPLAura</content>
+ <formFactor>Large</formFactor>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>LightningComponent</type>
</actionOverrides>
<actionOverrides>
<actionName>NewCase</actionName>
- <formFactor>Large</formFactor>
<type>Default</type>
</actionOverrides>
<actionOverrides>
@@ -186,7 +190,7 @@
<actionName>View</actionName>
<comment>Action override created by Lightning App Builder during activation.</comment>
<content>CIC</content>
- <formFactor>Small</formFactor>
+ <formFactor>Large</formFactor>
<skipRecordTypeSelect>false</skipRecordTypeSelect>
<type>Flexipage</type>
</actionOverrides>
@@ -194,7 +198,7 @@
<actionName>View</actionName>
<comment>Action override created by Lightning App Builder during activation.</comment>
<content>CIC</content>
- <formFactor>Large</formFactor>
+ <formFactor>Small</formFactor>
<skipRecordTypeSelect>false</skipRecordTypeSelect>
<type>Flexipage</type>
</actionOverrides>
@@ -206,39 +210,50 @@
<enableFeeds>true</enableFeeds>
<externalSharingModel>Private</externalSharingModel>
<recordTypeTrackFeedHistory>false</recordTypeTrackFeedHistory>
- <recordTypeTrackHistory>true</recordTypeTrackHistory>
+ <recordTypeTrackHistory>false</recordTypeTrackHistory>
<searchLayouts>
<customTabListAdditionalFields>CASES.CASE_NUMBER</customTabListAdditionalFields>
- <customTabListAdditionalFields>CASES.SUBJECT</customTabListAdditionalFields>
- <customTabListAdditionalFields>CASES.CREATED_DATE</customTabListAdditionalFields>
- <customTabListAdditionalFields>CASES.PRIORITY</customTabListAdditionalFields>
+ <customTabListAdditionalFields>CASES.STATUS</customTabListAdditionalFields>
+ <customTabListAdditionalFields>OWNER_NAME</customTabListAdditionalFields>
+ <customTabListAdditionalFields>Contact_staff__c</customTabListAdditionalFields>
+ <customTabListAdditionalFields>Contract_request__c</customTabListAdditionalFields>
+ <customTabListAdditionalFields>inquiry_detail__c</customTabListAdditionalFields>
+ <customTabListAdditionalFields>Received_call_day__c</customTabListAdditionalFields>
+ <customTabListAdditionalFields>ElapsedDates__c</customTabListAdditionalFields>
<excludedStandardButtons>OpenListInQuip</excludedStandardButtons>
<excludedStandardButtons>NewFromDocument</excludedStandardButtons>
<excludedStandardButtons>MassAccept</excludedStandardButtons>
<excludedStandardButtons>Accept</excludedStandardButtons>
<excludedStandardButtons>MassClose</excludedStandardButtons>
- <excludedStandardButtons>ChangeOwner</excludedStandardButtons>
+ <excludedStandardButtons>MassAddToActionableList</excludedStandardButtons>
<excludedStandardButtons>ChangeStatus</excludedStandardButtons>
<excludedStandardButtons>MassChangeOwner</excludedStandardButtons>
<excludedStandardButtons>MassMergeCase</excludedStandardButtons>
<excludedStandardButtons>PrintableListView</excludedStandardButtons>
- <excludedStandardButtons>MassAddToActionableList</excludedStandardButtons>
+ <excludedStandardButtons>ChangeOwner</excludedStandardButtons>
<lookupDialogsAdditionalFields>CASES.CASE_NUMBER</lookupDialogsAdditionalFields>
<lookupDialogsAdditionalFields>CASES.SUBJECT</lookupDialogsAdditionalFields>
- <lookupDialogsAdditionalFields>NAME</lookupDialogsAdditionalFields>
- <lookupDialogsAdditionalFields>ACCOUNT.NAME</lookupDialogsAdditionalFields>
<lookupDialogsAdditionalFields>CASES.STATUS</lookupDialogsAdditionalFields>
+ <lookupDialogsAdditionalFields>CASES.PRIORITY</lookupDialogsAdditionalFields>
+ <lookupDialogsAdditionalFields>CASES.CREATED_DATE_DATE_ONLY</lookupDialogsAdditionalFields>
+ <lookupDialogsAdditionalFields>CORE.USERS.ALIAS</lookupDialogsAdditionalFields>
+ <lookupDialogsAdditionalFields>CREATEDBY_USER.ALIAS</lookupDialogsAdditionalFields>
<lookupPhoneDialogsAdditionalFields>CASES.CASE_NUMBER</lookupPhoneDialogsAdditionalFields>
<lookupPhoneDialogsAdditionalFields>CASES.SUBJECT</lookupPhoneDialogsAdditionalFields>
<lookupPhoneDialogsAdditionalFields>NAME</lookupPhoneDialogsAdditionalFields>
<lookupPhoneDialogsAdditionalFields>ACCOUNT.NAME</lookupPhoneDialogsAdditionalFields>
<lookupPhoneDialogsAdditionalFields>CASES.STATUS</lookupPhoneDialogsAdditionalFields>
<lookupPhoneDialogsAdditionalFields>cic_telephone__c</lookupPhoneDialogsAdditionalFields>
+ <searchFilterFields>CASES.RECORDTYPE</searchFilterFields>
<searchResultsAdditionalFields>CASES.CASE_NUMBER</searchResultsAdditionalFields>
- <searchResultsAdditionalFields>CASES.SUBJECT</searchResultsAdditionalFields>
<searchResultsAdditionalFields>CASES.STATUS</searchResultsAdditionalFields>
- <searchResultsAdditionalFields>CASES.CREATED_DATE</searchResultsAdditionalFields>
- <searchResultsAdditionalFields>CORE.USERS.ALIAS</searchResultsAdditionalFields>
+ <searchResultsAdditionalFields>answer_day__c</searchResultsAdditionalFields>
+ <searchResultsAdditionalFields>Contact_staff__c</searchResultsAdditionalFields>
+ <searchResultsAdditionalFields>Contract_request__c</searchResultsAdditionalFields>
+ <searchResultsAdditionalFields>inquiry_detail__c</searchResultsAdditionalFields>
+ <searchResultsAdditionalFields>Received_call_day__c</searchResultsAdditionalFields>
+ <searchResultsAdditionalFields>ElapsedDates__c</searchResultsAdditionalFields>
+ <searchResultsAdditionalFields>answer_detail_content__c</searchResultsAdditionalFields>
</searchLayouts>
<sharingModel>Private</sharingModel>
</CustomObject>
diff --git a/force-app/main/default/objects/Case/fields/AccountId.field-meta.xml b/force-app/main/default/objects/Case/fields/AccountId.field-meta.xml
index 5fb1500..e5fcc21 100644
--- a/force-app/main/default/objects/Case/fields/AccountId.field-meta.xml
+++ b/force-app/main/default/objects/Case/fields/AccountId.field-meta.xml
@@ -1,6 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>AccountId</fullName>
+ <lookupFilter>
+ <active>true</active>
+ <filterItems>
+ <field>Account.RecordTypeId</field>
+ <operation>equals</operation>
+ <value>璨╁２搴�, 鐥呴櫌</value>
+ </filterItems>
+ <filterItems>
+ <field>Account.Is_Active_Formula__c</field>
+ <operation>equals</operation>
+ <value>鏃犳晥,鏈夋晥</value>
+ </filterItems>
+ <infoMessage>璇烽�夋嫨鍖婚櫌鎴栫粡閿�鍟�</infoMessage>
+ <isOptional>true</isOptional>
+ </lookupFilter>
<trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
diff --git a/force-app/main/default/objects/Case/fields/CurrencyIsoCode.field-meta.xml b/force-app/main/default/objects/Case/fields/CurrencyIsoCode.field-meta.xml
index b924b7a..7d38008 100644
--- a/force-app/main/default/objects/Case/fields/CurrencyIsoCode.field-meta.xml
+++ b/force-app/main/default/objects/Case/fields/CurrencyIsoCode.field-meta.xml
@@ -2,6 +2,6 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>CurrencyIsoCode</fullName>
<trackFeedHistory>false</trackFeedHistory>
- <trackHistory>true</trackHistory>
+ <trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
</CustomField>
diff --git a/force-app/main/default/objects/Case/fields/Language.field-meta.xml b/force-app/main/default/objects/Case/fields/Language.field-meta.xml
new file mode 100644
index 0000000..b243e11
--- /dev/null
+++ b/force-app/main/default/objects/Case/fields/Language.field-meta.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Language</fullName>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+</CustomField>
diff --git a/force-app/main/default/objects/Case/fields/Origin.field-meta.xml b/force-app/main/default/objects/Case/fields/Origin.field-meta.xml
index 6325b9b..dae90d2 100644
--- a/force-app/main/default/objects/Case/fields/Origin.field-meta.xml
+++ b/force-app/main/default/objects/Case/fields/Origin.field-meta.xml
@@ -2,7 +2,7 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Origin</fullName>
<trackFeedHistory>false</trackFeedHistory>
- <trackHistory>true</trackHistory>
+ <trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Picklist</type>
</CustomField>
diff --git a/force-app/main/default/objects/Case/fields/ParentId.field-meta.xml b/force-app/main/default/objects/Case/fields/ParentId.field-meta.xml
index 08cd560..5e4e1f4 100644
--- a/force-app/main/default/objects/Case/fields/ParentId.field-meta.xml
+++ b/force-app/main/default/objects/Case/fields/ParentId.field-meta.xml
@@ -2,7 +2,7 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>ParentId</fullName>
<trackFeedHistory>false</trackFeedHistory>
- <trackHistory>false</trackHistory>
+ <trackHistory>true</trackHistory>
<trackTrending>false</trackTrending>
<type>Lookup</type>
</CustomField>
diff --git a/force-app/main/default/objects/Case/fields/Reason.field-meta.xml b/force-app/main/default/objects/Case/fields/Reason.field-meta.xml
index d909d27..05e6e97 100644
--- a/force-app/main/default/objects/Case/fields/Reason.field-meta.xml
+++ b/force-app/main/default/objects/Case/fields/Reason.field-meta.xml
@@ -2,7 +2,7 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Reason</fullName>
<trackFeedHistory>false</trackFeedHistory>
- <trackHistory>true</trackHistory>
+ <trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Picklist</type>
</CustomField>
diff --git a/force-app/main/default/objects/Case/fields/SourceId.field-meta.xml b/force-app/main/default/objects/Case/fields/SourceId.field-meta.xml
new file mode 100644
index 0000000..2f0d833
--- /dev/null
+++ b/force-app/main/default/objects/Case/fields/SourceId.field-meta.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>SourceId</fullName>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Case/fields/Status.field-meta.xml b/force-app/main/default/objects/Case/fields/Status.field-meta.xml
index 72cc1da..0448f28 100644
--- a/force-app/main/default/objects/Case/fields/Status.field-meta.xml
+++ b/force-app/main/default/objects/Case/fields/Status.field-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Status</fullName>
- <trackFeedHistory>false</trackFeedHistory>
+ <trackFeedHistory>true</trackFeedHistory>
<trackHistory>true</trackHistory>
<trackTrending>false</trackTrending>
<type>Picklist</type>
diff --git a/force-app/main/default/objects/Case/fields/answer_day__c.field-meta.xml b/force-app/main/default/objects/Case/fields/answer_day__c.field-meta.xml
index 02fec73..19d2fe8 100644
--- a/force-app/main/default/objects/Case/fields/answer_day__c.field-meta.xml
+++ b/force-app/main/default/objects/Case/fields/answer_day__c.field-meta.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>answer_day__c</fullName>
- <defaultValue>TODAY()</defaultValue>
<externalId>false</externalId>
<label>鍥炵瓟鏃ユ湡</label>
<required>false</required>
diff --git a/force-app/main/default/objects/Case/listViews/All_CIC_Record.listView-meta.xml b/force-app/main/default/objects/Case/listViews/All_CIC_Record.listView-meta.xml
index 2131bf7..53e3418 100644
--- a/force-app/main/default/objects/Case/listViews/All_CIC_Record.listView-meta.xml
+++ b/force-app/main/default/objects/Case/listViews/All_CIC_Record.listView-meta.xml
@@ -19,6 +19,10 @@
<operation>equals</operation>
<value>Case.CICRecordType</value>
</filters>
+ <filters>
+ <field>Province__c</field>
+ <operation>equals</operation>
+ <value>鍖椾含甯�</value>
+ </filters>
<label>00.鎵�鏈塁IC璁板綍</label>
- <language>zh_CN</language>
</ListView>
diff --git a/force-app/main/default/objects/Case/validationRules/Input_IT_related_information.validationRule-meta.xml b/force-app/main/default/objects/Case/validationRules/Input_IT_related_information.validationRule-meta.xml
index 509078e..e5443a5 100644
--- a/force-app/main/default/objects/Case/validationRules/Input_IT_related_information.validationRule-meta.xml
+++ b/force-app/main/default/objects/Case/validationRules/Input_IT_related_information.validationRule-meta.xml
@@ -8,6 +8,5 @@
)
)</errorConditionFormula>
- <errorDisplayField>Task_category__c</errorDisplayField>
<errorMessage>IT椤圭洰蹇呴』濉啓IT椤圭洰鍒嗙被鍜孖T閮ㄨ礋璐ｄ汉</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Case/validationRules/Request_problem_reason.validationRule-meta.xml b/force-app/main/default/objects/Case/validationRules/Request_problem_reason.validationRule-meta.xml
index 7b68006..7f51534 100644
--- a/force-app/main/default/objects/Case/validationRules/Request_problem_reason.validationRule-meta.xml
+++ b/force-app/main/default/objects/Case/validationRules/Request_problem_reason.validationRule-meta.xml
@@ -5,6 +5,5 @@
<errorConditionFormula>Text(Status) = '鍥炵瓟瀹屾垚&纭' &&
TEXT( inquiry_type__c ) = '鏁呴殰鍒ゆ柇' &&
ISBLANK(TEXT(solutuion__c ))</errorConditionFormula>
- <errorDisplayField>Task_category__c</errorDisplayField>
<errorMessage>濡傛灉闂绫诲瀷鏄痆鏁呴殰鍒ゆ柇]鐨勮瘽锛屾晠闅滃垽鏂�夐」蹇呭～</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Competition_Company__c/fields/Aim_Price__c.field-meta.xml b/force-app/main/default/objects/Competition_Company__c/fields/Aim_Price__c.field-meta.xml
index 435c991..b14db7c 100644
--- a/force-app/main/default/objects/Competition_Company__c/fields/Aim_Price__c.field-meta.xml
+++ b/force-app/main/default/objects/Competition_Company__c/fields/Aim_Price__c.field-meta.xml
@@ -3,7 +3,7 @@
<fullName>Aim_Price__c</fullName>
<description>鐗圭磩璨╁２搴椼伄鐩</description>
<externalId>false</externalId>
- <inlineHelpText>Agreed aim of authorized dealer</inlineHelpText>
+ <inlineHelpText>鐗圭害缁忛攢鍟嗗崗璁洰鏍�</inlineHelpText>
<label>鐩閲戦锛堢◣杈硷級</label>
<precision>18</precision>
<required>false</required>
diff --git a/force-app/main/default/objects/Consum_Apply_Equipment_Set_Detail__c/Consum_Apply_Equipment_Set_Detail__c.object-meta.xml b/force-app/main/default/objects/Consum_Apply_Equipment_Set_Detail__c/Consum_Apply_Equipment_Set_Detail__c.object-meta.xml
index af8bf73..1b7aa1c 100644
--- a/force-app/main/default/objects/Consum_Apply_Equipment_Set_Detail__c/Consum_Apply_Equipment_Set_Detail__c.object-meta.xml
+++ b/force-app/main/default/objects/Consum_Apply_Equipment_Set_Detail__c/Consum_Apply_Equipment_Set_Detail__c.object-meta.xml
@@ -58,11 +58,13 @@
</actionOverrides>
<actionOverrides>
<actionName>Edit</actionName>
- <type>Default</type>
+ <content>LexConsumApplyEquipSetDetailPIPLAura</content>
+ <formFactor>Large</formFactor>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>LightningComponent</type>
</actionOverrides>
<actionOverrides>
<actionName>Edit</actionName>
- <formFactor>Large</formFactor>
<type>Default</type>
</actionOverrides>
<actionOverrides>
@@ -86,11 +88,13 @@
</actionOverrides>
<actionOverrides>
<actionName>New</actionName>
- <type>Default</type>
+ <content>LexConsumApplyEquipSetDetailPIPLAura</content>
+ <formFactor>Large</formFactor>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>LightningComponent</type>
</actionOverrides>
<actionOverrides>
<actionName>New</actionName>
- <formFactor>Large</formFactor>
<type>Default</type>
</actionOverrides>
<actionOverrides>
@@ -168,11 +172,11 @@
<searchLayouts>
<excludedStandardButtons>OpenListInQuip</excludedStandardButtons>
<excludedStandardButtons>NewFromDocument</excludedStandardButtons>
- <excludedStandardButtons>Accept</excludedStandardButtons>
- <excludedStandardButtons>ChangeOwner</excludedStandardButtons>
- <excludedStandardButtons>Import</excludedStandardButtons>
<excludedStandardButtons>MassChangeOwner</excludedStandardButtons>
+ <excludedStandardButtons>ChangeOwner</excludedStandardButtons>
<excludedStandardButtons>PrintableListView</excludedStandardButtons>
+ <excludedStandardButtons>Import</excludedStandardButtons>
+ <excludedStandardButtons>Accept</excludedStandardButtons>
</searchLayouts>
<sharingModel>ControlledByParent</sharingModel>
<visibility>Public</visibility>
diff --git a/force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/Can_Not_Cancel_When_Have_Shipment.validationRule-meta.xml b/force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/Can_Not_Cancel_When_Have_Shipment.validationRule-meta.xml
index 7b61047..f008cf9 100644
--- a/force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/Can_Not_Cancel_When_Have_Shipment.validationRule-meta.xml
+++ b/force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/Can_Not_Cancel_When_Have_Shipment.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Can_Not_Cancel_When_Have_Shipment</fullName>
- <active>false</active>
+ <active>true</active>
<description>鏈夊嚭搴撴槑缁嗙殑涓�瑙堜笉鑳藉彇娑�
鐢宠鑰呮敹璐G鐨勪緥澶�</description>
<errorConditionFormula>DataMigration_Flag__c == false &&
diff --git a/force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/Cancel_reason_not_null.validationRule-meta.xml b/force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/Cancel_reason_not_null.validationRule-meta.xml
index 7280d21..f0234d1 100644
--- a/force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/Cancel_reason_not_null.validationRule-meta.xml
+++ b/force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/Cancel_reason_not_null.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Cancel_reason_not_null</fullName>
- <active>false</active>
+ <active>true</active>
<description>鍙栨秷鐨勬椂鍊欙紝鍙栨秷鐞嗙敱涓嶈兘涓虹┖</description>
<errorConditionFormula>DataMigration_Flag__c == false &&
Cancel_Select__c &&
diff --git a/force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/Cannot_Cancel_When_Application.validationRule-meta.xml b/force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/Cannot_Cancel_When_Application.validationRule-meta.xml
index 651bbb1..0437778 100644
--- a/force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/Cannot_Cancel_When_Application.validationRule-meta.xml
+++ b/force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/Cannot_Cancel_When_Application.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Cannot_Cancel_When_Application</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>ISPICKVAL(Consum_Apply__r.Status__c, '鐢宠涓�')
&& ISCHANGED(Cancel_Select__c)
&& Cancel_Select__c = true</errorConditionFormula>
diff --git a/force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/Cannot_Change_CancelANDCancelR.validationRule-meta.xml b/force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/Cannot_Change_CancelANDCancelR.validationRule-meta.xml
index 9afb59f..23afc12 100644
--- a/force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/Cannot_Change_CancelANDCancelR.validationRule-meta.xml
+++ b/force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/Cannot_Change_CancelANDCancelR.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Cannot_Change_CancelANDCancelR</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>DataMigration_Flag__c == false
&& PRIORVALUE(Cancel_Select__c)
&& (ISCHANGED(Cancel_Select__c)
diff --git a/force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/Cannot_reply_before_received.validationRule-meta.xml b/force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/Cannot_reply_before_received.validationRule-meta.xml
index bedb7c1..81376d1 100644
--- a/force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/Cannot_reply_before_received.validationRule-meta.xml
+++ b/force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/Cannot_reply_before_received.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Cannot_reply_before_received</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>/*bp2
AND(Send_to_return_email__c = TRUE,
OR(
diff --git a/force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/Consum_Start_Date_Must_Input.validationRule-meta.xml b/force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/Consum_Start_Date_Must_Input.validationRule-meta.xml
index 631f819..411e69e 100644
--- a/force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/Consum_Start_Date_Must_Input.validationRule-meta.xml
+++ b/force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/Consum_Start_Date_Must_Input.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Consum_Start_Date_Must_Input</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>ISNEW() && ISNULL(Consum_Start_Date__c)</errorConditionFormula>
<errorDisplayField>Consum_Start_Date__c</errorDisplayField>
<errorMessage>棰勮浣跨敤鏃ヤ笉鑳戒负绌�</errorMessage>
diff --git a/force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/Need_detail_when_confirm_ng.validationRule-meta.xml b/force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/Need_detail_when_confirm_ng.validationRule-meta.xml
index b2f3c16..3b425b4 100644
--- a/force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/Need_detail_when_confirm_ng.validationRule-meta.xml
+++ b/force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/Need_detail_when_confirm_ng.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Need_detail_when_confirm_ng</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>DataMigration_Flag__c == false &&
TEXT(Received_Confirm__c) = 'NG' && Received_ng_detail__c = null</errorConditionFormula>
<errorMessage>纭缁撴灉NG鐨勬椂鍊欙紝蹇呴』濉啓璇︾粏鐨勫紓甯稿唴瀹�</errorMessage>
diff --git a/force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/Received_Confirm_Not_Changed.validationRule-meta.xml b/force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/Received_Confirm_Not_Changed.validationRule-meta.xml
index 1abcc33..50f8e58 100644
--- a/force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/Received_Confirm_Not_Changed.validationRule-meta.xml
+++ b/force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/Received_Confirm_Not_Changed.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Received_Confirm_Not_Changed</fullName>
- <active>false</active>
+ <active>true</active>
<description>2018/0115: IT淇敼
鍥犱负Phase2鏈夊垎鎵瑰彂璐х殑鎯呭喌锛屼慨鏀逛簡瑙勫垯銆�</description>
<errorConditionFormula>DataMigration_Flag__c == false &&
diff --git a/force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/cannot_hospital_sign_without_site_time.validationRule-meta.xml b/force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/cannot_hospital_sign_without_site_time.validationRule-meta.xml
index fabe4ba..b2f162e 100644
--- a/force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/cannot_hospital_sign_without_site_time.validationRule-meta.xml
+++ b/force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/cannot_hospital_sign_without_site_time.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>cannot_hospital_sign_without_site_time</fullName>
- <active>false</active>
+ <active>true</active>
<description>褰撴病鏈夋敹鍒扮幇鍦虹‘璁ゅ鐞嗭紝涓嶈兘杩涜鍖婚櫌鏀跺埌绛惧瓧澶勭悊锛�</description>
<errorConditionFormula>/*bp2 HP_received_time__c 銈掑墛闄ゃ仐銇熴亜
ISNULL( Loaner_received_time__c ) && NOT(ISNULL( HP_received_time__c ))
diff --git a/force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/consumNumReduceChk.validationRule-meta.xml b/force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/consumNumReduceChk.validationRule-meta.xml
index 7c187ba..d597c12 100644
--- a/force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/consumNumReduceChk.validationRule-meta.xml
+++ b/force-app/main/default/objects/Consum_Apply_Equipment_Set__c/validationRules/consumNumReduceChk.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>consumNumReduceChk</fullName>
- <active>false</active>
+ <active>true</active>
<description>鍙湁鐘舵�佹槸鑽夋涓椂锛屾暟閲忓彲浠ュ彉鏇�</description>
<errorConditionFormula>DataMigration_Flag__c == false
&& Canceled_Id__c = null
diff --git a/force-app/main/default/objects/Consum_Apply__c/Consum_Apply__c.object-meta.xml b/force-app/main/default/objects/Consum_Apply__c/Consum_Apply__c.object-meta.xml
index 938e738..cfcaab7 100644
--- a/force-app/main/default/objects/Consum_Apply__c/Consum_Apply__c.object-meta.xml
+++ b/force-app/main/default/objects/Consum_Apply__c/Consum_Apply__c.object-meta.xml
@@ -58,11 +58,13 @@
</actionOverrides>
<actionOverrides>
<actionName>Edit</actionName>
- <type>Default</type>
+ <content>LexConsumApplyPIPLAura</content>
+ <formFactor>Large</formFactor>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>LightningComponent</type>
</actionOverrides>
<actionOverrides>
<actionName>Edit</actionName>
- <formFactor>Large</formFactor>
<type>Default</type>
</actionOverrides>
<actionOverrides>
@@ -131,7 +133,7 @@
<actionOverrides>
<actionName>View</actionName>
<comment>Action override created by Lightning App Builder during activation.</comment>
- <content>FlexiPage11213337</content>
+ <content>ConsumApply</content>
<formFactor>Large</formFactor>
<skipRecordTypeSelect>false</skipRecordTypeSelect>
<type>Flexipage</type>
@@ -139,7 +141,7 @@
<actionOverrides>
<actionName>View</actionName>
<comment>Action override created by Lightning App Builder during activation.</comment>
- <content>FlexiPage11213337</content>
+ <content>ConsumApply</content>
<formFactor>Small</formFactor>
<skipRecordTypeSelect>false</skipRecordTypeSelect>
<type>Flexipage</type>
@@ -179,10 +181,10 @@
<excludedStandardButtons>OpenListInQuip</excludedStandardButtons>
<excludedStandardButtons>NewFromDocument</excludedStandardButtons>
<excludedStandardButtons>Accept</excludedStandardButtons>
- <excludedStandardButtons>ChangeOwner</excludedStandardButtons>
- <excludedStandardButtons>Import</excludedStandardButtons>
<excludedStandardButtons>MassChangeOwner</excludedStandardButtons>
<excludedStandardButtons>PrintableListView</excludedStandardButtons>
+ <excludedStandardButtons>Import</excludedStandardButtons>
+ <excludedStandardButtons>ChangeOwner</excludedStandardButtons>
<lookupDialogsAdditionalFields>RA_Status__c</lookupDialogsAdditionalFields>
<lookupDialogsAdditionalFields>demo_purpose2__c</lookupDialogsAdditionalFields>
<lookupDialogsAdditionalFields>Hospital__c</lookupDialogsAdditionalFields>
diff --git a/force-app/main/default/objects/Consum_Apply__c/fields/Loaner_medical_Staff__c.field-meta.xml b/force-app/main/default/objects/Consum_Apply__c/fields/Loaner_medical_Staff__c.field-meta.xml
index bd0003a..53a9f95 100644
--- a/force-app/main/default/objects/Consum_Apply__c/fields/Loaner_medical_Staff__c.field-meta.xml
+++ b/force-app/main/default/objects/Consum_Apply__c/fields/Loaner_medical_Staff__c.field-meta.xml
@@ -5,7 +5,7 @@
<externalId>false</externalId>
<label>绉戝璐熻矗浜�</label>
<lookupFilter>
- <active>false</active>
+ <active>true</active>
<filterItems>
<field>Contact.RecordTypeId</field>
<operation>equals</operation>
diff --git a/force-app/main/default/objects/Consum_Apply__c/validationRules/Applicant_CancelReason_Active_Only.validationRule-meta.xml b/force-app/main/default/objects/Consum_Apply__c/validationRules/Applicant_CancelReason_Active_Only.validationRule-meta.xml
index 9a3139b..a04e490 100644
--- a/force-app/main/default/objects/Consum_Apply__c/validationRules/Applicant_CancelReason_Active_Only.validationRule-meta.xml
+++ b/force-app/main/default/objects/Consum_Apply__c/validationRules/Applicant_CancelReason_Active_Only.validationRule-meta.xml
@@ -2,12 +2,13 @@
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Applicant_CancelReason_Active_Only</fullName>
<active>true</active>
- <errorConditionFormula>(($User.ProfileId <>'00eC800000005Cb')&&
-($User.ProfileId <>'00eC600000004y5')&&
+ <errorConditionFormula>(($User.ProfileId <>'00e10000000Y3o5')&&
+($User.ProfileId <>'00e10000000xnoT')&&
(NOT(CONTAINS($Label.ProfileId_EquCenAdmin, $User.ProfileId)))&&
+($User.ProfileId <>'00e10000000xo1D') &&
(NOT(CONTAINS($Label.ProfileId_EquCenCheckAndDepot, $User.ProfileId))))
&& Text(Cancel_Reason__c) <> '涓诲姩鍙栨秷'
-&& ISPICKVAL(Status__c, '鍙栨秷') && NOT($User.Batch_User__c) && $User.ProfileId <>'00eC600000003SX'</errorConditionFormula>
+&& ISPICKVAL(Status__c, '鍙栨秷') && NOT($User.Batch_User__c) && $User.ProfileId <>'00e10000000dEQx'</errorConditionFormula>
<errorDisplayField>Cancel_Reason__c</errorDisplayField>
<errorMessage>鐢宠浜哄彧鑳介�夋嫨涓诲姩鍙栨秷銆�</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Consum_Apply__c/validationRules/Before_Request_Apporve.validationRule-meta.xml b/force-app/main/default/objects/Consum_Apply__c/validationRules/Before_Request_Apporve.validationRule-meta.xml
index 7f2c179..6d8fed4 100644
--- a/force-app/main/default/objects/Consum_Apply__c/validationRules/Before_Request_Apporve.validationRule-meta.xml
+++ b/force-app/main/default/objects/Consum_Apply__c/validationRules/Before_Request_Apporve.validationRule-meta.xml
@@ -7,9 +7,10 @@
RA_Status__c <> '宸叉壒鍑�'
&& RA_Status__c <> '宸插垎閰�' )
&&
-(($User.ProfileId <>'00eC800000005Cb')&&
-($User.ProfileId <>'00eC600000004y5')&&
-(NOT(CONTAINS($Label.ProfileId_EquCenCheckAndDepot, $User.ProfileId)))
+(($User.ProfileId <>'00e10000000Y3o5')&&
+($User.ProfileId <>'00e10000000xnoT')&&
+(NOT(CONTAINS($Label.ProfileId_EquCenCheckAndDepot, $User.ProfileId)))&&
+($User.ProfileId <>'00e10000000xo1D')
)
&&
ISCHANGED(Loaner_cancel_request__c)</errorConditionFormula>
diff --git a/force-app/main/default/objects/Consum_Apply__c/validationRules/Campaign_EndStatus_Confim.validationRule-meta.xml b/force-app/main/default/objects/Consum_Apply__c/validationRules/Campaign_EndStatus_Confim.validationRule-meta.xml
index 0eccaf2..9629795 100644
--- a/force-app/main/default/objects/Consum_Apply__c/validationRules/Campaign_EndStatus_Confim.validationRule-meta.xml
+++ b/force-app/main/default/objects/Consum_Apply__c/validationRules/Campaign_EndStatus_Confim.validationRule-meta.xml
@@ -9,7 +9,7 @@
<errorConditionFormula>AND( TEXT(demo_purpose2__c) = '瀛︿細灞曚細',
IF( Campaign__c != null , IF( TEXT(Campaign__r.Status) = '宸茬粨鏉�' , true, false),
false))&&or(isnew(),text(Status__c)=='鑽夋涓�') && Not(ischanged(Loaner_cancel_request__c)) &&
-$User.ProfileId <>'00eC800000005Cb'</errorConditionFormula>
+$User.ProfileId <>'00e10000000Y3o5'</errorConditionFormula>
<errorDisplayField>Repair__c</errorDisplayField>
<errorMessage>瀛︿細宸茬粨鏉燂紝涓嶈兘淇濆瓨</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Consum_Apply__c/validationRules/Cannot_change_PIC.validationRule-meta.xml b/force-app/main/default/objects/Consum_Apply__c/validationRules/Cannot_change_PIC.validationRule-meta.xml
index 68aa100..18d8e9d 100644
--- a/force-app/main/default/objects/Consum_Apply__c/validationRules/Cannot_change_PIC.validationRule-meta.xml
+++ b/force-app/main/default/objects/Consum_Apply__c/validationRules/Cannot_change_PIC.validationRule-meta.xml
@@ -2,7 +2,7 @@
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Cannot_change_PIC</fullName>
<active>true</active>
- <errorConditionFormula>$Profile.Id != "00eC800000005Cb" && ISCHANGED( Person_In_Charge__c )&& RA_Status__c <> '鑽夋涓�'</errorConditionFormula>
+ <errorConditionFormula>$Profile.Id != "00e10000000Y3o5" && ISCHANGED( Person_In_Charge__c )&& RA_Status__c <> '鑽夋涓�'</errorConditionFormula>
<errorDisplayField>Person_In_Charge__c</errorDisplayField>
<errorMessage>涓嶈兘鏇存敼涓绘媴褰�</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Consum_Apply__c/validationRules/Consum_Apply_Flag_Confim.validationRule-meta.xml b/force-app/main/default/objects/Consum_Apply__c/validationRules/Consum_Apply_Flag_Confim.validationRule-meta.xml
index 625e2ee..180727f 100644
--- a/force-app/main/default/objects/Consum_Apply__c/validationRules/Consum_Apply_Flag_Confim.validationRule-meta.xml
+++ b/force-app/main/default/objects/Consum_Apply__c/validationRules/Consum_Apply_Flag_Confim.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Consum_Apply_Flag_Confim</fullName>
- <active>true</active>
+ <active>false</active>
<description>瀛︿細鎻愬墠14澶╃敵璇烽檺鍒�</description>
<errorConditionFormula>AND(TEXT(demo_purpose2__c) = '瀛︿細灞曚細',
IF( Campaign__c <> null,if( TODAY()-Request_shipping_day__c <= 14,true,false),false))&&or(and(isnew(),isnull(Old_Consum_Apply__c)),text(Status__c)=='鑽夋涓�')
@@ -9,6 +9,6 @@
&& Not(ischanged(Loaner_cancel_request__c)) && Not(ischanged(Cancel_Reason__c))
-&& ($User.ProfileId <>'00eC800000005Cb')</errorConditionFormula>
+&& ($User.ProfileId <>'00e10000000Y3o5')</errorConditionFormula>
<errorMessage>鐢宠鎻愪氦蹇呴』鍦�14澶╀互涓婃墠鍙互</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Consum_Apply__c/validationRules/Must_Is_Class.validationRule-meta.xml b/force-app/main/default/objects/Consum_Apply__c/validationRules/Must_Is_Class.validationRule-meta.xml
index 7dc991c..bbe3f43 100644
--- a/force-app/main/default/objects/Consum_Apply__c/validationRules/Must_Is_Class.validationRule-meta.xml
+++ b/force-app/main/default/objects/Consum_Apply__c/validationRules/Must_Is_Class.validationRule-meta.xml
@@ -3,7 +3,7 @@
<fullName>Must_Is_Class</fullName>
<active>true</active>
<description>蹇呴』鏄瀹�</description>
- <errorConditionFormula>$User.ProfileId <>'00eC800000005Cb'
+ <errorConditionFormula>$User.ProfileId <>'00e10000000Y3o5'
&&
NOT($User.Batch_User__c)
&&
@@ -12,7 +12,7 @@
/* 鏃犳晥 ==> 鎶ラ敊 */
Account__r.Is_Active_Formula__c == "鏃犳晥",
/* 鐪嬬埗璁板綍锛屼笉鏄尰闄紝涓嶆槸缁忛攢鍟嗐�� 鑷繁涔熶笉鏄尰闄� ==> 鎶ラ敊 */
-Not(Account__r.Parent.Parent.RecordTypeId = "012C600000003HZ")
+Not(Account__r.Parent.Parent.RecordTypeId = "01210000000QemG")
)</errorConditionFormula>
<errorDisplayField>Account__c</errorDisplayField>
<errorMessage>绉戝蹇呴』鏄垬鐣ョ瀹や笅绉戝</errorMessage>
diff --git a/force-app/main/default/objects/Consum_Apply__c/validationRules/Must_Is_DeptClas.validationRule-meta.xml b/force-app/main/default/objects/Consum_Apply__c/validationRules/Must_Is_DeptClas.validationRule-meta.xml
index 1268598..adac709 100644
--- a/force-app/main/default/objects/Consum_Apply__c/validationRules/Must_Is_DeptClas.validationRule-meta.xml
+++ b/force-app/main/default/objects/Consum_Apply__c/validationRules/Must_Is_DeptClas.validationRule-meta.xml
@@ -3,13 +3,13 @@
<fullName>Must_Is_DeptClas</fullName>
<active>true</active>
<description>蹇呴』濉啓璇ュ尰闄笅鐨勬垬鐣ョ瀹�</description>
- <errorConditionFormula>$User.ProfileId <>'00eC800000005Cb'
+ <errorConditionFormula>$User.ProfileId <>'00e10000000Y3o5'
&&
NOT($User.Batch_User__c)
&&
Isnew() && OR (
/* 鐪嬬埗璁板綍锛屾槸鍖婚櫌锛屾病鏈夐�夌浉搴旂殑鎴樼暐绉戝 ==> 鎶ラ敊 */
-AND(Account__r.Parent.Parent.RecordTypeId = "012C600000003HZ",
+AND(Account__r.Parent.Parent.RecordTypeId = "01210000000QemG",
Account__r.ParentId <> Strategic_dept__c
)
)</errorConditionFormula>
diff --git a/force-app/main/default/objects/Consum_Apply__c/validationRules/Need_CampaignInfo.validationRule-meta.xml b/force-app/main/default/objects/Consum_Apply__c/validationRules/Need_CampaignInfo.validationRule-meta.xml
index 9db7fd9..f2b10be 100644
--- a/force-app/main/default/objects/Consum_Apply__c/validationRules/Need_CampaignInfo.validationRule-meta.xml
+++ b/force-app/main/default/objects/Consum_Apply__c/validationRules/Need_CampaignInfo.validationRule-meta.xml
@@ -10,7 +10,7 @@
TEXT(Demo_purpose1__c) = "瀛︿細灞曚細"
&&
ISBLANK(Campaign__c)</description>
- <errorConditionFormula>RecordTypeId <> "012C600000003K0"
+ <errorConditionFormula>RecordTypeId <> "01210000000RHIn"
&&
ISBLANK(Old_Consum_Apply__c)
&&
diff --git a/force-app/main/default/objects/Consum_Apply__c/validationRules/Need_QIS_input.validationRule-meta.xml b/force-app/main/default/objects/Consum_Apply__c/validationRules/Need_QIS_input.validationRule-meta.xml
index fb2de9c..c1b1eb5 100644
--- a/force-app/main/default/objects/Consum_Apply__c/validationRules/Need_QIS_input.validationRule-meta.xml
+++ b/force-app/main/default/objects/Consum_Apply__c/validationRules/Need_QIS_input.validationRule-meta.xml
@@ -2,7 +2,7 @@
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Need_QIS_input</fullName>
<active>true</active>
- <errorConditionFormula>RecordTypeId <> "012C600000003K0" &&
+ <errorConditionFormula>RecordTypeId <> "01210000000RHIn" &&
$User.ProfileId <> "00e10000000dEQx" &&
ISBLANK(Old_Consum_Apply__c) &&
diff --git a/force-app/main/default/objects/Consum_Apply__c/validationRules/New_Request_Verify.validationRule-meta.xml b/force-app/main/default/objects/Consum_Apply__c/validationRules/New_Request_Verify.validationRule-meta.xml
index 81695e5..3af81d9 100644
--- a/force-app/main/default/objects/Consum_Apply__c/validationRules/New_Request_Verify.validationRule-meta.xml
+++ b/force-app/main/default/objects/Consum_Apply__c/validationRules/New_Request_Verify.validationRule-meta.xml
@@ -5,7 +5,7 @@
<description>鏂板缓鑰楁潗澶囧搧鐢宠鏃讹紝涓嶈兘濉啓鍥炲簱鐗╂祦淇℃伅鍜岀瀛椾俊鎭�</description>
<errorConditionFormula>isnew()
&&
-($User.ProfileId <>'00eC800000005Cb')
+($User.ProfileId <>'00e10000000Y3o5')
&&
( not(ISBLANK(text(Return_Track_Company__c))) ||
not(ISBLANK(text(Return_Distrubutor_Method__c))) ||
diff --git a/force-app/main/default/objects/Consum_Apply__c/validationRules/Person_In_Charge_Not_Support.validationRule-meta.xml b/force-app/main/default/objects/Consum_Apply__c/validationRules/Person_In_Charge_Not_Support.validationRule-meta.xml
index c066fb9..2ac486b 100644
--- a/force-app/main/default/objects/Consum_Apply__c/validationRules/Person_In_Charge_Not_Support.validationRule-meta.xml
+++ b/force-app/main/default/objects/Consum_Apply__c/validationRules/Person_In_Charge_Not_Support.validationRule-meta.xml
@@ -4,12 +4,13 @@
<active>true</active>
<errorConditionFormula>(Isnew() || Text(Status__c) = '鑽夋涓�') &&
Onwer_job_category__c = '鏀彺' &&
-$User.ProfileId <>'00eC800000005Cb' &&
-$User.ProfileId <>'00eC600000004y5' &&
-$User.ProfileId <>'00eC600000004y6' &&
-$User.ProfileId <>'00eC600000004y7' &&
-$User.ProfileId <>'00eC600000004y9'&&
-$User.ProfileId <>'00eC600000004yA'</errorConditionFormula>
+$User.ProfileId <>'00e10000000Y3o5' &&
+$User.ProfileId <>'00e10000000xo1D' &&
+$User.ProfileId <>'00e10000000xnoT' &&
+$User.ProfileId <>'00e10000000xnoY' &&
+$User.ProfileId <>'00e100000012CwP' &&
+$User.ProfileId <>'00e10000000xnod'&&
+$User.ProfileId <>'00e100000012CwK'</errorConditionFormula>
<errorDisplayField>Person_In_Charge__c</errorDisplayField>
<errorMessage>鍔╃悊涓嶈兘鍋氱敵璇蜂汉銆�</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Consum_Apply__c/validationRules/QIS_next_action_Confim.validationRule-meta.xml b/force-app/main/default/objects/Consum_Apply__c/validationRules/QIS_next_action_Confim.validationRule-meta.xml
index 62ff3d7..0065805 100644
--- a/force-app/main/default/objects/Consum_Apply__c/validationRules/QIS_next_action_Confim.validationRule-meta.xml
+++ b/force-app/main/default/objects/Consum_Apply__c/validationRules/QIS_next_action_Confim.validationRule-meta.xml
@@ -6,6 +6,6 @@
<errorConditionFormula>AND(
TEXT(demo_purpose2__c) = '绱㈣禂QIS',
TEXT(QIS_number__r.next_action__c) = '閫佸洖')&&or(isnew(),text(Status__c)=='鑽夋涓�')&& Not(ischanged(Loaner_cancel_request__c)) &&
-$User.ProfileId <>'00eC800000005Cb'</errorConditionFormula>
+$User.ProfileId <>'00e10000000Y3o5'</errorConditionFormula>
<errorMessage>QIS鐨勫搴旀柟娉曚负鈥滈�佸洖鈥濓紝涓嶅彲鍊熺敤澶囧搧</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Consum_Apply__c/validationRules/Request_approval_day_earlier_14_day.validationRule-meta.xml b/force-app/main/default/objects/Consum_Apply__c/validationRules/Request_approval_day_earlier_14_day.validationRule-meta.xml
index 81419cd..d251eb0 100644
--- a/force-app/main/default/objects/Consum_Apply__c/validationRules/Request_approval_day_earlier_14_day.validationRule-meta.xml
+++ b/force-app/main/default/objects/Consum_Apply__c/validationRules/Request_approval_day_earlier_14_day.validationRule-meta.xml
@@ -5,6 +5,6 @@
<errorConditionFormula>ISPICKVAL(demo_purpose2__c, "瀛︿細灞曚細") && ( TODAY() >= Request_shipping_day__c -7)
&&or(and(isnew(),ISBLANK(Old_Consum_Apply__c)),text(Status__c)=='鑽夋涓�',TEXT(Status__c)="濉啓瀹屾瘯" )
&& Not(ischanged(Loaner_cancel_request__c)) && Not(ischanged(Cancel_Reason__c))
-&& ($User.ProfileId <>'00eC800000005Cb')</errorConditionFormula>
+&& ($User.ProfileId <>'00e10000000Y3o5')</errorConditionFormula>
<errorMessage>蹇呴』鎻愬墠浜庡笇鏈涘埌璐ф棩7澶╀互涓婃彁浜ょ敵璇�</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Consum_Apply__c/webLinks/Loaned_history.webLink-meta.xml b/force-app/main/default/objects/Consum_Apply__c/webLinks/Loaned_history.webLink-meta.xml
index 0cd1aa3..5d9a167 100644
--- a/force-app/main/default/objects/Consum_Apply__c/webLinks/Loaned_history.webLink-meta.xml
+++ b/force-app/main/default/objects/Consum_Apply__c/webLinks/Loaned_history.webLink-meta.xml
@@ -16,5 +16,5 @@
<protected>false</protected>
<showsLocation>true</showsLocation>
<showsStatus>true</showsStatus>
- <url>/00OC60000000WfcMAE?pv0={!Consum_Apply__c.Hospital_ID__c}</url>
+ <url>/00O1000000661NB?pv0={!Consum_Apply__c.Hospital_ID__c}</url>
</WebLink>
diff --git a/force-app/main/default/objects/Consum_Inventory_Detail__c/fields/Final_Quality_Check_Result__c.field-meta.xml b/force-app/main/default/objects/Consum_Inventory_Detail__c/fields/Final_Quality_Check_Result__c.field-meta.xml
index 39d25c2..1daf13d 100644
--- a/force-app/main/default/objects/Consum_Inventory_Detail__c/fields/Final_Quality_Check_Result__c.field-meta.xml
+++ b/force-app/main/default/objects/Consum_Inventory_Detail__c/fields/Final_Quality_Check_Result__c.field-meta.xml
@@ -3,8 +3,8 @@
<fullName>Final_Quality_Check_Result__c</fullName>
<externalId>false</externalId>
<formula>IF(Text(Expiration_Check_Result__c)='NG' || Text(Appearance_Check_Result__c)='NG' || Text(Package_Check_Result__c)='NG',
-'NG',
-IF(Text(Expiration_Check_Result__c)='OK' && Text(Appearance_Check_Result__c)='OK' && Text(Package_Check_Result__c)='OK','OK','绌�')
+ 'NG',
+ IF(Text(Expiration_Check_Result__c)='OK' && Text(Appearance_Check_Result__c)='OK' && Text(Package_Check_Result__c)='OK','OK','绌�')
)</formula>
<label>鏈�缁堣川閲忕姸鍐靛垽瀹氱粨鏋�</label>
<required>false</required>
diff --git a/force-app/main/default/objects/ConsumableSampleLineItem__c/fields/OPD_SIS_Report__c.field-meta.xml b/force-app/main/default/objects/ConsumableSampleLineItem__c/fields/OPD_SIS_Report__c.field-meta.xml
index 3b668a2..fa73720 100644
--- a/force-app/main/default/objects/ConsumableSampleLineItem__c/fields/OPD_SIS_Report__c.field-meta.xml
+++ b/force-app/main/default/objects/ConsumableSampleLineItem__c/fields/OPD_SIS_Report__c.field-meta.xml
@@ -5,11 +5,11 @@
<externalId>false</externalId>
<label>OPD/SIS Report</label>
<lookupFilter>
- <active>false</active>
+ <active>true</active>
<filterItems>
<field>Report__c.RecordTypeId</field>
<operation>equals</operation>
- <value>SIS-ENG, SIS-ET</value>
+ <value>SIS</value>
</filterItems>
<isOptional>false</isOptional>
</lookupFilter>
diff --git a/force-app/main/default/objects/Consumable_Orderdetails__c/fields/Sum_of_money__c.field-meta.xml b/force-app/main/default/objects/Consumable_Orderdetails__c/fields/Sum_of_money__c.field-meta.xml
index 12254fc..a32e480 100644
--- a/force-app/main/default/objects/Consumable_Orderdetails__c/fields/Sum_of_money__c.field-meta.xml
+++ b/force-app/main/default/objects/Consumable_Orderdetails__c/fields/Sum_of_money__c.field-meta.xml
@@ -4,7 +4,7 @@
<externalId>false</externalId>
<formula>Consumable_count__c * Intra_Trade_List_RMB__c</formula>
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
- <inlineHelpText>Consumable_count__c Dealer_Custom_Price__c</inlineHelpText>
+ <inlineHelpText>Consumable_count__c * Dealer_Custom_Price__c</inlineHelpText>
<label>閲囪喘閲戦</label>
<precision>18</precision>
<required>false</required>
diff --git a/force-app/main/default/objects/Consumable_order_details2__c/fields/ApplySalsesTeam_F2__c.field-meta.xml b/force-app/main/default/objects/Consumable_order_details2__c/fields/ApplySalsesTeam_F2__c.field-meta.xml
index 1059eca..d0a76c2 100644
--- a/force-app/main/default/objects/Consumable_order_details2__c/fields/ApplySalsesTeam_F2__c.field-meta.xml
+++ b/force-app/main/default/objects/Consumable_order_details2__c/fields/ApplySalsesTeam_F2__c.field-meta.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>ApplySalsesTeam_F2__c</fullName>
+ <description>TEXT(Owner:User.Work_Location__c )
+20231030ws锛�
+if( OwnerId = '00510000000gT2R',Province_Account__c,TEXT(Owner:User.Work_Location__c ))</description>
<externalId>false</externalId>
- <formula>TEXT(Owner:User.Work_Location__c )</formula>
- <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <formula>if(or(source__c = 'OSH',Owner:User.OSHFLG__c = TRUE),'鍚堣偉-OSH',
+if(OwnerId = '00510000000gT2R',Province_Account__c,TEXT(Owner:User.Work_Location__c )))</formula>
<label>鐢宠閿�鍞(鍏紡)</label>
<required>false</required>
<trackHistory>false</trackHistory>
diff --git a/force-app/main/default/objects/Consumable_order_details2__c/fields/Consumable_Sale_order__c.field-meta.xml b/force-app/main/default/objects/Consumable_order_details2__c/fields/Consumable_Sale_order__c.field-meta.xml
index 5006659..023e3fb 100644
--- a/force-app/main/default/objects/Consumable_order_details2__c/fields/Consumable_Sale_order__c.field-meta.xml
+++ b/force-app/main/default/objects/Consumable_order_details2__c/fields/Consumable_Sale_order__c.field-meta.xml
@@ -7,7 +7,7 @@
<referenceTo>Consumable_order__c</referenceTo>
<relationshipName>Consumable_Sale_order2</relationshipName>
<required>false</required>
- <trackHistory>false</trackHistory>
+ <trackHistory>true</trackHistory>
<trackTrending>false</trackTrending>
<type>Lookup</type>
</CustomField>
diff --git a/force-app/main/default/objects/Consumable_order_details2__c/fields/Order_ProType_det2_formula__c.field-meta.xml b/force-app/main/default/objects/Consumable_order_details2__c/fields/Order_ProType_det2_formula__c.field-meta.xml
index 3033f2d..aaefb75 100644
--- a/force-app/main/default/objects/Consumable_order_details2__c/fields/Order_ProType_det2_formula__c.field-meta.xml
+++ b/force-app/main/default/objects/Consumable_order_details2__c/fields/Order_ProType_det2_formula__c.field-meta.xml
@@ -4,7 +4,7 @@
<externalId>false</externalId>
<formula>IF(not(isblank( Consumable_order_minor__c )),TEXT(Consumable_order_minor__r.Order_ProType__c),
IF(not(isblank( Consumable_Arrived_order__c )),TEXT(Consumable_Arrived_order__r.Order_ProType__c),
-""))</formula>
+Product_Type__c))</formula>
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
<label>璁㈠崟浜у搧鍒嗙被(鍏紡)</label>
<required>false</required>
diff --git a/force-app/main/default/objects/Consumable_order_details2__c/fields/Product_Type__c.field-meta.xml b/force-app/main/default/objects/Consumable_order_details2__c/fields/Product_Type__c.field-meta.xml
index ca315ef..7336356 100644
--- a/force-app/main/default/objects/Consumable_order_details2__c/fields/Product_Type__c.field-meta.xml
+++ b/force-app/main/default/objects/Consumable_order_details2__c/fields/Product_Type__c.field-meta.xml
@@ -3,7 +3,7 @@
<fullName>Product_Type__c</fullName>
<description>IF( ISBLANK( Consumable_order_minor__c ) , IF(ISBLANK( Consumable_Arrived_order__c ), IF( Consumable_product__r.Pro2_Dealer_Object__c , 'ET', '') & IF( Consumable_product__r.Pro2_Dealer_ENG__c , 'ENG', ''), text(Consumable_Arrived_order__r.Order_ProType__c)) , text(Consumable_order_minor__r.Order_ProType__c) )</description>
<externalId>false</externalId>
- <formula>IF( ISBLANK( Consumable_order_minor__c ) , IF(ISBLANK( Consumable_Arrived_order__c ), IF( Consumable_product__r.Pro2_Dealer_Object__c , 'ET', if( Consumable_product__r.Product2__r.ConsumCategory1__c = 'ET鑰楁潗','ET','')) & IF( Consumable_product__r.Pro2_Dealer_ENG__c , 'ENG', if( Consumable_product__r.Product2__r.ConsumCategory1__c = 'ENG鑰楁潗','ENG','')), text(Consumable_Arrived_order__r.Order_ProType__c)) , text(Consumable_order_minor__r.Order_ProType__c) )</formula>
+ <formula>IF( ISBLANK( Consumable_order_minor__c ) , IF(ISBLANK( Consumable_Arrived_order__c ), IF( Consumable_product__r.Pro2_Dealer_Object__c , 'ET', if( Consumable_product__r.Product2__r.ConsumCategory1F__c = 'ET鑰楁潗','ET','')) & IF( Consumable_product__r.Pro2_Dealer_ENG__c , 'ENG', if( Consumable_product__r.Product2__r.ConsumCategory1F__c = 'ENG鑰楁潗','ENG','')), text(Consumable_Arrived_order__r.Order_ProType__c)) , text(Consumable_order_minor__r.Order_ProType__c) )</formula>
<label>浜у搧鍒嗙被</label>
<required>false</required>
<trackHistory>false</trackHistory>
diff --git a/force-app/main/default/objects/Consumable_order_details2__c/fields/Province_Account__c.field-meta.xml b/force-app/main/default/objects/Consumable_order_details2__c/fields/Province_Account__c.field-meta.xml
index 02e2637..581682b 100644
--- a/force-app/main/default/objects/Consumable_order_details2__c/fields/Province_Account__c.field-meta.xml
+++ b/force-app/main/default/objects/Consumable_order_details2__c/fields/Province_Account__c.field-meta.xml
@@ -1,13 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Province_Account__c</fullName>
+ <description>20240111ws淇敼鍓嶏細
+IF(not(isblank(Consumable_Sale_order__c))&& not(isblank( HospItal_Name__c )),Consumable_Sale_order__r.Order_ForHospital__r.OCM_man_province_txt__c,
+
+IF(not(isblank(Consumable_Shipment_order__c))&& not(isblank(HospItal_Name__c)),Consumable_Shipment_order__r.Order_ForHospital__r.OCM_man_province_txt__c,
+ IF(Used_Account_Type__c = "濂戠磩",Account_province_txt__c,
+Consumable_Arrived_order__r.Dealer_Info__r.OCM_man_province_txt__c)
+))
+杩藉姞鍑鸿揣鍏冿紙鎺ュ彛锛夌殑鐪侊紙瀹㈡埛锛夊彇鍊�</description>
<externalId>false</externalId>
<formula>IF(not(isblank(Consumable_Sale_order__c))&& not(isblank( HospItal_Name__c )),Consumable_Sale_order__r.Order_ForHospital__r.OCM_man_province_txt__c,
IF(not(isblank(Consumable_Shipment_order__c))&& not(isblank(HospItal_Name__c)),Consumable_Shipment_order__r.Order_ForHospital__r.OCM_man_province_txt__c,
IF(Used_Account_Type__c = "濂戠磩",Account_province_txt__c,
-Consumable_Arrived_order__r.Dealer_Info__r.OCM_man_province_txt__c)
-))</formula>
+
+IF( not(isblank(Consumable_Arrived_order__c)),Consumable_Arrived_order__r.Dealer_Info__r.OCM_man_province_txt__c,
+Dealer_Info_IF__r.OCM_man_province_txt__c
+)
+)))</formula>
<label>鐪�(瀹㈡埛)</label>
<required>false</required>
<trackHistory>false</trackHistory>
diff --git a/force-app/main/default/objects/Consumable_order_details2__c/fields/Sales_Promotion__c.field-meta.xml b/force-app/main/default/objects/Consumable_order_details2__c/fields/Sales_Promotion__c.field-meta.xml
index fbe2dac..c2b5fe6 100644
--- a/force-app/main/default/objects/Consumable_order_details2__c/fields/Sales_Promotion__c.field-meta.xml
+++ b/force-app/main/default/objects/Consumable_order_details2__c/fields/Sales_Promotion__c.field-meta.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Sales_Promotion__c</fullName>
+ <description>20231030鐜嬬淇敼鍓嶏細
+IF( OwnerId = $Label.User_OlympusSystem , Consumable_order_minor__r.ApplySalsesTeam_F__c , TEXT(Owner:User.Work_Location__c) )</description>
<externalId>false</externalId>
- <formula>IF( OwnerId = $Label.User_OlympusSystem , Consumable_order_minor__r.ApplySalsesTeam_F__c , TEXT(Owner:User.Work_Location__c) )</formula>
- <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <formula>IF(or(source__c = 'OSH',Owner:User.OSHFLG__c = TRUE),'鍚堣偉-OSH',
+if(OwnerId = $Label.User_OlympusSystem ,
+if(Not(isblank(Consumable_order_minor__c)),Consumable_order_minor__r.ApplySalsesTeam_F__c,Province_Account__c) , TEXT(Owner:User.Work_Location__c) ))</formula>
<label>閿�鍞帹骞胯</label>
<required>false</required>
<trackHistory>false</trackHistory>
diff --git a/force-app/main/default/objects/Consumable_order_details2__c/fields/Used_date__c.field-meta.xml b/force-app/main/default/objects/Consumable_order_details2__c/fields/Used_date__c.field-meta.xml
index 31eab38..b2e384e 100644
--- a/force-app/main/default/objects/Consumable_order_details2__c/fields/Used_date__c.field-meta.xml
+++ b/force-app/main/default/objects/Consumable_order_details2__c/fields/Used_date__c.field-meta.xml
@@ -5,7 +5,7 @@
<externalId>false</externalId>
<label>閿�鍞棩鏈�</label>
<required>false</required>
- <trackHistory>false</trackHistory>
+ <trackHistory>true</trackHistory>
<trackTrending>false</trackTrending>
<type>Date</type>
</CustomField>
diff --git a/force-app/main/default/objects/Consumable_order_details2__c/listViews/All.listView-meta.xml b/force-app/main/default/objects/Consumable_order_details2__c/listViews/All.listView-meta.xml
index 08befc9..cc77a54 100644
--- a/force-app/main/default/objects/Consumable_order_details2__c/listViews/All.listView-meta.xml
+++ b/force-app/main/default/objects/Consumable_order_details2__c/listViews/All.listView-meta.xml
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<ListView xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>All</fullName>
+ <columns>NAME</columns>
+ <columns>CREATEDBY_USER</columns>
+ <columns>CREATED_DATE</columns>
<filterScope>Everything</filterScope>
<label>鍏ㄩ儴</label>
+ <language>zh_CN</language>
</ListView>
diff --git a/force-app/main/default/objects/Consumable_order_details2__c/listViews/All_rens.listView-meta.xml b/force-app/main/default/objects/Consumable_order_details2__c/listViews/All_rens.listView-meta.xml
index 163bbe7..f17d3f9 100644
--- a/force-app/main/default/objects/Consumable_order_details2__c/listViews/All_rens.listView-meta.xml
+++ b/force-app/main/default/objects/Consumable_order_details2__c/listViews/All_rens.listView-meta.xml
@@ -6,7 +6,7 @@
<filters>
<field>Dealer_Info_text__c</field>
<operation>contains</operation>
- <value>浠佸北</value>
+ <value>甯屽嚡</value>
</filters>
<filters>
<field>Deliver_date__c</field>
@@ -14,5 +14,4 @@
<value>7/1/2023</value>
</filters>
<label>鍏ㄩ儴-浠佸北</label>
- <language>zh_CN</language>
</ListView>
diff --git a/force-app/main/default/objects/Consumable_order_details2__c/recordTypes/Detail2_Delivery.recordType-meta.xml b/force-app/main/default/objects/Consumable_order_details2__c/recordTypes/Detail2_Delivery.recordType-meta.xml
index 13f4ee6..43c38e7 100644
--- a/force-app/main/default/objects/Consumable_order_details2__c/recordTypes/Detail2_Delivery.recordType-meta.xml
+++ b/force-app/main/default/objects/Consumable_order_details2__c/recordTypes/Detail2_Delivery.recordType-meta.xml
@@ -14,15 +14,4 @@
<default>true</default>
</values>
</picklistValues>
- <picklistValues>
- <picklist>Purchase_Unitprice_From__c</picklist>
- <values>
- <fullName>淇冮攢</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鏍囧噯</fullName>
- <default>true</default>
- </values>
- </picklistValues>
</RecordType>
diff --git a/force-app/main/default/objects/Consumable_order_details2__c/recordTypes/Detail2_ReturnGoods.recordType-meta.xml b/force-app/main/default/objects/Consumable_order_details2__c/recordTypes/Detail2_ReturnGoods.recordType-meta.xml
index a152395..d1c9978 100644
--- a/force-app/main/default/objects/Consumable_order_details2__c/recordTypes/Detail2_ReturnGoods.recordType-meta.xml
+++ b/force-app/main/default/objects/Consumable_order_details2__c/recordTypes/Detail2_ReturnGoods.recordType-meta.xml
@@ -14,15 +14,4 @@
<default>true</default>
</values>
</picklistValues>
- <picklistValues>
- <picklist>Purchase_Unitprice_From__c</picklist>
- <values>
- <fullName>淇冮攢</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鏍囧噯</fullName>
- <default>true</default>
- </values>
- </picklistValues>
</RecordType>
diff --git a/force-app/main/default/objects/Contact/Contact.object-meta.xml b/force-app/main/default/objects/Contact/Contact.object-meta.xml
index f4752d5..d5fcd48 100644
--- a/force-app/main/default/objects/Contact/Contact.object-meta.xml
+++ b/force-app/main/default/objects/Contact/Contact.object-meta.xml
@@ -86,11 +86,13 @@
</actionOverrides>
<actionOverrides>
<actionName>Edit</actionName>
- <type>Default</type>
+ <content>LexContactPIPLAura</content>
+ <formFactor>Large</formFactor>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>LightningComponent</type>
</actionOverrides>
<actionOverrides>
<actionName>Edit</actionName>
- <formFactor>Large</formFactor>
<type>Default</type>
</actionOverrides>
<actionOverrides>
@@ -198,11 +200,13 @@
</actionOverrides>
<actionOverrides>
<actionName>NewContact</actionName>
- <type>Default</type>
+ <content>LexContactPIPLAura</content>
+ <formFactor>Large</formFactor>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>LightningComponent</type>
</actionOverrides>
<actionOverrides>
<actionName>NewContact</actionName>
- <formFactor>Large</formFactor>
<type>Default</type>
</actionOverrides>
<actionOverrides>
@@ -269,7 +273,7 @@
<actionOverrides>
<actionName>View</actionName>
<comment>Action override created by Lightning App Builder during activation.</comment>
- <content>FlexiPage11213327</content>
+ <content>FlexiPage914008</content>
<formFactor>Large</formFactor>
<skipRecordTypeSelect>false</skipRecordTypeSelect>
<type>Flexipage</type>
@@ -325,8 +329,8 @@
<formFactor>Small</formFactor>
<type>Default</type>
</actionOverrides>
- <compactLayoutAssignment>SYSTEM</compactLayoutAssignment>
- <enableEnhancedLookup>true</enableEnhancedLookup>
+ <compactLayoutAssignment>physician</compactLayoutAssignment>
+ <enableEnhancedLookup>false</enableEnhancedLookup>
<enableFeeds>true</enableFeeds>
<enableHistory>true</enableHistory>
<externalSharingModel>ControlledByParent</externalSharingModel>
@@ -335,26 +339,48 @@
<searchLayouts>
<customTabListAdditionalFields>FULL_NAME</customTabListAdditionalFields>
<customTabListAdditionalFields>ACCOUNT.NAME</customTabListAdditionalFields>
- <customTabListAdditionalFields>CONTACT.PHONE1</customTabListAdditionalFields>
+ <customTabListAdditionalFields>Isactive__c</customTabListAdditionalFields>
+ <customTabListAdditionalFields>Doctor_Division1__c</customTabListAdditionalFields>
+ <customTabListAdditionalFields>HCP__c</customTabListAdditionalFields>
+ <customTabListAdditionalFields>Decision_Maker_Type__c</customTabListAdditionalFields>
+ <customTabListAdditionalFields>Ready_To_See_Date__c</customTabListAdditionalFields>
+ <customTabListAdditionalFields>CONTACT.PHONE3</customTabListAdditionalFields>
+ <customTabListAdditionalFields>CONTACT.EMAIL</customTabListAdditionalFields>
+ <customTabListAdditionalFields>New_Maneuver_Needs__c</customTabListAdditionalFields>
<excludedStandardButtons>OpenListInQuip</excludedStandardButtons>
<excludedStandardButtons>NewFromDocument</excludedStandardButtons>
<excludedStandardButtons>PipelineInspection</excludedStandardButtons>
<excludedStandardButtons>AddToCampaign</excludedStandardButtons>
<excludedStandardButtons>Import</excludedStandardButtons>
- <excludedStandardButtons>MassAddToCampaign</excludedStandardButtons>
+ <excludedStandardButtons>MassAddToActionableList</excludedStandardButtons>
<excludedStandardButtons>MassCreateCallList</excludedStandardButtons>
<excludedStandardButtons>SendListEmailAction</excludedStandardButtons>
<excludedStandardButtons>SendBulkMessageAction</excludedStandardButtons>
<excludedStandardButtons>PrintableListView</excludedStandardButtons>
+ <excludedStandardButtons>MassAddToCampaign</excludedStandardButtons>
<lookupDialogsAdditionalFields>FULL_NAME</lookupDialogsAdditionalFields>
<lookupDialogsAdditionalFields>ACCOUNT.NAME</lookupDialogsAdditionalFields>
+ <lookupDialogsAdditionalFields>Isactive__c</lookupDialogsAdditionalFields>
+ <lookupDialogsAdditionalFields>Doctor_Division1__c</lookupDialogsAdditionalFields>
+ <lookupDialogsAdditionalFields>HCP__c</lookupDialogsAdditionalFields>
+ <lookupDialogsAdditionalFields>Decision_Maker_Type__c</lookupDialogsAdditionalFields>
+ <lookupDialogsAdditionalFields>Ready_To_See_Date__c</lookupDialogsAdditionalFields>
+ <lookupDialogsAdditionalFields>CONTACT.PHONE3</lookupDialogsAdditionalFields>
+ <lookupDialogsAdditionalFields>CONTACT.EMAIL</lookupDialogsAdditionalFields>
+ <lookupDialogsAdditionalFields>New_Maneuver_Needs__c</lookupDialogsAdditionalFields>
<lookupPhoneDialogsAdditionalFields>FULL_NAME</lookupPhoneDialogsAdditionalFields>
<lookupPhoneDialogsAdditionalFields>ACCOUNT.NAME</lookupPhoneDialogsAdditionalFields>
- <lookupPhoneDialogsAdditionalFields>CONTACT.PHONE1</lookupPhoneDialogsAdditionalFields>
+ <lookupPhoneDialogsAdditionalFields>Isactive__c</lookupPhoneDialogsAdditionalFields>
+ <lookupPhoneDialogsAdditionalFields>Doctor_Division1__c</lookupPhoneDialogsAdditionalFields>
+ <lookupPhoneDialogsAdditionalFields>HCP__c</lookupPhoneDialogsAdditionalFields>
+ <lookupPhoneDialogsAdditionalFields>Decision_Maker_Type__c</lookupPhoneDialogsAdditionalFields>
+ <lookupPhoneDialogsAdditionalFields>Ready_To_See_Date__c</lookupPhoneDialogsAdditionalFields>
<lookupPhoneDialogsAdditionalFields>CONTACT.PHONE3</lookupPhoneDialogsAdditionalFields>
- <lookupPhoneDialogsAdditionalFields>CONTACT.PHONE4</lookupPhoneDialogsAdditionalFields>
- <lookupPhoneDialogsAdditionalFields>CONTACT.PHONE5</lookupPhoneDialogsAdditionalFields>
- <lookupPhoneDialogsAdditionalFields>CONTACT.PHONE6</lookupPhoneDialogsAdditionalFields>
+ <lookupPhoneDialogsAdditionalFields>CONTACT.EMAIL</lookupPhoneDialogsAdditionalFields>
+ <lookupPhoneDialogsAdditionalFields>New_Maneuver_Needs__c</lookupPhoneDialogsAdditionalFields>
+ <searchFilterFields>CONTACT.RECORDTYPE</searchFilterFields>
+ <searchFilterFields>CONTACT.TITLE</searchFilterFields>
+ <searchFilterFields>CONTACT.PHONE1</searchFilterFields>
<searchResultsAdditionalFields>FULL_NAME</searchResultsAdditionalFields>
<searchResultsAdditionalFields>ACCOUNT.NAME</searchResultsAdditionalFields>
<searchResultsAdditionalFields>Isactive__c</searchResultsAdditionalFields>
diff --git a/force-app/main/default/objects/Contact/fields/ContactType__c.field-meta.xml b/force-app/main/default/objects/Contact/fields/ContactType__c.field-meta.xml
index 7a27dc6..8f5926c 100644
--- a/force-app/main/default/objects/Contact/fields/ContactType__c.field-meta.xml
+++ b/force-app/main/default/objects/Contact/fields/ContactType__c.field-meta.xml
@@ -34,7 +34,6 @@
<value>
<fullName>*****</fullName>
<default>false</default>
- <isActive>false</isActive>
<label>*****</label>
</value>
</valueSetDefinition>
diff --git a/force-app/main/default/objects/Contact/fields/Description.field-meta.xml b/force-app/main/default/objects/Contact/fields/Description.field-meta.xml
index da708d5..b3781d5 100644
--- a/force-app/main/default/objects/Contact/fields/Description.field-meta.xml
+++ b/force-app/main/default/objects/Contact/fields/Description.field-meta.xml
@@ -2,5 +2,5 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Description</fullName>
<trackFeedHistory>false</trackFeedHistory>
- <trackHistory>false</trackHistory>
+ <trackHistory>true</trackHistory>
</CustomField>
diff --git a/force-app/main/default/objects/Contact/fields/Doctor_Division1__c.field-meta.xml b/force-app/main/default/objects/Contact/fields/Doctor_Division1__c.field-meta.xml
index 82dda41..a110dca 100644
--- a/force-app/main/default/objects/Contact/fields/Doctor_Division1__c.field-meta.xml
+++ b/force-app/main/default/objects/Contact/fields/Doctor_Division1__c.field-meta.xml
@@ -108,6 +108,14 @@
</value>
</valueSetDefinition>
<valueSettings>
+ <controllingFieldValue>*****</controllingFieldValue>
+ <controllingFieldValue>鍖荤敓</controllingFieldValue>
+ <controllingFieldValue>鎶ゅ＋</controllingFieldValue>
+ <controllingFieldValue>璁惧绉�</controllingFieldValue>
+ <controllingFieldValue>鍏朵粬</controllingFieldValue>
+ <valueName>*****</valueName>
+ </valueSettings>
+ <valueSettings>
<controllingFieldValue>鍖荤敓</controllingFieldValue>
<valueName>闄㈤暱</valueName>
</valueSettings>
@@ -130,14 +138,6 @@
<valueSettings>
<controllingFieldValue>鍖荤敓</controllingFieldValue>
<valueName>瀹炰範鍖荤敓</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鍖荤敓</controllingFieldValue>
- <controllingFieldValue>鎶ゅ＋</controllingFieldValue>
- <controllingFieldValue>璁惧绉�</controllingFieldValue>
- <controllingFieldValue>鍏朵粬</controllingFieldValue>
- <controllingFieldValue>*****</controllingFieldValue>
- <valueName>*****</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>鎶ゅ＋</controllingFieldValue>
diff --git a/force-app/main/default/objects/Contact/fields/Jigsaw.field-meta.xml b/force-app/main/default/objects/Contact/fields/Jigsaw.field-meta.xml
new file mode 100644
index 0000000..0c9e6b7
--- /dev/null
+++ b/force-app/main/default/objects/Contact/fields/Jigsaw.field-meta.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Jigsaw</fullName>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+</CustomField>
diff --git a/force-app/main/default/objects/Contact/fields/MobilePhone.field-meta.xml b/force-app/main/default/objects/Contact/fields/MobilePhone.field-meta.xml
index 621449e..c2d6d53 100644
--- a/force-app/main/default/objects/Contact/fields/MobilePhone.field-meta.xml
+++ b/force-app/main/default/objects/Contact/fields/MobilePhone.field-meta.xml
@@ -2,5 +2,5 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>MobilePhone</fullName>
<trackFeedHistory>false</trackFeedHistory>
- <trackHistory>true</trackHistory>
+ <trackHistory>false</trackHistory>
</CustomField>
diff --git a/force-app/main/default/objects/Contact/fields/MobilePhone_Encrypted__c.field-meta.xml b/force-app/main/default/objects/Contact/fields/MobilePhone_Encrypted__c.field-meta.xml
index 645cffe..809b52c 100644
--- a/force-app/main/default/objects/Contact/fields/MobilePhone_Encrypted__c.field-meta.xml
+++ b/force-app/main/default/objects/Contact/fields/MobilePhone_Encrypted__c.field-meta.xml
@@ -5,7 +5,7 @@
<label>MobilePhone Encrypted</label>
<length>2000</length>
<trackFeedHistory>false</trackFeedHistory>
- <trackHistory>false</trackHistory>
+ <trackHistory>true</trackHistory>
<type>LongTextArea</type>
<visibleLines>10</visibleLines>
</CustomField>
diff --git a/force-app/main/default/objects/Contact/fields/Name.field-meta.xml b/force-app/main/default/objects/Contact/fields/Name.field-meta.xml
index 8ec5444..288f7eb 100644
--- a/force-app/main/default/objects/Contact/fields/Name.field-meta.xml
+++ b/force-app/main/default/objects/Contact/fields/Name.field-meta.xml
@@ -2,5 +2,5 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Name</fullName>
<trackFeedHistory>true</trackFeedHistory>
- <trackHistory>true</trackHistory>
+ <trackHistory>false</trackHistory>
</CustomField>
diff --git a/force-app/main/default/objects/Contact/fields/Phone.field-meta.xml b/force-app/main/default/objects/Contact/fields/Phone.field-meta.xml
index e514c87..6d61b86 100644
--- a/force-app/main/default/objects/Contact/fields/Phone.field-meta.xml
+++ b/force-app/main/default/objects/Contact/fields/Phone.field-meta.xml
@@ -2,5 +2,5 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Phone</fullName>
<trackFeedHistory>false</trackFeedHistory>
- <trackHistory>true</trackHistory>
+ <trackHistory>false</trackHistory>
</CustomField>
diff --git a/force-app/main/default/objects/Contact/fields/Phone_Encrypted__c.field-meta.xml b/force-app/main/default/objects/Contact/fields/Phone_Encrypted__c.field-meta.xml
index 0bd4af2..e852a6a 100644
--- a/force-app/main/default/objects/Contact/fields/Phone_Encrypted__c.field-meta.xml
+++ b/force-app/main/default/objects/Contact/fields/Phone_Encrypted__c.field-meta.xml
@@ -5,7 +5,7 @@
<label>Phone Encrypted</label>
<length>2000</length>
<trackFeedHistory>false</trackFeedHistory>
- <trackHistory>false</trackHistory>
+ <trackHistory>true</trackHistory>
<type>LongTextArea</type>
<visibleLines>10</visibleLines>
</CustomField>
diff --git a/force-app/main/default/objects/Contact/recordTypes/Agency.recordType-meta.xml b/force-app/main/default/objects/Contact/recordTypes/Agency.recordType-meta.xml
index 93e86f5..af5d0f3 100644
--- a/force-app/main/default/objects/Contact/recordTypes/Agency.recordType-meta.xml
+++ b/force-app/main/default/objects/Contact/recordTypes/Agency.recordType-meta.xml
@@ -7,6 +7,10 @@
<picklistValues>
<picklist>ContactType__c</picklist>
<values>
+ <fullName>*****</fullName>
+ <default>false</default>
+ </values>
+ <values>
<fullName>ASE</fullName>
<default>false</default>
</values>
@@ -198,25 +202,6 @@
</values>
<values>
<fullName>鏈璇�</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>GenderIdentity</picklist>
- <values>
- <fullName>濂�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鏈垪鍑�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鐢�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>闈炰簩鍏冩�у埆</fullName>
<default>false</default>
</values>
</picklistValues>
@@ -873,33 +858,6 @@
<values>
<fullName>鏈紑灞�</fullName>
<default>true</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>Pronouns</picklist>
- <values>
- <fullName>浠�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>浠�%2F浠栦滑</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>浠栦滑</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>濂�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>濂�%2F濂逛滑</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鏈垪鍑�</fullName>
- <default>false</default>
</values>
</picklistValues>
<picklistValues>
diff --git a/force-app/main/default/objects/Contact/recordTypes/Doctor.recordType-meta.xml b/force-app/main/default/objects/Contact/recordTypes/Doctor.recordType-meta.xml
index 5d72f2d..970e6d2 100644
--- a/force-app/main/default/objects/Contact/recordTypes/Doctor.recordType-meta.xml
+++ b/force-app/main/default/objects/Contact/recordTypes/Doctor.recordType-meta.xml
@@ -7,6 +7,10 @@
<picklistValues>
<picklist>ContactType__c</picklist>
<values>
+ <fullName>*****</fullName>
+ <default>false</default>
+ </values>
+ <values>
<fullName>ASE</fullName>
<default>false</default>
</values>
@@ -126,92 +130,6 @@
</values>
</picklistValues>
<picklistValues>
- <picklist>ENG_CertificationLevel__c</picklist>
- <values>
- <fullName>A绾�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>A绾�%28澶辨晥%29</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>A绾ф湭閫氳繃</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>A绾ф湭閫氳繃%EF%BC%88澶辨晥%EF%BC%89</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>B绾�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>B绾�%28澶辨晥%29</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>B绾ф湭閫氳繃</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鍒濈骇</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鍒濈骇鏈�氳繃</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鏈璇�</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>ET_CertificationLevel__c</picklist>
- <values>
- <fullName>A绾�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>A绾�%28澶辨晥%29</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>A绾ф湭閫氳繃</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>A绾ф湭閫氳繃%EF%BC%88澶辨晥%EF%BC%89</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>B绾�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>B绾�%28澶辨晥%29</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>B绾ф湭閫氳繃</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鍒濈骇</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鍒濈骇鏈�氳繃</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鏈璇�</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
<picklist>Follow_state__c</picklist>
<values>
<fullName>鏀惧純璺熻繘</fullName>
@@ -227,68 +145,6 @@
</values>
<values>
<fullName>閲嶇偣璺熻繘</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>GIR_CertificationLevel__c</picklist>
- <values>
- <fullName>A绾�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>A绾�%28澶辨晥%29</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>A绾ф湭閫氳繃</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>A绾ф湭閫氳繃%EF%BC%88澶辨晥%EF%BC%89</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>B绾�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>B绾�%28澶辨晥%29</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>B绾ф湭閫氳繃</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鍒濈骇</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鍒濈骇鏈�氳繃</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鏈璇�</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>GenderIdentity</picklist>
- <values>
- <fullName>濂�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鏈垪鍑�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鐢�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>闈炰簩鍏冩�у埆</fullName>
<default>false</default>
</values>
</picklistValues>
@@ -948,33 +804,6 @@
</values>
</picklistValues>
<picklistValues>
- <picklist>Pronouns</picklist>
- <values>
- <fullName>浠�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>浠�%2F浠栦滑</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>浠栦滑</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>濂�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>濂�%2F濂逛滑</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鏈垪鍑�</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
<picklist>Ready_To_See_Date__c</picklist>
<values>
<fullName>鍦熸洔鏃ュ崍鍓�</fullName>
@@ -1030,49 +859,6 @@
</values>
<values>
<fullName>閲戞洔鏃ュ崍寰�</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>SP_CertificationLevel__c</picklist>
- <values>
- <fullName>A绾�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>A绾�%28澶辨晥%29</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>A绾ф湭閫氳繃</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>A绾ф湭閫氳繃%EF%BC%88澶辨晥%EF%BC%89</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>B绾�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>B绾�%28澶辨晥%29</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>B绾ф湭閫氳繃</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鍒濈骇</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鍒濈骇鏈�氳繃</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鏈璇�</fullName>
<default>false</default>
</values>
</picklistValues>
diff --git a/force-app/main/default/objects/Contact/recordTypes/Internal_staff.recordType-meta.xml b/force-app/main/default/objects/Contact/recordTypes/Internal_staff.recordType-meta.xml
index 2cc1a21..4eb1e24 100644
--- a/force-app/main/default/objects/Contact/recordTypes/Internal_staff.recordType-meta.xml
+++ b/force-app/main/default/objects/Contact/recordTypes/Internal_staff.recordType-meta.xml
@@ -7,6 +7,10 @@
<picklistValues>
<picklist>ContactType__c</picklist>
<values>
+ <fullName>*****</fullName>
+ <default>false</default>
+ </values>
+ <values>
<fullName>ASE</fullName>
<default>false</default>
</values>
@@ -54,49 +58,6 @@
</values>
</picklistValues>
<picklistValues>
- <picklist>ENG_CertificationLevel__c</picklist>
- <values>
- <fullName>A绾�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>A绾�%28澶辨晥%29</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>A绾ф湭閫氳繃</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>A绾ф湭閫氳繃%EF%BC%88澶辨晥%EF%BC%89</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>B绾�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>B绾�%28澶辨晥%29</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>B绾ф湭閫氳繃</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鍒濈骇</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鍒濈骇鏈�氳繃</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鏈璇�</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
<picklist>ET_CertificationLevel__c</picklist>
<values>
<fullName>鏈璇�</fullName>
@@ -119,68 +80,6 @@
</values>
<values>
<fullName>閲嶇偣璺熻繘</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>GIR_CertificationLevel__c</picklist>
- <values>
- <fullName>A绾�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>A绾�%28澶辨晥%29</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>A绾ф湭閫氳繃</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>A绾ф湭閫氳繃%EF%BC%88澶辨晥%EF%BC%89</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>B绾�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>B绾�%28澶辨晥%29</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>B绾ф湭閫氳繃</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鍒濈骇</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鍒濈骇鏈�氳繃</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鏈璇�</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>GenderIdentity</picklist>
- <values>
- <fullName>濂�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鏈垪鍑�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鐢�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>闈炰簩鍏冩�у埆</fullName>
<default>false</default>
</values>
</picklistValues>
@@ -840,33 +739,6 @@
</values>
</picklistValues>
<picklistValues>
- <picklist>Pronouns</picklist>
- <values>
- <fullName>浠�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>浠�%2F浠栦滑</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>浠栦滑</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>濂�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>濂�%2F濂逛滑</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鏈垪鍑�</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
<picklist>Ready_To_See_Date__c</picklist>
<values>
<fullName>鍦熸洔鏃ュ崍鍓�</fullName>
@@ -922,49 +794,6 @@
</values>
<values>
<fullName>閲戞洔鏃ュ崍寰�</fullName>
- <default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>SP_CertificationLevel__c</picklist>
- <values>
- <fullName>A绾�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>A绾�%28澶辨晥%29</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>A绾ф湭閫氳繃</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>A绾ф湭閫氳繃%EF%BC%88澶辨晥%EF%BC%89</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>B绾�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>B绾�%28澶辨晥%29</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>B绾ф湭閫氳繃</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鍒濈骇</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鍒濈骇鏈�氳繃</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鏈璇�</fullName>
<default>false</default>
</values>
</picklistValues>
diff --git a/force-app/main/default/objects/Contact/validationRules/Create_Contrat_Firstname_Check.validationRule-meta.xml b/force-app/main/default/objects/Contact/validationRules/Create_Contrat_Firstname_Check.validationRule-meta.xml
index 2955e86..65c55a2 100644
--- a/force-app/main/default/objects/Contact/validationRules/Create_Contrat_Firstname_Check.validationRule-meta.xml
+++ b/force-app/main/default/objects/Contact/validationRules/Create_Contrat_Firstname_Check.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Create_Contrat_Firstname_Check</fullName>
- <active>false</active>
+ <active>true</active>
<description>妫�鏌ョ敤鎴峰悕瀛楀悎娉曟�� 锛岀粡杩嘝I鏀归�犱箣鍚庯紝FirstName涓虹┖锛屽幓鎺夋潯浠讹細isblank(FirstName)</description>
<errorConditionFormula>isnew()&&
$User.ProfileId <>'00e10000000Y3o5'&&
diff --git a/force-app/main/default/objects/Contact/validationRules/DealerMobilePhone.validationRule-meta.xml b/force-app/main/default/objects/Contact/validationRules/DealerMobilePhone.validationRule-meta.xml
index 921a493..4dd998a 100644
--- a/force-app/main/default/objects/Contact/validationRules/DealerMobilePhone.validationRule-meta.xml
+++ b/force-app/main/default/objects/Contact/validationRules/DealerMobilePhone.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>DealerMobilePhone</fullName>
- <active>false</active>
+ <active>true</active>
<description>缁忛攢鍟嗘墜鏈哄彿楠岃瘉锛屽繀椤�11浣�</description>
<errorConditionFormula>IF(RecordType.DeveloperName == 'Agency' && LEN( MobilePhone )!= 11 && !ISBLANK(MobilePhone) ,TRUE,FALSE)</errorConditionFormula>
<errorDisplayField>MobilePhone</errorDisplayField>
diff --git a/force-app/main/default/objects/Contact/validationRules/Doctor_Create_dept_only.validationRule-meta.xml b/force-app/main/default/objects/Contact/validationRules/Doctor_Create_dept_only.validationRule-meta.xml
index 5881278..c9fb7d1 100644
--- a/force-app/main/default/objects/Contact/validationRules/Doctor_Create_dept_only.validationRule-meta.xml
+++ b/force-app/main/default/objects/Contact/validationRules/Doctor_Create_dept_only.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Doctor_Create_dept_only</fullName>
- <active>false</active>
+ <active>true</active>
<description>鍒涘缓鍖荤敓鍙兘鍦ㄧ瀹ら噷</description>
<errorConditionFormula>($User.ProfileId <>'00e10000000Y3o5' && $User.ProfileId <> '00e10000000dEQx')&&RecordTypeId='01210000000QfWd'&&isnew()&&
(Account.RecordType.DeveloperName=='HP'||
diff --git a/force-app/main/default/objects/Daily_Report__c/Daily_Report__c.object-meta.xml b/force-app/main/default/objects/Daily_Report__c/Daily_Report__c.object-meta.xml
index b12d21e..e879a59 100644
--- a/force-app/main/default/objects/Daily_Report__c/Daily_Report__c.object-meta.xml
+++ b/force-app/main/default/objects/Daily_Report__c/Daily_Report__c.object-meta.xml
@@ -177,10 +177,10 @@
<customTabListAdditionalFields>Approved_DateTime__c</customTabListAdditionalFields>
<customTabListAdditionalFields>CREATEDBY_USER.ALIAS</customTabListAdditionalFields>
<customTabListAdditionalFields>CREATEDBY_USER</customTabListAdditionalFields>
+ <excludedStandardButtons>Accept</excludedStandardButtons>
<excludedStandardButtons>New</excludedStandardButtons>
<excludedStandardButtons>OpenListInQuip</excludedStandardButtons>
<excludedStandardButtons>NewFromDocument</excludedStandardButtons>
- <excludedStandardButtons>Accept</excludedStandardButtons>
<excludedStandardButtons>ChangeOwner</excludedStandardButtons>
<excludedStandardButtons>Import</excludedStandardButtons>
<excludedStandardButtons>MassChangeOwner</excludedStandardButtons>
@@ -201,7 +201,6 @@
<searchResultsAdditionalFields>Reporter__c</searchResultsAdditionalFields>
<searchResultsAdditionalFields>CREATEDBY_USER</searchResultsAdditionalFields>
<searchResultsAdditionalFields>CREATED_DATE</searchResultsAdditionalFields>
- <searchResultsCustomButtons>newDailyReport</searchResultsCustomButtons>
</searchLayouts>
<sharingModel>Private</sharingModel>
<visibility>Public</visibility>
diff --git a/force-app/main/default/objects/Daily_Report__c/fields/Daily_Report_Key__c.field-meta.xml b/force-app/main/default/objects/Daily_Report__c/fields/Daily_Report_Key__c.field-meta.xml
index 6ed40c8..d0e7f27 100644
--- a/force-app/main/default/objects/Daily_Report__c/fields/Daily_Report_Key__c.field-meta.xml
+++ b/force-app/main/default/objects/Daily_Report__c/fields/Daily_Report_Key__c.field-meta.xml
@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Daily_Report_Key__c</fullName>
+ <caseSensitive>true</caseSensitive>
<description>鍫卞憡鑰呫仺鍫卞憡鏃ャ伄瑜囧悎銈兗</description>
- <externalId>false</externalId>
+ <externalId>true</externalId>
<label>Daily_Report_Key</label>
<length>255</length>
<required>false</required>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Text</type>
- <unique>false</unique>
+ <unique>true</unique>
</CustomField>
diff --git a/force-app/main/default/objects/Daily_Report__c/listViews/NotApprovedReport_new.listView-meta.xml b/force-app/main/default/objects/Daily_Report__c/listViews/NotApprovedReport_new.listView-meta.xml
index 342bb10..ad0804f 100644
--- a/force-app/main/default/objects/Daily_Report__c/listViews/NotApprovedReport_new.listView-meta.xml
+++ b/force-app/main/default/objects/Daily_Report__c/listViews/NotApprovedReport_new.listView-meta.xml
@@ -31,7 +31,7 @@
<filters>
<field>Daily_Report_Data_Type__c</field>
<operation>equals</operation>
- <value>閫氬父,涓�鏃ヤ紤鍋�,鍏ㄥぉ鍩硅</value>
+ <value>閫氬父,涓�鏃ヤ紤鍋�,BTC/ATC/ETC,鍏ㄥぉ鍩硅</value>
</filters>
<filters>
<field>Apply_Report__c</field>
@@ -39,4 +39,5 @@
<value>鏄�</value>
</filters>
<label>15.鐢宠涓渶瑕佽嚜宸卞鎵圭殑鏃ユ姤-浠呰嚜宸�</label>
+ <language>ja</language>
</ListView>
diff --git a/force-app/main/default/objects/Equipment_Set_Detail__c/Equipment_Set_Detail__c.object-meta.xml b/force-app/main/default/objects/Equipment_Set_Detail__c/Equipment_Set_Detail__c.object-meta.xml
index 380d7cb..25622b9 100644
--- a/force-app/main/default/objects/Equipment_Set_Detail__c/Equipment_Set_Detail__c.object-meta.xml
+++ b/force-app/main/default/objects/Equipment_Set_Detail__c/Equipment_Set_Detail__c.object-meta.xml
@@ -168,9 +168,9 @@
<customTabListAdditionalFields>Loaner_asset_no__c</customTabListAdditionalFields>
<customTabListAdditionalFields>Category3__c</customTabListAdditionalFields>
<customTabListAdditionalFields>Repair_total_amount__c</customTabListAdditionalFields>
+ <excludedStandardButtons>OpenListInQuip</excludedStandardButtons>
<excludedStandardButtons>NewFromDocument</excludedStandardButtons>
<excludedStandardButtons>Accept</excludedStandardButtons>
- <excludedStandardButtons>OpenListInQuip</excludedStandardButtons>
<excludedStandardButtons>ChangeOwner</excludedStandardButtons>
<excludedStandardButtons>Import</excludedStandardButtons>
<excludedStandardButtons>MassChangeOwner</excludedStandardButtons>
diff --git a/force-app/main/default/objects/Equipment_Set_Detail__c/fields/Asset__c.field-meta.xml b/force-app/main/default/objects/Equipment_Set_Detail__c/fields/Asset__c.field-meta.xml
index 2b6f824..4eab992 100644
--- a/force-app/main/default/objects/Equipment_Set_Detail__c/fields/Asset__c.field-meta.xml
+++ b/force-app/main/default/objects/Equipment_Set_Detail__c/fields/Asset__c.field-meta.xml
@@ -4,7 +4,7 @@
<externalId>false</externalId>
<label>淇濇湁璁惧</label>
<lookupFilter>
- <active>false</active>
+ <active>true</active>
<errorMessage>璇烽�夋嫨Olympus璧勪骇</errorMessage>
<filterItems>
<field>Asset.Asset_Owner__c</field>
diff --git a/force-app/main/default/objects/Equipment_Set__c/fields/Return_Distributor_method__c.field-meta.xml b/force-app/main/default/objects/Equipment_Set__c/fields/Return_Distributor_method__c.field-meta.xml
index e84b769..5a2ae41 100644
--- a/force-app/main/default/objects/Equipment_Set__c/fields/Return_Distributor_method__c.field-meta.xml
+++ b/force-app/main/default/objects/Equipment_Set__c/fields/Return_Distributor_method__c.field-meta.xml
@@ -33,6 +33,14 @@
</value>
</valueSetDefinition>
<valueSettings>
+ <controllingFieldValue>Fedex</controllingFieldValue>
+ <valueName>浼樺厛杈�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>Fedex</controllingFieldValue>
+ <valueName>鏅揪</valueName>
+ </valueSettings>
+ <valueSettings>
<controllingFieldValue>鍒╄</controllingFieldValue>
<controllingFieldValue>鍢夐噷澶ч��</controllingFieldValue>
<controllingFieldValue>鑾辨瘮鐗�</controllingFieldValue>
@@ -45,14 +53,6 @@
<controllingFieldValue>鑾辨瘮鐗�</controllingFieldValue>
<controllingFieldValue>鎱ч�氶�熼��</controllingFieldValue>
<valueName>绌鸿繍</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>Fedex</controllingFieldValue>
- <valueName>浼樺厛杈�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>Fedex</controllingFieldValue>
- <valueName>鏅揪</valueName>
</valueSettings>
</valueSet>
</CustomField>
diff --git a/force-app/main/default/objects/Event_Oppotunity__c/Event_Oppotunity__c.object-meta.xml b/force-app/main/default/objects/Event_Oppotunity__c/Event_Oppotunity__c.object-meta.xml
index c26497b..d4f855d 100644
--- a/force-app/main/default/objects/Event_Oppotunity__c/Event_Oppotunity__c.object-meta.xml
+++ b/force-app/main/default/objects/Event_Oppotunity__c/Event_Oppotunity__c.object-meta.xml
@@ -154,7 +154,7 @@
<enableSharing>true</enableSharing>
<enableStreamingApi>true</enableStreamingApi>
<externalSharingModel>ControlledByParent</externalSharingModel>
- <label>娲诲姩2</label>
+ <label>娲诲姩2_璇环</label>
<nameField>
<displayFormat>{YYYY}{MM}{DD}-{000000}</displayFormat>
<label>No.</label>
diff --git a/force-app/main/default/objects/Event__c/Event__c.object-meta.xml b/force-app/main/default/objects/Event__c/Event__c.object-meta.xml
index 9227bae..0d6d013 100644
--- a/force-app/main/default/objects/Event__c/Event__c.object-meta.xml
+++ b/force-app/main/default/objects/Event__c/Event__c.object-meta.xml
@@ -44,7 +44,9 @@
</actionOverrides>
<actionOverrides>
<actionName>Delete</actionName>
- <type>Default</type>
+ <content>YouCantDeleteEventC</content>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>Visualforce</type>
</actionOverrides>
<actionOverrides>
<actionName>Delete</actionName>
@@ -58,7 +60,9 @@
</actionOverrides>
<actionOverrides>
<actionName>Edit</actionName>
- <type>Default</type>
+ <content>XinDailyReport</content>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>Visualforce</type>
</actionOverrides>
<actionOverrides>
<actionName>Edit</actionName>
@@ -170,12 +174,12 @@
<customTabListAdditionalFields>StartDateTime__c</customTabListAdditionalFields>
<customTabListAdditionalFields>EndDateTime__c</customTabListAdditionalFields>
<customTabListAdditionalFields>Reporter_Name__c</customTabListAdditionalFields>
+ <excludedStandardButtons>MassChangeOwner</excludedStandardButtons>
<excludedStandardButtons>OpenListInQuip</excludedStandardButtons>
<excludedStandardButtons>NewFromDocument</excludedStandardButtons>
<excludedStandardButtons>Accept</excludedStandardButtons>
<excludedStandardButtons>ChangeOwner</excludedStandardButtons>
<excludedStandardButtons>Import</excludedStandardButtons>
- <excludedStandardButtons>MassChangeOwner</excludedStandardButtons>
<excludedStandardButtons>PrintableListView</excludedStandardButtons>
<listViewButtons>Minister</listViewButtons>
<searchResultsAdditionalFields>Activity_Type2__c</searchResultsAdditionalFields>
diff --git a/force-app/main/default/objects/Event__c/fields/Activity_PurposeEscFSE__c.field-meta.xml b/force-app/main/default/objects/Event__c/fields/Activity_PurposeEscFSE__c.field-meta.xml
index c88c7d5..67606d7 100644
--- a/force-app/main/default/objects/Event__c/fields/Activity_PurposeEscFSE__c.field-meta.xml
+++ b/force-app/main/default/objects/Event__c/fields/Activity_PurposeEscFSE__c.field-meta.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Activity_PurposeEscFSE__c</fullName>
+ <description>闈炴湇鍔�</description>
<externalId>false</externalId>
<label>鎷滆鐩殑</label>
<required>false</required>
@@ -123,18 +124,6 @@
<valueName>椤圭洰璺熻繘</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>绀惧唴娲诲嫊</controllingFieldValue>
- <valueName>浼氳</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>绀惧唴娲诲嫊</controllingFieldValue>
- <valueName>鍩硅</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>绀惧唴娲诲嫊</controllingFieldValue>
- <valueName>浜嬪姟鎬у伐浣�</valueName>
- </valueSettings>
- <valueSettings>
<controllingFieldValue>璨╁２搴�</controllingFieldValue>
<valueName>涓氬姟瀵瑰簲</valueName>
</valueSettings>
@@ -147,6 +136,18 @@
<valueName>鍏朵粬</valueName>
</valueSettings>
<valueSettings>
+ <controllingFieldValue>绀惧唴娲诲嫊</controllingFieldValue>
+ <valueName>浼氳</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>绀惧唴娲诲嫊</controllingFieldValue>
+ <valueName>鍩硅</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>绀惧唴娲诲嫊</controllingFieldValue>
+ <valueName>浜嬪姟鎬у伐浣�</valueName>
+ </valueSettings>
+ <valueSettings>
<controllingFieldValue>绀惧銈ゃ儥銉炽儓</controllingFieldValue>
<valueName>浼氳瀵瑰簲</valueName>
</valueSettings>
diff --git a/force-app/main/default/objects/Event__c/fields/Activity_PurposeFSE__c.field-meta.xml b/force-app/main/default/objects/Event__c/fields/Activity_PurposeFSE__c.field-meta.xml
index a950dbf..13243d0 100644
--- a/force-app/main/default/objects/Event__c/fields/Activity_PurposeFSE__c.field-meta.xml
+++ b/force-app/main/default/objects/Event__c/fields/Activity_PurposeFSE__c.field-meta.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Activity_PurposeFSE__c</fullName>
+ <description>鏈嶅姟</description>
<externalId>false</externalId>
<label>鎷滆鐩殑</label>
<required>false</required>
@@ -9,6 +10,7 @@
<type>Picklist</type>
<valueSet>
<controllingField>Activity_Type2__c</controllingField>
+ <restricted>true</restricted>
<valueSetDefinition>
<sorted>false</sorted>
<value>
@@ -146,6 +148,11 @@
<default>false</default>
<label>ET APP娲诲姩</label>
</value>
+ <value>
+ <fullName>椤圭洰璺熻繘</fullName>
+ <default>false</default>
+ <label>椤圭洰璺熻繘</label>
+ </value>
</valueSetDefinition>
<valueSettings>
<controllingFieldValue>鐥呴櫌</controllingFieldValue>
@@ -188,6 +195,18 @@
<valueName>閿�鍞敮鎸�</valueName>
</valueSettings>
<valueSettings>
+ <controllingFieldValue>璨╁２搴�</controllingFieldValue>
+ <valueName>ASE鍩瑰吇</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>璨╁２搴�</controllingFieldValue>
+ <valueName>瀹氭湡娌熼�氫緥浼�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>璨╁２搴�</controllingFieldValue>
+ <valueName>鍏朵粬</valueName>
+ </valueSettings>
+ <valueSettings>
<controllingFieldValue>绀惧唴娲诲嫊</controllingFieldValue>
<valueName>浼氳</valueName>
</valueSettings>
@@ -202,18 +221,6 @@
<valueSettings>
<controllingFieldValue>绀惧唴娲诲嫊</controllingFieldValue>
<valueName>璁惧鏀跺彂璐�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>璨╁２搴�</controllingFieldValue>
- <valueName>ASE鍩瑰吇</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>璨╁２搴�</controllingFieldValue>
- <valueName>瀹氭湡娌熼�氫緥浼�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>璨╁２搴�</controllingFieldValue>
- <valueName>鍏朵粬</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>绀惧銈ゃ儥銉炽儓</controllingFieldValue>
diff --git a/force-app/main/default/objects/Event__c/fields/Activity_Purpose__c.field-meta.xml b/force-app/main/default/objects/Event__c/fields/Activity_Purpose__c.field-meta.xml
index 1008251..56263dd 100644
--- a/force-app/main/default/objects/Event__c/fields/Activity_Purpose__c.field-meta.xml
+++ b/force-app/main/default/objects/Event__c/fields/Activity_Purpose__c.field-meta.xml
@@ -182,6 +182,11 @@
<label>閿�鍞細璁�</label>
</value>
<value>
+ <fullName>椤圭洰璺熻繘</fullName>
+ <default>false</default>
+ <label>椤圭洰璺熻繘</label>
+ </value>
+ <value>
<fullName>浜嬪姟鎬у伐</fullName>
<default>false</default>
<isActive>false</isActive>
diff --git a/force-app/main/default/objects/Event__c/fields/Purpose_Type2__c.field-meta.xml b/force-app/main/default/objects/Event__c/fields/Purpose_Type2__c.field-meta.xml
index c75c06c..a557850 100644
--- a/force-app/main/default/objects/Event__c/fields/Purpose_Type2__c.field-meta.xml
+++ b/force-app/main/default/objects/Event__c/fields/Purpose_Type2__c.field-meta.xml
@@ -479,14 +479,22 @@
<valueName>鏈嶅姟鍚堝悓</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>绀惧唴娲诲嫊</controllingFieldValue>
<controllingFieldValue>璨╁２搴�</controllingFieldValue>
+ <controllingFieldValue>绀惧唴娲诲嫊</controllingFieldValue>
<valueName>渚嬩細</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>绀惧唴娲诲嫊</controllingFieldValue>
<controllingFieldValue>璨╁２搴�</controllingFieldValue>
+ <controllingFieldValue>绀惧唴娲诲嫊</controllingFieldValue>
<valueName>鍩硅</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>璨╁２搴�</controllingFieldValue>
+ <valueName>搴撳瓨纭</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>璨╁２搴�</controllingFieldValue>
+ <valueName>鍏朵粬浜嬪疁</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>绀惧唴娲诲嫊</controllingFieldValue>
@@ -499,14 +507,6 @@
<valueSettings>
<controllingFieldValue>绀惧唴娲诲嫊</controllingFieldValue>
<valueName>鍑嗗璧勬枡or鎶ュ憡</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>璨╁２搴�</controllingFieldValue>
- <valueName>搴撳瓨纭</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>璨╁２搴�</controllingFieldValue>
- <valueName>鍏朵粬浜嬪疁</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>绉诲嫊</controllingFieldValue>
diff --git a/force-app/main/default/objects/Event__c/fields/Purpose_Type3__c.field-meta.xml b/force-app/main/default/objects/Event__c/fields/Purpose_Type3__c.field-meta.xml
index 3dc35bd..22d7a7b 100644
--- a/force-app/main/default/objects/Event__c/fields/Purpose_Type3__c.field-meta.xml
+++ b/force-app/main/default/objects/Event__c/fields/Purpose_Type3__c.field-meta.xml
@@ -459,14 +459,22 @@
<valueName>鏈嶅姟鍚堝悓</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>绀惧唴娲诲嫊</controllingFieldValue>
<controllingFieldValue>璨╁２搴�</controllingFieldValue>
+ <controllingFieldValue>绀惧唴娲诲嫊</controllingFieldValue>
<valueName>渚嬩細</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>绀惧唴娲诲嫊</controllingFieldValue>
<controllingFieldValue>璨╁２搴�</controllingFieldValue>
+ <controllingFieldValue>绀惧唴娲诲嫊</controllingFieldValue>
<valueName>鍩硅</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>璨╁２搴�</controllingFieldValue>
+ <valueName>搴撳瓨纭</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>璨╁２搴�</controllingFieldValue>
+ <valueName>鍏朵粬浜嬪疁</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>绀惧唴娲诲嫊</controllingFieldValue>
@@ -479,14 +487,6 @@
<valueSettings>
<controllingFieldValue>绀惧唴娲诲嫊</controllingFieldValue>
<valueName>鍑嗗璧勬枡or鎶ュ憡</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>璨╁２搴�</controllingFieldValue>
- <valueName>搴撳瓨纭</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>璨╁２搴�</controllingFieldValue>
- <valueName>鍏朵粬浜嬪疁</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>绉诲嫊</controllingFieldValue>
diff --git a/force-app/main/default/objects/Event__c/fields/Purpose_Type4__c.field-meta.xml b/force-app/main/default/objects/Event__c/fields/Purpose_Type4__c.field-meta.xml
index 8301320..2830256 100644
--- a/force-app/main/default/objects/Event__c/fields/Purpose_Type4__c.field-meta.xml
+++ b/force-app/main/default/objects/Event__c/fields/Purpose_Type4__c.field-meta.xml
@@ -489,14 +489,22 @@
<valueName>鏈嶅姟鍚堝悓</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>绀惧唴娲诲嫊</controllingFieldValue>
<controllingFieldValue>璨╁２搴�</controllingFieldValue>
+ <controllingFieldValue>绀惧唴娲诲嫊</controllingFieldValue>
<valueName>渚嬩細</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>绀惧唴娲诲嫊</controllingFieldValue>
<controllingFieldValue>璨╁２搴�</controllingFieldValue>
+ <controllingFieldValue>绀惧唴娲诲嫊</controllingFieldValue>
<valueName>鍩硅</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>璨╁２搴�</controllingFieldValue>
+ <valueName>搴撳瓨纭</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>璨╁２搴�</controllingFieldValue>
+ <valueName>鍏朵粬浜嬪疁</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>绀惧唴娲诲嫊</controllingFieldValue>
@@ -509,14 +517,6 @@
<valueSettings>
<controllingFieldValue>绀惧唴娲诲嫊</controllingFieldValue>
<valueName>鍑嗗璧勬枡or鎶ュ憡</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>璨╁２搴�</controllingFieldValue>
- <valueName>搴撳瓨纭</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>璨╁２搴�</controllingFieldValue>
- <valueName>鍏朵粬浜嬪疁</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>绉诲嫊</controllingFieldValue>
diff --git a/force-app/main/default/objects/Event__c/fields/Purpose_Type5__c.field-meta.xml b/force-app/main/default/objects/Event__c/fields/Purpose_Type5__c.field-meta.xml
index 4e70a44..33f55e1 100644
--- a/force-app/main/default/objects/Event__c/fields/Purpose_Type5__c.field-meta.xml
+++ b/force-app/main/default/objects/Event__c/fields/Purpose_Type5__c.field-meta.xml
@@ -484,14 +484,22 @@
<valueName>鏈嶅姟鍚堝悓</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>绀惧唴娲诲嫊</controllingFieldValue>
<controllingFieldValue>璨╁２搴�</controllingFieldValue>
+ <controllingFieldValue>绀惧唴娲诲嫊</controllingFieldValue>
<valueName>渚嬩細</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>绀惧唴娲诲嫊</controllingFieldValue>
<controllingFieldValue>璨╁２搴�</controllingFieldValue>
+ <controllingFieldValue>绀惧唴娲诲嫊</controllingFieldValue>
<valueName>鍩硅</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>璨╁２搴�</controllingFieldValue>
+ <valueName>搴撳瓨纭</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>璨╁２搴�</controllingFieldValue>
+ <valueName>鍏朵粬浜嬪疁</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>绀惧唴娲诲嫊</controllingFieldValue>
@@ -504,14 +512,6 @@
<valueSettings>
<controllingFieldValue>绀惧唴娲诲嫊</controllingFieldValue>
<valueName>鍑嗗璧勬枡or鎶ュ憡</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>璨╁２搴�</controllingFieldValue>
- <valueName>搴撳瓨纭</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>璨╁２搴�</controllingFieldValue>
- <valueName>鍏朵粬浜嬪疁</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>绉诲嫊</controllingFieldValue>
diff --git a/force-app/main/default/objects/Event__c/fields/Purpose_TypeFSE2__c.field-meta.xml b/force-app/main/default/objects/Event__c/fields/Purpose_TypeFSE2__c.field-meta.xml
index d1e2231..163131a 100644
--- a/force-app/main/default/objects/Event__c/fields/Purpose_TypeFSE2__c.field-meta.xml
+++ b/force-app/main/default/objects/Event__c/fields/Purpose_TypeFSE2__c.field-meta.xml
@@ -419,17 +419,121 @@
</value>
</valueSetDefinition>
<valueSettings>
- <controllingFieldValue>鏁呴殰澶勭悊</controllingFieldValue>
- <valueName>鏁呴殰妫�娴�</valueName>
+ <controllingFieldValue>浜у搧鍝佽川淇濆叏</controllingFieldValue>
+ <valueName>鎶曡瘔绱㈣禂瀵瑰簲</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鏁呴殰澶勭悊</controllingFieldValue>
- <valueName>缁存姢淇濆吇灏忎慨</valueName>
+ <controllingFieldValue>浜у搧鍝佽川淇濆叏</controllingFieldValue>
+ <valueName>淇悊鍝佽川瀵瑰簲</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鍚堝悓鎺ㄥ箍</controllingFieldValue>
+ <controllingFieldValue>浜у搧鍝佽川淇濆叏</controllingFieldValue>
+ <valueName>鍙洖鍝佸搴�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>浜у搧鍝佽川淇濆叏</controllingFieldValue>
+ <valueName>涓嶈壇浜嬩欢瀵瑰簲</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>棰勯槻淇濆叏娲诲姩</controllingFieldValue>
+ <valueName>鐐规</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>棰勯槻淇濆叏娲诲姩</controllingFieldValue>
+ <valueName>鍞悗璺熷彴</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>棰勯槻淇濆叏娲诲姩</controllingFieldValue>
+ <valueName>鏁呴殰棰勯槻鍩硅</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>棰勯槻淇濆叏娲诲姩</controllingFieldValue>
+ <valueName>OER鏈嶅姟瀵瑰簲</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>甯傚満澶氬勾淇濅慨</controllingFieldValue>
+ <valueName>娑堣垂鐜囬璀︾偣妫�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>甯傚満澶氬勾淇濅慨</controllingFieldValue>
+ <valueName>娑堣垂鐜囬璀﹁窡鍙�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>甯傚満澶氬勾淇濅慨</controllingFieldValue>
+ <valueName>娑堣垂鐜囬璀﹀煿璁�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>甯傚満澶氬勾淇濅慨</controllingFieldValue>
+ <valueName>娑堣垂鐜囬璀M娲诲姩</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>璁惧鏀跺彂璐�</controllingFieldValue>
+ <valueName>淇悊鍝佹敹鍙戣揣</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>璁惧鏀跺彂璐�</controllingFieldValue>
+ <valueName>澶囧搧鏀跺彂璐�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>ASE鍩瑰吇</controllingFieldValue>
+ <valueName>ASE鍩硅/甯︽暀</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>ASE鍩瑰吇</controllingFieldValue>
+ <valueName>璁よ瘉/骞村鏀寔</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>瀹氭湡娌熼�氫緥浼�</controllingFieldValue>
+ <valueName>瀹氭湡娌熼�氫緥浼�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鏈嶅姟浼氳</controllingFieldValue>
+ <valueName>TTC娲诲姩鏀寔</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鏈嶅姟浼氳</controllingFieldValue>
+ <valueName>GI-NTC娲诲姩鏀寔</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鏈嶅姟浼氳</controllingFieldValue>
+ <valueName>SP-NTC娲诲姩鏀寔</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鏈嶅姟浼氳</controllingFieldValue>
+ <valueName>鍖绘妧鎶ゆ椿鍔ㄦ敮鎸�</valueName>
+ </valueSettings>
+ <valueSettings>
<controllingFieldValue>缁翠慨璺熻繘</controllingFieldValue>
+ <valueName>鍙栨晠闅滆澶�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>缁翠慨璺熻繘</controllingFieldValue>
+ <valueName>鎶ヤ环璺熻繘</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>缁翠慨璺熻繘</controllingFieldValue>
+ <valueName>淇悊瀹屾垚鍝佸綊杩�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>缁翠慨璺熻繘</controllingFieldValue>
+ <controllingFieldValue>鍚堝悓鎺ㄥ箍</controllingFieldValue>
<valueName>鏀舵</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>閿�鍞敮鎸�</controllingFieldValue>
+ <valueName>澶囧搧瑁呮満/OPD</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>閿�鍞敮鎸�</controllingFieldValue>
+ <valueName>鍞墠鍜ㄨ鏀寔</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>閿�鍞敮鎸�</controllingFieldValue>
+ <valueName>浜у搧璇曠敤鏀寔</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>閿�鍞敮鎸�</controllingFieldValue>
+ <valueName>鎷涙爣/鍟嗚皥</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>鍚堝悓鎺ㄥ箍</controllingFieldValue>
@@ -461,36 +565,12 @@
<valueName>鍩硅</valueName>
</valueSettings>
<valueSettings>
+ <controllingFieldValue>鍏朵粬</controllingFieldValue>
+ <valueName>鍏朵粬</valueName>
+ </valueSettings>
+ <valueSettings>
<controllingFieldValue>浼氳瀵瑰簲</controllingFieldValue>
<valueName>閿�鍞細璁�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>ET APP娲诲姩</controllingFieldValue>
- <valueName>ET APP娲诲姩</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>閿�鍞敮鎸�</controllingFieldValue>
- <valueName>澶囧搧瑁呮満/OPD</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>閿�鍞敮鎸�</controllingFieldValue>
- <valueName>鍞墠鍜ㄨ鏀寔</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>閿�鍞敮鎸�</controllingFieldValue>
- <valueName>浜у搧璇曠敤鏀寔</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>閿�鍞敮鎸�</controllingFieldValue>
- <valueName>鎷涙爣/鍟嗚皥</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>浼氳</controllingFieldValue>
- <valueName>渚嬩細</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>浼氳</controllingFieldValue>
- <valueName>鍏朵粬浼氳</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>鍏徃鍩硅</controllingFieldValue>
@@ -503,6 +583,26 @@
<valueSettings>
<controllingFieldValue>鍏徃鍩硅</controllingFieldValue>
<valueName>鍏朵粬鍩硅</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>ET APP娲诲姩</controllingFieldValue>
+ <valueName>ET APP娲诲姩</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>浼戝亣</controllingFieldValue>
+ <valueName>浼戝亣</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>绉诲姩</controllingFieldValue>
+ <valueName>绉诲姩</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>浼氳</controllingFieldValue>
+ <valueName>渚嬩細</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>浼氳</controllingFieldValue>
+ <valueName>鍏朵粬浼氳</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>浜嬪姟鎬у伐浣�</controllingFieldValue>
@@ -525,48 +625,12 @@
<valueName>鍏朵粬浜嬪姟鎬у伐浣�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>璁惧鏀跺彂璐�</controllingFieldValue>
- <valueName>淇悊鍝佹敹鍙戣揣</valueName>
+ <controllingFieldValue>鏁呴殰澶勭悊</controllingFieldValue>
+ <valueName>鏁呴殰妫�娴�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>璁惧鏀跺彂璐�</controllingFieldValue>
- <valueName>澶囧搧鏀跺彂璐�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>ASE鍩瑰吇</controllingFieldValue>
- <valueName>ASE鍩硅/甯︽暀</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>ASE鍩瑰吇</controllingFieldValue>
- <valueName>璁よ瘉/骞村鏀寔</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>瀹氭湡娌熼�氫緥浼�</controllingFieldValue>
- <valueName>瀹氭湡娌熼�氫緥浼�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鍏朵粬</controllingFieldValue>
- <valueName>鍏朵粬</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鏈嶅姟浼氳</controllingFieldValue>
- <valueName>TTC娲诲姩鏀寔</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鏈嶅姟浼氳</controllingFieldValue>
- <valueName>GI-NTC娲诲姩鏀寔</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鏈嶅姟浼氳</controllingFieldValue>
- <valueName>SP-NTC娲诲姩鏀寔</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鏈嶅姟浼氳</controllingFieldValue>
- <valueName>鍖绘妧鎶ゆ椿鍔ㄦ敮鎸�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>绉诲姩</controllingFieldValue>
- <valueName>绉诲姩</valueName>
+ <controllingFieldValue>鏁呴殰澶勭悊</controllingFieldValue>
+ <valueName>缁存姢淇濆吇灏忎慨</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>瑁呮満</controllingFieldValue>
@@ -607,58 +671,6 @@
<valueSettings>
<controllingFieldValue>鐜板満鏈嶅姟</controllingFieldValue>
<valueName>绀艰妭鎬ф嫓璁�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>缁翠慨璺熻繘</controllingFieldValue>
- <valueName>鍙栨晠闅滆澶�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>缁翠慨璺熻繘</controllingFieldValue>
- <valueName>鎶ヤ环璺熻繘</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>缁翠慨璺熻繘</controllingFieldValue>
- <valueName>淇悊瀹屾垚鍝佸綊杩�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>澶囧搧瀵瑰簲</controllingFieldValue>
- <valueName>澶囧搧瑁呮満</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>澶囧搧瀵瑰簲</controllingFieldValue>
- <valueName>澶囧搧鍥炴敹</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>浜у搧鍝佽川淇濆叏</controllingFieldValue>
- <valueName>鎶曡瘔绱㈣禂瀵瑰簲</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>浜у搧鍝佽川淇濆叏</controllingFieldValue>
- <valueName>淇悊鍝佽川瀵瑰簲</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>浜у搧鍝佽川淇濆叏</controllingFieldValue>
- <valueName>鍙洖鍝佸搴�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>浜у搧鍝佽川淇濆叏</controllingFieldValue>
- <valueName>涓嶈壇浜嬩欢瀵瑰簲</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>棰勯槻淇濆叏娲诲姩</controllingFieldValue>
- <valueName>鐐规</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>棰勯槻淇濆叏娲诲姩</controllingFieldValue>
- <valueName>鍞悗璺熷彴</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>棰勯槻淇濆叏娲诲姩</controllingFieldValue>
- <valueName>鏁呴殰棰勯槻鍩硅</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>棰勯槻淇濆叏娲诲姩</controllingFieldValue>
- <valueName>OER鏈嶅姟瀵瑰簲</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>瀹㈡埛鍩硅</controllingFieldValue>
@@ -709,24 +721,12 @@
<valueName>鍚堝悓AM娲诲姩</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>甯傚満澶氬勾淇濅慨</controllingFieldValue>
- <valueName>娑堣垂鐜囬璀︾偣妫�</valueName>
+ <controllingFieldValue>澶囧搧瀵瑰簲</controllingFieldValue>
+ <valueName>澶囧搧瑁呮満</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>甯傚満澶氬勾淇濅慨</controllingFieldValue>
- <valueName>娑堣垂鐜囬璀﹁窡鍙�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>甯傚満澶氬勾淇濅慨</controllingFieldValue>
- <valueName>娑堣垂鐜囬璀﹀煿璁�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>甯傚満澶氬勾淇濅慨</controllingFieldValue>
- <valueName>娑堣垂鐜囬璀M娲诲姩</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>浼戝亣</controllingFieldValue>
- <valueName>浼戝亣</valueName>
+ <controllingFieldValue>澶囧搧瀵瑰簲</controllingFieldValue>
+ <valueName>澶囧搧鍥炴敹</valueName>
</valueSettings>
</valueSet>
</CustomField>
diff --git a/force-app/main/default/objects/Event__c/fields/Purpose_TypeFSE3__c.field-meta.xml b/force-app/main/default/objects/Event__c/fields/Purpose_TypeFSE3__c.field-meta.xml
index ca82c9e..e03f36b 100644
--- a/force-app/main/default/objects/Event__c/fields/Purpose_TypeFSE3__c.field-meta.xml
+++ b/force-app/main/default/objects/Event__c/fields/Purpose_TypeFSE3__c.field-meta.xml
@@ -419,17 +419,126 @@
</value>
</valueSetDefinition>
<valueSettings>
- <controllingFieldValue>鏁呴殰澶勭悊</controllingFieldValue>
- <valueName>鏁呴殰妫�娴�</valueName>
+ <controllingFieldValue>浜у搧鍝佽川淇濆叏</controllingFieldValue>
+ <valueName>鎶曡瘔绱㈣禂瀵瑰簲</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鏁呴殰澶勭悊</controllingFieldValue>
- <valueName>缁存姢淇濆吇灏忎慨</valueName>
+ <controllingFieldValue>浜у搧鍝佽川淇濆叏</controllingFieldValue>
+ <valueName>淇悊鍝佽川瀵瑰簲</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鍚堝悓鎺ㄥ箍</controllingFieldValue>
+ <controllingFieldValue>浜у搧鍝佽川淇濆叏</controllingFieldValue>
+ <valueName>鍙洖鍝佸搴�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>浜у搧鍝佽川淇濆叏</controllingFieldValue>
+ <valueName>涓嶈壇浜嬩欢瀵瑰簲</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>棰勯槻淇濆叏娲诲姩</controllingFieldValue>
+ <valueName>鐐规</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>棰勯槻淇濆叏娲诲姩</controllingFieldValue>
+ <valueName>鍞悗璺熷彴</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>棰勯槻淇濆叏娲诲姩</controllingFieldValue>
+ <valueName>鏁呴殰棰勯槻鍩硅</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>棰勯槻淇濆叏娲诲姩</controllingFieldValue>
+ <valueName>OER鏈嶅姟瀵瑰簲</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>甯傚満澶氬勾淇濅慨</controllingFieldValue>
+ <valueName>娑堣垂鐜囬璀︾偣妫�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>甯傚満澶氬勾淇濅慨</controllingFieldValue>
+ <valueName>娑堣垂鐜囬璀﹁窡鍙�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>甯傚満澶氬勾淇濅慨</controllingFieldValue>
+ <valueName>娑堣垂鐜囬璀﹀煿璁�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>甯傚満澶氬勾淇濅慨</controllingFieldValue>
+ <valueName>娑堣垂鐜囬璀M娲诲姩</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>璁惧鏀跺彂璐�</controllingFieldValue>
+ <valueName>淇悊鍝佹敹鍙戣揣</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>璁惧鏀跺彂璐�</controllingFieldValue>
+ <valueName>澶囧搧鏀跺彂璐�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>ASE鍩瑰吇</controllingFieldValue>
+ <valueName>ASE鍩硅/甯︽暀</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>ASE鍩瑰吇</controllingFieldValue>
+ <valueName>璁よ瘉/骞村鏀寔</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>瀹氭湡娌熼�氫緥浼�</controllingFieldValue>
+ <valueName>瀹氭湡娌熼�氫緥浼�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鏈嶅姟浼氳</controllingFieldValue>
+ <valueName>TTC娲诲姩鏀寔</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鏈嶅姟浼氳</controllingFieldValue>
+ <valueName>GI-NTC娲诲姩鏀寔</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鏈嶅姟浼氳</controllingFieldValue>
+ <valueName>SP-NTC娲诲姩鏀寔</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鏈嶅姟浼氳</controllingFieldValue>
+ <valueName>鍖绘妧鎶ゆ椿鍔ㄦ敮鎸�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>椤圭洰璺熻繘</controllingFieldValue>
+ <controllingFieldValue>浼氳瀵瑰簲</controllingFieldValue>
+ <valueName>閿�鍞細璁�</valueName>
+ </valueSettings>
+ <valueSettings>
<controllingFieldValue>缁翠慨璺熻繘</controllingFieldValue>
+ <valueName>鎶ヤ环璺熻繘</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>缁翠慨璺熻繘</controllingFieldValue>
+ <valueName>淇悊瀹屾垚鍝佸綊杩�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>缁翠慨璺熻繘</controllingFieldValue>
+ <controllingFieldValue>鍚堝悓鎺ㄥ箍</controllingFieldValue>
<valueName>鏀舵</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>缁翠慨璺熻繘</controllingFieldValue>
+ <valueName>鍙栨晠闅滆澶�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>閿�鍞敮鎸�</controllingFieldValue>
+ <valueName>澶囧搧瑁呮満/OPD</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>閿�鍞敮鎸�</controllingFieldValue>
+ <valueName>鍞墠鍜ㄨ鏀寔</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>閿�鍞敮鎸�</controllingFieldValue>
+ <valueName>浜у搧璇曠敤鏀寔</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>閿�鍞敮鎸�</controllingFieldValue>
+ <valueName>鎷涙爣/鍟嗚皥</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>鍚堝悓鎺ㄥ箍</controllingFieldValue>
@@ -463,36 +572,8 @@
<valueName>鍩硅</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>浼氳瀵瑰簲</controllingFieldValue>
- <valueName>閿�鍞細璁�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>ET APP娲诲姩</controllingFieldValue>
- <valueName>ET APP娲诲姩</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>閿�鍞敮鎸�</controllingFieldValue>
- <valueName>澶囧搧瑁呮満/OPD</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>閿�鍞敮鎸�</controllingFieldValue>
- <valueName>鍞墠鍜ㄨ鏀寔</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>閿�鍞敮鎸�</controllingFieldValue>
- <valueName>浜у搧璇曠敤鏀寔</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>閿�鍞敮鎸�</controllingFieldValue>
- <valueName>鎷涙爣/鍟嗚皥</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>浼氳</controllingFieldValue>
- <valueName>渚嬩細</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>浼氳</controllingFieldValue>
- <valueName>鍏朵粬浼氳</valueName>
+ <controllingFieldValue>鍏朵粬</controllingFieldValue>
+ <valueName>鍏朵粬</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>鍏徃鍩硅</controllingFieldValue>
@@ -505,6 +586,26 @@
<valueSettings>
<controllingFieldValue>鍏徃鍩硅</controllingFieldValue>
<valueName>鍏朵粬鍩硅</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>ET APP娲诲姩</controllingFieldValue>
+ <valueName>ET APP娲诲姩</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>浼戝亣</controllingFieldValue>
+ <valueName>浼戝亣</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>绉诲姩</controllingFieldValue>
+ <valueName>绉诲姩</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>浼氳</controllingFieldValue>
+ <valueName>渚嬩細</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>浼氳</controllingFieldValue>
+ <valueName>鍏朵粬浼氳</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>浜嬪姟鎬у伐浣�</controllingFieldValue>
@@ -527,48 +628,12 @@
<valueName>鍏朵粬浜嬪姟鎬у伐浣�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>璁惧鏀跺彂璐�</controllingFieldValue>
- <valueName>淇悊鍝佹敹鍙戣揣</valueName>
+ <controllingFieldValue>鏁呴殰澶勭悊</controllingFieldValue>
+ <valueName>鏁呴殰妫�娴�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>璁惧鏀跺彂璐�</controllingFieldValue>
- <valueName>澶囧搧鏀跺彂璐�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>ASE鍩瑰吇</controllingFieldValue>
- <valueName>ASE鍩硅/甯︽暀</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>ASE鍩瑰吇</controllingFieldValue>
- <valueName>璁よ瘉/骞村鏀寔</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>瀹氭湡娌熼�氫緥浼�</controllingFieldValue>
- <valueName>瀹氭湡娌熼�氫緥浼�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鍏朵粬</controllingFieldValue>
- <valueName>鍏朵粬</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鏈嶅姟浼氳</controllingFieldValue>
- <valueName>TTC娲诲姩鏀寔</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鏈嶅姟浼氳</controllingFieldValue>
- <valueName>GI-NTC娲诲姩鏀寔</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鏈嶅姟浼氳</controllingFieldValue>
- <valueName>SP-NTC娲诲姩鏀寔</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鏈嶅姟浼氳</controllingFieldValue>
- <valueName>鍖绘妧鎶ゆ椿鍔ㄦ敮鎸�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>绉诲姩</controllingFieldValue>
- <valueName>绉诲姩</valueName>
+ <controllingFieldValue>鏁呴殰澶勭悊</controllingFieldValue>
+ <valueName>缁存姢淇濆吇灏忎慨</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>瑁呮満</controllingFieldValue>
@@ -609,58 +674,6 @@
<valueSettings>
<controllingFieldValue>鐜板満鏈嶅姟</controllingFieldValue>
<valueName>绀艰妭鎬ф嫓璁�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>缁翠慨璺熻繘</controllingFieldValue>
- <valueName>鎶ヤ环璺熻繘</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>缁翠慨璺熻繘</controllingFieldValue>
- <valueName>淇悊瀹屾垚鍝佸綊杩�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>缁翠慨璺熻繘</controllingFieldValue>
- <valueName>鍙栨晠闅滆澶�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>澶囧搧瀵瑰簲</controllingFieldValue>
- <valueName>澶囧搧瑁呮満</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>澶囧搧瀵瑰簲</controllingFieldValue>
- <valueName>澶囧搧鍥炴敹</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>浜у搧鍝佽川淇濆叏</controllingFieldValue>
- <valueName>鎶曡瘔绱㈣禂瀵瑰簲</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>浜у搧鍝佽川淇濆叏</controllingFieldValue>
- <valueName>淇悊鍝佽川瀵瑰簲</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>浜у搧鍝佽川淇濆叏</controllingFieldValue>
- <valueName>鍙洖鍝佸搴�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>浜у搧鍝佽川淇濆叏</controllingFieldValue>
- <valueName>涓嶈壇浜嬩欢瀵瑰簲</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>棰勯槻淇濆叏娲诲姩</controllingFieldValue>
- <valueName>鐐规</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>棰勯槻淇濆叏娲诲姩</controllingFieldValue>
- <valueName>鍞悗璺熷彴</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>棰勯槻淇濆叏娲诲姩</controllingFieldValue>
- <valueName>鏁呴殰棰勯槻鍩硅</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>棰勯槻淇濆叏娲诲姩</controllingFieldValue>
- <valueName>OER鏈嶅姟瀵瑰簲</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>瀹㈡埛鍩硅</controllingFieldValue>
@@ -711,24 +724,12 @@
<valueName>鍚堝悓AM娲诲姩</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>甯傚満澶氬勾淇濅慨</controllingFieldValue>
- <valueName>娑堣垂鐜囬璀︾偣妫�</valueName>
+ <controllingFieldValue>澶囧搧瀵瑰簲</controllingFieldValue>
+ <valueName>澶囧搧瑁呮満</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>甯傚満澶氬勾淇濅慨</controllingFieldValue>
- <valueName>娑堣垂鐜囬璀﹁窡鍙�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>甯傚満澶氬勾淇濅慨</controllingFieldValue>
- <valueName>娑堣垂鐜囬璀﹀煿璁�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>甯傚満澶氬勾淇濅慨</controllingFieldValue>
- <valueName>娑堣垂鐜囬璀M娲诲姩</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>浼戝亣</controllingFieldValue>
- <valueName>浼戝亣</valueName>
+ <controllingFieldValue>澶囧搧瀵瑰簲</controllingFieldValue>
+ <valueName>澶囧搧鍥炴敹</valueName>
</valueSettings>
</valueSet>
</CustomField>
diff --git a/force-app/main/default/objects/Event__c/fields/Purpose_TypeFSE4__c.field-meta.xml b/force-app/main/default/objects/Event__c/fields/Purpose_TypeFSE4__c.field-meta.xml
index 34ffb68..f193851 100644
--- a/force-app/main/default/objects/Event__c/fields/Purpose_TypeFSE4__c.field-meta.xml
+++ b/force-app/main/default/objects/Event__c/fields/Purpose_TypeFSE4__c.field-meta.xml
@@ -419,17 +419,126 @@
</value>
</valueSetDefinition>
<valueSettings>
- <controllingFieldValue>鏁呴殰澶勭悊</controllingFieldValue>
- <valueName>鏁呴殰妫�娴�</valueName>
+ <controllingFieldValue>浜у搧鍝佽川淇濆叏</controllingFieldValue>
+ <valueName>鎶曡瘔绱㈣禂瀵瑰簲</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鏁呴殰澶勭悊</controllingFieldValue>
- <valueName>缁存姢淇濆吇灏忎慨</valueName>
+ <controllingFieldValue>浜у搧鍝佽川淇濆叏</controllingFieldValue>
+ <valueName>淇悊鍝佽川瀵瑰簲</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鍚堝悓鎺ㄥ箍</controllingFieldValue>
+ <controllingFieldValue>浜у搧鍝佽川淇濆叏</controllingFieldValue>
+ <valueName>鍙洖鍝佸搴�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>浜у搧鍝佽川淇濆叏</controllingFieldValue>
+ <valueName>涓嶈壇浜嬩欢瀵瑰簲</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>棰勯槻淇濆叏娲诲姩</controllingFieldValue>
+ <valueName>鐐规</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>棰勯槻淇濆叏娲诲姩</controllingFieldValue>
+ <valueName>鍞悗璺熷彴</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>棰勯槻淇濆叏娲诲姩</controllingFieldValue>
+ <valueName>鏁呴殰棰勯槻鍩硅</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>棰勯槻淇濆叏娲诲姩</controllingFieldValue>
+ <valueName>OER鏈嶅姟瀵瑰簲</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>甯傚満澶氬勾淇濅慨</controllingFieldValue>
+ <valueName>娑堣垂鐜囬璀︾偣妫�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>甯傚満澶氬勾淇濅慨</controllingFieldValue>
+ <valueName>娑堣垂鐜囬璀﹁窡鍙�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>甯傚満澶氬勾淇濅慨</controllingFieldValue>
+ <valueName>娑堣垂鐜囬璀﹀煿璁�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>甯傚満澶氬勾淇濅慨</controllingFieldValue>
+ <valueName>娑堣垂鐜囬璀M娲诲姩</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>璁惧鏀跺彂璐�</controllingFieldValue>
+ <valueName>淇悊鍝佹敹鍙戣揣</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>璁惧鏀跺彂璐�</controllingFieldValue>
+ <valueName>澶囧搧鏀跺彂璐�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>ASE鍩瑰吇</controllingFieldValue>
+ <valueName>ASE鍩硅/甯︽暀</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>ASE鍩瑰吇</controllingFieldValue>
+ <valueName>璁よ瘉/骞村鏀寔</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>瀹氭湡娌熼�氫緥浼�</controllingFieldValue>
+ <valueName>瀹氭湡娌熼�氫緥浼�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鏈嶅姟浼氳</controllingFieldValue>
+ <valueName>TTC娲诲姩鏀寔</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鏈嶅姟浼氳</controllingFieldValue>
+ <valueName>GI-NTC娲诲姩鏀寔</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鏈嶅姟浼氳</controllingFieldValue>
+ <valueName>SP-NTC娲诲姩鏀寔</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鏈嶅姟浼氳</controllingFieldValue>
+ <valueName>鍖绘妧鎶ゆ椿鍔ㄦ敮鎸�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>椤圭洰璺熻繘</controllingFieldValue>
+ <controllingFieldValue>浼氳瀵瑰簲</controllingFieldValue>
+ <valueName>閿�鍞細璁�</valueName>
+ </valueSettings>
+ <valueSettings>
<controllingFieldValue>缁翠慨璺熻繘</controllingFieldValue>
+ <valueName>鍙栨晠闅滆澶�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>缁翠慨璺熻繘</controllingFieldValue>
+ <valueName>鎶ヤ环璺熻繘</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>缁翠慨璺熻繘</controllingFieldValue>
+ <valueName>淇悊瀹屾垚鍝佸綊杩�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>缁翠慨璺熻繘</controllingFieldValue>
+ <controllingFieldValue>鍚堝悓鎺ㄥ箍</controllingFieldValue>
<valueName>鏀舵</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>閿�鍞敮鎸�</controllingFieldValue>
+ <valueName>澶囧搧瑁呮満/OPD</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>閿�鍞敮鎸�</controllingFieldValue>
+ <valueName>鍞墠鍜ㄨ鏀寔</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>閿�鍞敮鎸�</controllingFieldValue>
+ <valueName>浜у搧璇曠敤鏀寔</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>閿�鍞敮鎸�</controllingFieldValue>
+ <valueName>鎷涙爣/鍟嗚皥</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>鍚堝悓鎺ㄥ箍</controllingFieldValue>
@@ -462,36 +571,8 @@
<valueName>鍩硅</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>浼氳瀵瑰簲</controllingFieldValue>
- <valueName>閿�鍞細璁�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>ET APP娲诲姩</controllingFieldValue>
- <valueName>ET APP娲诲姩</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>閿�鍞敮鎸�</controllingFieldValue>
- <valueName>澶囧搧瑁呮満/OPD</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>閿�鍞敮鎸�</controllingFieldValue>
- <valueName>鍞墠鍜ㄨ鏀寔</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>閿�鍞敮鎸�</controllingFieldValue>
- <valueName>浜у搧璇曠敤鏀寔</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>閿�鍞敮鎸�</controllingFieldValue>
- <valueName>鎷涙爣/鍟嗚皥</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>浼氳</controllingFieldValue>
- <valueName>渚嬩細</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>浼氳</controllingFieldValue>
- <valueName>鍏朵粬浼氳</valueName>
+ <controllingFieldValue>鍏朵粬</controllingFieldValue>
+ <valueName>鍏朵粬</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>鍏徃鍩硅</controllingFieldValue>
@@ -504,6 +585,26 @@
<valueSettings>
<controllingFieldValue>鍏徃鍩硅</controllingFieldValue>
<valueName>鍏朵粬鍩硅</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>ET APP娲诲姩</controllingFieldValue>
+ <valueName>ET APP娲诲姩</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>浼戝亣</controllingFieldValue>
+ <valueName>浼戝亣</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>绉诲姩</controllingFieldValue>
+ <valueName>绉诲姩</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>浼氳</controllingFieldValue>
+ <valueName>渚嬩細</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>浼氳</controllingFieldValue>
+ <valueName>鍏朵粬浼氳</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>浜嬪姟鎬у伐浣�</controllingFieldValue>
@@ -526,48 +627,12 @@
<valueName>鍏朵粬浜嬪姟鎬у伐浣�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>璁惧鏀跺彂璐�</controllingFieldValue>
- <valueName>淇悊鍝佹敹鍙戣揣</valueName>
+ <controllingFieldValue>鏁呴殰澶勭悊</controllingFieldValue>
+ <valueName>鏁呴殰妫�娴�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>璁惧鏀跺彂璐�</controllingFieldValue>
- <valueName>澶囧搧鏀跺彂璐�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>ASE鍩瑰吇</controllingFieldValue>
- <valueName>ASE鍩硅/甯︽暀</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>ASE鍩瑰吇</controllingFieldValue>
- <valueName>璁よ瘉/骞村鏀寔</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>瀹氭湡娌熼�氫緥浼�</controllingFieldValue>
- <valueName>瀹氭湡娌熼�氫緥浼�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鍏朵粬</controllingFieldValue>
- <valueName>鍏朵粬</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鏈嶅姟浼氳</controllingFieldValue>
- <valueName>TTC娲诲姩鏀寔</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鏈嶅姟浼氳</controllingFieldValue>
- <valueName>GI-NTC娲诲姩鏀寔</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鏈嶅姟浼氳</controllingFieldValue>
- <valueName>SP-NTC娲诲姩鏀寔</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鏈嶅姟浼氳</controllingFieldValue>
- <valueName>鍖绘妧鎶ゆ椿鍔ㄦ敮鎸�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>绉诲姩</controllingFieldValue>
- <valueName>绉诲姩</valueName>
+ <controllingFieldValue>鏁呴殰澶勭悊</controllingFieldValue>
+ <valueName>缁存姢淇濆吇灏忎慨</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>瑁呮満</controllingFieldValue>
@@ -608,58 +673,6 @@
<valueSettings>
<controllingFieldValue>鐜板満鏈嶅姟</controllingFieldValue>
<valueName>绀艰妭鎬ф嫓璁�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>缁翠慨璺熻繘</controllingFieldValue>
- <valueName>鍙栨晠闅滆澶�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>缁翠慨璺熻繘</controllingFieldValue>
- <valueName>鎶ヤ环璺熻繘</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>缁翠慨璺熻繘</controllingFieldValue>
- <valueName>淇悊瀹屾垚鍝佸綊杩�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>澶囧搧瀵瑰簲</controllingFieldValue>
- <valueName>澶囧搧瑁呮満</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>澶囧搧瀵瑰簲</controllingFieldValue>
- <valueName>澶囧搧鍥炴敹</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>浜у搧鍝佽川淇濆叏</controllingFieldValue>
- <valueName>鎶曡瘔绱㈣禂瀵瑰簲</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>浜у搧鍝佽川淇濆叏</controllingFieldValue>
- <valueName>淇悊鍝佽川瀵瑰簲</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>浜у搧鍝佽川淇濆叏</controllingFieldValue>
- <valueName>鍙洖鍝佸搴�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>浜у搧鍝佽川淇濆叏</controllingFieldValue>
- <valueName>涓嶈壇浜嬩欢瀵瑰簲</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>棰勯槻淇濆叏娲诲姩</controllingFieldValue>
- <valueName>鐐规</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>棰勯槻淇濆叏娲诲姩</controllingFieldValue>
- <valueName>鍞悗璺熷彴</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>棰勯槻淇濆叏娲诲姩</controllingFieldValue>
- <valueName>鏁呴殰棰勯槻鍩硅</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>棰勯槻淇濆叏娲诲姩</controllingFieldValue>
- <valueName>OER鏈嶅姟瀵瑰簲</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>瀹㈡埛鍩硅</controllingFieldValue>
@@ -710,24 +723,12 @@
<valueName>鍚堝悓AM娲诲姩</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>甯傚満澶氬勾淇濅慨</controllingFieldValue>
- <valueName>娑堣垂鐜囬璀︾偣妫�</valueName>
+ <controllingFieldValue>澶囧搧瀵瑰簲</controllingFieldValue>
+ <valueName>澶囧搧瑁呮満</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>甯傚満澶氬勾淇濅慨</controllingFieldValue>
- <valueName>娑堣垂鐜囬璀﹁窡鍙�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>甯傚満澶氬勾淇濅慨</controllingFieldValue>
- <valueName>娑堣垂鐜囬璀﹀煿璁�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>甯傚満澶氬勾淇濅慨</controllingFieldValue>
- <valueName>娑堣垂鐜囬璀M娲诲姩</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>浼戝亣</controllingFieldValue>
- <valueName>浼戝亣</valueName>
+ <controllingFieldValue>澶囧搧瀵瑰簲</controllingFieldValue>
+ <valueName>澶囧搧鍥炴敹</valueName>
</valueSettings>
</valueSet>
</CustomField>
diff --git a/force-app/main/default/objects/Event__c/fields/Purpose_TypeFSE5__c.field-meta.xml b/force-app/main/default/objects/Event__c/fields/Purpose_TypeFSE5__c.field-meta.xml
index 18b82b1..9c40f08 100644
--- a/force-app/main/default/objects/Event__c/fields/Purpose_TypeFSE5__c.field-meta.xml
+++ b/force-app/main/default/objects/Event__c/fields/Purpose_TypeFSE5__c.field-meta.xml
@@ -419,12 +419,125 @@
</value>
</valueSetDefinition>
<valueSettings>
- <controllingFieldValue>鏁呴殰澶勭悊</controllingFieldValue>
- <valueName>鏁呴殰妫�娴�</valueName>
+ <controllingFieldValue>浜у搧鍝佽川淇濆叏</controllingFieldValue>
+ <valueName>鎶曡瘔绱㈣禂瀵瑰簲</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鏁呴殰澶勭悊</controllingFieldValue>
- <valueName>缁存姢淇濆吇灏忎慨</valueName>
+ <controllingFieldValue>浜у搧鍝佽川淇濆叏</controllingFieldValue>
+ <valueName>淇悊鍝佽川瀵瑰簲</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>浜у搧鍝佽川淇濆叏</controllingFieldValue>
+ <valueName>鍙洖鍝佸搴�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>浜у搧鍝佽川淇濆叏</controllingFieldValue>
+ <valueName>涓嶈壇浜嬩欢瀵瑰簲</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>棰勯槻淇濆叏娲诲姩</controllingFieldValue>
+ <valueName>鐐规</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>棰勯槻淇濆叏娲诲姩</controllingFieldValue>
+ <valueName>鍞悗璺熷彴</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>棰勯槻淇濆叏娲诲姩</controllingFieldValue>
+ <valueName>鏁呴殰棰勯槻鍩硅</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>棰勯槻淇濆叏娲诲姩</controllingFieldValue>
+ <valueName>OER鏈嶅姟瀵瑰簲</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>甯傚満澶氬勾淇濅慨</controllingFieldValue>
+ <valueName>娑堣垂鐜囬璀︾偣妫�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>甯傚満澶氬勾淇濅慨</controllingFieldValue>
+ <valueName>娑堣垂鐜囬璀﹁窡鍙�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>甯傚満澶氬勾淇濅慨</controllingFieldValue>
+ <valueName>娑堣垂鐜囬璀﹀煿璁�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>甯傚満澶氬勾淇濅慨</controllingFieldValue>
+ <valueName>娑堣垂鐜囬璀M娲诲姩</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>璁惧鏀跺彂璐�</controllingFieldValue>
+ <valueName>淇悊鍝佹敹鍙戣揣</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>璁惧鏀跺彂璐�</controllingFieldValue>
+ <valueName>澶囧搧鏀跺彂璐�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>ASE鍩瑰吇</controllingFieldValue>
+ <valueName>ASE鍩硅/甯︽暀</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>ASE鍩瑰吇</controllingFieldValue>
+ <valueName>璁よ瘉/骞村鏀寔</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>瀹氭湡娌熼�氫緥浼�</controllingFieldValue>
+ <valueName>瀹氭湡娌熼�氫緥浼�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鏈嶅姟浼氳</controllingFieldValue>
+ <valueName>TTC娲诲姩鏀寔</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鏈嶅姟浼氳</controllingFieldValue>
+ <valueName>GI-NTC娲诲姩鏀寔</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鏈嶅姟浼氳</controllingFieldValue>
+ <valueName>SP-NTC娲诲姩鏀寔</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鏈嶅姟浼氳</controllingFieldValue>
+ <valueName>鍖绘妧鎶ゆ椿鍔ㄦ敮鎸�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>椤圭洰璺熻繘</controllingFieldValue>
+ <controllingFieldValue>浼氳瀵瑰簲</controllingFieldValue>
+ <valueName>閿�鍞細璁�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>缁翠慨璺熻繘</controllingFieldValue>
+ <valueName>鍙栨晠闅滆澶�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>缁翠慨璺熻繘</controllingFieldValue>
+ <valueName>鎶ヤ环璺熻繘</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>缁翠慨璺熻繘</controllingFieldValue>
+ <valueName>淇悊瀹屾垚鍝佸綊杩�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>缁翠慨璺熻繘</controllingFieldValue>
+ <valueName>鏀舵</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>閿�鍞敮鎸�</controllingFieldValue>
+ <valueName>澶囧搧瑁呮満/OPD</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>閿�鍞敮鎸�</controllingFieldValue>
+ <valueName>鍞墠鍜ㄨ鏀寔</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>閿�鍞敮鎸�</controllingFieldValue>
+ <valueName>浜у搧璇曠敤鏀寔</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>閿�鍞敮鎸�</controllingFieldValue>
+ <valueName>鎷涙爣/鍟嗚皥</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>鍚堝悓鎺ㄥ箍</controllingFieldValue>
@@ -453,36 +566,8 @@
<valueName>鍩硅</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>浼氳瀵瑰簲</controllingFieldValue>
- <valueName>閿�鍞細璁�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>ET APP娲诲姩</controllingFieldValue>
- <valueName>ET APP娲诲姩</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>閿�鍞敮鎸�</controllingFieldValue>
- <valueName>澶囧搧瑁呮満/OPD</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>閿�鍞敮鎸�</controllingFieldValue>
- <valueName>鍞墠鍜ㄨ鏀寔</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>閿�鍞敮鎸�</controllingFieldValue>
- <valueName>浜у搧璇曠敤鏀寔</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>閿�鍞敮鎸�</controllingFieldValue>
- <valueName>鎷涙爣/鍟嗚皥</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>浼氳</controllingFieldValue>
- <valueName>渚嬩細</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>浼氳</controllingFieldValue>
- <valueName>鍏朵粬浼氳</valueName>
+ <controllingFieldValue>鍏朵粬</controllingFieldValue>
+ <valueName>鍏朵粬</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>鍏徃鍩硅</controllingFieldValue>
@@ -495,6 +580,26 @@
<valueSettings>
<controllingFieldValue>鍏徃鍩硅</controllingFieldValue>
<valueName>鍏朵粬鍩硅</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>ET APP娲诲姩</controllingFieldValue>
+ <valueName>ET APP娲诲姩</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>浼戝亣</controllingFieldValue>
+ <valueName>浼戝亣</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>绉诲姩</controllingFieldValue>
+ <valueName>绉诲姩</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>浼氳</controllingFieldValue>
+ <valueName>渚嬩細</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>浼氳</controllingFieldValue>
+ <valueName>鍏朵粬浼氳</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>浜嬪姟鎬у伐浣�</controllingFieldValue>
@@ -517,48 +622,12 @@
<valueName>鍏朵粬浜嬪姟鎬у伐浣�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>璁惧鏀跺彂璐�</controllingFieldValue>
- <valueName>淇悊鍝佹敹鍙戣揣</valueName>
+ <controllingFieldValue>鏁呴殰澶勭悊</controllingFieldValue>
+ <valueName>鏁呴殰妫�娴�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>璁惧鏀跺彂璐�</controllingFieldValue>
- <valueName>澶囧搧鏀跺彂璐�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>ASE鍩瑰吇</controllingFieldValue>
- <valueName>ASE鍩硅/甯︽暀</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>ASE鍩瑰吇</controllingFieldValue>
- <valueName>璁よ瘉/骞村鏀寔</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>瀹氭湡娌熼�氫緥浼�</controllingFieldValue>
- <valueName>瀹氭湡娌熼�氫緥浼�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鍏朵粬</controllingFieldValue>
- <valueName>鍏朵粬</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鏈嶅姟浼氳</controllingFieldValue>
- <valueName>TTC娲诲姩鏀寔</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鏈嶅姟浼氳</controllingFieldValue>
- <valueName>GI-NTC娲诲姩鏀寔</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鏈嶅姟浼氳</controllingFieldValue>
- <valueName>SP-NTC娲诲姩鏀寔</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鏈嶅姟浼氳</controllingFieldValue>
- <valueName>鍖绘妧鎶ゆ椿鍔ㄦ敮鎸�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>绉诲姩</controllingFieldValue>
- <valueName>绉诲姩</valueName>
+ <controllingFieldValue>鏁呴殰澶勭悊</controllingFieldValue>
+ <valueName>缁存姢淇濆吇灏忎慨</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>瑁呮満</controllingFieldValue>
@@ -599,62 +668,6 @@
<valueSettings>
<controllingFieldValue>鐜板満鏈嶅姟</controllingFieldValue>
<valueName>绀艰妭鎬ф嫓璁�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>缁翠慨璺熻繘</controllingFieldValue>
- <valueName>鍙栨晠闅滆澶�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>缁翠慨璺熻繘</controllingFieldValue>
- <valueName>鎶ヤ环璺熻繘</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>缁翠慨璺熻繘</controllingFieldValue>
- <valueName>淇悊瀹屾垚鍝佸綊杩�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>缁翠慨璺熻繘</controllingFieldValue>
- <valueName>鏀舵</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>澶囧搧瀵瑰簲</controllingFieldValue>
- <valueName>澶囧搧瑁呮満</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>澶囧搧瀵瑰簲</controllingFieldValue>
- <valueName>澶囧搧鍥炴敹</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>浜у搧鍝佽川淇濆叏</controllingFieldValue>
- <valueName>鎶曡瘔绱㈣禂瀵瑰簲</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>浜у搧鍝佽川淇濆叏</controllingFieldValue>
- <valueName>淇悊鍝佽川瀵瑰簲</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>浜у搧鍝佽川淇濆叏</controllingFieldValue>
- <valueName>鍙洖鍝佸搴�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>浜у搧鍝佽川淇濆叏</controllingFieldValue>
- <valueName>涓嶈壇浜嬩欢瀵瑰簲</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>棰勯槻淇濆叏娲诲姩</controllingFieldValue>
- <valueName>鐐规</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>棰勯槻淇濆叏娲诲姩</controllingFieldValue>
- <valueName>鍞悗璺熷彴</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>棰勯槻淇濆叏娲诲姩</controllingFieldValue>
- <valueName>鏁呴殰棰勯槻鍩硅</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>棰勯槻淇濆叏娲诲姩</controllingFieldValue>
- <valueName>OER鏈嶅姟瀵瑰簲</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>瀹㈡埛鍩硅</controllingFieldValue>
@@ -709,24 +722,12 @@
<valueName>鍚堝悓AM娲诲姩</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>甯傚満澶氬勾淇濅慨</controllingFieldValue>
- <valueName>娑堣垂鐜囬璀︾偣妫�</valueName>
+ <controllingFieldValue>澶囧搧瀵瑰簲</controllingFieldValue>
+ <valueName>澶囧搧瑁呮満</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>甯傚満澶氬勾淇濅慨</controllingFieldValue>
- <valueName>娑堣垂鐜囬璀﹁窡鍙�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>甯傚満澶氬勾淇濅慨</controllingFieldValue>
- <valueName>娑堣垂鐜囬璀﹀煿璁�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>甯傚満澶氬勾淇濅慨</controllingFieldValue>
- <valueName>娑堣垂鐜囬璀M娲诲姩</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>浼戝亣</controllingFieldValue>
- <valueName>浼戝亣</valueName>
+ <controllingFieldValue>澶囧搧瀵瑰簲</controllingFieldValue>
+ <valueName>澶囧搧鍥炴敹</valueName>
</valueSettings>
</valueSet>
</CustomField>
diff --git a/force-app/main/default/objects/Event__c/fields/Purpose_TypeFSE__c.field-meta.xml b/force-app/main/default/objects/Event__c/fields/Purpose_TypeFSE__c.field-meta.xml
index 513e402..94e7e8c 100644
--- a/force-app/main/default/objects/Event__c/fields/Purpose_TypeFSE__c.field-meta.xml
+++ b/force-app/main/default/objects/Event__c/fields/Purpose_TypeFSE__c.field-meta.xml
@@ -9,6 +9,7 @@
<type>Picklist</type>
<valueSet>
<controllingField>Activity_PurposeFSE__c</controllingField>
+ <restricted>true</restricted>
<valueSetDefinition>
<sorted>false</sorted>
<value>
@@ -416,14 +417,125 @@
<default>false</default>
<label>OER鏈嶅姟瀵瑰簲</label>
</value>
+ <value>
+ <fullName>瀹夎纭涔﹀洖鏀�</fullName>
+ <default>false</default>
+ <isActive>false</isActive>
+ <label>瀹夎纭涔﹀洖鏀�</label>
+ </value>
</valueSetDefinition>
<valueSettings>
- <controllingFieldValue>鏁呴殰澶勭悊</controllingFieldValue>
- <valueName>鏁呴殰妫�娴�</valueName>
+ <controllingFieldValue>浜у搧鍝佽川淇濆叏</controllingFieldValue>
+ <valueName>鎶曡瘔绱㈣禂瀵瑰簲</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鏁呴殰澶勭悊</controllingFieldValue>
- <valueName>缁存姢淇濆吇灏忎慨</valueName>
+ <controllingFieldValue>浜у搧鍝佽川淇濆叏</controllingFieldValue>
+ <valueName>淇悊鍝佽川瀵瑰簲</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>浜у搧鍝佽川淇濆叏</controllingFieldValue>
+ <valueName>鍙洖鍝佸搴�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>浜у搧鍝佽川淇濆叏</controllingFieldValue>
+ <valueName>涓嶈壇浜嬩欢瀵瑰簲</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>棰勯槻淇濆叏娲诲姩</controllingFieldValue>
+ <valueName>鐐规</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>棰勯槻淇濆叏娲诲姩</controllingFieldValue>
+ <valueName>鍞悗璺熷彴</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>棰勯槻淇濆叏娲诲姩</controllingFieldValue>
+ <valueName>鏁呴殰棰勯槻鍩硅</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>甯傚満澶氬勾淇濅慨</controllingFieldValue>
+ <valueName>娑堣垂鐜囬璀︾偣妫�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>甯傚満澶氬勾淇濅慨</controllingFieldValue>
+ <valueName>娑堣垂鐜囬璀﹁窡鍙�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>甯傚満澶氬勾淇濅慨</controllingFieldValue>
+ <valueName>娑堣垂鐜囬璀﹀煿璁�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>甯傚満澶氬勾淇濅慨</controllingFieldValue>
+ <valueName>娑堣垂鐜囬璀M娲诲姩</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>璁惧鏀跺彂璐�</controllingFieldValue>
+ <valueName>淇悊鍝佹敹鍙戣揣</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>璁惧鏀跺彂璐�</controllingFieldValue>
+ <valueName>澶囧搧鏀跺彂璐�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>ASE鍩瑰吇</controllingFieldValue>
+ <valueName>ASE鍩硅/甯︽暀</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>ASE鍩瑰吇</controllingFieldValue>
+ <valueName>璁よ瘉/骞村鏀寔</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>瀹氭湡娌熼�氫緥浼�</controllingFieldValue>
+ <valueName>瀹氭湡娌熼�氫緥浼�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鏈嶅姟浼氳</controllingFieldValue>
+ <valueName>TTC娲诲姩鏀寔</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鏈嶅姟浼氳</controllingFieldValue>
+ <valueName>GI-NTC娲诲姩鏀寔</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鏈嶅姟浼氳</controllingFieldValue>
+ <valueName>SP-NTC娲诲姩鏀寔</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鏈嶅姟浼氳</controllingFieldValue>
+ <valueName>鍖绘妧鎶ゆ椿鍔ㄦ敮鎸�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>椤圭洰璺熻繘</controllingFieldValue>
+ <controllingFieldValue>浼氳瀵瑰簲</controllingFieldValue>
+ <valueName>閿�鍞細璁�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>缁翠慨璺熻繘</controllingFieldValue>
+ <valueName>鍙栨晠闅滆澶�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>缁翠慨璺熻繘</controllingFieldValue>
+ <valueName>鎶ヤ环璺熻繘</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>缁翠慨璺熻繘</controllingFieldValue>
+ <valueName>淇悊瀹屾垚鍝佸綊杩�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>缁翠慨璺熻繘</controllingFieldValue>
+ <valueName>鏀舵</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>閿�鍞敮鎸�</controllingFieldValue>
+ <valueName>鍞墠鍜ㄨ鏀寔</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>閿�鍞敮鎸�</controllingFieldValue>
+ <valueName>浜у搧璇曠敤鏀寔</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>閿�鍞敮鎸�</controllingFieldValue>
+ <valueName>鎷涙爣/鍟嗚皥</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>鍚堝悓鎺ㄥ箍</controllingFieldValue>
@@ -450,32 +562,8 @@
<valueName>鍩硅</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>浼氳瀵瑰簲</controllingFieldValue>
- <valueName>閿�鍞細璁�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>ET APP娲诲姩</controllingFieldValue>
- <valueName>ET APP娲诲姩</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>閿�鍞敮鎸�</controllingFieldValue>
- <valueName>鍞墠鍜ㄨ鏀寔</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>閿�鍞敮鎸�</controllingFieldValue>
- <valueName>浜у搧璇曠敤鏀寔</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>閿�鍞敮鎸�</controllingFieldValue>
- <valueName>鎷涙爣/鍟嗚皥</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>浼氳</controllingFieldValue>
- <valueName>渚嬩細</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>浼氳</controllingFieldValue>
- <valueName>鍏朵粬浼氳</valueName>
+ <controllingFieldValue>鍏朵粬</controllingFieldValue>
+ <valueName>鍏朵粬</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>鍏徃鍩硅</controllingFieldValue>
@@ -488,6 +576,26 @@
<valueSettings>
<controllingFieldValue>鍏徃鍩硅</controllingFieldValue>
<valueName>鍏朵粬鍩硅</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>ET APP娲诲姩</controllingFieldValue>
+ <valueName>ET APP娲诲姩</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>浼戝亣</controllingFieldValue>
+ <valueName>浼戝亣</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>绉诲姩</controllingFieldValue>
+ <valueName>绉诲姩</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>浼氳</controllingFieldValue>
+ <valueName>渚嬩細</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>浼氳</controllingFieldValue>
+ <valueName>鍏朵粬浼氳</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>浜嬪姟鎬у伐浣�</controllingFieldValue>
@@ -510,48 +618,12 @@
<valueName>鏀跺彂璐�/鏀跺彂浼犵湡鎶ヤ环</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>璁惧鏀跺彂璐�</controllingFieldValue>
- <valueName>淇悊鍝佹敹鍙戣揣</valueName>
+ <controllingFieldValue>鏁呴殰澶勭悊</controllingFieldValue>
+ <valueName>鏁呴殰妫�娴�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>璁惧鏀跺彂璐�</controllingFieldValue>
- <valueName>澶囧搧鏀跺彂璐�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>ASE鍩瑰吇</controllingFieldValue>
- <valueName>ASE鍩硅/甯︽暀</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>ASE鍩瑰吇</controllingFieldValue>
- <valueName>璁よ瘉/骞村鏀寔</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>瀹氭湡娌熼�氫緥浼�</controllingFieldValue>
- <valueName>瀹氭湡娌熼�氫緥浼�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鍏朵粬</controllingFieldValue>
- <valueName>鍏朵粬</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鏈嶅姟浼氳</controllingFieldValue>
- <valueName>TTC娲诲姩鏀寔</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鏈嶅姟浼氳</controllingFieldValue>
- <valueName>GI-NTC娲诲姩鏀寔</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鏈嶅姟浼氳</controllingFieldValue>
- <valueName>SP-NTC娲诲姩鏀寔</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鏈嶅姟浼氳</controllingFieldValue>
- <valueName>鍖绘妧鎶ゆ椿鍔ㄦ敮鎸�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>绉诲姩</controllingFieldValue>
- <valueName>绉诲姩</valueName>
+ <controllingFieldValue>鏁呴殰澶勭悊</controllingFieldValue>
+ <valueName>缁存姢淇濆吇灏忎慨</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>瑁呮満</controllingFieldValue>
@@ -580,58 +652,6 @@
<valueSettings>
<controllingFieldValue>鐜板満鏈嶅姟</controllingFieldValue>
<valueName>鐜板満淇悊</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>缁翠慨璺熻繘</controllingFieldValue>
- <valueName>鍙栨晠闅滆澶�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>缁翠慨璺熻繘</controllingFieldValue>
- <valueName>鎶ヤ环璺熻繘</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>缁翠慨璺熻繘</controllingFieldValue>
- <valueName>淇悊瀹屾垚鍝佸綊杩�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>缁翠慨璺熻繘</controllingFieldValue>
- <valueName>鏀舵</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>澶囧搧瀵瑰簲</controllingFieldValue>
- <valueName>澶囧搧瑁呮満</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>澶囧搧瀵瑰簲</controllingFieldValue>
- <valueName>澶囧搧鍥炴敹</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>浜у搧鍝佽川淇濆叏</controllingFieldValue>
- <valueName>鎶曡瘔绱㈣禂瀵瑰簲</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>浜у搧鍝佽川淇濆叏</controllingFieldValue>
- <valueName>淇悊鍝佽川瀵瑰簲</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>浜у搧鍝佽川淇濆叏</controllingFieldValue>
- <valueName>鍙洖鍝佸搴�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>浜у搧鍝佽川淇濆叏</controllingFieldValue>
- <valueName>涓嶈壇浜嬩欢瀵瑰簲</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>棰勯槻淇濆叏娲诲姩</controllingFieldValue>
- <valueName>鐐规</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>棰勯槻淇濆叏娲诲姩</controllingFieldValue>
- <valueName>鍞悗璺熷彴</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>棰勯槻淇濆叏娲诲姩</controllingFieldValue>
- <valueName>鏁呴殰棰勯槻鍩硅</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>瀹㈡埛鍩硅</controllingFieldValue>
@@ -686,24 +706,12 @@
<valueName>鍚堝悓AM娲诲姩</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>甯傚満澶氬勾淇濅慨</controllingFieldValue>
- <valueName>娑堣垂鐜囬璀︾偣妫�</valueName>
+ <controllingFieldValue>澶囧搧瀵瑰簲</controllingFieldValue>
+ <valueName>澶囧搧瑁呮満</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>甯傚満澶氬勾淇濅慨</controllingFieldValue>
- <valueName>娑堣垂鐜囬璀﹁窡鍙�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>甯傚満澶氬勾淇濅慨</controllingFieldValue>
- <valueName>娑堣垂鐜囬璀﹀煿璁�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>甯傚満澶氬勾淇濅慨</controllingFieldValue>
- <valueName>娑堣垂鐜囬璀M娲诲姩</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>浼戝亣</controllingFieldValue>
- <valueName>浼戝亣</valueName>
+ <controllingFieldValue>澶囧搧瀵瑰簲</controllingFieldValue>
+ <valueName>澶囧搧鍥炴敹</valueName>
</valueSettings>
</valueSet>
</CustomField>
diff --git a/force-app/main/default/objects/Event__c/fields/Purpose_Type__c.field-meta.xml b/force-app/main/default/objects/Event__c/fields/Purpose_Type__c.field-meta.xml
index 175da10..615b995 100644
--- a/force-app/main/default/objects/Event__c/fields/Purpose_Type__c.field-meta.xml
+++ b/force-app/main/default/objects/Event__c/fields/Purpose_Type__c.field-meta.xml
@@ -483,14 +483,22 @@
<valueName>鐐规</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>绀惧唴娲诲嫊</controllingFieldValue>
<controllingFieldValue>璨╁２搴�</controllingFieldValue>
+ <controllingFieldValue>绀惧唴娲诲嫊</controllingFieldValue>
<valueName>渚嬩細</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>绀惧唴娲诲嫊</controllingFieldValue>
<controllingFieldValue>璨╁２搴�</controllingFieldValue>
+ <controllingFieldValue>绀惧唴娲诲嫊</controllingFieldValue>
<valueName>鍩硅</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>璨╁２搴�</controllingFieldValue>
+ <valueName>搴撳瓨纭</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>璨╁２搴�</controllingFieldValue>
+ <valueName>鍏朵粬浜嬪疁</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>绀惧唴娲诲嫊</controllingFieldValue>
@@ -503,14 +511,6 @@
<valueSettings>
<controllingFieldValue>绀惧唴娲诲嫊</controllingFieldValue>
<valueName>鍑嗗璧勬枡or鎶ュ憡</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>璨╁２搴�</controllingFieldValue>
- <valueName>搴撳瓨纭</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>璨╁２搴�</controllingFieldValue>
- <valueName>鍏朵粬浜嬪疁</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>绉诲嫊</controllingFieldValue>
diff --git a/force-app/main/default/objects/Event__c/validationRules/location_input_check.validationRule-meta.xml b/force-app/main/default/objects/Event__c/validationRules/location_input_check.validationRule-meta.xml
index 0a33fe0..52d2fd6 100644
--- a/force-app/main/default/objects/Event__c/validationRules/location_input_check.validationRule-meta.xml
+++ b/force-app/main/default/objects/Event__c/validationRules/location_input_check.validationRule-meta.xml
@@ -2,7 +2,9 @@
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>location_input_check</fullName>
<active>false</active>
- <description>娌℃湁WhatID</description>
+ <description>20231106
+(Text(Activity_Type2__c) == '璨╁２搴�'||
+Text(Activity_Type2__c) == '绀惧銈ゃ儥銉炽儓')&&whatid__c == null&&Free_Input__c ==false</description>
<errorConditionFormula>(Text(Activity_Type2__c) == '璨╁２搴�'||
Text(Activity_Type2__c) == '绀惧銈ゃ儥銉炽儓')&&whatid__c == null&&Free_Input__c ==false</errorConditionFormula>
<errorMessage>璇烽�夋嫨绯荤粺涓殑璁块棶浣嶇疆锛屽鏋滄病鏈夛紝璇峰嬀閫� 鈥滄墜鍔ㄨ緭鍏モ��</errorMessage>
diff --git a/force-app/main/default/objects/FileAddress__c/webLinks/BatchDelete.webLink-meta.xml b/force-app/main/default/objects/FileAddress__c/webLinks/BatchDelete.webLink-meta.xml
index 1b02717..810b0f8 100644
--- a/force-app/main/default/objects/FileAddress__c/webLinks/BatchDelete.webLink-meta.xml
+++ b/force-app/main/default/objects/FileAddress__c/webLinks/BatchDelete.webLink-meta.xml
@@ -8,5 +8,44 @@
<openType>onClickJavaScript</openType>
<protected>false</protected>
<requireRowSelection>true</requireRowSelection>
- <url>windows.location</url>
+ <url>{!RequireScript("/soap/ajax/51.0/connection.js")}
+{!RequireScript("/soap/ajax/51.0/apex.js")}
+var records = {!GETRECORDIDS($ObjectType.FileAddress__c)};
+var retURL = '{! $ObjectType.FileAddress__c}';
+if (records[0] == null) {
+ alert('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹��');
+} else {
+ if (confirm('纭畾瑕佸垹闄よ繖' + records.length + '鏉℃暟鎹悧?')) {
+ var recordsSql = '';
+ for (var i = 0; i < records.length; i++) {
+ recordsSql += ',\'' + records[i] + '\'';
+ }
+ recordsSql = recordsSql.substring(1);
+ console.log('recordsSql = ' + recordsSql);
+ debugger
+ var r = sforce.connection.query("select id,AWS_File_Key__c from FileAddress__c where id in (" + recordsSql +
+ ")");
+ var keyList = [];
+ if (r.getArray("records").length > 0) {
+ var recordsObj = r.getArray("records");
+ for (var i = 0; i < recordsObj.length; i++) {
+ keyList.push(recordsObj[i].AWS_File_Key__c);
+ }
+ console.log('keyList = ' + keyList);
+ }
+ //鍒犻櫎SF闄勪欢
+ var rtn1 = sforce.apex.execute("FileBatchDeleteController", "fileSFDelete", {
+ idList: records
+ });
+ console.log('rtn1 = ' + rtn1);
+ if (rtn1 == 'success') {
+ //鍒犻櫎AWS闄勪欢
+ //var rtn2 = sforce.apex.execute("FileBatchDeleteController", "fileAWSDelete", {
+ //keyList: keyList
+ //});
+ //console.log('rtn2 = ' + rtn2);
+ location.reload();
+ }
+ }
+}</url>
</WebLink>
diff --git a/force-app/main/default/objects/FixtureDeliverySlip__c/FixtureDeliverySlip__c.object-meta.xml b/force-app/main/default/objects/FixtureDeliverySlip__c/FixtureDeliverySlip__c.object-meta.xml
index 0a9cbdf..cc37a56 100644
--- a/force-app/main/default/objects/FixtureDeliverySlip__c/FixtureDeliverySlip__c.object-meta.xml
+++ b/force-app/main/default/objects/FixtureDeliverySlip__c/FixtureDeliverySlip__c.object-meta.xml
@@ -166,13 +166,13 @@
<customTabListAdditionalFields>Shippment_loaner_time__c</customTabListAdditionalFields>
<customTabListAdditionalFields>CREATEDBY_USER</customTabListAdditionalFields>
<customTabListAdditionalFields>CREATED_DATE</customTabListAdditionalFields>
+ <excludedStandardButtons>ChangeOwner</excludedStandardButtons>
<excludedStandardButtons>OpenListInQuip</excludedStandardButtons>
<excludedStandardButtons>NewFromDocument</excludedStandardButtons>
- <excludedStandardButtons>Accept</excludedStandardButtons>
<excludedStandardButtons>PrintableListView</excludedStandardButtons>
<excludedStandardButtons>Import</excludedStandardButtons>
<excludedStandardButtons>MassChangeOwner</excludedStandardButtons>
- <excludedStandardButtons>ChangeOwner</excludedStandardButtons>
+ <excludedStandardButtons>Accept</excludedStandardButtons>
<searchResultsAdditionalFields>DeliveryType__c</searchResultsAdditionalFields>
<searchResultsAdditionalFields>DeliveryCompany__c</searchResultsAdditionalFields>
<searchResultsAdditionalFields>Distributor_method__c</searchResultsAdditionalFields>
diff --git a/force-app/main/default/objects/FixtureDeliverySlip__c/validationRules/Cannot_Change_ConsumSlip.validationRule-meta.xml b/force-app/main/default/objects/FixtureDeliverySlip__c/validationRules/Cannot_Change_ConsumSlip.validationRule-meta.xml
index 4f95b17..347cf23 100644
--- a/force-app/main/default/objects/FixtureDeliverySlip__c/validationRules/Cannot_Change_ConsumSlip.validationRule-meta.xml
+++ b/force-app/main/default/objects/FixtureDeliverySlip__c/validationRules/Cannot_Change_ConsumSlip.validationRule-meta.xml
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Cannot_Change_ConsumSlip</fullName>
- <active>false</active>
+ <active>true</active>
<description>杩愯緭鍗曠殑绫诲埆锛堣�楁潗/澶囧搧锛変笉鍙慨鏀�</description>
<errorConditionFormula>NOT(ISNEW())&&ISCHANGED(ConsumSlip__c)</errorConditionFormula>
- <errorDisplayField>CreatedBy_Name_Text__c</errorDisplayField>
<errorMessage>杩愯緭鍗曠殑绫诲埆锛堣�楁潗/澶囧搧锛変笉鍙慨鏀�</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/FixtureDeliverySlip__c/validationRules/DeliveryCompany_Required.validationRule-meta.xml b/force-app/main/default/objects/FixtureDeliverySlip__c/validationRules/DeliveryCompany_Required.validationRule-meta.xml
index 4394f12..c3a9f54 100644
--- a/force-app/main/default/objects/FixtureDeliverySlip__c/validationRules/DeliveryCompany_Required.validationRule-meta.xml
+++ b/force-app/main/default/objects/FixtureDeliverySlip__c/validationRules/DeliveryCompany_Required.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>DeliveryCompany_Required</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>IsBlank(Text(DeliveryCompany__c))</errorConditionFormula>
<errorDisplayField>DeliveryCompany__c</errorDisplayField>
<errorMessage>蹇呴』濉啓銆愮墿娴佸叕鍙搞��</errorMessage>
diff --git a/force-app/main/default/objects/FixtureDeliverySlip__c/validationRules/Return_Back_IMF_CHECK.validationRule-meta.xml b/force-app/main/default/objects/FixtureDeliverySlip__c/validationRules/Return_Back_IMF_CHECK.validationRule-meta.xml
index 522c416..e544309 100644
--- a/force-app/main/default/objects/FixtureDeliverySlip__c/validationRules/Return_Back_IMF_CHECK.validationRule-meta.xml
+++ b/force-app/main/default/objects/FixtureDeliverySlip__c/validationRules/Return_Back_IMF_CHECK.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Return_Back_IMF_CHECK</fullName>
- <active>false</active>
+ <active>true</active>
<description>From 澶囧搧Set</description>
<errorConditionFormula>IsPickval(DeliveryType__c, '鍥炲瘎')
&&
@@ -9,6 +9,5 @@
ISBLANK(text(DeliveryCompany__c)),
ISBLANK(Wh_Staff__c)
)</errorConditionFormula>
- <errorDisplayField>CreatedBy_Name_Text__c</errorDisplayField>
<errorMessage>璇疯緭鍏�"鍙戣揣-鐗╂祦鍏徃"鍜�"鍙戣揣-杩愯緭鏂瑰紡"鐨勪俊鎭�</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Fixture_Set_Detail__c/fields/Loaner_category__c.field-meta.xml b/force-app/main/default/objects/Fixture_Set_Detail__c/fields/Loaner_category__c.field-meta.xml
index 4054b4e..ca736a5 100644
--- a/force-app/main/default/objects/Fixture_Set_Detail__c/fields/Loaner_category__c.field-meta.xml
+++ b/force-app/main/default/objects/Fixture_Set_Detail__c/fields/Loaner_category__c.field-meta.xml
@@ -2,12 +2,20 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Loaner_category__c</fullName>
<externalId>false</externalId>
- <formula>AND(
-OR(!ISBLANK(TEXT(Fixture_Set__r.Loaner_categoryI__c)) ,!ISBLANK(TEXT(Fixture_Set__r.Loaner_categoryII__c)))
-, !ISBLANK(Product2__c)
-, Is_Body__c
-,OR(TEXT(Fixture_Set__r.Loaner_categoryI__c) != Product2__r.Loaner_categoryI__c
-,TEXT(Fixture_Set__r.Loaner_categoryII__c) != Product2__r.Loaner_categoryII__c)
+ <formula>OR(
+AND(
+ OR(!ISBLANK(TEXT(Fixture_Set__r.Loaner_categoryI__c)) ,!ISBLANK(TEXT(Fixture_Set__r.Loaner_categoryII__c)) ,!ISBLANK(TEXT(Fixture_Set__r.Product_Type__c)))
+ ,!ISBLANK(Product2__c)
+ ,Is_Body__c
+ ,OR(TEXT(Fixture_Set__r.Loaner_categoryI__c) != Product2__r.Loaner_categoryI__c
+ ,TEXT(Fixture_Set__r.Loaner_categoryII__c) != Product2__r.Loaner_categoryII__c
+ ,TEXT(Fixture_Set__r.Product_Type__c) != Product2__r.Product_Type__c)
+)
+,
+AND(
+ !ISBLANK(Product2__c)
+ ,Is_Body__c != Product2__r.RentalSubject__c
+)
)</formula>
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
<label>澶囧搧绫诲瀷涓嶄竴鑷�</label>
diff --git a/force-app/main/default/objects/Fixture_Set_Detail__c/validationRules/ProductIsRequired.validationRule-meta.xml b/force-app/main/default/objects/Fixture_Set_Detail__c/validationRules/ProductIsRequired.validationRule-meta.xml
index 4fdc13c..14cba24 100644
--- a/force-app/main/default/objects/Fixture_Set_Detail__c/validationRules/ProductIsRequired.validationRule-meta.xml
+++ b/force-app/main/default/objects/Fixture_Set_Detail__c/validationRules/ProductIsRequired.validationRule-meta.xml
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>ProductIsRequired</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>DataMigration_Flag__c == false &&
Isblank(Product2__c)</errorConditionFormula>
- <errorDisplayField>Is_OneToOne__c</errorDisplayField>
<errorMessage>蹇呴』濉啓浜у搧</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Fixture_Set_Detail__c/validationRules/UniqueKey_Not_Null.validationRule-meta.xml b/force-app/main/default/objects/Fixture_Set_Detail__c/validationRules/UniqueKey_Not_Null.validationRule-meta.xml
index efa57f0..3934c4c 100644
--- a/force-app/main/default/objects/Fixture_Set_Detail__c/validationRules/UniqueKey_Not_Null.validationRule-meta.xml
+++ b/force-app/main/default/objects/Fixture_Set_Detail__c/validationRules/UniqueKey_Not_Null.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>UniqueKey_Not_Null</fullName>
- <active>false</active>
+ <active>true</active>
<description>澶囧搧閰嶅鏄庣粏鏁版嵁鐨刄niqueKey涓嶅厑璁镐负绌�</description>
<errorConditionFormula>ISBLANK(UniqueKey__c) && DataMigration_Flag__c == false</errorConditionFormula>
<errorDisplayField>UniqueKey__c</errorDisplayField>
diff --git a/force-app/main/default/objects/Fixture_Set__c/listViews/View.listView-meta.xml b/force-app/main/default/objects/Fixture_Set__c/listViews/View.listView-meta.xml
index 1e0ce59..a61c28d 100644
--- a/force-app/main/default/objects/Fixture_Set__c/listViews/View.listView-meta.xml
+++ b/force-app/main/default/objects/Fixture_Set__c/listViews/View.listView-meta.xml
@@ -10,6 +10,10 @@
<field>Loaner_code__c</field>
<operation>notEqual</operation>
</filters>
+ <filters>
+ <field>Loaner_name__c</field>
+ <operation>contains</operation>
+ <value>鎸侀拡鍣�</value>
+ </filters>
<label>鍏ㄩ儴閰嶅</label>
- <language>zh_CN</language>
</ListView>
diff --git a/force-app/main/default/objects/GuaranteePeriodAlterationApplication__c/GuaranteePeriodAlterationApplication__c.object-meta.xml b/force-app/main/default/objects/GuaranteePeriodAlterationApplication__c/GuaranteePeriodAlterationApplication__c.object-meta.xml
index 1c0e8ec..cbfd1e9 100644
--- a/force-app/main/default/objects/GuaranteePeriodAlterationApplication__c/GuaranteePeriodAlterationApplication__c.object-meta.xml
+++ b/force-app/main/default/objects/GuaranteePeriodAlterationApplication__c/GuaranteePeriodAlterationApplication__c.object-meta.xml
@@ -58,7 +58,9 @@
</actionOverrides>
<actionOverrides>
<actionName>Edit</actionName>
- <type>Default</type>
+ <content>AssetGuaranteePeriodAlteration</content>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>Visualforce</type>
</actionOverrides>
<actionOverrides>
<actionName>Edit</actionName>
@@ -160,14 +162,14 @@
<type>AutoNumber</type>
</nameField>
<searchLayouts>
+ <excludedStandardButtons>NewFromDocument</excludedStandardButtons>
<excludedStandardButtons>New</excludedStandardButtons>
<excludedStandardButtons>OpenListInQuip</excludedStandardButtons>
- <excludedStandardButtons>NewFromDocument</excludedStandardButtons>
- <excludedStandardButtons>Accept</excludedStandardButtons>
+ <excludedStandardButtons>PrintableListView</excludedStandardButtons>
<excludedStandardButtons>ChangeOwner</excludedStandardButtons>
<excludedStandardButtons>Import</excludedStandardButtons>
<excludedStandardButtons>MassChangeOwner</excludedStandardButtons>
- <excludedStandardButtons>PrintableListView</excludedStandardButtons>
+ <excludedStandardButtons>Accept</excludedStandardButtons>
</searchLayouts>
<sharingModel>ReadWrite</sharingModel>
<visibility>Public</visibility>
diff --git a/force-app/main/default/objects/GuaranteePeriodAlterationApplication__c/listViews/All.listView-meta.xml b/force-app/main/default/objects/GuaranteePeriodAlterationApplication__c/listViews/All.listView-meta.xml
index 509e659..17703f0 100644
--- a/force-app/main/default/objects/GuaranteePeriodAlterationApplication__c/listViews/All.listView-meta.xml
+++ b/force-app/main/default/objects/GuaranteePeriodAlterationApplication__c/listViews/All.listView-meta.xml
@@ -7,7 +7,7 @@
<columns>Change_status__c</columns>
<columns>WarrantyStartDate__c</columns>
<columns>RawGuaranteeTime__c</columns>
+ <columns>CREATEDBY_USER</columns>
<filterScope>Everything</filterScope>
<label>鍏ㄩ儴</label>
- <language>zh_CN</language>
</ListView>
diff --git a/force-app/main/default/objects/IS_Opportunity_Demand__c/IS_Opportunity_Demand__c.object-meta.xml b/force-app/main/default/objects/IS_Opportunity_Demand__c/IS_Opportunity_Demand__c.object-meta.xml
index a08e496..6a8dd20 100644
--- a/force-app/main/default/objects/IS_Opportunity_Demand__c/IS_Opportunity_Demand__c.object-meta.xml
+++ b/force-app/main/default/objects/IS_Opportunity_Demand__c/IS_Opportunity_Demand__c.object-meta.xml
@@ -166,14 +166,14 @@
<customTabListAdditionalFields>Demand_Demonstration_Cnt__c</customTabListAdditionalFields>
<customTabListAdditionalFields>OperatingCnt__c</customTabListAdditionalFields>
<customTabListAdditionalFields>Func_SOD_Status__c</customTabListAdditionalFields>
+ <excludedStandardButtons>PrintableListView</excludedStandardButtons>
<excludedStandardButtons>New</excludedStandardButtons>
<excludedStandardButtons>OpenListInQuip</excludedStandardButtons>
- <excludedStandardButtons>NewFromDocument</excludedStandardButtons>
<excludedStandardButtons>Accept</excludedStandardButtons>
<excludedStandardButtons>ChangeOwner</excludedStandardButtons>
<excludedStandardButtons>Import</excludedStandardButtons>
<excludedStandardButtons>MassChangeOwner</excludedStandardButtons>
- <excludedStandardButtons>PrintableListView</excludedStandardButtons>
+ <excludedStandardButtons>NewFromDocument</excludedStandardButtons>
</searchLayouts>
<sharingModel>ReadWrite</sharingModel>
<visibility>Public</visibility>
diff --git a/force-app/main/default/objects/Infrastructure_Project__c/fields/BedUnit__c.field-meta.xml b/force-app/main/default/objects/Infrastructure_Project__c/fields/BedUnit__c.field-meta.xml
index 3f3d326..9bec136 100644
--- a/force-app/main/default/objects/Infrastructure_Project__c/fields/BedUnit__c.field-meta.xml
+++ b/force-app/main/default/objects/Infrastructure_Project__c/fields/BedUnit__c.field-meta.xml
@@ -5,7 +5,7 @@
<label>搴婁綅鏁�</label>
<length>100</length>
<required>false</required>
- <trackHistory>true</trackHistory>
+ <trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Text</type>
<unique>false</unique>
diff --git a/force-app/main/default/objects/Infrastructure_Project__c/fields/DoNotknowtheday__c.field-meta.xml b/force-app/main/default/objects/Infrastructure_Project__c/fields/DoNotknowtheday__c.field-meta.xml
index b3b135c..e79f976 100644
--- a/force-app/main/default/objects/Infrastructure_Project__c/fields/DoNotknowtheday__c.field-meta.xml
+++ b/force-app/main/default/objects/Infrastructure_Project__c/fields/DoNotknowtheday__c.field-meta.xml
@@ -4,7 +4,7 @@
<externalId>false</externalId>
<label>鎷呭綋涓嶇煡鏅撴棩</label>
<required>false</required>
- <trackHistory>true</trackHistory>
+ <trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Date</type>
</CustomField>
diff --git a/force-app/main/default/objects/Infrastructure_Project__c/fields/HospitalName__c.field-meta.xml b/force-app/main/default/objects/Infrastructure_Project__c/fields/HospitalName__c.field-meta.xml
index ef7c082..b8d4790 100644
--- a/force-app/main/default/objects/Infrastructure_Project__c/fields/HospitalName__c.field-meta.xml
+++ b/force-app/main/default/objects/Infrastructure_Project__c/fields/HospitalName__c.field-meta.xml
@@ -5,7 +5,7 @@
<label>鍖婚櫌鍚嶇О</label>
<length>100</length>
<required>false</required>
- <trackHistory>false</trackHistory>
+ <trackHistory>true</trackHistory>
<trackTrending>false</trackTrending>
<type>Text</type>
<unique>false</unique>
diff --git a/force-app/main/default/objects/Infrastructure_Project__c/fields/IfFollow__c.field-meta.xml b/force-app/main/default/objects/Infrastructure_Project__c/fields/IfFollow__c.field-meta.xml
index e51b085..77aff10 100644
--- a/force-app/main/default/objects/Infrastructure_Project__c/fields/IfFollow__c.field-meta.xml
+++ b/force-app/main/default/objects/Infrastructure_Project__c/fields/IfFollow__c.field-meta.xml
@@ -7,7 +7,7 @@
<precision>1</precision>
<required>false</required>
<scale>0</scale>
- <trackHistory>false</trackHistory>
+ <trackHistory>true</trackHistory>
<trackTrending>false</trackTrending>
<type>Number</type>
<unique>false</unique>
diff --git a/force-app/main/default/objects/Infrastructure_Project__c/fields/IfVisited__c.field-meta.xml b/force-app/main/default/objects/Infrastructure_Project__c/fields/IfVisited__c.field-meta.xml
index 78b6b10..aa4fa9d 100644
--- a/force-app/main/default/objects/Infrastructure_Project__c/fields/IfVisited__c.field-meta.xml
+++ b/force-app/main/default/objects/Infrastructure_Project__c/fields/IfVisited__c.field-meta.xml
@@ -7,7 +7,7 @@
<precision>1</precision>
<required>false</required>
<scale>0</scale>
- <trackHistory>false</trackHistory>
+ <trackHistory>true</trackHistory>
<trackTrending>false</trackTrending>
<type>Number</type>
<unique>false</unique>
diff --git a/force-app/main/default/objects/Infrastructure_Project__c/fields/InfoSource__c.field-meta.xml b/force-app/main/default/objects/Infrastructure_Project__c/fields/InfoSource__c.field-meta.xml
index d8ee3d6..23ac866 100644
--- a/force-app/main/default/objects/Infrastructure_Project__c/fields/InfoSource__c.field-meta.xml
+++ b/force-app/main/default/objects/Infrastructure_Project__c/fields/InfoSource__c.field-meta.xml
@@ -4,7 +4,7 @@
<externalId>false</externalId>
<label>淇℃伅鏉ユ簮</label>
<required>false</required>
- <trackHistory>false</trackHistory>
+ <trackHistory>true</trackHistory>
<trackTrending>false</trackTrending>
<type>Picklist</type>
<valueSet>
diff --git a/force-app/main/default/objects/Infrastructure_Project__c/fields/InvestmentAmount__c.field-meta.xml b/force-app/main/default/objects/Infrastructure_Project__c/fields/InvestmentAmount__c.field-meta.xml
index 883fead..92b78cd 100644
--- a/force-app/main/default/objects/Infrastructure_Project__c/fields/InvestmentAmount__c.field-meta.xml
+++ b/force-app/main/default/objects/Infrastructure_Project__c/fields/InvestmentAmount__c.field-meta.xml
@@ -6,7 +6,7 @@
<precision>18</precision>
<required>false</required>
<scale>0</scale>
- <trackHistory>true</trackHistory>
+ <trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Number</type>
<unique>false</unique>
diff --git a/force-app/main/default/objects/Infrastructure_Project__c/fields/NoRelate_Reson__c.field-meta.xml b/force-app/main/default/objects/Infrastructure_Project__c/fields/NoRelate_Reson__c.field-meta.xml
index 2dedf0b..cb4a913 100644
--- a/force-app/main/default/objects/Infrastructure_Project__c/fields/NoRelate_Reson__c.field-meta.xml
+++ b/force-app/main/default/objects/Infrastructure_Project__c/fields/NoRelate_Reson__c.field-meta.xml
@@ -5,7 +5,7 @@
<label>涓嶇浉鍏冲師鍥�</label>
<length>255</length>
<required>false</required>
- <trackHistory>true</trackHistory>
+ <trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Text</type>
<unique>false</unique>
diff --git a/force-app/main/default/objects/Infrastructure_Project__c/fields/Node_Options__c.field-meta.xml b/force-app/main/default/objects/Infrastructure_Project__c/fields/Node_Options__c.field-meta.xml
index f6e713f..456d357 100644
--- a/force-app/main/default/objects/Infrastructure_Project__c/fields/Node_Options__c.field-meta.xml
+++ b/force-app/main/default/objects/Infrastructure_Project__c/fields/Node_Options__c.field-meta.xml
@@ -2,9 +2,9 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Node_Options__c</fullName>
<externalId>false</externalId>
- <label>椤圭洰鑺傜偣/闃舵杩涘害(閫夐」)</label>
+ <label>椤圭洰鑺傜偣(閫夐」)</label>
<required>false</required>
- <trackHistory>false</trackHistory>
+ <trackHistory>true</trackHistory>
<trackTrending>false</trackTrending>
<type>Picklist</type>
<valueSet>
@@ -12,34 +12,46 @@
<valueSetDefinition>
<sorted>false</sorted>
<value>
- <fullName>椤圭洰瑙勫垝</fullName>
+ <fullName>椤圭洰绔嬮」</fullName>
<default>false</default>
- <label>椤圭洰瑙勫垝</label>
+ <label>1.椤圭洰绔嬮」</label>
</value>
<value>
- <fullName>璁捐绔嬮」</fullName>
+ <fullName>璁捐瑙勫垝</fullName>
<default>false</default>
- <label>璁捐绔嬮」</label>
+ <label>2.璁捐瑙勫垝</label>
</value>
<value>
<fullName>寤鸿鏂藉伐</fullName>
<default>false</default>
- <label>寤鸿鏂藉伐</label>
+ <label>3.寤鸿鏂藉伐</label>
</value>
<value>
- <fullName>绔ｅ伐灏侀」</fullName>
+ <fullName>绔ｅ伐灏侀《</fullName>
<default>false</default>
- <label>绔ｅ伐灏侀」</label>
+ <label>4.绔ｅ伐灏侀《</label>
</value>
<value>
<fullName>瀹ゅ唴瑁呬慨</fullName>
<default>false</default>
- <label>瀹ゅ唴瑁呬慨</label>
+ <label>5.瀹ゅ唴瑁呬慨</label>
</value>
<value>
<fullName>楠屾敹杩愯惀</fullName>
<default>false</default>
- <label>楠屾敹杩愯惀</label>
+ <label>6.楠屾敹杩愯惀</label>
+ </value>
+ <value>
+ <fullName>璁捐绔嬮」</fullName>
+ <default>false</default>
+ <isActive>false</isActive>
+ <label>璁捐绔嬮」</label>
+ </value>
+ <value>
+ <fullName>椤圭洰瑙勫垝</fullName>
+ <default>false</default>
+ <isActive>false</isActive>
+ <label>椤圭洰瑙勫垝</label>
</value>
</valueSetDefinition>
</valueSet>
diff --git a/force-app/main/default/objects/Infrastructure_Project__c/fields/Node__c.field-meta.xml b/force-app/main/default/objects/Infrastructure_Project__c/fields/Node__c.field-meta.xml
index 4817d57..c11d5fc 100644
--- a/force-app/main/default/objects/Infrastructure_Project__c/fields/Node__c.field-meta.xml
+++ b/force-app/main/default/objects/Infrastructure_Project__c/fields/Node__c.field-meta.xml
@@ -5,7 +5,7 @@
<label>椤圭洰鑺傜偣/闃舵杩涘害</label>
<length>255</length>
<required>false</required>
- <trackHistory>false</trackHistory>
+ <trackHistory>true</trackHistory>
<trackTrending>false</trackTrending>
<type>Text</type>
<unique>false</unique>
diff --git a/force-app/main/default/objects/Infrastructure_Project__c/fields/OCSM_Hospital__c.field-meta.xml b/force-app/main/default/objects/Infrastructure_Project__c/fields/OCSM_Hospital__c.field-meta.xml
index 48c9e03..5e1735f 100644
--- a/force-app/main/default/objects/Infrastructure_Project__c/fields/OCSM_Hospital__c.field-meta.xml
+++ b/force-app/main/default/objects/Infrastructure_Project__c/fields/OCSM_Hospital__c.field-meta.xml
@@ -3,12 +3,26 @@
<fullName>OCSM_Hospital__c</fullName>
<deleteConstraint>SetNull</deleteConstraint>
<externalId>false</externalId>
- <label>瀹㈡埛</label>
+ <label>SFDC瀹㈡埛</label>
+ <lookupFilter>
+ <active>true</active>
+ <filterItems>
+ <field>Account.Is_Active__c</field>
+ <operation>equals</operation>
+ <value>鏈夋晥</value>
+ </filterItems>
+ <filterItems>
+ <field>Account.RecordTypeId</field>
+ <operation>equals</operation>
+ <value>鐥呴櫌</value>
+ </filterItems>
+ <isOptional>true</isOptional>
+ </lookupFilter>
<referenceTo>Account</referenceTo>
<relationshipLabel>鍩哄缓椤圭洰</relationshipLabel>
<relationshipName>InProjectDnFH</relationshipName>
<required>false</required>
- <trackHistory>false</trackHistory>
+ <trackHistory>true</trackHistory>
<trackTrending>false</trackTrending>
<type>Lookup</type>
</CustomField>
diff --git a/force-app/main/default/objects/Infrastructure_Project__c/fields/PlanningDepartment__c.field-meta.xml b/force-app/main/default/objects/Infrastructure_Project__c/fields/PlanningDepartment__c.field-meta.xml
index 53c4390..908d845 100644
--- a/force-app/main/default/objects/Infrastructure_Project__c/fields/PlanningDepartment__c.field-meta.xml
+++ b/force-app/main/default/objects/Infrastructure_Project__c/fields/PlanningDepartment__c.field-meta.xml
@@ -3,19 +3,10 @@
<fullName>PlanningDepartment__c</fullName>
<externalId>false</externalId>
<label>瑙勫垝绉戝</label>
+ <length>255</length>
<required>false</required>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
- <type>Picklist</type>
- <valueSet>
- <restricted>true</restricted>
- <valueSetDefinition>
- <sorted>false</sorted>
- <value>
- <fullName>鏃�</fullName>
- <default>false</default>
- <label>鏃�</label>
- </value>
- </valueSetDefinition>
- </valueSet>
+ <type>Text</type>
+ <unique>false</unique>
</CustomField>
diff --git a/force-app/main/default/objects/Infrastructure_Project__c/fields/ProfessionalDifferentiation__c.field-meta.xml b/force-app/main/default/objects/Infrastructure_Project__c/fields/ProfessionalDifferentiation__c.field-meta.xml
index d51061f..8fb24c2 100644
--- a/force-app/main/default/objects/Infrastructure_Project__c/fields/ProfessionalDifferentiation__c.field-meta.xml
+++ b/force-app/main/default/objects/Infrastructure_Project__c/fields/ProfessionalDifferentiation__c.field-meta.xml
@@ -8,7 +8,6 @@
<trackTrending>false</trackTrending>
<type>Picklist</type>
<valueSet>
- <restricted>true</restricted>
<valueSetDefinition>
<sorted>false</sorted>
<value>
diff --git a/force-app/main/default/objects/Infrastructure_Project__c/fields/ProjectMemo__c.field-meta.xml b/force-app/main/default/objects/Infrastructure_Project__c/fields/ProjectMemo__c.field-meta.xml
index eb8047c..f8601d6 100644
--- a/force-app/main/default/objects/Infrastructure_Project__c/fields/ProjectMemo__c.field-meta.xml
+++ b/force-app/main/default/objects/Infrastructure_Project__c/fields/ProjectMemo__c.field-meta.xml
@@ -3,7 +3,7 @@
<fullName>ProjectMemo__c</fullName>
<externalId>false</externalId>
<label>椤圭洰绠�浠�</label>
- <length>500</length>
+ <length>1500</length>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>LongTextArea</type>
diff --git a/force-app/main/default/objects/Infrastructure_Project__c/fields/ProjectStatus1__c.field-meta.xml b/force-app/main/default/objects/Infrastructure_Project__c/fields/ProjectStatus1__c.field-meta.xml
index 18fcb51..ddc4f8a 100644
--- a/force-app/main/default/objects/Infrastructure_Project__c/fields/ProjectStatus1__c.field-meta.xml
+++ b/force-app/main/default/objects/Infrastructure_Project__c/fields/ProjectStatus1__c.field-meta.xml
@@ -2,7 +2,7 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>ProjectStatus1__c</fullName>
<externalId>false</externalId>
- <formula>IF(NOT(ISNULL(CompletionDate__c)),
+ <formula>IF(NOT(ISNULL(Acceptance_operation_date__c)),
'5.缁撴潫',
IF(
diff --git a/force-app/main/default/objects/Infrastructure_Project__c/fields/Project_level__c.field-meta.xml b/force-app/main/default/objects/Infrastructure_Project__c/fields/Project_level__c.field-meta.xml
index 5ab5399..7ef15be 100644
--- a/force-app/main/default/objects/Infrastructure_Project__c/fields/Project_level__c.field-meta.xml
+++ b/force-app/main/default/objects/Infrastructure_Project__c/fields/Project_level__c.field-meta.xml
@@ -20,7 +20,7 @@
'2.閲嶇偣鍏虫敞',
IF(AND(Text(Relation__c) == '楂�', Urgency__c== '1.绱ф��'),
'1.閲嶇偣绠＄悊',
- ''
+ IF(Urgency__c== '4.宸茶繍钀�', '0.甯歌绠＄悊', '')
)
)
)
diff --git a/force-app/main/default/objects/Infrastructure_Project__c/fields/RelatedInquiryDate__c.field-meta.xml b/force-app/main/default/objects/Infrastructure_Project__c/fields/RelatedInquiryDate__c.field-meta.xml
index 8b25cf1..8b0643a 100644
--- a/force-app/main/default/objects/Infrastructure_Project__c/fields/RelatedInquiryDate__c.field-meta.xml
+++ b/force-app/main/default/objects/Infrastructure_Project__c/fields/RelatedInquiryDate__c.field-meta.xml
@@ -4,7 +4,7 @@
<externalId>false</externalId>
<label>鍏宠仈璇环鏃�</label>
<required>false</required>
- <trackHistory>false</trackHistory>
+ <trackHistory>true</trackHistory>
<trackTrending>false</trackTrending>
<type>Date</type>
</CustomField>
diff --git a/force-app/main/default/objects/Infrastructure_Project__c/fields/Relation__c.field-meta.xml b/force-app/main/default/objects/Infrastructure_Project__c/fields/Relation__c.field-meta.xml
index 91adc2b..c159fb6 100644
--- a/force-app/main/default/objects/Infrastructure_Project__c/fields/Relation__c.field-meta.xml
+++ b/force-app/main/default/objects/Infrastructure_Project__c/fields/Relation__c.field-meta.xml
@@ -14,17 +14,17 @@
<value>
<fullName>楂�</fullName>
<default>false</default>
- <label>楂�</label>
+ <label>1.楂�</label>
</value>
<value>
<fullName>涓�</fullName>
<default>false</default>
- <label>涓�</label>
+ <label>2.涓�</label>
</value>
<value>
<fullName>浣�</fullName>
<default>false</default>
- <label>浣�</label>
+ <label>3.浣�</label>
</value>
</valueSetDefinition>
</valueSet>
diff --git a/force-app/main/default/objects/Infrastructure_Project__c/fields/Source__c.field-meta.xml b/force-app/main/default/objects/Infrastructure_Project__c/fields/Source__c.field-meta.xml
index dc996f0..d8ffe46 100644
--- a/force-app/main/default/objects/Infrastructure_Project__c/fields/Source__c.field-meta.xml
+++ b/force-app/main/default/objects/Infrastructure_Project__c/fields/Source__c.field-meta.xml
@@ -5,7 +5,7 @@
<label>璧勯噾鏉ユ簮</label>
<length>255</length>
<required>false</required>
- <trackHistory>true</trackHistory>
+ <trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Text</type>
<unique>false</unique>
diff --git a/force-app/main/default/objects/Infrastructure_Project__c/fields/StageProgress__c.field-meta.xml b/force-app/main/default/objects/Infrastructure_Project__c/fields/StageProgress__c.field-meta.xml
index e48beec..835b9e9 100644
--- a/force-app/main/default/objects/Infrastructure_Project__c/fields/StageProgress__c.field-meta.xml
+++ b/force-app/main/default/objects/Infrastructure_Project__c/fields/StageProgress__c.field-meta.xml
@@ -2,7 +2,7 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>StageProgress__c</fullName>
<externalId>false</externalId>
- <label>闃舵杩涘害</label>
+ <label>椤圭洰澶囨敞</label>
<length>255</length>
<required>false</required>
<trackHistory>false</trackHistory>
diff --git a/force-app/main/default/objects/Infrastructure_Project__c/fields/Urgency__c.field-meta.xml b/force-app/main/default/objects/Infrastructure_Project__c/fields/Urgency__c.field-meta.xml
index 92ba3c6..42bea45 100644
--- a/force-app/main/default/objects/Infrastructure_Project__c/fields/Urgency__c.field-meta.xml
+++ b/force-app/main/default/objects/Infrastructure_Project__c/fields/Urgency__c.field-meta.xml
@@ -6,7 +6,7 @@
'椤圭洰绔嬮」','3.闀挎湡',
'璁捐瑙勫垝','2.涓湡',
'寤鸿鏂藉伐','2.涓湡',
-'绔ｅ伐灏侀」','1.绱ф��',
+'绔ｅ伐灏侀《','1.绱ф��',
'瀹ゅ唴瑁呬慨','1.绱ф��',
'楠屾敹杩愯惀','4.宸茶繍钀�',
''
diff --git a/force-app/main/default/objects/Infrastructure_Project__c/fields/headquarters__c.field-meta.xml b/force-app/main/default/objects/Infrastructure_Project__c/fields/headquarters__c.field-meta.xml
index ec07d27..4d02817 100644
--- a/force-app/main/default/objects/Infrastructure_Project__c/fields/headquarters__c.field-meta.xml
+++ b/force-app/main/default/objects/Infrastructure_Project__c/fields/headquarters__c.field-meta.xml
@@ -8,6 +8,7 @@
'灞变笢鐪�','1.鍗庡寳',
'闈掑矝甯�','1.鍗庡寳',
'鍐呰挋鍙�','1.鍗庡寳',
+ '鍐呰挋鍙よ嚜娌诲尯','1.鍗庡寳',
'娌冲寳鐪�','1.鍗庡寳',
'榛戦緳姹熺渷','2.涓滃寳',
'榛戦緳姹�','2.涓滃寳',
@@ -21,6 +22,7 @@
'闄曡タ鐪�','3.瑗垮寳',
'鏂扮枂鑷不鍖�','3.瑗垮寳',
'鏂扮枂','3.瑗垮寳',
+ '鏂扮枂缁村惥灏旇嚜娌诲尯','3.瑗垮寳',
'鐢樿們鐪�','3.瑗垮寳',
'娌冲崡鐪�','3.瑗垮寳',
'璐靛窞鐪�','4.瑗垮崡',
@@ -37,6 +39,7 @@
'瀹夊窘鐪�','5.鍗庝笢',
'骞胯タ鑷不鍖�','6.鍗庡崡',
'骞胯タ鐪�','6.鍗庡崡',
+ '骞胯タ澹棌鑷不鍖�','6.鍗庡崡',
'娴峰崡鐪�','6.鍗庡崡',
'骞夸笢鐪�','6.鍗庡崡',
'婀栧崡鐪�','6.鍗庡崡',
diff --git a/force-app/main/default/objects/Infrastructure_Project__c/fields/hospitalLevel__c.field-meta.xml b/force-app/main/default/objects/Infrastructure_Project__c/fields/hospitalLevel__c.field-meta.xml
index a8ea3f1..abc807d 100644
--- a/force-app/main/default/objects/Infrastructure_Project__c/fields/hospitalLevel__c.field-meta.xml
+++ b/force-app/main/default/objects/Infrastructure_Project__c/fields/hospitalLevel__c.field-meta.xml
@@ -8,7 +8,6 @@
<trackTrending>false</trackTrending>
<type>Picklist</type>
<valueSet>
- <restricted>true</restricted>
<valueSetDefinition>
<sorted>false</sorted>
<value>
diff --git a/force-app/main/default/objects/Infrastructure_Project__c/listViews/All_001.listView-meta.xml b/force-app/main/default/objects/Infrastructure_Project__c/listViews/All_001.listView-meta.xml
index ccfcfe0..a266d5c 100644
--- a/force-app/main/default/objects/Infrastructure_Project__c/listViews/All_001.listView-meta.xml
+++ b/force-app/main/default/objects/Infrastructure_Project__c/listViews/All_001.listView-meta.xml
@@ -4,11 +4,12 @@
<columns>ProjectNum__c</columns>
<columns>NAME</columns>
<columns>Province__c</columns>
- <columns>City__c</columns>
- <columns>Relation__c</columns>
- <columns>Positioning__c</columns>
- <columns>Node__c</columns>
<columns>OCSM_Hospital__c</columns>
+ <columns>ProjectStatus1__c</columns>
+ <columns>Relation__c</columns>
+ <columns>Urgency__c</columns>
+ <columns>Project_level__c</columns>
+ <columns>sale_confirmation__c</columns>
<columns>Source__c</columns>
<columns>InvestmentAmount__c</columns>
<columns>EndDate__c</columns>
@@ -16,17 +17,9 @@
<columns>IfFollow__c</columns>
<filterScope>Everything</filterScope>
<filters>
- <field>IfRelated__c</field>
- <operation>equals</operation>
+ <field>ProjectStatus1__c</field>
+ <operation>contains</operation>
+ <value>2</value>
</filters>
- <filters>
- <field>OCSM_Hospital__c</field>
- <operation>notEqual</operation>
- </filters>
- <filters>
- <field>IfFollow__c</field>
- <operation>equals</operation>
- </filters>
- <label>002闇�瑕佺‘璁ょ浉鍏虫�у叧鑱旇浠风殑椤圭洰-鎷呭綋</label>
- <language>zh_CN</language>
+ <label>002闇�瑕佹媴褰撶‘璁ょ殑椤圭洰-鎷呭綋</label>
</ListView>
diff --git a/force-app/main/default/objects/Infrastructure_Project__c/listViews/All_006.listView-meta.xml b/force-app/main/default/objects/Infrastructure_Project__c/listViews/All_006.listView-meta.xml
index 0c722e4..7eddfa0 100644
--- a/force-app/main/default/objects/Infrastructure_Project__c/listViews/All_006.listView-meta.xml
+++ b/force-app/main/default/objects/Infrastructure_Project__c/listViews/All_006.listView-meta.xml
@@ -10,7 +10,6 @@
<columns>Urgency__c</columns>
<columns>Relation__c</columns>
<columns>Project_level__c</columns>
- <columns>IfRelated__c</columns>
<columns>Source__c</columns>
<columns>InvestmentAmount__c</columns>
<columns>IfVisited__c</columns>
@@ -28,5 +27,4 @@
<value>0</value>
</filters>
<label>001寰呭叧鑱斿尰闄㈢殑椤圭洰-鍔╃悊</label>
- <language>zh_CN</language>
</ListView>
diff --git a/force-app/main/default/objects/Inquiry_form__c/Inquiry_form__c.object-meta.xml b/force-app/main/default/objects/Inquiry_form__c/Inquiry_form__c.object-meta.xml
index a6de18c..e0c826d 100644
--- a/force-app/main/default/objects/Inquiry_form__c/Inquiry_form__c.object-meta.xml
+++ b/force-app/main/default/objects/Inquiry_form__c/Inquiry_form__c.object-meta.xml
@@ -133,18 +133,21 @@
<actionOverrides>
<actionName>View</actionName>
<comment>Action override created by Lightning App Builder during activation.</comment>
- <content>FlexiPage11213346</content>
+ <content>FlexiPage11213320</content>
<formFactor>Large</formFactor>
<skipRecordTypeSelect>false</skipRecordTypeSelect>
<type>Flexipage</type>
</actionOverrides>
<actionOverrides>
<actionName>View</actionName>
- <type>Default</type>
+ <comment>Action override created by Lightning App Builder during activation.</comment>
+ <content>FlexiPage11213320</content>
+ <formFactor>Small</formFactor>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>Flexipage</type>
</actionOverrides>
<actionOverrides>
<actionName>View</actionName>
- <formFactor>Small</formFactor>
<type>Default</type>
</actionOverrides>
<allowInChatterGroups>false</allowInChatterGroups>
diff --git a/force-app/main/default/objects/Inquiry_form__c/fields/Contact_Name__c.field-meta.xml b/force-app/main/default/objects/Inquiry_form__c/fields/Contact_Name__c.field-meta.xml
index 11f23a8..de8eb6a 100644
--- a/force-app/main/default/objects/Inquiry_form__c/fields/Contact_Name__c.field-meta.xml
+++ b/force-app/main/default/objects/Inquiry_form__c/fields/Contact_Name__c.field-meta.xml
@@ -5,7 +5,7 @@
<externalId>false</externalId>
<label>瀹㈡埛濮撳悕</label>
<lookupFilter>
- <active>false</active>
+ <active>true</active>
<filterItems>
<field>$Source.Hospital__c</field>
<operation>equals</operation>
diff --git a/force-app/main/default/objects/Inquiry_form__c/fields/Opp_Name_Search__c.field-meta.xml b/force-app/main/default/objects/Inquiry_form__c/fields/Opp_Name_Search__c.field-meta.xml
index a44331a..b5530de 100644
--- a/force-app/main/default/objects/Inquiry_form__c/fields/Opp_Name_Search__c.field-meta.xml
+++ b/force-app/main/default/objects/Inquiry_form__c/fields/Opp_Name_Search__c.field-meta.xml
@@ -5,7 +5,7 @@
<externalId>false</externalId>
<label>宸叉湁璇环鍚嶇О</label>
<lookupFilter>
- <active>false</active>
+ <active>true</active>
<booleanFilter>(1 AND 2 AND 3) OR 4</booleanFilter>
<filterItems>
<field>Opportunity.Hospital__c</field>
diff --git a/force-app/main/default/objects/Inquiry_form__c/validationRules/CampaignSource.validationRule-meta.xml b/force-app/main/default/objects/Inquiry_form__c/validationRules/CampaignSource.validationRule-meta.xml
index 3f1270b..28a2ab3 100644
--- a/force-app/main/default/objects/Inquiry_form__c/validationRules/CampaignSource.validationRule-meta.xml
+++ b/force-app/main/default/objects/Inquiry_form__c/validationRules/CampaignSource.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>CampaignSource</fullName>
- <active>false</active>
+ <active>true</active>
<description>褰撳挩璇㈠崟鏉ユ簮鏄�滃浼氫細璁�濇椂锛屸�滀富瑕佸浼� 鈥濆繀椤诲～鍐�</description>
<errorConditionFormula>TEXT(LeadSource__c) == '瀛︿細浼氳' && ISBLANK(Campaign__c)&& $Profile.Id !='00e10000000Y3o5'</errorConditionFormula>
<errorDisplayField>Campaign__c</errorDisplayField>
diff --git a/force-app/main/default/objects/Inquiry_form__c/validationRules/Product_Null.validationRule-meta.xml b/force-app/main/default/objects/Inquiry_form__c/validationRules/Product_Null.validationRule-meta.xml
index 4e74c14..ae20dc0 100644
--- a/force-app/main/default/objects/Inquiry_form__c/validationRules/Product_Null.validationRule-meta.xml
+++ b/force-app/main/default/objects/Inquiry_form__c/validationRules/Product_Null.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Product_Null</fullName>
- <active>false</active>
+ <active>true</active>
<description>浜у搧淇℃伅鍜屼骇鍝佷俊鎭紙鎵嬪姩锛夎鏈変竴涓繀濉�</description>
<errorConditionFormula>ISBLANK(Product1__c) && ISBLANK(Product1_Manual__c)</errorConditionFormula>
<errorMessage>浜у搧淇℃伅鍜屼骇鍝佷俊鎭紙鎵嬪姩锛夎嚦灏戝～鍐欎竴椤�</errorMessage>
diff --git a/force-app/main/default/objects/Inspection_Item__c/Inspection_Item__c.object-meta.xml b/force-app/main/default/objects/Inspection_Item__c/Inspection_Item__c.object-meta.xml
index 8c0821f..534cd87 100644
--- a/force-app/main/default/objects/Inspection_Item__c/Inspection_Item__c.object-meta.xml
+++ b/force-app/main/default/objects/Inspection_Item__c/Inspection_Item__c.object-meta.xml
@@ -58,7 +58,9 @@
</actionOverrides>
<actionOverrides>
<actionName>Edit</actionName>
- <type>Default</type>
+ <content>OFSInsReportLayout</content>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>Visualforce</type>
</actionOverrides>
<actionOverrides>
<actionName>Edit</actionName>
@@ -159,13 +161,13 @@
<type>Text</type>
</nameField>
<searchLayouts>
+ <excludedStandardButtons>ChangeOwner</excludedStandardButtons>
<excludedStandardButtons>OpenListInQuip</excludedStandardButtons>
<excludedStandardButtons>NewFromDocument</excludedStandardButtons>
- <excludedStandardButtons>Accept</excludedStandardButtons>
<excludedStandardButtons>PrintableListView</excludedStandardButtons>
<excludedStandardButtons>Import</excludedStandardButtons>
<excludedStandardButtons>MassChangeOwner</excludedStandardButtons>
- <excludedStandardButtons>ChangeOwner</excludedStandardButtons>
+ <excludedStandardButtons>Accept</excludedStandardButtons>
</searchLayouts>
<sharingModel>ControlledByParent</sharingModel>
<visibility>Public</visibility>
diff --git a/force-app/main/default/objects/Inspection_Item__c/fields/Fault_Classification3__c.field-meta.xml b/force-app/main/default/objects/Inspection_Item__c/fields/Fault_Classification3__c.field-meta.xml
index 20e20aa..4752a5b 100644
--- a/force-app/main/default/objects/Inspection_Item__c/fields/Fault_Classification3__c.field-meta.xml
+++ b/force-app/main/default/objects/Inspection_Item__c/fields/Fault_Classification3__c.field-meta.xml
@@ -527,6 +527,50 @@
</value>
</valueSetDefinition>
<valueSettings>
+ <controllingFieldValue>涓绘満/鍏夋簮</controllingFieldValue>
+ <valueName>寮傚搷</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>涓绘満/鍏夋簮</controllingFieldValue>
+ <valueName>绉皹</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>涓绘満/鍏夋簮</controllingFieldValue>
+ <valueName>鐏场</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>涓绘満/鍏夋簮</controllingFieldValue>
+ <valueName>鐏骇/鐐圭伅鍣�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>涓绘満/鍏夋簮</controllingFieldValue>
+ <valueName>璁板繂鐢垫睜</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>涓绘満/鍏夋簮</controllingFieldValue>
+ <valueName>鑷姩璋冨厜</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>涓绘満/鍏夋簮</controllingFieldValue>
+ <valueName>鍥惧儚</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>涓绘満/鍏夋簮</controllingFieldValue>
+ <valueName>鍐呴暅鐢电紗</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>涓绘満/鍏夋簮</controllingFieldValue>
+ <valueName>鍏夋簮鎻掑ご鎺ョ偣</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鏄剧ず鍣�</controllingFieldValue>
+ <valueName>棰滆壊/浜害</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鏄剧ず鍣�</controllingFieldValue>
+ <valueName>鍥惧儚鍒囨崲</valueName>
+ </valueSettings>
+ <valueSettings>
<controllingFieldValue>OER</controllingFieldValue>
<valueName>鏁呴殰浠ｇ爜</valueName>
</valueSettings>
@@ -634,6 +678,10 @@
<controllingFieldValue>鍏朵粬鍛ㄨ竟/闄勪欢</controllingFieldValue>
<controllingFieldValue>鍏朵粬</controllingFieldValue>
<valueName>鍏朵粬</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>閬ユ帶鎸夐挳</controllingFieldValue>
+ <valueName>鍔熻兘銉昏劚鑷�</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>鎺ョ稓閮�</controllingFieldValue>
@@ -770,21 +818,9 @@
<valueName>铔囩铔囪</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>澶栬Τ</controllingFieldValue>
<controllingFieldValue>婕忔按妞滄熁</controllingFieldValue>
- <valueName>鏁翠綋</valueName>
- </valueSettings>
- <valueSettings>
<controllingFieldValue>澶栬Τ</controllingFieldValue>
- <valueName>缁濈紭閮ㄤ綅</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鎿嶄綔鎬�</controllingFieldValue>
- <valueName>閽冲槾寮�鍚�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鎿嶄綔鎬�</controllingFieldValue>
- <valueName>鎵嬫焺杩炴帴</valueName>
+ <valueName>鏁翠綋</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>娓呮磥鍒风枏閫�</controllingFieldValue>
@@ -891,52 +927,16 @@
<valueName>ID涓嶆樉绀恒兓鏄剧ず閿欒</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>閬ユ帶鎸夐挳</controllingFieldValue>
- <valueName>鍔熻兘銉昏劚鑷�</valueName>
+ <controllingFieldValue>澶栬Τ</controllingFieldValue>
+ <valueName>缁濈紭閮ㄤ綅</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>涓绘満/鍏夋簮</controllingFieldValue>
- <valueName>寮傚搷</valueName>
+ <controllingFieldValue>鎿嶄綔鎬�</controllingFieldValue>
+ <valueName>閽冲槾寮�鍚�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>涓绘満/鍏夋簮</controllingFieldValue>
- <valueName>绉皹</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>涓绘満/鍏夋簮</controllingFieldValue>
- <valueName>鐏场</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>涓绘満/鍏夋簮</controllingFieldValue>
- <valueName>鐏骇/鐐圭伅鍣�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>涓绘満/鍏夋簮</controllingFieldValue>
- <valueName>璁板繂鐢垫睜</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>涓绘満/鍏夋簮</controllingFieldValue>
- <valueName>鑷姩璋冨厜</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>涓绘満/鍏夋簮</controllingFieldValue>
- <valueName>鍥惧儚</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>涓绘満/鍏夋簮</controllingFieldValue>
- <valueName>鍐呴暅鐢电紗</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>涓绘満/鍏夋簮</controllingFieldValue>
- <valueName>鍏夋簮鎻掑ご鎺ョ偣</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鏄剧ず鍣�</controllingFieldValue>
- <valueName>棰滆壊/浜害</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鏄剧ず鍣�</controllingFieldValue>
- <valueName>鍥惧儚鍒囨崲</valueName>
+ <controllingFieldValue>鎿嶄綔鎬�</controllingFieldValue>
+ <valueName>鎵嬫焺杩炴帴</valueName>
</valueSettings>
</valueSet>
</CustomField>
diff --git a/force-app/main/default/objects/Inspection_Report__c/Inspection_Report__c.object-meta.xml b/force-app/main/default/objects/Inspection_Report__c/Inspection_Report__c.object-meta.xml
index 91a00ea..430fda9 100644
--- a/force-app/main/default/objects/Inspection_Report__c/Inspection_Report__c.object-meta.xml
+++ b/force-app/main/default/objects/Inspection_Report__c/Inspection_Report__c.object-meta.xml
@@ -58,11 +58,13 @@
</actionOverrides>
<actionOverrides>
<actionName>Edit</actionName>
- <type>Default</type>
+ <content>LexInspectionReportPIPLAura</content>
+ <formFactor>Large</formFactor>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>LightningComponent</type>
</actionOverrides>
<actionOverrides>
<actionName>Edit</actionName>
- <formFactor>Large</formFactor>
<type>Default</type>
</actionOverrides>
<actionOverrides>
@@ -86,11 +88,13 @@
</actionOverrides>
<actionOverrides>
<actionName>New</actionName>
- <type>Default</type>
+ <content>LexInspectionReportPIPLAura</content>
+ <formFactor>Large</formFactor>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>LightningComponent</type>
</actionOverrides>
<actionOverrides>
<actionName>New</actionName>
- <formFactor>Large</formFactor>
<type>Default</type>
</actionOverrides>
<actionOverrides>
@@ -161,13 +165,14 @@
</nameField>
<recordTypeTrackHistory>false</recordTypeTrackHistory>
<searchLayouts>
- <excludedStandardButtons>OpenListInQuip</excludedStandardButtons>
+ <excludedStandardButtons>MassChangeOwner</excludedStandardButtons>
+ <excludedStandardButtons>PrintableListView</excludedStandardButtons>
+ <excludedStandardButtons>New</excludedStandardButtons>
+ <excludedStandardButtons>Import</excludedStandardButtons>
<excludedStandardButtons>NewFromDocument</excludedStandardButtons>
<excludedStandardButtons>Accept</excludedStandardButtons>
<excludedStandardButtons>ChangeOwner</excludedStandardButtons>
- <excludedStandardButtons>Import</excludedStandardButtons>
- <excludedStandardButtons>MassChangeOwner</excludedStandardButtons>
- <excludedStandardButtons>PrintableListView</excludedStandardButtons>
+ <excludedStandardButtons>OpenListInQuip</excludedStandardButtons>
<searchResultsAdditionalFields>Inspection_Date__c</searchResultsAdditionalFields>
</searchLayouts>
<sharingModel>ControlledByParent</sharingModel>
diff --git a/force-app/main/default/objects/Inspection_Report__c/fields/Reporter__c.field-meta.xml b/force-app/main/default/objects/Inspection_Report__c/fields/Reporter__c.field-meta.xml
index a866825..5b0ce1f 100644
--- a/force-app/main/default/objects/Inspection_Report__c/fields/Reporter__c.field-meta.xml
+++ b/force-app/main/default/objects/Inspection_Report__c/fields/Reporter__c.field-meta.xml
@@ -5,7 +5,7 @@
<externalId>false</externalId>
<label>鎶ュ憡鑰�</label>
<lookupFilter>
- <active>false</active>
+ <active>true</active>
<booleanFilter>1 OR 2</booleanFilter>
<filterItems>
<field>User.Job_Category__c</field>
diff --git a/force-app/main/default/objects/Inspection_Report__c/validationRules/InputFinishRPCheck.validationRule-meta.xml b/force-app/main/default/objects/Inspection_Report__c/validationRules/InputFinishRPCheck.validationRule-meta.xml
index 3b3c157..f786841 100644
--- a/force-app/main/default/objects/Inspection_Report__c/validationRules/InputFinishRPCheck.validationRule-meta.xml
+++ b/force-app/main/default/objects/Inspection_Report__c/validationRules/InputFinishRPCheck.validationRule-meta.xml
@@ -3,6 +3,6 @@
<fullName>InputFinishRPCheck</fullName>
<active>true</active>
<errorConditionFormula>TEXT(Status__c) = '濉啓瀹屾瘯' && ISBLANK(Responsible_Person_F__c)</errorConditionFormula>
- <errorDisplayField>Responsible_Person__c</errorDisplayField>
+ <errorDisplayField>Responsible_Person_F__c</errorDisplayField>
<errorMessage>璇峰～鍐欓櫌鏂硅礋璐ｄ汉</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Inspection_Report__c/validationRules/PdfRPCheck.validationRule-meta.xml b/force-app/main/default/objects/Inspection_Report__c/validationRules/PdfRPCheck.validationRule-meta.xml
index 7e678d5..e9cbcfd 100644
--- a/force-app/main/default/objects/Inspection_Report__c/validationRules/PdfRPCheck.validationRule-meta.xml
+++ b/force-app/main/default/objects/Inspection_Report__c/validationRules/PdfRPCheck.validationRule-meta.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>PdfRPCheck</fullName>
- <active>true</active>
- <errorConditionFormula>TEXT(Status__c) = 'PDF' && ISBLANK(Responsible_Person_F__c)</errorConditionFormula>
+ <active>false</active>
+ <errorConditionFormula>TEXT(Status__c) = 'PDF' && ISBLANK(Responsible_Person__c)</errorConditionFormula>
<errorDisplayField>Responsible_Person__c</errorDisplayField>
<errorMessage>璇峰～鍐欓櫌鏂硅礋璐ｄ汉</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Instructed_staff__c/fields/Instruct_content__c.field-meta.xml b/force-app/main/default/objects/Instructed_staff__c/fields/Instruct_content__c.field-meta.xml
index b969cc7..37da725 100644
--- a/force-app/main/default/objects/Instructed_staff__c/fields/Instruct_content__c.field-meta.xml
+++ b/force-app/main/default/objects/Instructed_staff__c/fields/Instruct_content__c.field-meta.xml
@@ -7,6 +7,7 @@
<trackTrending>false</trackTrending>
<type>MultiselectPicklist</type>
<valueSet>
+ <restricted>true</restricted>
<valueSetDefinition>
<sorted>false</sorted>
<value>
@@ -64,6 +65,36 @@
<default>false</default>
<label>鍏跺畠</label>
</value>
+ <value>
+ <fullName>鍏朵粬</fullName>
+ <default>false</default>
+ <isActive>false</isActive>
+ <label>鍏朵粬</label>
+ </value>
+ <value>
+ <fullName>鏁呴殰鎺掓煡(290/260鍐呴暅绯荤粺锛�</fullName>
+ <default>false</default>
+ <isActive>false</isActive>
+ <label>鏁呴殰鎺掓煡(290/260鍐呴暅绯荤粺锛�</label>
+ </value>
+ <value>
+ <fullName>鏁呴殰鎺掓煡(涓绘満銆佸厜婧愩�佸懆杈硅澶囷級</fullName>
+ <default>false</default>
+ <isActive>false</isActive>
+ <label>鏁呴殰鎺掓煡(涓绘満銆佸厜婧愩�佸懆杈硅澶囷級</label>
+ </value>
+ <value>
+ <fullName>鏁版嵁鍒嗘瀽(浠�1-2涓湀鏁版嵁涓轰緥)</fullName>
+ <default>false</default>
+ <isActive>false</isActive>
+ <label>鏁版嵁鍒嗘瀽(浠�1-2涓湀鏁版嵁涓轰緥)</label>
+ </value>
+ <value>
+ <fullName>闈㈠悜绉戝寮�灞曞煿璁�</fullName>
+ <default>false</default>
+ <isActive>false</isActive>
+ <label>闈㈠悜绉戝寮�灞曞煿璁�</label>
+ </value>
</valueSetDefinition>
</valueSet>
<visibleLines>4</visibleLines>
diff --git a/force-app/main/default/objects/Inventory_Header__c/listViews/All1.listView-meta.xml b/force-app/main/default/objects/Inventory_Header__c/listViews/All1.listView-meta.xml
index 3d5b21a..74c80e4 100644
--- a/force-app/main/default/objects/Inventory_Header__c/listViews/All1.listView-meta.xml
+++ b/force-app/main/default/objects/Inventory_Header__c/listViews/All1.listView-meta.xml
@@ -15,11 +15,5 @@
<operation>contains</operation>
<value>BSC</value>
</filters>
- <filters>
- <field>NAME</field>
- <operation>contains</operation>
- <value>FY2023</value>
- </filters>
<label>鍔炰簨澶�</label>
- <language>zh_CN</language>
</ListView>
diff --git a/force-app/main/default/objects/Inventory_Header__c/validationRules/Cannot_Submit_App_When_Have_Dot_Inventor.validationRule-meta.xml b/force-app/main/default/objects/Inventory_Header__c/validationRules/Cannot_Submit_App_When_Have_Dot_Inventor.validationRule-meta.xml
index 58c7395..159f80c 100644
--- a/force-app/main/default/objects/Inventory_Header__c/validationRules/Cannot_Submit_App_When_Have_Dot_Inventor.validationRule-meta.xml
+++ b/force-app/main/default/objects/Inventory_Header__c/validationRules/Cannot_Submit_App_When_Have_Dot_Inventor.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Cannot_Submit_App_When_Have_Dot_Inventor</fullName>
- <active>false</active>
+ <active>true</active>
<description>鏈夋湭鐩樼偣鐨勬槑缁嗘椂涓嶈兘鎻愪氦瀹℃壒</description>
<errorConditionFormula>ISPICKVAL(Inventory_Status__c, '濉啓瀹屾瘯')
&& Dot_Inventory_Detail_Count__c > 0</errorConditionFormula>
diff --git a/force-app/main/default/objects/Inventory_Header__c/validationRules/Cannot_Submit_When_Have_Not_Inventor_C.validationRule-meta.xml b/force-app/main/default/objects/Inventory_Header__c/validationRules/Cannot_Submit_When_Have_Not_Inventor_C.validationRule-meta.xml
index ea485e6..df29e31 100644
--- a/force-app/main/default/objects/Inventory_Header__c/validationRules/Cannot_Submit_When_Have_Not_Inventor_C.validationRule-meta.xml
+++ b/force-app/main/default/objects/Inventory_Header__c/validationRules/Cannot_Submit_When_Have_Not_Inventor_C.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Cannot_Submit_When_Have_Not_Inventor_C</fullName>
- <active>false</active>
+ <active>true</active>
<description>鏈夋湭鐩樼偣鐨勮�楁潗鏄庣粏鏃朵笉鑳芥彁浜ゅ鎵�</description>
<errorConditionFormula>ISPICKVAL(Inventory_Status__c, '濉啓瀹屾瘯')
&& Dot_Consum_Inventory_Detail_Count__c > 0</errorConditionFormula>
diff --git a/force-app/main/default/objects/Inventory_Header__c/validationRules/Cannot_Submit_When_NOTHave_ManagerBuzhan.validationRule-meta.xml b/force-app/main/default/objects/Inventory_Header__c/validationRules/Cannot_Submit_When_NOTHave_ManagerBuzhan.validationRule-meta.xml
index b2425bc..aeb8363 100644
--- a/force-app/main/default/objects/Inventory_Header__c/validationRules/Cannot_Submit_When_NOTHave_ManagerBuzhan.validationRule-meta.xml
+++ b/force-app/main/default/objects/Inventory_Header__c/validationRules/Cannot_Submit_When_NOTHave_ManagerBuzhan.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Cannot_Submit_When_NOTHave_ManagerBuzhan</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>ISPICKVAL(Inventory_Status__c, '濉啓瀹屾瘯')
&& ISBLANK(Jingli_Equipment__c)
&& ISBLANK(Buzhang_Equipment__c)</errorConditionFormula>
diff --git a/force-app/main/default/objects/Knowledge__kav/Knowledge__kav.object-meta.xml b/force-app/main/default/objects/Knowledge__kav/Knowledge__kav.object-meta.xml
index af245fd..b59bd05 100644
--- a/force-app/main/default/objects/Knowledge__kav/Knowledge__kav.object-meta.xml
+++ b/force-app/main/default/objects/Knowledge__kav/Knowledge__kav.object-meta.xml
@@ -24,15 +24,14 @@
<enableHistory>false</enableHistory>
<label>CIC-FAQ</label>
<searchLayouts>
- <excludedStandardButtons>OpenListInQuip</excludedStandardButtons>
<excludedStandardButtons>NewFromDocument</excludedStandardButtons>
+ <excludedStandardButtons>OpenListInQuip</excludedStandardButtons>
<excludedStandardButtons>MassPublishKnowledgeArticleVersion</excludedStandardButtons>
<excludedStandardButtons>MassAssignKnowledgeArticleVersion</excludedStandardButtons>
- <excludedStandardButtons>MassArchiveKnowledgeArticleVersion</excludedStandardButtons>
+ <excludedStandardButtons>MassChangeOwnerKnowledgeArticleVersion</excludedStandardButtons>
<excludedStandardButtons>MassDeleteArchiveKnowledgeArticleVersion</excludedStandardButtons>
<excludedStandardButtons>MassDeleteDraftKnowledgeArticleVersion</excludedStandardButtons>
<excludedStandardButtons>MassRestoreKnowledgeArticleVersion</excludedStandardButtons>
- <excludedStandardButtons>MassSubmitKnowledgeArticleVersionForTranslation</excludedStandardButtons>
- <excludedStandardButtons>MassChangeOwnerKnowledgeArticleVersion</excludedStandardButtons>
+ <excludedStandardButtons>MassArchiveKnowledgeArticleVersion</excludedStandardButtons>
</searchLayouts>
</CustomObject>
diff --git a/force-app/main/default/objects/Knowledge__kav/fields/Contents__c.field-meta.xml b/force-app/main/default/objects/Knowledge__kav/fields/Contents__c.field-meta.xml
index 1541b09..2855496 100644
--- a/force-app/main/default/objects/Knowledge__kav/fields/Contents__c.field-meta.xml
+++ b/force-app/main/default/objects/Knowledge__kav/fields/Contents__c.field-meta.xml
@@ -3,7 +3,7 @@
<fullName>Contents__c</fullName>
<externalId>false</externalId>
<label>鍐呭</label>
- <length>32768</length>
+ <length>131072</length>
<type>Html</type>
<visibleLines>10</visibleLines>
</CustomField>
diff --git a/force-app/main/default/objects/Knowledge__kav/listViews/archived_articles.listView-meta.xml b/force-app/main/default/objects/Knowledge__kav/listViews/archived_articles.listView-meta.xml
index cdc595d..8c67cd2 100644
--- a/force-app/main/default/objects/Knowledge__kav/listViews/archived_articles.listView-meta.xml
+++ b/force-app/main/default/objects/Knowledge__kav/listViews/archived_articles.listView-meta.xml
@@ -9,12 +9,12 @@
<filters>
<field>PUBLISH_STATUS</field>
<operation>equals</operation>
- <value>3</value>
+ <value>2</value>
</filters>
<filters>
<field>LANGUAGE</field>
<operation>equals</operation>
- <value>en_US</value>
+ <value>zh_CN</value>
</filters>
<label>00.鍏紑涓殑鎵�鏈塅AQ</label>
</ListView>
diff --git a/force-app/main/default/objects/Knowledge__kav/listViews/draft_articles.listView-meta.xml b/force-app/main/default/objects/Knowledge__kav/listViews/draft_articles.listView-meta.xml
index 2973836..be0dd3a 100644
--- a/force-app/main/default/objects/Knowledge__kav/listViews/draft_articles.listView-meta.xml
+++ b/force-app/main/default/objects/Knowledge__kav/listViews/draft_articles.listView-meta.xml
@@ -9,12 +9,17 @@
<filters>
<field>PUBLISH_STATUS</field>
<operation>equals</operation>
- <value>1</value>
+ <value>2</value>
</filters>
<filters>
<field>LANGUAGE</field>
<operation>equals</operation>
- <value>en_US</value>
+ <value>zh_CN</value>
+ </filters>
+ <filters>
+ <field>FAQ_disclosed_day__c</field>
+ <operation>equals</operation>
+ <value>THIS_MONTH</value>
</filters>
<label>01.鏈湀鍏紑鐨勬墍鏈塅AQ</label>
</ListView>
diff --git a/force-app/main/default/objects/Knowledge__kav/listViews/published_articles.listView-meta.xml b/force-app/main/default/objects/Knowledge__kav/listViews/published_articles.listView-meta.xml
index 0b6d558..5912e07 100644
--- a/force-app/main/default/objects/Knowledge__kav/listViews/published_articles.listView-meta.xml
+++ b/force-app/main/default/objects/Knowledge__kav/listViews/published_articles.listView-meta.xml
@@ -9,12 +9,12 @@
<filters>
<field>PUBLISH_STATUS</field>
<operation>equals</operation>
- <value>2</value>
+ <value>1</value>
</filters>
<filters>
<field>LANGUAGE</field>
<operation>equals</operation>
- <value>en_US</value>
+ <value>zh_CN</value>
</filters>
<label>98.杩樻病鎵瑰噯FAQ</label>
</ListView>
diff --git a/force-app/main/default/objects/LastbuyProduct__c/LastbuyProduct__c.object-meta.xml b/force-app/main/default/objects/LastbuyProduct__c/LastbuyProduct__c.object-meta.xml
index 572d523..ebeb670 100644
--- a/force-app/main/default/objects/LastbuyProduct__c/LastbuyProduct__c.object-meta.xml
+++ b/force-app/main/default/objects/LastbuyProduct__c/LastbuyProduct__c.object-meta.xml
@@ -86,19 +86,17 @@
</actionOverrides>
<actionOverrides>
<actionName>New</actionName>
- <content>lexLastbuyProductNewAura</content>
- <formFactor>Large</formFactor>
- <skipRecordTypeSelect>false</skipRecordTypeSelect>
- <type>LightningComponent</type>
- </actionOverrides>
- <actionOverrides>
- <actionName>New</actionName>
<content>LastbuyProductNew</content>
<skipRecordTypeSelect>false</skipRecordTypeSelect>
<type>Visualforce</type>
</actionOverrides>
<actionOverrides>
<actionName>New</actionName>
+ <formFactor>Large</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>New</actionName>
<formFactor>Small</formFactor>
<type>Default</type>
</actionOverrides>
diff --git a/force-app/main/default/objects/LastbuyProduct__c/fields/InquiryCode__c.field-meta.xml b/force-app/main/default/objects/LastbuyProduct__c/fields/InquiryCode__c.field-meta.xml
index 372e622..66a02b3 100644
--- a/force-app/main/default/objects/LastbuyProduct__c/fields/InquiryCode__c.field-meta.xml
+++ b/force-app/main/default/objects/LastbuyProduct__c/fields/InquiryCode__c.field-meta.xml
@@ -4,6 +4,25 @@
<deleteConstraint>SetNull</deleteConstraint>
<externalId>false</externalId>
<label>璇环鍚嶇О</label>
+ <lookupFilter>
+ <active>true</active>
+ <filterItems>
+ <field>Opportunity.SAP_Send_OK__c</field>
+ <operation>equals</operation>
+ <value>False</value>
+ </filterItems>
+ <filterItems>
+ <field>Opportunity.StageName__c</field>
+ <operation>notEqual</operation>
+ <value>澶卞崟</value>
+ </filterItems>
+ <filterItems>
+ <field>Opportunity.StageName__c</field>
+ <operation>notEqual</operation>
+ <value>鍙栨秷</value>
+ </filterItems>
+ <isOptional>true</isOptional>
+ </lookupFilter>
<referenceTo>Opportunity</referenceTo>
<relationshipLabel>棰勭暀浜у搧</relationshipLabel>
<relationshipName>InquiryCode</relationshipName>
diff --git a/force-app/main/default/objects/LastbuyProduct__c/webLinks/CB_LBP_New.webLink-meta.xml b/force-app/main/default/objects/LastbuyProduct__c/webLinks/CB_LBP_New.webLink-meta.xml
index ad76bf2..e73b593 100644
--- a/force-app/main/default/objects/LastbuyProduct__c/webLinks/CB_LBP_New.webLink-meta.xml
+++ b/force-app/main/default/objects/LastbuyProduct__c/webLinks/CB_LBP_New.webLink-meta.xml
@@ -8,5 +8,18 @@
<openType>onClickJavaScript</openType>
<protected>false</protected>
<requireRowSelection>false</requireRowSelection>
- <url>windows.location</url>
+ <url>{!REQUIRESCRIPT('/soap/ajax/51.0/connection.js')}
+{!REQUIRESCRIPT('/soap/ajax/51.0/apex.js')}
+var foo = function(){
+var url = '/apex/StandardFieldDefaults?';
+
+var product = '{!Product2.Id}';
+if (product != undefined && product != '') {
+url = url + 'SObjId=' + '{!URLENCODE(Product2.Id)}' + '&SObjName=' + '{!URLENCODE(Product2.Name)}' + '&linkId=00N10000009HD8q' + '&Pagefrom=Product';
+}
+
+url = url + '&Pageto=LastbuyProduct';
+window.open(url);
+}
+foo();</url>
</WebLink>
diff --git a/force-app/main/default/objects/Lead/Lead.object-meta.xml b/force-app/main/default/objects/Lead/Lead.object-meta.xml
new file mode 100644
index 0000000..762d2d7
--- /dev/null
+++ b/force-app/main/default/objects/Lead/Lead.object-meta.xml
@@ -0,0 +1,312 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomObject xmlns="http://soap.sforce.com/2006/04/metadata">
+ <actionOverrides>
+ <actionName>Accept</actionName>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>Accept</actionName>
+ <formFactor>Large</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>Accept</actionName>
+ <formFactor>Small</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>AddToCampaign</actionName>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>AddToCampaign</actionName>
+ <formFactor>Large</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>AddToCampaign</actionName>
+ <formFactor>Small</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>CallHighlightAction</actionName>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>CallHighlightAction</actionName>
+ <formFactor>Large</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>CallHighlightAction</actionName>
+ <formFactor>Small</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>CancelEdit</actionName>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>CancelEdit</actionName>
+ <formFactor>Large</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>CancelEdit</actionName>
+ <formFactor>Small</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>ChangeStatus</actionName>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>ChangeStatus</actionName>
+ <formFactor>Large</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>ChangeStatus</actionName>
+ <formFactor>Small</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>Clone</actionName>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>Clone</actionName>
+ <formFactor>Large</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>Clone</actionName>
+ <formFactor>Small</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>Convert</actionName>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>Convert</actionName>
+ <formFactor>Large</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>Convert</actionName>
+ <formFactor>Small</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>Delete</actionName>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>Delete</actionName>
+ <formFactor>Large</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>Delete</actionName>
+ <formFactor>Small</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>Edit</actionName>
+ <content>LexLeadPIPLAura</content>
+ <formFactor>Large</formFactor>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>LightningComponent</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>Edit</actionName>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>Edit</actionName>
+ <formFactor>Small</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>EmailHighlightAction</actionName>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>EmailHighlightAction</actionName>
+ <formFactor>Large</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>EmailHighlightAction</actionName>
+ <formFactor>Small</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>FindDup</actionName>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>FindDup</actionName>
+ <formFactor>Large</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>FindDup</actionName>
+ <formFactor>Small</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>List</actionName>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>List</actionName>
+ <formFactor>Large</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>List</actionName>
+ <formFactor>Small</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>ListClean</actionName>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>ListClean</actionName>
+ <formFactor>Large</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>ListClean</actionName>
+ <formFactor>Small</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>New</actionName>
+ <content>LexLeadPIPLAura</content>
+ <formFactor>Large</formFactor>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>LightningComponent</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>New</actionName>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>New</actionName>
+ <formFactor>Small</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>SaveEdit</actionName>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>SaveEdit</actionName>
+ <formFactor>Large</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>SaveEdit</actionName>
+ <formFactor>Small</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>SmsHighlightAction</actionName>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>SmsHighlightAction</actionName>
+ <formFactor>Large</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>SmsHighlightAction</actionName>
+ <formFactor>Small</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>Tab</actionName>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>Tab</actionName>
+ <formFactor>Large</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>Tab</actionName>
+ <formFactor>Small</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>View</actionName>
+ <comment>Action override created by Lightning App Builder during activation.</comment>
+ <content>FlexiPage914009</content>
+ <formFactor>Large</formFactor>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>Flexipage</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>View</actionName>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>View</actionName>
+ <formFactor>Small</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <compactLayoutAssignment>BuyLead_CampaignLayout</compactLayoutAssignment>
+ <enableFeeds>true</enableFeeds>
+ <enableHistory>true</enableHistory>
+ <externalSharingModel>Private</externalSharingModel>
+ <recordTypeTrackFeedHistory>false</recordTypeTrackFeedHistory>
+ <recordTypeTrackHistory>false</recordTypeTrackHistory>
+ <searchLayouts>
+ <customTabListAdditionalFields>FULL_NAME</customTabListAdditionalFields>
+ <customTabListAdditionalFields>LEAD.COMPANY</customTabListAdditionalFields>
+ <customTabListAdditionalFields>urgent__c</customTabListAdditionalFields>
+ <customTabListAdditionalFields>Opp_Name__c</customTabListAdditionalFields>
+ <customTabListAdditionalFields>Opportunity_Division__c</customTabListAdditionalFields>
+ <customTabListAdditionalFields>Purchase_Plan__c</customTabListAdditionalFields>
+ <customTabListAdditionalFields>LEAD.CREATED_DATE</customTabListAdditionalFields>
+ <customTabListAdditionalFields>CREATEDBY_USER.ALIAS</customTabListAdditionalFields>
+ <excludedStandardButtons>OpenListInQuip</excludedStandardButtons>
+ <excludedStandardButtons>MassAddToActionableList</excludedStandardButtons>
+ <excludedStandardButtons>New</excludedStandardButtons>
+ <excludedStandardButtons>PipelineInspection</excludedStandardButtons>
+ <excludedStandardButtons>Accept</excludedStandardButtons>
+ <excludedStandardButtons>ChangeStatus</excludedStandardButtons>
+ <excludedStandardButtons>ChangeOwner</excludedStandardButtons>
+ <excludedStandardButtons>MassAccept</excludedStandardButtons>
+ <excludedStandardButtons>AddToCampaign</excludedStandardButtons>
+ <excludedStandardButtons>Import</excludedStandardButtons>
+ <excludedStandardButtons>MassAddToCampaign</excludedStandardButtons>
+ <excludedStandardButtons>MassChangeStatus</excludedStandardButtons>
+ <excludedStandardButtons>MassChangeOwner</excludedStandardButtons>
+ <excludedStandardButtons>MassCreateCallList</excludedStandardButtons>
+ <excludedStandardButtons>SendListEmailAction</excludedStandardButtons>
+ <excludedStandardButtons>PrintableListView</excludedStandardButtons>
+ <excludedStandardButtons>NewFromDocument</excludedStandardButtons>
+ <lookupDialogsAdditionalFields>FULL_NAME</lookupDialogsAdditionalFields>
+ <lookupDialogsAdditionalFields>LEAD.COMPANY</lookupDialogsAdditionalFields>
+ <lookupPhoneDialogsAdditionalFields>FULL_NAME</lookupPhoneDialogsAdditionalFields>
+ <lookupPhoneDialogsAdditionalFields>LEAD.COMPANY</lookupPhoneDialogsAdditionalFields>
+ <lookupPhoneDialogsAdditionalFields>LEAD.PHONE</lookupPhoneDialogsAdditionalFields>
+ <lookupPhoneDialogsAdditionalFields>LEAD.MOBILE_PHONE</lookupPhoneDialogsAdditionalFields>
+ <searchResultsAdditionalFields>FULL_NAME</searchResultsAdditionalFields>
+ <searchResultsAdditionalFields>LEAD.TITLE</searchResultsAdditionalFields>
+ <searchResultsAdditionalFields>LEAD.PHONE</searchResultsAdditionalFields>
+ <searchResultsAdditionalFields>LEAD.COMPANY</searchResultsAdditionalFields>
+ <searchResultsAdditionalFields>LEAD.EMAIL</searchResultsAdditionalFields>
+ <searchResultsAdditionalFields>LEAD.STATUS</searchResultsAdditionalFields>
+ <searchResultsAdditionalFields>CORE.USERS.ALIAS</searchResultsAdditionalFields>
+ <searchResultsAdditionalFields>LEAD.LEAD_SOURCE</searchResultsAdditionalFields>
+ <searchResultsAdditionalFields>Competitor__c</searchResultsAdditionalFields>
+ <searchResultsAdditionalFields>Purchase_Expected_Date__c</searchResultsAdditionalFields>
+ </searchLayouts>
+ <sharingModel>Private</sharingModel>
+</CustomObject>
diff --git "a/force-app/main/default/objects/Lead/businessProcesses/\346\227\245\345\240\261.businessProcess-meta.xml" "b/force-app/main/default/objects/Lead/businessProcesses/\346\227\245\345\240\261.businessProcess-meta.xml"
new file mode 100644
index 0000000..e0ccde3
--- /dev/null
+++ "b/force-app/main/default/objects/Lead/businessProcesses/\346\227\245\345\240\261.businessProcess-meta.xml"
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<BusinessProcess xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>鏃ュ牨</fullName>
+ <isActive>true</isActive>
+ <values>
+ <fullName>涓嶇敤%28閲嶅%29</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏃犳晥</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏈窡杩�</fullName>
+ <default>true</default>
+ </values>
+ <values>
+ <fullName>纰鸿獚娓堛伩</fullName>
+ <default>false</default>
+ </values>
+</BusinessProcess>
diff --git "a/force-app/main/default/objects/Lead/businessProcesses/\346\250\231\346\272\226.businessProcess-meta.xml" "b/force-app/main/default/objects/Lead/businessProcesses/\346\250\231\346\272\226.businessProcess-meta.xml"
new file mode 100644
index 0000000..251f9a1
--- /dev/null
+++ "b/force-app/main/default/objects/Lead/businessProcesses/\346\250\231\346\272\226.businessProcess-meta.xml"
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<BusinessProcess xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>妯欐簴</fullName>
+ <isActive>true</isActive>
+ <values>
+ <fullName>涓嶇敤%28閲嶅%29</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏃犳晥</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏈窡杩�</fullName>
+ <default>true</default>
+ </values>
+ <values>
+ <fullName>纰鸿獚娓堛伩</fullName>
+ <default>false</default>
+ </values>
+</BusinessProcess>
diff --git a/force-app/main/default/objects/Lead/compactLayouts/BuyLead_CampaignLayout.compactLayout-meta.xml b/force-app/main/default/objects/Lead/compactLayouts/BuyLead_CampaignLayout.compactLayout-meta.xml
new file mode 100644
index 0000000..4de8d5b
--- /dev/null
+++ b/force-app/main/default/objects/Lead/compactLayouts/BuyLead_CampaignLayout.compactLayout-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CompactLayout xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>BuyLead_CampaignLayout</fullName>
+ <fields>Name</fields>
+ <fields>Status</fields>
+ <fields>Hospital_Name__c</fields>
+ <fields>Email</fields>
+ <fields>Department_Class__c</fields>
+ <fields>Company</fields>
+ <fields>LeadSource</fields>
+ <label>璐拱鎰忓悜-瀛︿細/鍩硅</label>
+</CompactLayout>
diff --git a/force-app/main/default/objects/Lead/compactLayouts/Other_intention.compactLayout-meta.xml b/force-app/main/default/objects/Lead/compactLayouts/Other_intention.compactLayout-meta.xml
new file mode 100644
index 0000000..c27cb23
--- /dev/null
+++ b/force-app/main/default/objects/Lead/compactLayouts/Other_intention.compactLayout-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CompactLayout xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Other_intention</fullName>
+ <fields>Name</fields>
+ <fields>Status</fields>
+ <fields>Opportunity_Division__c</fields>
+ <fields>Lead_status__c</fields>
+ <fields>Hospital_Name__c</fields>
+ <fields>Department_Class__c</fields>
+ <fields>LeadSource</fields>
+ <fields>Company</fields>
+ <fields>Purchase_Reason__c</fields>
+ <fields>Purchase_Plan__c</fields>
+ <label>鍏朵粬閫斿緞鑾峰彇鐨勬剰鍚�</label>
+</CompactLayout>
diff --git a/force-app/main/default/objects/Lead/fields/AWS_Data_Id__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/AWS_Data_Id__c.field-meta.xml
new file mode 100644
index 0000000..83e0b0d
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/AWS_Data_Id__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>AWS_Data_Id__c</fullName>
+ <externalId>false</externalId>
+ <label>AWS Data Id</label>
+ <length>255</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Account_Province__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Account_Province__c.field-meta.xml
new file mode 100644
index 0000000..4f950a9
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Account_Province__c.field-meta.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Account_Province__c</fullName>
+ <description>/*20230407 lt update 鏁翠綋淇敼鏈湴鏈夊浠�*/</description>
+ <externalId>false</externalId>
+ <formula>CASE(Hospital_Name__r.Parent.Parent.OCM_man_province_txt__c,
+'鍖椾含', 'BJ',
+'澶╂触', 'TJ',
+'娌冲崡', 'HN',
+'娌冲寳', 'ZB',
+'灞辫タ', 'SX',
+'鍐呰挋鍙�', 'NM',
+'灞变笢', 'SD',
+'闈掑矝', 'QD',
+'闄曡タ', 'XA',
+'闈掓捣', 'QH',
+'瀹佸', 'NX',
+'鐢樿們', 'GS',
+'鏂扮枂', 'XJ',
+'澶ц繛', 'DL',
+'娌堥槼', 'SY',
+'杈藉畞', 'LN',
+'榛戦緳姹�', 'HJ',
+'鍚夋灄', 'JL',
+'涓婃捣', 'SH',
+'姹熻嫃', 'JS',
+'娴欐睙', 'ZJ',
+'绂忓缓', 'FJ',
+'瀹夊窘', 'AH',
+'姹熻タ', 'JX',
+'骞夸笢', 'GD',
+'娣卞湷', 'SZ',
+'骞胯タ', 'GX',
+'娴峰崡', 'QN',
+'鍥涘窛', 'SC',
+'瑗胯棌鑷不鍖�', 'XZ',
+'鍥涘窛/瑗胯棌', 'SC',
+'閲嶅簡', 'CQ',
+'浜戝崡', 'YN',
+'璐靛窞', 'GZ',
+'婀栧寳', 'HB',
+'婀栧崡', 'CS',
+''
+)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>Account_Province</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Account_Salesdepartment__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Account_Salesdepartment__c.field-meta.xml
new file mode 100644
index 0000000..64c8d8b
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Account_Salesdepartment__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Account_Salesdepartment__c</fullName>
+ <externalId>false</externalId>
+ <label>閿�鍞湰閮�</label>
+ <length>80</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Account_State__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Account_State__c.field-meta.xml
new file mode 100644
index 0000000..139872d
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Account_State__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Account_State__c</fullName>
+ <externalId>false</externalId>
+ <label>鐪�-鍖婚櫌-</label>
+ <length>80</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Account_for_search__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Account_for_search__c.field-meta.xml
new file mode 100644
index 0000000..e474fe6
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Account_for_search__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Account_for_search__c</fullName>
+ <externalId>true</externalId>
+ <label>鍖婚櫌鍚�(妫�绱㈢敤)</label>
+ <length>250</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Address.field-meta.xml b/force-app/main/default/objects/Lead/fields/Address.field-meta.xml
new file mode 100644
index 0000000..7e19105
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Address.field-meta.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Address</fullName>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Agency_Opportunity__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Agency_Opportunity__c.field-meta.xml
new file mode 100644
index 0000000..b3a15de
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Agency_Opportunity__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Agency_Opportunity__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>缁忛攢鍟嗚浠�</label>
+ <referenceTo>Agency_Opportunity__c</referenceTo>
+ <relationshipLabel>娼滃湪瀹㈡埛</relationshipLabel>
+ <relationshipName>AgencyOpportunity</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/AnnualRevenue.field-meta.xml b/force-app/main/default/objects/Lead/fields/AnnualRevenue.field-meta.xml
new file mode 100644
index 0000000..9707731
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/AnnualRevenue.field-meta.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>AnnualRevenue</fullName>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/CProv__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/CProv__c.field-meta.xml
new file mode 100644
index 0000000..4047ba7
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/CProv__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>CProv__c</fullName>
+ <externalId>false</externalId>
+ <formula>Text(Owner:User.Province__c)</formula>
+ <label>锛�###锛変綔鎴愪汉鐪�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Caluculated_start_day__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Caluculated_start_day__c.field-meta.xml
new file mode 100644
index 0000000..df9f33d
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Caluculated_start_day__c.field-meta.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Caluculated_start_day__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(
+ MONTH(Today())=12,
+ IF(
+ DATEVALUE( CreatedDate ) >= DATE(YEAR(today()),01,01),
+ 1,
+ 0
+ ),
+ IF( DATEVALUE( CreatedDate ) >= DATE(YEAR(today())-1,MONTH(Today())+1,01),
+ 1,
+ 0
+ )
+)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>缁熻寮�濮嬫棩(1骞村墠) 鍒涘缓鏃�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/CampaignId.field-meta.xml b/force-app/main/default/objects/Lead/fields/CampaignId.field-meta.xml
new file mode 100644
index 0000000..0219b5a
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/CampaignId.field-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>CampaignId</fullName>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Campaign__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Campaign__c.field-meta.xml
new file mode 100644
index 0000000..a2d8fd0
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Campaign__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Campaign__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>涓昏瀛︿細</label>
+ <referenceTo>Campaign</referenceTo>
+ <relationshipLabel>璇㈤棶鍗�</relationshipLabel>
+ <relationshipName>R5bS</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>true</trackHistory>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Cancel_Reason__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Cancel_Reason__c.field-meta.xml
new file mode 100644
index 0000000..a51c789
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Cancel_Reason__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Cancel_Reason__c</fullName>
+ <externalId>false</externalId>
+ <label>鍙栨秷鍘熷洜</label>
+ <length>255</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Close_Forecasted_Date__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Close_Forecasted_Date__c.field-meta.xml
new file mode 100644
index 0000000..b0bb23f
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Close_Forecasted_Date__c.field-meta.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Close_Forecasted_Date__c</fullName>
+ <externalId>false</externalId>
+ <label>棰勬祴OCSM绛剧害鏃�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Compagin_ID__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Compagin_ID__c.field-meta.xml
new file mode 100644
index 0000000..5716522
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Compagin_ID__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Compagin_ID__c</fullName>
+ <externalId>false</externalId>
+ <formula>Campaign__r.Id</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>瀛︿細銉诲煿璁� ID</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Company.field-meta.xml b/force-app/main/default/objects/Lead/fields/Company.field-meta.xml
new file mode 100644
index 0000000..59156b5
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Company.field-meta.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Company</fullName>
+ <inlineHelpText>涓嶇敤濉啓</inlineHelpText>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Competitor__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Competitor__c.field-meta.xml
new file mode 100644
index 0000000..47247c4
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Competitor__c.field-meta.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Competitor__c</fullName>
+ <description>杩欎釜瀛楁鏄媴褰撳垱寤鸿喘涔版剰鍚戠殑鏃堕�夋嫨璇环闃舵鏃讹紝鑷姩鍙嶅簲鍑烘潵鐨勶紝骞朵笉鏄叧鑱斿埌鐨勮浠风殑绛夌骇鎯呭喌銆�</description>
+ <externalId>false</externalId>
+ <label>璇环绛夌骇(鍚庡彴鐢�)</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Picklist</type>
+ <valueSet>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>A</fullName>
+ <default>false</default>
+ <label>A</label>
+ </value>
+ <value>
+ <fullName>B</fullName>
+ <default>false</default>
+ <label>B</label>
+ </value>
+ <value>
+ <fullName>C</fullName>
+ <default>false</default>
+ <label>C</label>
+ </value>
+ <value>
+ <fullName>D</fullName>
+ <default>false</default>
+ <label>D</label>
+ </value>
+ <value>
+ <fullName>E</fullName>
+ <default>false</default>
+ <label>E</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Contact_Method__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Contact_Method__c.field-meta.xml
new file mode 100644
index 0000000..56d8dc2
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Contact_Method__c.field-meta.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Contact_Method__c</fullName>
+ <externalId>false</externalId>
+ <label>鑱旂粶鏂规硶</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Picklist</type>
+ <valueSet>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>鎷滆</fullName>
+ <default>false</default>
+ <label>鎷滆</label>
+ </value>
+ <value>
+ <fullName>閭欢</fullName>
+ <default>false</default>
+ <label>閭欢</label>
+ </value>
+ <value>
+ <fullName>鐢佃瘽</fullName>
+ <default>false</default>
+ <label>鐢佃瘽</label>
+ </value>
+ <value>
+ <fullName>鍏朵粬</fullName>
+ <default>false</default>
+ <label>鍏朵粬</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Contact_Name__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Contact_Name__c.field-meta.xml
new file mode 100644
index 0000000..1040f85
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Contact_Name__c.field-meta.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Contact_Name__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>瀹㈡埛濮撳悕</label>
+ <lookupFilter>
+ <active>false</active>
+ <booleanFilter>1 OR 2</booleanFilter>
+ <filterItems>
+ <field>$Source.hospital__c</field>
+ <operation>equals</operation>
+ <valueField>Contact.Account.Hospital__c</valueField>
+ </filterItems>
+ <filterItems>
+ <field>$User.Username</field>
+ <operation>equals</operation>
+ <value>buli@deloitte.com.cn</value>
+ </filterItems>
+ <isOptional>false</isOptional>
+ </lookupFilter>
+ <referenceTo>Contact</referenceTo>
+ <relationshipLabel>璐拱鎰忓悜</relationshipLabel>
+ <relationshipName>gmYXv8dN</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>true</trackHistory>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Contact__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Contact__c.field-meta.xml
new file mode 100644
index 0000000..599883f
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Contact__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Contact__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>瀹㈡埛浜哄憳</label>
+ <referenceTo>Contact</referenceTo>
+ <relationshipLabel>璐拱鎰忓悜锛堝鎴蜂汉鍛橈級</relationshipLabel>
+ <relationshipName>Leadp8zN</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Count_number__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Count_number__c.field-meta.xml
new file mode 100644
index 0000000..4e89abb
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Count_number__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Count_number__c</fullName>
+ <externalId>false</externalId>
+ <formula>1</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>璐拱鎰忓悜娆℃暟</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Coverted_Num__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Coverted_Num__c.field-meta.xml
new file mode 100644
index 0000000..f145045
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Coverted_Num__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Coverted_Num__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(OR(TEXT(Status)='纰鸿獚娓堛伩', TEXT(Status)='寮�濮嬭浠�') ,1,0)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>宸茶浆鎹㈡暟閲�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/CreateEvent__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/CreateEvent__c.field-meta.xml
new file mode 100644
index 0000000..07b1625
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/CreateEvent__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>CreateEvent__c</fullName>
+ <externalId>false</externalId>
+ <formula>HYPERLINK("/apex/OFSCalendar?sub="+ Contact__r.Account.Name +"&accid="+ Contact__r.Account.Id +"&wv=1&w=90&h=90", "鈻�")</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>+浜嬩欢</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/CreatedBy_ID__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/CreatedBy_ID__c.field-meta.xml
new file mode 100644
index 0000000..8a31464
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/CreatedBy_ID__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>CreatedBy_ID__c</fullName>
+ <externalId>false</externalId>
+ <formula>CreatedById</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>CreatedBy_ID</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/CreatedBy_Name__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/CreatedBy_Name__c.field-meta.xml
new file mode 100644
index 0000000..fb2de72
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/CreatedBy_Name__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>CreatedBy_Name__c</fullName>
+ <externalId>false</externalId>
+ <formula>Owner:User.LastName + " " + Owner:User.FirstName</formula>
+ <label>鍒涘缓浜哄悕</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Created_staff_ID__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Created_staff_ID__c.field-meta.xml
new file mode 100644
index 0000000..723388b
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Created_staff_ID__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Created_staff_ID__c</fullName>
+ <externalId>false</externalId>
+ <formula>CreatedById</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鍒涘缓浜篒D</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Creator_Job_Category__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Creator_Job_Category__c.field-meta.xml
new file mode 100644
index 0000000..8f4f2e7
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Creator_Job_Category__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Creator_Job_Category__c</fullName>
+ <externalId>false</externalId>
+ <label>鎷呭綋浜�-鑱岀</label>
+ <length>80</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/CurrencyIsoCode.field-meta.xml b/force-app/main/default/objects/Lead/fields/CurrencyIsoCode.field-meta.xml
new file mode 100644
index 0000000..e62841c
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/CurrencyIsoCode.field-meta.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>CurrencyIsoCode</fullName>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Department_Class__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Department_Class__c.field-meta.xml
new file mode 100644
index 0000000..b10a3a9
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Department_Class__c.field-meta.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Department_Class__c</fullName>
+ <deleteConstraint>Restrict</deleteConstraint>
+ <externalId>false</externalId>
+ <label>鎴樼暐绉戝鍒嗙被</label>
+ <lookupFilter>
+ <active>false</active>
+ <filterItems>
+ <field>Account.Department_Class_Label__c</field>
+ <operation>equals</operation>
+ <value>鎴︾暐绉戝鍒嗛 銇濄伄浠�, 鎴︾暐绉戝鍒嗛 涓嶆槑, 鎴︾暐绉戝鍒嗛 鍛煎惛绉�, 鎴︾暐绉戝鍒嗛 濠︿汉绉�, 鎴︾暐绉戝鍒嗛 鏅绉�, 鎴︾暐绉戝鍒嗛 娉屽翱绉�, 鎴︾暐绉戝鍒嗛 娑堝寲绉�, 鎴︾暐绉戝鍒嗛 鑰抽蓟鍠夌, 鎴︾暐绉戝鍒嗛ET</value>
+ </filterItems>
+ <isOptional>false</isOptional>
+ </lookupFilter>
+ <referenceTo>Account</referenceTo>
+ <relationshipLabel>鎴樼暐绉戝鍒嗙被</relationshipLabel>
+ <relationshipName>Department_Class</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Description.field-meta.xml b/force-app/main/default/objects/Lead/fields/Description.field-meta.xml
new file mode 100644
index 0000000..da708d5
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Description.field-meta.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Description</fullName>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Dicision_Maker__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Dicision_Maker__c.field-meta.xml
new file mode 100644
index 0000000..e80dbd0
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Dicision_Maker__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Dicision_Maker__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>璐拱鍐冲畾鑰�</label>
+ <referenceTo>Contact</referenceTo>
+ <relationshipLabel>璐拱鍐冲畾鑰�</relationshipLabel>
+ <relationshipName>Ssv</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/DoNotCall.field-meta.xml b/force-app/main/default/objects/Lead/fields/DoNotCall.field-meta.xml
new file mode 100644
index 0000000..ea3ede6
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/DoNotCall.field-meta.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>DoNotCall</fullName>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/ET_Check__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/ET_Check__c.field-meta.xml
new file mode 100644
index 0000000..9891280
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/ET_Check__c.field-meta.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ET_Check__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>ET鍕鹃��</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Email.field-meta.xml b/force-app/main/default/objects/Lead/fields/Email.field-meta.xml
new file mode 100644
index 0000000..a52c0ce
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Email.field-meta.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Email</fullName>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Email_Encrypted__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Email_Encrypted__c.field-meta.xml
new file mode 100644
index 0000000..56594e9
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Email_Encrypted__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Email_Encrypted__c</fullName>
+ <externalId>false</externalId>
+ <label>Email Encrypted</label>
+ <length>2000</length>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>LongTextArea</type>
+ <visibleLines>3</visibleLines>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Energy_Assistant__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Energy_Assistant__c.field-meta.xml
new file mode 100644
index 0000000..131094e
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Energy_Assistant__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Energy_Assistant__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>鑳介噺鏈儴鍔╃悊</label>
+ <referenceTo>User</referenceTo>
+ <relationshipName>leadwlzW</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Fax.field-meta.xml b/force-app/main/default/objects/Lead/fields/Fax.field-meta.xml
new file mode 100644
index 0000000..14cdbf1
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Fax.field-meta.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Fax</fullName>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/FirstDate_Quote_Irai__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/FirstDate_Quote_Irai__c.field-meta.xml
new file mode 100644
index 0000000..6d535dc
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/FirstDate_Quote_Irai__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>FirstDate_Quote_Irai__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>棣栨鎶ヤ环濮旀墭鏃�</label>
+ <referenceTo>OlympusCalendar__c</referenceTo>
+ <relationshipLabel>娼滃湪瀹㈡埛 (棣栨鎶ヤ环濮旀墭鏃�)</relationshipLabel>
+ <relationshipName>FirstDate_Quote_Irai</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/FirstOffer_IntervalDays__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/FirstOffer_IntervalDays__c.field-meta.xml
new file mode 100644
index 0000000..169960a
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/FirstOffer_IntervalDays__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>FirstOffer_IntervalDays__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF( ISBLANK(FirstDate_Quote_Irai__c) , TODAY() - Lead_Olympus__r.Date__c , FirstDate_Quote_Irai__r.Date__c - Lead_Olympus__r.Date__c )</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>棣栨鎶ヤ环濮旀墭闂撮殧澶╂暟</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/ForLossReport__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/ForLossReport__c.field-meta.xml
new file mode 100644
index 0000000..eb43d0f
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/ForLossReport__c.field-meta.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ForLossReport__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>澶卞崟鎶ュ憡鐢�</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Fund_Basis__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Fund_Basis__c.field-meta.xml
new file mode 100644
index 0000000..e7911d0
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Fund_Basis__c.field-meta.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Fund_Basis__c</fullName>
+ <externalId>false</externalId>
+ <label>璧勯噾鏉ユ簮</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Picklist</type>
+ <valueSet>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>鏀垮簻璩囬噾</fullName>
+ <default>false</default>
+ <label>鏀垮簻璩囬噾</label>
+ </value>
+ <value>
+ <fullName>鐥呴櫌璩囬噾</fullName>
+ <default>false</default>
+ <label>鐥呴櫌璩囬噾</label>
+ </value>
+ <value>
+ <fullName>鍥介殯璩囬噾</fullName>
+ <default>false</default>
+ <label>鍥介殯璩囬噾</label>
+ </value>
+ <value>
+ <fullName>閵�琛岃硣閲�</fullName>
+ <default>false</default>
+ <label>閵�琛岃硣閲�</label>
+ </value>
+ <value>
+ <fullName>浼氱ぞ/鍊嬩汉璩囬噾</fullName>
+ <default>false</default>
+ <label>浼氱ぞ/鍊嬩汉璩囬噾</label>
+ </value>
+ <value>
+ <fullName>铻嶈祫绉熻祦锛堛儶銉笺偣锛�</fullName>
+ <default>false</default>
+ <label>铻嶈祫绉熻祦锛堛儶銉笺偣锛�</label>
+ </value>
+ <value>
+ <fullName>璐存伅璐锋</fullName>
+ <default>false</default>
+ <label>璐存伅璐锋</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/GenderIdentity.field-meta.xml b/force-app/main/default/objects/Lead/fields/GenderIdentity.field-meta.xml
new file mode 100644
index 0000000..c6e6d7a
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/GenderIdentity.field-meta.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>GenderIdentity</fullName>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Picklist</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/HasOptedOutOfEmail.field-meta.xml b/force-app/main/default/objects/Lead/fields/HasOptedOutOfEmail.field-meta.xml
new file mode 100644
index 0000000..03687d1
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/HasOptedOutOfEmail.field-meta.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>HasOptedOutOfEmail</fullName>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/HasOptedOutOfFax.field-meta.xml b/force-app/main/default/objects/Lead/fields/HasOptedOutOfFax.field-meta.xml
new file mode 100644
index 0000000..4573ee7
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/HasOptedOutOfFax.field-meta.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>HasOptedOutOfFax</fullName>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Hospital_Budget__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Hospital_Budget__c.field-meta.xml
new file mode 100644
index 0000000..4f07cfe
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Hospital_Budget__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Hospital_Budget__c</fullName>
+ <externalId>false</externalId>
+ <label>鍖婚櫌璐拱棰勭畻</label>
+ <precision>15</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Hospital_Name__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Hospital_Name__c.field-meta.xml
new file mode 100644
index 0000000..83cb4cd
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Hospital_Name__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Hospital_Name__c</fullName>
+ <deleteConstraint>Restrict</deleteConstraint>
+ <externalId>false</externalId>
+ <inlineHelpText>璇峰～鍐欏埌鍏蜂綋绉戝</inlineHelpText>
+ <label>鍖婚櫌鍚�</label>
+ <referenceTo>Account</referenceTo>
+ <relationshipLabel>銉兗銉�</relationshipLabel>
+ <relationshipName>Hospital</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Hospital_Owner__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Hospital_Owner__c.field-meta.xml
new file mode 100644
index 0000000..5f5644c
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Hospital_Owner__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Hospital_Owner__c</fullName>
+ <externalId>false</externalId>
+ <formula>Hospital_Name__r.OwnerId</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鍖婚櫌鎵�鏈変汉</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/IndividualId.field-meta.xml b/force-app/main/default/objects/Lead/fields/IndividualId.field-meta.xml
new file mode 100644
index 0000000..6607c94
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/IndividualId.field-meta.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>IndividualId</fullName>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Industry.field-meta.xml b/force-app/main/default/objects/Lead/fields/Industry.field-meta.xml
new file mode 100644
index 0000000..bc2e7eb
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Industry.field-meta.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Industry</fullName>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Picklist</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Infrastructure_Project__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Infrastructure_Project__c.field-meta.xml
new file mode 100644
index 0000000..4536f3f
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Infrastructure_Project__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Infrastructure_Project__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>鍩哄缓椤圭洰</label>
+ <referenceTo>Infrastructure_Project__c</referenceTo>
+ <relationshipLabel>娼滃湪瀹㈡埛</relationshipLabel>
+ <relationshipName>Infrastructure_ProjectGOAa</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Inquiry_Num__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Inquiry_Num__c.field-meta.xml
new file mode 100644
index 0000000..6790a52
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Inquiry_Num__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Inquiry_Num__c</fullName>
+ <externalId>false</externalId>
+ <label>鍜ㄨ鍗曠紪鐮�</label>
+ <length>255</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Inquiry_form_num__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Inquiry_form_num__c.field-meta.xml
new file mode 100644
index 0000000..6372adb
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Inquiry_form_num__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Inquiry_form_num__c</fullName>
+ <externalId>false</externalId>
+ <formula>if(isblank(Lead_Inquiry_form__c),0,1)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>浼氳璇㈤棶鍗曟暟閲�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Is_Followed_Intime__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Is_Followed_Intime__c.field-meta.xml
new file mode 100644
index 0000000..af2dfe5
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Is_Followed_Intime__c.field-meta.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Is_Followed_Intime__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(AND(NOT(ISNULL( intention_within_seven_days__c )), intention_within_seven_days__c == 1), True, False)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏄惁鎸夋椂璺熻繘</label>
+ <trackHistory>false</trackHistory>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Jigsaw.field-meta.xml b/force-app/main/default/objects/Lead/fields/Jigsaw.field-meta.xml
new file mode 100644
index 0000000..0c9e6b7
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Jigsaw.field-meta.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Jigsaw</fullName>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/JobCategoryOfCreator__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/JobCategoryOfCreator__c.field-meta.xml
new file mode 100644
index 0000000..fa1a1dd
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/JobCategoryOfCreator__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>JobCategoryOfCreator__c</fullName>
+ <externalId>false</externalId>
+ <label>鍒涘缓浜鸿亴绉�</label>
+ <length>40</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/LastTransferDate.field-meta.xml b/force-app/main/default/objects/Lead/fields/LastTransferDate.field-meta.xml
new file mode 100644
index 0000000..4dbacbd
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/LastTransferDate.field-meta.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>LastTransferDate</fullName>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/LatestQuotationEntrustment__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/LatestQuotationEntrustment__c.field-meta.xml
new file mode 100644
index 0000000..6e857e6
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/LatestQuotationEntrustment__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>LatestQuotationEntrustment__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>鏈�鏂版姤浠峰鎵�</label>
+ <referenceTo>QuoteIrai__c</referenceTo>
+ <relationshipLabel>娼滃湪瀹㈡埛</relationshipLabel>
+ <relationshipName>LatesQuotationEntrustmentson</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/LeadSource.field-meta.xml b/force-app/main/default/objects/Lead/fields/LeadSource.field-meta.xml
new file mode 100644
index 0000000..e314c2a
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/LeadSource.field-meta.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>LeadSource</fullName>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>true</trackHistory>
+ <type>Picklist</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Lead_Inquiry_form__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Lead_Inquiry_form__c.field-meta.xml
new file mode 100644
index 0000000..2e33b7f
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Lead_Inquiry_form__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Lead_Inquiry_form__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>浼氳璇㈤棶鍗�</label>
+ <referenceTo>Inquiry_form__c</referenceTo>
+ <relationshipLabel>娼滃湪瀹㈡埛</relationshipLabel>
+ <relationshipName>lead04NY</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Lead_NoDate__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Lead_NoDate__c.field-meta.xml
new file mode 100644
index 0000000..fc59da1
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Lead_NoDate__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Lead_NoDate__c</fullName>
+ <externalId>false</externalId>
+ <formula>TEXT(YEAR(TODAY())) + LPAD(TEXT(MONTH(TODAY())), 2, '0') + LPAD(TEXT(DAY(TODAY())), 2, '0')</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>Lead_NoDate</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Lead_No__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Lead_No__c.field-meta.xml
new file mode 100644
index 0000000..ae686fb
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Lead_No__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Lead_No__c</fullName>
+ <caseSensitive>false</caseSensitive>
+ <externalId>false</externalId>
+ <label>鎰忓悜缂栫爜</label>
+ <length>255</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Text</type>
+ <unique>true</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Lead_Num__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Lead_Num__c.field-meta.xml
new file mode 100644
index 0000000..7fe0b2d
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Lead_Num__c.field-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Lead_Num__c</fullName>
+ <displayFormat>{000}</displayFormat>
+ <externalId>false</externalId>
+ <label>鎰忓悜缂栫爜-鍒涘缓鎰忓悜缂栫爜鐢�</label>
+ <trackHistory>false</trackHistory>
+ <type>AutoNumber</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Lead_Olympus__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Lead_Olympus__c.field-meta.xml
new file mode 100644
index 0000000..c56b498
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Lead_Olympus__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Lead_Olympus__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>LeadOlympus</label>
+ <referenceTo>OlympusCalendar__c</referenceTo>
+ <relationshipLabel>鎰忓悜</relationshipLabel>
+ <relationshipName>Lead_Olympus</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Lead_status__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Lead_status__c.field-meta.xml
new file mode 100644
index 0000000..99891ca
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Lead_status__c.field-meta.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Lead_status__c</fullName>
+ <externalId>false</externalId>
+ <formula>case(text(Status),
+"鏈窡杩�","杩樺湪鎰忓悜",
+"宸插垎閰�","杩樺湪鎰忓悜",
+"璺熻繘涓�","杩樺湪鎰忓悜",
+"纰鸿獚娓堛伩","杞Щ鍒拌浠�",
+"涓嶈","鍙栨秷",
+"涓嶇敤(閲嶅)","鍙栨秷","")</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>璐拱鎰忓悜鐘舵��(鍏紡)</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/MeetingApprovedNo__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/MeetingApprovedNo__c.field-meta.xml
new file mode 100644
index 0000000..4248257
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/MeetingApprovedNo__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>MeetingApprovedNo__c</fullName>
+ <externalId>false</externalId>
+ <formula>Campaign__r.MeetingApprovedNo__c</formula>
+ <label>浼氳鍐宠缂栫爜</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/MobilePhone.field-meta.xml b/force-app/main/default/objects/Lead/fields/MobilePhone.field-meta.xml
new file mode 100644
index 0000000..c2d6d53
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/MobilePhone.field-meta.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>MobilePhone</fullName>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Name.field-meta.xml b/force-app/main/default/objects/Lead/fields/Name.field-meta.xml
new file mode 100644
index 0000000..288f7eb
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Name.field-meta.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Name</fullName>
+ <trackFeedHistory>true</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Name_Encrypted__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Name_Encrypted__c.field-meta.xml
new file mode 100644
index 0000000..f9607bc
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Name_Encrypted__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Name_Encrypted__c</fullName>
+ <externalId>false</externalId>
+ <label>Name Encrypted</label>
+ <length>131072</length>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>LongTextArea</type>
+ <visibleLines>2</visibleLines>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/NumberOfEmployees.field-meta.xml b/force-app/main/default/objects/Lead/fields/NumberOfEmployees.field-meta.xml
new file mode 100644
index 0000000..6465aa2
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/NumberOfEmployees.field-meta.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>NumberOfEmployees</fullName>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Number__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Number__c.field-meta.xml
new file mode 100644
index 0000000..13d6cf1
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Number__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Number__c</fullName>
+ <externalId>false</externalId>
+ <formula>1</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>璁板綍鏁伴噺</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/OCM_Management_Province_HP__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/OCM_Management_Province_HP__c.field-meta.xml
new file mode 100644
index 0000000..009aa03
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/OCM_Management_Province_HP__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OCM_Management_Province_HP__c</fullName>
+ <externalId>false</externalId>
+ <formula>Hospital_Name__r.OCM_Management_Province_HP__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>锛�###锛夊尰闄CSM绠＄悊鐪�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/OCM_Oppor_Assistant__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/OCM_Oppor_Assistant__c.field-meta.xml
new file mode 100644
index 0000000..843c145
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/OCM_Oppor_Assistant__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OCM_Oppor_Assistant__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>OCSM绠＄悊瀵瑰簲鐪佽浠峰姪鐞�</label>
+ <referenceTo>User</referenceTo>
+ <relationshipName>leaderswlzM</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/OCM_man_province_cus__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/OCM_man_province_cus__c.field-meta.xml
new file mode 100644
index 0000000..211be96
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/OCM_man_province_cus__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OCM_man_province_cus__c</fullName>
+ <externalId>false</externalId>
+ <formula>Hospital_Name__r.OCM_man_province_txt__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鐪�(瀹㈡埛)</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/OCM_man_province_cus_txt__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/OCM_man_province_cus_txt__c.field-meta.xml
new file mode 100644
index 0000000..a2e5c93
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/OCM_man_province_cus_txt__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OCM_man_province_cus_txt__c</fullName>
+ <externalId>false</externalId>
+ <label>鐪�(瀹㈡埛鏂囨湰)</label>
+ <length>40</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/OfferToEntrust__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/OfferToEntrust__c.field-meta.xml
new file mode 100644
index 0000000..939e4e9
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/OfferToEntrust__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OfferToEntrust__c</fullName>
+ <defaultValue>0</defaultValue>
+ <externalId>false</externalId>
+ <label>鎶ヤ环濮旀墭</label>
+ <precision>1</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Opp_Name_Search__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Opp_Name_Search__c.field-meta.xml
new file mode 100644
index 0000000..70f6416
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Opp_Name_Search__c.field-meta.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Opp_Name_Search__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <description>绛涢�塠鍖婚櫌鍚峕瀵瑰簲鐨勮浠风殑鐘舵��1 涓嶇瓑浜� 瀹屾瘯 鍙栨秷鍜屽け鍗� 鐨勮褰�</description>
+ <externalId>false</externalId>
+ <label>宸叉湁璇环鍚嶇О</label>
+ <lookupFilter>
+ <active>true</active>
+ <filterItems>
+ <field>Opportunity.Department_Class__c</field>
+ <operation>equals</operation>
+ <valueField>$Source.Department_Class__c</valueField>
+ </filterItems>
+ <filterItems>
+ <field>Opportunity.StageName__c</field>
+ <operation>notEqual</operation>
+ <value>瀹屾瘯,澶卞崟,鍙栨秷</value>
+ </filterItems>
+ <filterItems>
+ <field>$Source.Department_Class__c</field>
+ <operation>notEqual</operation>
+ <value></value>
+ </filterItems>
+ <isOptional>true</isOptional>
+ </lookupFilter>
+ <referenceTo>Opportunity</referenceTo>
+ <relationshipLabel>宸叉湁璇环鍚嶇О</relationshipLabel>
+ <relationshipName>Opp_Name_Search</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Opp_Name__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Opp_Name__c.field-meta.xml
new file mode 100644
index 0000000..58e1fb9
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Opp_Name__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Opp_Name__c</fullName>
+ <externalId>false</externalId>
+ <label>璇环鍚嶇О</label>
+ <length>200</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Opportunity_Category__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Opportunity_Category__c.field-meta.xml
new file mode 100644
index 0000000..32bcf05
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Opportunity_Category__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Opportunity_Category__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(ET_Check__c, 'ET', Hospital_Name__r.Department_Class_Wd__c)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>绉戝鍒嗙被</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Opportunity_Division__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Opportunity_Division__c.field-meta.xml
new file mode 100644
index 0000000..6780a61
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Opportunity_Division__c.field-meta.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Opportunity_Division__c</fullName>
+ <externalId>false</externalId>
+ <label>鎰忓悜鍖哄垎</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Picklist</type>
+ <valueSet>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>璇环</fullName>
+ <default>false</default>
+ <label>璇环</label>
+ </value>
+ <value>
+ <fullName>淇℃伅</fullName>
+ <default>false</default>
+ <label>淇℃伅</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Opportunity_stage__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Opportunity_stage__c.field-meta.xml
new file mode 100644
index 0000000..8b8d742
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Opportunity_stage__c.field-meta.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Opportunity_stage__c</fullName>
+ <externalId>false</externalId>
+ <label>璇环闃舵</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Picklist</type>
+ <valueSet>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>杩樻病鐢宠棰勭畻</fullName>
+ <default>false</default>
+ <label>杩樻病鐢宠棰勭畻</label>
+ </value>
+ <value>
+ <fullName>鎻愪氦浜嗛绠楃敵璇�</fullName>
+ <default>false</default>
+ <label>鎻愪氦浜嗛绠楃敵璇�</label>
+ </value>
+ <value>
+ <fullName>棰勭畻娌℃湁鎵瑰噯</fullName>
+ <default>false</default>
+ <label>棰勭畻娌℃湁鎵瑰噯</label>
+ </value>
+ <value>
+ <fullName>棰勭畻宸茬粡鎵瑰噯</fullName>
+ <default>false</default>
+ <label>棰勭畻宸茬粡鎵瑰噯</label>
+ </value>
+ <value>
+ <fullName>纭畾浜嗗鎵嬪弬鏁�</fullName>
+ <default>false</default>
+ <label>纭畾浜嗗鎵嬪弬鏁�</label>
+ </value>
+ <value>
+ <fullName>娌℃湁纭畾鍙傛暟</fullName>
+ <default>false</default>
+ <label>鍙傛暟涓嶇‘瀹�</label>
+ </value>
+ <value>
+ <fullName>纭畾浜哋LY鍙傛暟</fullName>
+ <default>false</default>
+ <label>纭畾浜哋LY鍙傛暟</label>
+ </value>
+ <value>
+ <fullName>涓爣绛剧害</fullName>
+ <default>false</default>
+ <label>涓爣绛剧害</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Other_Society__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Other_Society__c.field-meta.xml
new file mode 100644
index 0000000..e74bf99
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Other_Society__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Other_Society__c</fullName>
+ <externalId>false</externalId>
+ <label>鍏朵粬瀛︿細</label>
+ <length>255</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/OwnerId.field-meta.xml b/force-app/main/default/objects/Lead/fields/OwnerId.field-meta.xml
new file mode 100644
index 0000000..22433de
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/OwnerId.field-meta.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OwnerId</fullName>
+ <trackFeedHistory>true</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Owner_Dep__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Owner_Dep__c.field-meta.xml
new file mode 100644
index 0000000..f05248f
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Owner_Dep__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Owner_Dep__c</fullName>
+ <externalId>false</externalId>
+ <formula>Owner:User.Salesdepartment__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>閿�鍞湰閮紙鎵�鏈変汉锛�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Owner_Dep_txt__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Owner_Dep_txt__c.field-meta.xml
new file mode 100644
index 0000000..bdde499
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Owner_Dep_txt__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Owner_Dep_txt__c</fullName>
+ <externalId>false</externalId>
+ <label>閿�鍞湰閮紙鎵�鏈変汉锛夋枃鏈�</label>
+ <length>40</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/PartnerAccountId.field-meta.xml b/force-app/main/default/objects/Lead/fields/PartnerAccountId.field-meta.xml
new file mode 100644
index 0000000..63f3e0d
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/PartnerAccountId.field-meta.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>PartnerAccountId</fullName>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Pastday_after_creat__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Pastday_after_creat__c.field-meta.xml
new file mode 100644
index 0000000..ec5f2d5
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Pastday_after_creat__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Pastday_after_creat__c</fullName>
+ <externalId>false</externalId>
+ <formula>Today() - Datevalue(CreatedDate)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鍒涘缓鍚庣粡杩囨棩鏁�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Phone.field-meta.xml b/force-app/main/default/objects/Lead/fields/Phone.field-meta.xml
new file mode 100644
index 0000000..6d61b86
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Phone.field-meta.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Phone</fullName>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Phone_Encrypted__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Phone_Encrypted__c.field-meta.xml
new file mode 100644
index 0000000..0bd4af2
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Phone_Encrypted__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Phone_Encrypted__c</fullName>
+ <externalId>false</externalId>
+ <label>Phone Encrypted</label>
+ <length>2000</length>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>LongTextArea</type>
+ <visibleLines>10</visibleLines>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Product_Model__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Product_Model__c.field-meta.xml
new file mode 100644
index 0000000..0cd8282
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Product_Model__c.field-meta.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Product_Model__c</fullName>
+ <externalId>false</externalId>
+ <label>瀵硅薄浜у搧鍨嬪彿</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>TextArea</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Product_Quote__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Product_Quote__c.field-meta.xml
new file mode 100644
index 0000000..0d57650
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Product_Quote__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Product_Quote__c</fullName>
+ <externalId>false</externalId>
+ <label>浜у搧鎶ヤ环娓呭崟</label>
+ <length>32768</length>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>LongTextArea</type>
+ <visibleLines>5</visibleLines>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Product_Sales_Category__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Product_Sales_Category__c.field-meta.xml
new file mode 100644
index 0000000..bab1cc6
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Product_Sales_Category__c.field-meta.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Product_Sales_Category__c</fullName>
+ <externalId>false</externalId>
+ <formula>Case( Opportunity_Category__c,
+"GI", "GI",
+"BF","GI",
+"ET","GI",
+"GS","SP",
+"URO","SP",
+"GYN","SP",
+"ENT","SP",
+"OTH","SP",
+"")</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>浜у搧鍒嗙被</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Product_set_LINK__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Product_set_LINK__c.field-meta.xml
new file mode 100644
index 0000000..b855ef3
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Product_set_LINK__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Product_set_LINK__c</fullName>
+ <externalId>false</externalId>
+ <formula>HYPERLINK(Id, Product_Model__c)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>浜у搧閰嶅鍚�(LINK)</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Promise_Class__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Promise_Class__c.field-meta.xml
new file mode 100644
index 0000000..7be36d2
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Promise_Class__c.field-meta.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Promise_Class__c</fullName>
+ <externalId>false</externalId>
+ <label>鍚堝悓鍒嗙被</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Picklist</type>
+ <valueSet>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>鍐呰部</fullName>
+ <default>false</default>
+ <label>鍐呰部</label>
+ </value>
+ <value>
+ <fullName>鍏嶇◣澶栬部</fullName>
+ <default>false</default>
+ <label>鍏嶇◣澶栬部</label>
+ </value>
+ <value>
+ <fullName>闈炲厤绋庡璨�</fullName>
+ <default>false</default>
+ <label>闈炲厤绋庡璨�</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Pronouns.field-meta.xml b/force-app/main/default/objects/Lead/fields/Pronouns.field-meta.xml
new file mode 100644
index 0000000..cb87c89
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Pronouns.field-meta.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Pronouns</fullName>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Picklist</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/ProvinceComparison__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/ProvinceComparison__c.field-meta.xml
new file mode 100644
index 0000000..9fca281
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/ProvinceComparison__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ProvinceComparison__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF( OCM_man_province_cus__c != OCM_man_province_cus_txt__c , 1, 0)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鐪�(瀹㈡埛鍜屽鎴锋枃鏈�)瀵规瘮</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Purchase_Expected_Date__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Purchase_Expected_Date__c.field-meta.xml
new file mode 100644
index 0000000..42fbb96
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Purchase_Expected_Date__c.field-meta.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Purchase_Expected_Date__c</fullName>
+ <externalId>false</externalId>
+ <label>棰勮璐拱鏃�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Purchase_Plan__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Purchase_Plan__c.field-meta.xml
new file mode 100644
index 0000000..5a220f7
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Purchase_Plan__c.field-meta.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Purchase_Plan__c</fullName>
+ <externalId>false</externalId>
+ <label>鏈夋棤璐拱璁″垝</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Picklist</type>
+ <valueSet>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>鏈�(鏃犻绠�)</fullName>
+ <default>false</default>
+ <label>鏈�(鏃犻绠�)</label>
+ </value>
+ <value>
+ <fullName>鏈�(鏈夐绠�)</fullName>
+ <default>false</default>
+ <label>鏈�(鏈夐绠�)</label>
+ </value>
+ <value>
+ <fullName>鏃�</fullName>
+ <default>false</default>
+ <label>鏃�</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Purchase_Reason__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Purchase_Reason__c.field-meta.xml
new file mode 100644
index 0000000..5a536c5
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Purchase_Reason__c.field-meta.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Purchase_Reason__c</fullName>
+ <externalId>false</externalId>
+ <label>璐拱鐞嗙敱</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Picklist</type>
+ <valueSet>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>鏂版湡</fullName>
+ <default>false</default>
+ <label>鏂版湡</label>
+ </value>
+ <value>
+ <fullName>鏇存柊</fullName>
+ <default>false</default>
+ <label>鏇存柊</label>
+ </value>
+ <value>
+ <fullName>澧楄ō</fullName>
+ <default>false</default>
+ <label>澧楄ō</label>
+ </value>
+ <value>
+ <fullName>濂洖</fullName>
+ <default>false</default>
+ <label>濂洖</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Purchase_Type__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Purchase_Type__c.field-meta.xml
new file mode 100644
index 0000000..1332992
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Purchase_Type__c.field-meta.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Purchase_Type__c</fullName>
+ <externalId>false</externalId>
+ <label>璁㈣揣娴佺▼绫诲埆</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Picklist</type>
+ <valueSet>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>涓�鑸紩鍚�</fullName>
+ <default>false</default>
+ <label>涓�鑸紩鍚�</label>
+ </value>
+ <value>
+ <fullName>ET24鏅傞枔璨╁２</fullName>
+ <default>false</default>
+ <label>ET24鏅傞枔璨╁２</label>
+ </value>
+ <value>
+ <fullName>SI锛堟墜琛撳妗堜欢锛�</fullName>
+ <default>false</default>
+ <label>SI锛堟墜琛撳妗堜欢锛�</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/QuotationDelegationStatus__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/QuotationDelegationStatus__c.field-meta.xml
new file mode 100644
index 0000000..7307393
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/QuotationDelegationStatus__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>QuotationDelegationStatus__c</fullName>
+ <externalId>false</externalId>
+ <formula>TEXT(LatestQuotationEntrustment__r.QuoteIrai_Status__c)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鎶ヤ环濮旀墭鐘舵��</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Rating.field-meta.xml b/force-app/main/default/objects/Lead/fields/Rating.field-meta.xml
new file mode 100644
index 0000000..87f1dd5
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Rating.field-meta.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Rating</fullName>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Picklist</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Report_FirstDate_Quote_Irai__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Report_FirstDate_Quote_Irai__c.field-meta.xml
new file mode 100644
index 0000000..db4a562
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Report_FirstDate_Quote_Irai__c.field-meta.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Report_FirstDate_Quote_Irai__c</fullName>
+ <externalId>false</externalId>
+ <formula>FirstDate_Quote_Irai__r.Date__c</formula>
+ <label>鎶ヨ〃鐢╛棣栨鎶ヤ环濮旀墭鏃�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Request_Detail__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Request_Detail__c.field-meta.xml
new file mode 100644
index 0000000..9593285
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Request_Detail__c.field-meta.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Request_Detail__c</fullName>
+ <externalId>false</externalId>
+ <label>濮旀墭浜嬮」璇︾粏</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>TextArea</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Request__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Request__c.field-meta.xml
new file mode 100644
index 0000000..0dc42ab
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Request__c.field-meta.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Request__c</fullName>
+ <externalId>false</externalId>
+ <label>濮旀墭浜嬮」</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>MultiselectPicklist</type>
+ <valueSet>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>闇�瑕佹姤浠�</fullName>
+ <default>false</default>
+ <label>闇�瑕佹姤浠�</label>
+ </value>
+ <value>
+ <fullName>OPD</fullName>
+ <default>false</default>
+ <label>OPD</label>
+ </value>
+ <value>
+ <fullName>浜у搧璇存槑</fullName>
+ <default>false</default>
+ <label>浜у搧璇存槑</label>
+ </value>
+ <value>
+ <fullName>瀵勯�佷骇鍝佽祫鏂�</fullName>
+ <default>false</default>
+ <label>瀵勯�佷骇鍝佽祫鏂�</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+ <visibleLines>4</visibleLines>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/SI_OppoLeadSec__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/SI_OppoLeadSec__c.field-meta.xml
new file mode 100644
index 0000000..506f013
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/SI_OppoLeadSec__c.field-meta.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>SI_OppoLeadSec__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>SI璇环鍓媴褰�</label>
+ <lookupFilter>
+ <active>false</active>
+ <booleanFilter>(1 AND 2) OR (3 AND 4) OR (5 AND 6) OR (7 AND 8) OR (9 AND 10)</booleanFilter>
+ <errorMessage>鍚勮惀涓氶儴鏈変笓闂ㄧ殑鎷呭綋</errorMessage>
+ <filterItems>
+ <field>$User.Salesdepartment__c</field>
+ <operation>equals</operation>
+ <value>1.鍗庡寳</value>
+ </filterItems>
+ <filterItems>
+ <field>User.Name__c</field>
+ <operation>equals</operation>
+ <value>闄� 瀛愭亽</value>
+ </filterItems>
+ <filterItems>
+ <field>$User.Salesdepartment__c</field>
+ <operation>equals</operation>
+ <value>2.涓滃寳,4.瑗垮崡</value>
+ </filterItems>
+ <filterItems>
+ <field>User.Name__c</field>
+ <operation>equals</operation>
+ <value>鍚� 鍥藉己</value>
+ </filterItems>
+ <filterItems>
+ <field>$User.Salesdepartment__c</field>
+ <operation>equals</operation>
+ <value>3.瑗垮寳</value>
+ </filterItems>
+ <filterItems>
+ <field>User.Name__c</field>
+ <operation>equals</operation>
+ <value>浜� 褰︽枌</value>
+ </filterItems>
+ <filterItems>
+ <field>$User.Salesdepartment__c</field>
+ <operation>equals</operation>
+ <value>5.鍗庝笢</value>
+ </filterItems>
+ <filterItems>
+ <field>User.Name__c</field>
+ <operation>equals</operation>
+ <value>浠� 楂樺嘲</value>
+ </filterItems>
+ <filterItems>
+ <field>$User.Salesdepartment__c</field>
+ <operation>equals</operation>
+ <value>6.鍗庡崡</value>
+ </filterItems>
+ <filterItems>
+ <field>User.Name__c</field>
+ <operation>equals</operation>
+ <value>濞� 鏍╂稕</value>
+ </filterItems>
+ <isOptional>false</isOptional>
+ </lookupFilter>
+ <referenceTo>User</referenceTo>
+ <relationshipName>LeadOppoXc89</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/SI_PromoteInquiry__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/SI_PromoteInquiry__c.field-meta.xml
new file mode 100644
index 0000000..6d602a5
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/SI_PromoteInquiry__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>SI_PromoteInquiry__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <inlineHelpText>SI璇环璇峰繀椤诲嬀閫夛紝杩涘叆SI璇环娴佺▼骞惰嚜鍔ㄥ甫鍑烘敮鎸佺殑SI涓撳憳</inlineHelpText>
+ <label>鏄惁SI璇环</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Sales_Method__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Sales_Method__c.field-meta.xml
new file mode 100644
index 0000000..ff9e63d
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Sales_Method__c.field-meta.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Sales_Method__c</fullName>
+ <externalId>false</externalId>
+ <label>鎷涙爣鏂瑰紡</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Picklist</type>
+ <valueSet>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>鏀垮簻鎷涙爣</fullName>
+ <default>false</default>
+ <label>鏀垮簻鎷涙爣</label>
+ </value>
+ <value>
+ <fullName>闄㈠唴鎷涙爣</fullName>
+ <default>false</default>
+ <label>闄㈠唴鎷涙爣</label>
+ </value>
+ <value>
+ <fullName>绔熶簤鎬ц皥鍒�(闈炴嫑鏍�)</fullName>
+ <default>false</default>
+ <label>绔熶簤鎬ц皥鍒�</label>
+ </value>
+ <value>
+ <fullName>鍗曚竴鏉ユ簮閲囪喘</fullName>
+ <default>false</default>
+ <label>鍗曚竴鏉ユ簮閲囪喘</label>
+ </value>
+ <value>
+ <fullName>绉佺珛鍖婚櫌閲囪喘</fullName>
+ <default>false</default>
+ <label>绉佺珛鍖婚櫌閲囪喘</label>
+ </value>
+ <value>
+ <fullName>鑰楁潗閲囪喘</fullName>
+ <default>false</default>
+ <label>鑰楁潗閲囪喘</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Sales_Root__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Sales_Root__c.field-meta.xml
new file mode 100644
index 0000000..c2756a7
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Sales_Root__c.field-meta.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Sales_Root__c</fullName>
+ <externalId>false</externalId>
+ <label>閿�鍞笭閬�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Picklist</type>
+ <valueSet>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>璨╁２搴�</fullName>
+ <default>false</default>
+ <label>璨╁２搴�</label>
+ </value>
+ <value>
+ <fullName>OCM鐩存帴璨╁２</fullName>
+ <default>false</default>
+ <label>OCSM鐩存帴閿�鍞�</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/SendMailToOwner__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/SendMailToOwner__c.field-meta.xml
new file mode 100644
index 0000000..fcbd372
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/SendMailToOwner__c.field-meta.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>SendMailToOwner__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>鎵�鏈夎�呫伀銉°兗銉�佷俊</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Status.field-meta.xml b/force-app/main/default/objects/Lead/fields/Status.field-meta.xml
new file mode 100644
index 0000000..a26e08b
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Status.field-meta.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Status</fullName>
+ <trackFeedHistory>true</trackFeedHistory>
+ <trackHistory>true</trackHistory>
+ <type>Picklist</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/StatusF__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/StatusF__c.field-meta.xml
new file mode 100644
index 0000000..2129dd8
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/StatusF__c.field-meta.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>StatusF__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(Text(Status) = '纰鸿獚娓堛伩','寮�濮嬭浠�',
+IF(Text(Status)='涓嶇敤(閲嶅)','宸叉湁璇环',
+IF(Text(Status)='涓嶈','鏃犻渶姹�',
+Text(Status))
+))</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>娼滃湪瀹㈡埛鐘舵��(鎶ヨ〃鐢�)</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Tender_information__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Tender_information__c.field-meta.xml
new file mode 100644
index 0000000..8cc696f
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Tender_information__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Tender_information__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>鎷涙爣椤圭洰</label>
+ <referenceTo>Tender_information__c</referenceTo>
+ <relationshipLabel>娼滃湪瀹㈡埛</relationshipLabel>
+ <relationshipName>TenderInformation</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Title.field-meta.xml b/force-app/main/default/objects/Lead/fields/Title.field-meta.xml
new file mode 100644
index 0000000..5cee131
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Title.field-meta.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Title</fullName>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Trade__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Trade__c.field-meta.xml
new file mode 100644
index 0000000..71838cc
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Trade__c.field-meta.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Trade__c</fullName>
+ <externalId>false</externalId>
+ <label>鍐呰部/澶栬部</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Picklist</type>
+ <valueSet>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>鍐呰部</fullName>
+ <default>false</default>
+ <label>鍐呰部</label>
+ </value>
+ <value>
+ <fullName>澶栬部</fullName>
+ <default>false</default>
+ <label>澶栬部</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Website.field-meta.xml b/force-app/main/default/objects/Lead/fields/Website.field-meta.xml
new file mode 100644
index 0000000..73253cf
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Website.field-meta.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Website</fullName>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Wholesale_Price__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Wholesale_Price__c.field-meta.xml
new file mode 100644
index 0000000..0f3a021
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Wholesale_Price__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Wholesale_Price__c</fullName>
+ <externalId>false</externalId>
+ <label>OCSM棰勬祴鎴愪氦閲戦锛堝惈绋庯級</label>
+ <precision>15</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/begin_opp_date__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/begin_opp_date__c.field-meta.xml
new file mode 100644
index 0000000..c97f700
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/begin_opp_date__c.field-meta.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>begin_opp_date__c</fullName>
+ <externalId>false</externalId>
+ <label>寮�濮嬭浠锋棩鏈�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/begin_opp_name__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/begin_opp_name__c.field-meta.xml
new file mode 100644
index 0000000..0be2a1a
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/begin_opp_name__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>begin_opp_name__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>鏂板缓璇环鍚嶇О</label>
+ <referenceTo>Opportunity</referenceTo>
+ <relationshipLabel>娼滃湪瀹㈡埛 (鏂板缓璇环鍚嶇О)</relationshipLabel>
+ <relationshipName>begin_opp_name</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/have_opp_date__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/have_opp_date__c.field-meta.xml
new file mode 100644
index 0000000..90f12f9
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/have_opp_date__c.field-meta.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>have_opp_date__c</fullName>
+ <externalId>false</externalId>
+ <label>宸叉湁璇环鏃ユ湡</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/hospital__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/hospital__c.field-meta.xml
new file mode 100644
index 0000000..0254562
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/hospital__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>hospital__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>鍖婚櫌</label>
+ <referenceTo>Account</referenceTo>
+ <relationshipLabel>娼滃湪瀹㈡埛 (鍖婚櫌)</relationshipLabel>
+ <relationshipName>hospitalAndopp</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/intention_within_seven_days__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/intention_within_seven_days__c.field-meta.xml
new file mode 100644
index 0000000..5236968
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/intention_within_seven_days__c.field-meta.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>intention_within_seven_days__c</fullName>
+ <description>瀛楁鍚嶇О淇敼锛� 14澶╁唴鎰忓悜纭
+ 2銆侀�昏緫淇敼涓猴細鎰忓悜鍒涘缓鏃堕棿+14鐘舵�佹樉绀轰负寮�濮嬭浠枫�佹棤闇�姹傘�佸凡鏈夎浠凤紝绗﹀悎1锛屼笉绗﹀悎0
+05/27淇敼鍓嶏細
+IF( begin_opp_date__c - DATEVALUE(CreatedDate) <= 7 || no_need_date__c - DATEVALUE(CreatedDate) <= 7 || have_opp_date__c - DATEVALUE(CreatedDate) <= 7, 1, 0)
+//20230310 update
+IF( begin_opp_date__c - Lead_Olympus__r.After_2_WorkDay__c <= 0 || no_need_date__c - Lead_Olympus__r.After_2_WorkDay__c <= 0 || have_opp_date__c - Lead_Olympus__r.After_2_WorkDay__c <= 0, 1, 0)</description>
+ <externalId>false</externalId>
+ <formula>IF(ISBLANK(FirstDate_Quote_Irai__c),
+IF( AND( ISBLANK(begin_opp_date__c) , ISBLANK(have_opp_date__c ), ISBLANK(no_need_date__c)) ,
+IF( TODAY() - Lead_Olympus__r.After_3_WorkDay__c <= 0,
+NULL,
+0
+),
+IF( NULLVALUE(begin_opp_date__c, NULLVALUE(have_opp_date__c, no_need_date__c)) - Lead_Olympus__r.After_3_WorkDay__c <= 0,
+1,
+0
+)
+),
+IF( AND( ISBLANK(begin_opp_date__c) , ISBLANK(have_opp_date__c ), ISBLANK(no_need_date__c)) ,
+IF( TODAY() - FirstDate_Quote_Irai__r.After_3_WorkDay__c <= 0,
+NULL,
+0
+),
+IF( NULLVALUE(begin_opp_date__c, NULLVALUE(have_opp_date__c, no_need_date__c)) - FirstDate_Quote_Irai__r.After_3_WorkDay__c <= 0,
+1,
+0
+)
+)
+)</formula>
+ <label>3涓伐浣滄棩鍐呮剰鍚戠‘璁�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/no_need_date__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/no_need_date__c.field-meta.xml
new file mode 100644
index 0000000..3f44515
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/no_need_date__c.field-meta.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>no_need_date__c</fullName>
+ <externalId>false</externalId>
+ <label>濮旀墭鏃犳晥鍏抽棴鏃ユ湡</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/owner_not_automatically_update__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/owner_not_automatically_update__c.field-meta.xml
new file mode 100644
index 0000000..cad8fe0
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/owner_not_automatically_update__c.field-meta.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>owner_not_automatically_update__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>璇环鎷呭綋浜哄崟鐙淮鎶�</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/urgent__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/urgent__c.field-meta.xml
new file mode 100644
index 0000000..476313b
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/urgent__c.field-meta.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>urgent__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>绱ф��</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/listViews/FOLLOW.listView-meta.xml b/force-app/main/default/objects/Lead/listViews/FOLLOW.listView-meta.xml
new file mode 100644
index 0000000..bb0b987
--- /dev/null
+++ b/force-app/main/default/objects/Lead/listViews/FOLLOW.listView-meta.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ListView xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>FOLLOW</fullName>
+ <columns>LEAD.CREATED_DATE</columns>
+ <columns>Hospital_Name__c</columns>
+ <columns>FULL_NAME</columns>
+ <columns>LEAD.STATUS</columns>
+ <columns>OfferToEntrust__c</columns>
+ <columns>Opp_Name__c</columns>
+ <columns>Opportunity_stage__c</columns>
+ <columns>Request__c</columns>
+ <columns>Purchase_Plan__c</columns>
+ <columns>Opportunity_Division__c</columns>
+ <columns>CORE.USERS.ALIAS</columns>
+ <columns>LEAD.LEAD_SOURCE</columns>
+ <columns>OCM_Oppor_Assistant__c</columns>
+ <filterScope>Everything</filterScope>
+ <filters>
+ <field>LEAD.STATUS</field>
+ <operation>equals</operation>
+ <value>鏈窡杩�</value>
+ </filters>
+ <filters>
+ <field>ForLossReport__c</field>
+ <operation>equals</operation>
+ <value>1</value>
+ </filters>
+ <label>00 鍔╃悊锛氬緟纭鐨勬剰鍚�-鍗庝笢鍗庡崡</label>
+ <language>ja</language>
+ <sharedTo>
+ <group>a_5_2</group>
+ <group>a_6_2</group>
+ </sharedTo>
+</ListView>
diff --git a/force-app/main/default/objects/Lead/listViews/FOLLOWED_opptunity.listView-meta.xml b/force-app/main/default/objects/Lead/listViews/FOLLOWED_opptunity.listView-meta.xml
new file mode 100644
index 0000000..304ea48
--- /dev/null
+++ b/force-app/main/default/objects/Lead/listViews/FOLLOWED_opptunity.listView-meta.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ListView xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>FOLLOWED_opptunity</fullName>
+ <columns>Lead_No__c</columns>
+ <columns>Hospital_Name__c</columns>
+ <columns>FULL_NAME</columns>
+ <columns>begin_opp_name__c</columns>
+ <columns>Opportunity_Division__c</columns>
+ <columns>Request__c</columns>
+ <columns>begin_opp_date__c</columns>
+ <columns>LEAD.CREATED_DATE</columns>
+ <filterScope>Everything</filterScope>
+ <filters>
+ <field>LEAD.STATUS</field>
+ <operation>equals</operation>
+ <value>纰鸿獚娓堛伩,寮�濮嬭浠�</value>
+ </filters>
+ <filters>
+ <field>LEAD.CREATED_DATE</field>
+ <operation>greaterOrEqual</operation>
+ <value>4/1/2022 12:00 AM</value>
+ </filters>
+ <label>02 宸茬粡寮�濮嬭浠风殑鎰忓悜</label>
+ <language>ja</language>
+</ListView>
diff --git a/force-app/main/default/objects/Lead/listViews/FOLLOWEDd.listView-meta.xml b/force-app/main/default/objects/Lead/listViews/FOLLOWEDd.listView-meta.xml
new file mode 100644
index 0000000..0b99ada
--- /dev/null
+++ b/force-app/main/default/objects/Lead/listViews/FOLLOWEDd.listView-meta.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ListView xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>FOLLOWEDd</fullName>
+ <columns>Hospital_Name__c</columns>
+ <columns>FULL_NAME</columns>
+ <columns>Opp_Name__c</columns>
+ <columns>Opportunity_stage__c</columns>
+ <columns>Request__c</columns>
+ <columns>Purchase_Plan__c</columns>
+ <columns>Opportunity_Division__c</columns>
+ <columns>Account_State__c</columns>
+ <columns>LEAD.CREATED_DATE</columns>
+ <filterScope>Everything</filterScope>
+ <filters>
+ <field>LEAD.STATUS</field>
+ <operation>equals</operation>
+ <value>纰鸿獚娓堛伩</value>
+ </filters>
+ <filters>
+ <field>CreatedBy_Name__c</field>
+ <operation>equals</operation>
+ <value>浜� 娑�</value>
+ </filters>
+ <label>05 寮�濮嬭浠风殑璐拱鎰忓悜</label>
+ <language>ja</language>
+</ListView>
diff --git a/force-app/main/default/objects/Lead/listViews/FOLLOWEDd1.listView-meta.xml b/force-app/main/default/objects/Lead/listViews/FOLLOWEDd1.listView-meta.xml
new file mode 100644
index 0000000..9201135
--- /dev/null
+++ b/force-app/main/default/objects/Lead/listViews/FOLLOWEDd1.listView-meta.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ListView xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>FOLLOWEDd1</fullName>
+ <columns>Hospital_Name__c</columns>
+ <columns>FULL_NAME</columns>
+ <columns>Opp_Name__c</columns>
+ <columns>Lead_No__c</columns>
+ <columns>Opportunity_stage__c</columns>
+ <columns>Request__c</columns>
+ <columns>Purchase_Plan__c</columns>
+ <columns>Opportunity_Division__c</columns>
+ <columns>Account_State__c</columns>
+ <columns>LEAD.CREATED_DATE</columns>
+ <filterScope>Everything</filterScope>
+ <filters>
+ <field>LEAD.STATUS</field>
+ <operation>equals</operation>
+ <value>纰鸿獚娓堛伩</value>
+ </filters>
+ <label>05 寮�濮嬭浠风殑璐拱鎰忓悜1</label>
+ <language>ja</language>
+</ListView>
diff --git a/force-app/main/default/objects/Lead/listViews/FOLLOWEDdA.listView-meta.xml b/force-app/main/default/objects/Lead/listViews/FOLLOWEDdA.listView-meta.xml
new file mode 100644
index 0000000..84d1f79
--- /dev/null
+++ b/force-app/main/default/objects/Lead/listViews/FOLLOWEDdA.listView-meta.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ListView xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>FOLLOWEDdA</fullName>
+ <columns>Hospital_Name__c</columns>
+ <columns>FULL_NAME</columns>
+ <columns>Opp_Name__c</columns>
+ <columns>Opportunity_stage__c</columns>
+ <columns>Request__c</columns>
+ <columns>Purchase_Plan__c</columns>
+ <columns>Opportunity_Division__c</columns>
+ <columns>Account_State__c</columns>
+ <filterScope>Everything</filterScope>
+ <filters>
+ <field>LEAD.STATUS</field>
+ <operation>equals</operation>
+ <value>纰鸿獚娓堛伩,寮�濮嬭浠�,涓嶇敤(閲嶅)</value>
+ </filters>
+ <filters>
+ <field>LEAD.CREATED_DATE</field>
+ <operation>greaterOrEqual</operation>
+ <value>12/1/2022 12:00 AM</value>
+ </filters>
+ <label>03 寮�濮嬭浠风殑鎰忓悜AAA</label>
+ <language>ja</language>
+</ListView>
diff --git a/force-app/main/default/objects/Lead/listViews/FOLLOWING.listView-meta.xml b/force-app/main/default/objects/Lead/listViews/FOLLOWING.listView-meta.xml
new file mode 100644
index 0000000..68bdb91
--- /dev/null
+++ b/force-app/main/default/objects/Lead/listViews/FOLLOWING.listView-meta.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ListView xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>FOLLOWING</fullName>
+ <columns>OCM_Management_Province_HP__c</columns>
+ <columns>Hospital_Name__c</columns>
+ <columns>FULL_NAME</columns>
+ <columns>Opp_Name__c</columns>
+ <columns>Purchase_Plan__c</columns>
+ <columns>Purchase_Reason__c</columns>
+ <columns>Request__c</columns>
+ <columns>Request_Detail__c</columns>
+ <columns>Lead_status__c</columns>
+ <columns>LEAD.CREATED_DATE</columns>
+ <filterScope>Everything</filterScope>
+ <filters>
+ <field>LEAD.STATUS</field>
+ <operation>equals</operation>
+ <value>璺熻繘涓�</value>
+ </filters>
+ <filters>
+ <field>LEAD.RECORDTYPE</field>
+ <operation>equals</operation>
+ <value>Lead.NewDaily_Report,Lead.Standard</value>
+ </filters>
+ <filters>
+ <field>Opportunity_Division__c</field>
+ <operation>equals</operation>
+ <value>璇环</value>
+ </filters>
+ <label>01 璺熻繘涓殑鎰忓悜</label>
+ <language>ja</language>
+</ListView>
diff --git a/force-app/main/default/objects/Lead/listViews/FOLLOW_new_sales.listView-meta.xml b/force-app/main/default/objects/Lead/listViews/FOLLOW_new_sales.listView-meta.xml
new file mode 100644
index 0000000..15da7ca
--- /dev/null
+++ b/force-app/main/default/objects/Lead/listViews/FOLLOW_new_sales.listView-meta.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ListView xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>FOLLOW_new_sales</fullName>
+ <columns>Hospital_Name__c</columns>
+ <columns>FULL_NAME</columns>
+ <columns>Lead_No__c</columns>
+ <columns>CORE.USERS.ALIAS</columns>
+ <columns>OfferToEntrust__c</columns>
+ <columns>Request__c</columns>
+ <columns>LEAD.CREATED_DATE</columns>
+ <columns>Opportunity_Division__c</columns>
+ <filterScope>Everything</filterScope>
+ <filters>
+ <field>LEAD.STATUS</field>
+ <operation>equals</operation>
+ <value>鏈窡杩�,璺熻繘涓�,宸插垎閰�</value>
+ </filters>
+ <filters>
+ <field>LEAD.CREATED_DATE</field>
+ <operation>greaterThan</operation>
+ <value>4/1/2022 12:00 AM</value>
+ </filters>
+ <filters>
+ <field>OfferToEntrust__c</field>
+ <operation>equals</operation>
+ <value>0</value>
+ </filters>
+ <label>00 鎷呭綋锛氳繕娌℃湁鎶ヤ环濮旀墭鐨勬剰鍚�</label>
+ <language>ja</language>
+</ListView>
diff --git a/force-app/main/default/objects/Lead/listViews/FOLLOW_new_sales_go.listView-meta.xml b/force-app/main/default/objects/Lead/listViews/FOLLOW_new_sales_go.listView-meta.xml
new file mode 100644
index 0000000..d471a98
--- /dev/null
+++ b/force-app/main/default/objects/Lead/listViews/FOLLOW_new_sales_go.listView-meta.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ListView xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>FOLLOW_new_sales_go</fullName>
+ <columns>Hospital_Name__c</columns>
+ <columns>FULL_NAME</columns>
+ <columns>Lead_No__c</columns>
+ <columns>LEAD.STATUS</columns>
+ <columns>QuotationDelegationStatus__c</columns>
+ <columns>OfferToEntrust__c</columns>
+ <columns>Request__c</columns>
+ <columns>LEAD.CREATED_DATE</columns>
+ <columns>Opportunity_Division__c</columns>
+ <columns>CORE.USERS.ALIAS</columns>
+ <columns>LEAD.LEAD_SOURCE</columns>
+ <columns>OCM_Oppor_Assistant__c</columns>
+ <columns>intention_within_seven_days__c</columns>
+ <columns>no_need_date__c</columns>
+ <filterScope>Everything</filterScope>
+ <filters>
+ <field>LEAD.STATUS</field>
+ <operation>equals</operation>
+ <value>鏈窡杩�,璺熻繘涓�,宸插垎閰�</value>
+ </filters>
+ <filters>
+ <field>LEAD.CREATED_DATE</field>
+ <operation>greaterThan</operation>
+ <value>12/15/2022 12:00 AM</value>
+ </filters>
+ <filters>
+ <field>OfferToEntrust__c</field>
+ <operation>equals</operation>
+ <value>1</value>
+ </filters>
+ <filters>
+ <field>QuotationDelegationStatus__c</field>
+ <operation>contains</operation>
+ <value>鏃犳晥,鍥炲</value>
+ </filters>
+ <label>00 鎷呭綋/鍔╃悊锛氬鎵樻棤鏁�/鏃犲洖澶嶅叧闂殑鎰忓悜</label>
+ <language>ja</language>
+</ListView>
diff --git a/force-app/main/default/objects/Lead/listViews/FOLLOW_withoutneed.listView-meta.xml b/force-app/main/default/objects/Lead/listViews/FOLLOW_withoutneed.listView-meta.xml
new file mode 100644
index 0000000..f16ff7f
--- /dev/null
+++ b/force-app/main/default/objects/Lead/listViews/FOLLOW_withoutneed.listView-meta.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ListView xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>FOLLOW_withoutneed</fullName>
+ <columns>LEAD.CREATED_DATE</columns>
+ <columns>Hospital_Name__c</columns>
+ <columns>FULL_NAME</columns>
+ <columns>LEAD.STATUS</columns>
+ <columns>Opp_Name__c</columns>
+ <columns>Opportunity_stage__c</columns>
+ <columns>Request__c</columns>
+ <columns>Purchase_Plan__c</columns>
+ <columns>Opportunity_Division__c</columns>
+ <columns>CORE.USERS.ALIAS</columns>
+ <columns>LEAD.LEAD_SOURCE</columns>
+ <columns>OCM_Oppor_Assistant__c</columns>
+ <filterScope>Everything</filterScope>
+ <filters>
+ <field>LEAD.STATUS</field>
+ <operation>equals</operation>
+ <value>涓嶈</value>
+ </filters>
+ <filters>
+ <field>LEAD.CREATED_DATE</field>
+ <operation>greaterOrEqual</operation>
+ <value>4/1/2022 12:00 AM</value>
+ </filters>
+ <label>鏃犻渶姹傜殑鎰忓悜</label>
+ <language>ja</language>
+</ListView>
diff --git a/force-app/main/default/objects/Lead/listViews/UNUSED.listView-meta.xml b/force-app/main/default/objects/Lead/listViews/UNUSED.listView-meta.xml
new file mode 100644
index 0000000..acabc2f
--- /dev/null
+++ b/force-app/main/default/objects/Lead/listViews/UNUSED.listView-meta.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ListView xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>UNUSED</fullName>
+ <columns>Hospital_Name__c</columns>
+ <columns>Opp_Name__c</columns>
+ <columns>FULL_NAME</columns>
+ <columns>Request__c</columns>
+ <columns>Purchase_Plan__c</columns>
+ <columns>Opportunity_Division__c</columns>
+ <filterScope>Everything</filterScope>
+ <filters>
+ <field>LEAD.STATUS</field>
+ <operation>equals</operation>
+ <value>涓嶇敤(閲嶅)</value>
+ </filters>
+ <label>04 鍙栨秷鐨勬剰鍚�</label>
+ <language>ja</language>
+</ListView>
diff --git a/force-app/main/default/objects/Lead/recordTypes/NewDaily_Report.recordType-meta.xml b/force-app/main/default/objects/Lead/recordTypes/NewDaily_Report.recordType-meta.xml
new file mode 100644
index 0000000..d10c0eb
--- /dev/null
+++ b/force-app/main/default/objects/Lead/recordTypes/NewDaily_Report.recordType-meta.xml
@@ -0,0 +1,455 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<RecordType xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>NewDaily_Report</fullName>
+ <active>true</active>
+ <businessProcess>鏃ュ牨</businessProcess>
+ <compactLayoutAssignment>Other_intention</compactLayoutAssignment>
+ <label>鎷滆鑾峰彇鐨勬剰鍚�</label>
+ <picklistValues>
+ <picklist>Competitor__c</picklist>
+ <values>
+ <fullName>A</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>B</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>C</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>D</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Contact_Method__c</picklist>
+ <values>
+ <fullName>鍏朵粬</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鎷滆</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鐢佃瘽</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閭欢</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Fund_Basis__c</picklist>
+ <values>
+ <fullName>浼氱ぞ%2F鍊嬩汉璩囬噾</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍥介殯璩囬噾</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏀垮簻璩囬噾</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鐥呴櫌璩囬噾</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>铻嶈祫绉熻祦%EF%BC%88銉兗銈�%EF%BC%89</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>璐存伅璐锋</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閵�琛岃硣閲�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Industry</picklist>
+ <values>
+ <fullName>銇濄伄浠�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>銈淬儬瑁藉搧</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>銉戙儷銉�%EF%BD%A5绱�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>銉°儑銈ｃ偄</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>涓嶅嫊鐢�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>淇濋櫤</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍊夊韩%EF%BD%A5閬嬭几闁㈤��</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍏叡姗熼枹</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍖栧</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍟嗘キ</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>寤鸿ō</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏀垮簻姗熼枹</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>姗熸</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>姘寸敚%EF%BD%A5杈叉灄</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>娴烽亱</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鐭虫补%EF%BD%A5鐭崇偔瑁藉搧</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>绌洪亱</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>绐キ</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>绮惧瘑姗熷櫒</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>绻婄董</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>瑁介��</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>杓搁�佺敤姗熷櫒</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閫氫俊</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲戝睘瑁藉搧</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲戣瀺</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閴勯嫾</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閴辨キ</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>闄搁亱</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>闆诲姏%EF%BD%A5銈偣</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>闆绘皸姗熷櫒</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>闈為墑閲戝睘</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>椋熷搧</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>LeadSource</picklist>
+ <values>
+ <fullName>OPD%2FSIS</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>浜岀骇</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍩哄缓椤圭洰</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>瀛︿細浼氳</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鐢佃瘽</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鐩存帴鎷滆</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>绉戝鎻愭</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>缁忛攢鍟�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Name</picklist>
+ <values>
+ <fullName>Mr%2E</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>Mrs%2E</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>Ms%2E</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>Prof%2E</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>妲�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Opportunity_Division__c</picklist>
+ <values>
+ <fullName>淇℃伅</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>璇环</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Opportunity_stage__c</picklist>
+ <values>
+ <fullName>鎻愪氦浜嗛绠楃敵璇�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>娌℃湁纭畾鍙傛暟</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>纭畾浜哋LY鍙傛暟</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>纭畾浜嗗鎵嬪弬鏁�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>杩樻病鐢宠棰勭畻</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>棰勭畻宸茬粡鎵瑰噯</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>棰勭畻娌℃湁鎵瑰噯</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Promise_Class__c</picklist>
+ <values>
+ <fullName>鍏嶇◣澶栬部</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍐呰部</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>闈炲厤绋庡璨�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Purchase_Plan__c</picklist>
+ <values>
+ <fullName>鏃�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏈�%28鏃犻绠�%29</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏈�%28鏈夐绠�%29</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Purchase_Reason__c</picklist>
+ <values>
+ <fullName>澧楄ō</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>濂洖</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏂版湡</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏇存柊</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Purchase_Type__c</picklist>
+ <values>
+ <fullName>ET24鏅傞枔璨╁２</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>SI%EF%BC%88鎵嬭瀹ゆ浠�%EF%BC%89</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>涓�鑸紩鍚�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Rating</picklist>
+ <values>
+ <fullName>鏈夎喘涔版剰鍚�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏈潵鏈夎喘涔版剰鍚�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>娌℃湁璐拱鎰忓悜</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Request__c</picklist>
+ <values>
+ <fullName>OPD</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>浜у搧璇存槑</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>瀵勯�佷骇鍝佽祫鏂�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>闇�瑕佹姤浠�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Sales_Method__c</picklist>
+ <values>
+ <fullName>鍗曚竴鏉ユ簮閲囪喘</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏀垮簻鎷涙爣</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>绉佺珛鍖婚櫌閲囪喘</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>绔熶簤鎬ц皥鍒�%28闈炴嫑鏍�%29</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鑰楁潗閲囪喘</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>闄㈠唴鎷涙爣</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Sales_Root__c</picklist>
+ <values>
+ <fullName>OCM鐩存帴璨╁２</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>璨╁２搴�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Trade__c</picklist>
+ <values>
+ <fullName>鍐呰部</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>澶栬部</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+</RecordType>
diff --git a/force-app/main/default/objects/Lead/recordTypes/Standard.recordType-meta.xml b/force-app/main/default/objects/Lead/recordTypes/Standard.recordType-meta.xml
new file mode 100644
index 0000000..13060e6
--- /dev/null
+++ b/force-app/main/default/objects/Lead/recordTypes/Standard.recordType-meta.xml
@@ -0,0 +1,455 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<RecordType xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Standard</fullName>
+ <active>true</active>
+ <businessProcess>妯欐簴</businessProcess>
+ <compactLayoutAssignment>Other_intention</compactLayoutAssignment>
+ <label>鍏朵粬閫斿緞鑾峰彇鐨勬剰鍚�</label>
+ <picklistValues>
+ <picklist>Competitor__c</picklist>
+ <values>
+ <fullName>A</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>B</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>C</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>D</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Contact_Method__c</picklist>
+ <values>
+ <fullName>鍏朵粬</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鎷滆</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鐢佃瘽</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閭欢</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Fund_Basis__c</picklist>
+ <values>
+ <fullName>浼氱ぞ%2F鍊嬩汉璩囬噾</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍥介殯璩囬噾</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏀垮簻璩囬噾</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鐥呴櫌璩囬噾</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>铻嶈祫绉熻祦%EF%BC%88銉兗銈�%EF%BC%89</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>璐存伅璐锋</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閵�琛岃硣閲�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Industry</picklist>
+ <values>
+ <fullName>銇濄伄浠�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>銈淬儬瑁藉搧</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>銉戙儷銉�%EF%BD%A5绱�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>銉°儑銈ｃ偄</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>涓嶅嫊鐢�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>淇濋櫤</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍊夊韩%EF%BD%A5閬嬭几闁㈤��</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍏叡姗熼枹</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍖栧</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍟嗘キ</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>寤鸿ō</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏀垮簻姗熼枹</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>姗熸</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>姘寸敚%EF%BD%A5杈叉灄</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>娴烽亱</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鐭虫补%EF%BD%A5鐭崇偔瑁藉搧</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>绌洪亱</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>绐キ</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>绮惧瘑姗熷櫒</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>绻婄董</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>瑁介��</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>杓搁�佺敤姗熷櫒</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閫氫俊</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲戝睘瑁藉搧</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲戣瀺</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閴勯嫾</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閴辨キ</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>闄搁亱</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>闆诲姏%EF%BD%A5銈偣</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>闆绘皸姗熷櫒</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>闈為墑閲戝睘</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>椋熷搧</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>LeadSource</picklist>
+ <values>
+ <fullName>OPD%2FSIS</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>浜岀骇</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍩哄缓椤圭洰</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>瀛︿細浼氳</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鐢佃瘽</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鐩存帴鎷滆</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>绉戝鎻愭</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>缁忛攢鍟�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Name</picklist>
+ <values>
+ <fullName>Mr%2E</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>Mrs%2E</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>Ms%2E</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>Prof%2E</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>妲�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Opportunity_Division__c</picklist>
+ <values>
+ <fullName>淇℃伅</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>璇环</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Opportunity_stage__c</picklist>
+ <values>
+ <fullName>鎻愪氦浜嗛绠楃敵璇�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>娌℃湁纭畾鍙傛暟</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>纭畾浜哋LY鍙傛暟</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>纭畾浜嗗鎵嬪弬鏁�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>杩樻病鐢宠棰勭畻</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>棰勭畻宸茬粡鎵瑰噯</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>棰勭畻娌℃湁鎵瑰噯</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Promise_Class__c</picklist>
+ <values>
+ <fullName>鍏嶇◣澶栬部</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍐呰部</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>闈炲厤绋庡璨�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Purchase_Plan__c</picklist>
+ <values>
+ <fullName>鏃�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏈�%28鏃犻绠�%29</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏈�%28鏈夐绠�%29</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Purchase_Reason__c</picklist>
+ <values>
+ <fullName>澧楄ō</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>濂洖</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏂版湡</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏇存柊</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Purchase_Type__c</picklist>
+ <values>
+ <fullName>ET24鏅傞枔璨╁２</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>SI%EF%BC%88鎵嬭瀹ゆ浠�%EF%BC%89</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>涓�鑸紩鍚�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Rating</picklist>
+ <values>
+ <fullName>鏈夎喘涔版剰鍚�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏈潵鏈夎喘涔版剰鍚�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>娌℃湁璐拱鎰忓悜</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Request__c</picklist>
+ <values>
+ <fullName>OPD</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>浜у搧璇存槑</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>瀵勯�佷骇鍝佽祫鏂�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>闇�瑕佹姤浠�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Sales_Method__c</picklist>
+ <values>
+ <fullName>鍗曚竴鏉ユ簮閲囪喘</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏀垮簻鎷涙爣</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>绉佺珛鍖婚櫌閲囪喘</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>绔熶簤鎬ц皥鍒�%28闈炴嫑鏍�%29</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鑰楁潗閲囪喘</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>闄㈠唴鎷涙爣</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Sales_Root__c</picklist>
+ <values>
+ <fullName>OCM鐩存帴璨╁２</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>璨╁２搴�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Trade__c</picklist>
+ <values>
+ <fullName>鍐呰部</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>澶栬部</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+</RecordType>
diff --git a/force-app/main/default/objects/Lead/validationRules/CampaignSource.validationRule-meta.xml b/force-app/main/default/objects/Lead/validationRules/CampaignSource.validationRule-meta.xml
new file mode 100644
index 0000000..93c0230
--- /dev/null
+++ b/force-app/main/default/objects/Lead/validationRules/CampaignSource.validationRule-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>CampaignSource</fullName>
+ <active>true</active>
+ <description>褰撹喘涔版剰鍚戜腑鍒涘缓鏉ユ簮鏄�滃浼氫細璁�濇椂锛屸�滀富瑕佸浼� 鈥濆繀椤诲～鍐�</description>
+ <errorConditionFormula>TEXT(LeadSource ) == '瀛︿細浼氳' && ISBLANK(Campaign__c) && (isNEW()||DATEVALUE(CreatedDate) > DATEVALUE('2022-07-14'))</errorConditionFormula>
+ <errorDisplayField>Campaign__c</errorDisplayField>
+ <errorMessage>褰撳垱寤烘潵婧愭槸鈥滃浼氫細璁�濇椂锛屸�滀富瑕佸浼� 鈥濆繀椤诲～鍐�</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Lead/validationRules/Check_Forecast_Date.validationRule-meta.xml b/force-app/main/default/objects/Lead/validationRules/Check_Forecast_Date.validationRule-meta.xml
new file mode 100644
index 0000000..e2c7d0a
--- /dev/null
+++ b/force-app/main/default/objects/Lead/validationRules/Check_Forecast_Date.validationRule-meta.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Check_Forecast_Date</fullName>
+ <active>true</active>
+ <description>棰勬祴OCSM绛剧害鏃ヨ鍦ㄦ湭鏉ヤ笁涓储骞村唴</description>
+ <errorConditionFormula>IF(Close_Forecasted_Date__c > (DATE(IF( MONTH( TODAY() ) > 3 , YEAR( TODAY() )+4, YEAR( TODAY() )+3),3,31)), true, false)</errorConditionFormula>
+ <errorMessage>棰勬祴OCSM绛剧害鏃ヨ鍦ㄦ湭鏉ヤ笁涓储骞村唴</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Lead/validationRules/Check_Hospital_IsActive.validationRule-meta.xml b/force-app/main/default/objects/Lead/validationRules/Check_Hospital_IsActive.validationRule-meta.xml
new file mode 100644
index 0000000..6ac60bc
--- /dev/null
+++ b/force-app/main/default/objects/Lead/validationRules/Check_Hospital_IsActive.validationRule-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Check_Hospital_IsActive</fullName>
+ <active>true</active>
+ <description>20220919璺宠繃绯荤粺绠＄悊鍛�</description>
+ <errorConditionFormula>Hospital_Name__r.Is_Active_Formula__c != '鏈夋晥' && $Profile.Id != '00e10000000Y3o5'</errorConditionFormula>
+ <errorDisplayField>Hospital_Name__c</errorDisplayField>
+ <errorMessage>璇烽�夋嫨鏈夋晥鐨勫尰闄㈢瀹�</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Lead/validationRules/HospitalDepartmentClassCheck.validationRule-meta.xml b/force-app/main/default/objects/Lead/validationRules/HospitalDepartmentClassCheck.validationRule-meta.xml
new file mode 100644
index 0000000..70a91e3
--- /dev/null
+++ b/force-app/main/default/objects/Lead/validationRules/HospitalDepartmentClassCheck.validationRule-meta.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>HospitalDepartmentClassCheck</fullName>
+ <active>true</active>
+ <description>褰撳墠鍖婚櫌鍚嶅拰閫夋嫨鐨勬垬鐣ョ瀹ゆ槸鍚︿竴鑷�
+0708璺宠繃绠＄悊鍛�</description>
+ <errorConditionFormula>AND(NOT(ISBLANK(Hospital_Name__c)),Hospital_Name__r.Department_Class__c != Department_Class__c, $User.Batch_User__c ==FALSE)</errorConditionFormula>
+ <errorDisplayField>Department_Class__c</errorDisplayField>
+ <errorMessage>涓庡尰闄㈠悕鐨勬垬鐣ョ瀹ゅ垎绫讳笉涓�鑷�</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Lead/validationRules/HospitalOppCheck.validationRule-meta.xml b/force-app/main/default/objects/Lead/validationRules/HospitalOppCheck.validationRule-meta.xml
new file mode 100644
index 0000000..24bce4f
--- /dev/null
+++ b/force-app/main/default/objects/Lead/validationRules/HospitalOppCheck.validationRule-meta.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>HospitalOppCheck</fullName>
+ <active>true</active>
+ <description>鍖婚櫌鍚嶅搴旂瀹ょ殑璇环妫�鏌�
+0708璺宠繃绠＄悊鍛�</description>
+ <errorConditionFormula>AND($User.Batch_User__c ==FALSE,NOT(ISBLANK(Opp_Name_Search__c)),
+ OR(Hospital_Name__r.Department_Class__c != Opp_Name_Search__r.Department_Class__c,
+ Opp_Name_Search__r.StageName__c = "瀹屾瘯",
+ Opp_Name_Search__r.StageName__c = "澶卞崟",
+ Opp_Name_Search__r.StageName__c = "鍙栨秷"
+ )
+)</errorConditionFormula>
+ <errorDisplayField>Opp_Name_Search__c</errorDisplayField>
+ <errorMessage>涓嶆槸鍖婚櫌鍚嶇瀹や笅鐨勮浠锋垨璇环宸茬粡鍏抽棴</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Lead/validationRules/LeadSource_Check.validationRule-meta.xml b/force-app/main/default/objects/Lead/validationRules/LeadSource_Check.validationRule-meta.xml
new file mode 100644
index 0000000..5697714
--- /dev/null
+++ b/force-app/main/default/objects/Lead/validationRules/LeadSource_Check.validationRule-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>LeadSource_Check</fullName>
+ <active>true</active>
+ <description>褰撲粠浜у搧鍜ㄨ鍗曟垨鎷涙爣椤圭洰璺宠浆鍒版剰鍚戞椂锛屾綔鍦ㄥ鎴锋潵婧愪笉鍙慨鏀�</description>
+ <errorConditionFormula>AND(OR(ISCHANGED(LeadSource), ISNEW()), OR(AND(NOT(ISBLANK(Tender_information__c)),TEXT(LeadSource)!='鎷涙爣缃�'), AND(NOT(ISBLANK(Lead_Inquiry_form__c)),AND(TEXT(LeadSource)!='鏅烘収鍖荤枟',TEXT(LeadSource)!='瀛︿細浼氳')), AND(NOT(ISBLANK(Agency_Opportunity__c)),TEXT(LeadSource)!='缁忛攢鍟�')))</errorConditionFormula>
+ <errorDisplayField>LeadSource</errorDisplayField>
+ <errorMessage>褰撲粠浜у搧鍜ㄨ鍗曟垨鎷涙爣椤圭洰璺宠浆鍒版剰鍚戞椂锛屾綔鍦ㄥ鎴锋潵婧愪笉鍙慨鏀�</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Lead/validationRules/Must_OppName_Check.validationRule-meta.xml b/force-app/main/default/objects/Lead/validationRules/Must_OppName_Check.validationRule-meta.xml
new file mode 100644
index 0000000..f29dc9d
--- /dev/null
+++ b/force-app/main/default/objects/Lead/validationRules/Must_OppName_Check.validationRule-meta.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Must_OppName_Check</fullName>
+ <active>true</active>
+ <description>鈥滆喘涔版剰鍚戠姸鎬佲�� 閫夋嫨 鈥滀笉鐢紙閲嶅锛夆�濇椂锛屽繀椤�
+0708璺宠繃绠＄悊鍛�</description>
+ <errorConditionFormula>AND(text(Status)="涓嶇敤(閲嶅)", ISBLANK(Opp_Name_Search__c), $User.Batch_User__c ==FALSE)</errorConditionFormula>
+ <errorDisplayField>Opp_Name_Search__c</errorDisplayField>
+ <errorMessage>"璐拱鎰忓悜鐘舵��"閫夋嫨鈥滀笉鐢紙閲嶅锛夆�濇椂,蹇呴』杈撳叆鍊�.</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Lead/validationRules/Need_Fill_InquiryAssistant.validationRule-meta.xml b/force-app/main/default/objects/Lead/validationRules/Need_Fill_InquiryAssistant.validationRule-meta.xml
new file mode 100644
index 0000000..0178c6f
--- /dev/null
+++ b/force-app/main/default/objects/Lead/validationRules/Need_Fill_InquiryAssistant.validationRule-meta.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Need_Fill_InquiryAssistant</fullName>
+ <active>true</active>
+ <errorConditionFormula>SI_PromoteInquiry__c && ISNULL(SI_OppoLeadSec__c)</errorConditionFormula>
+ <errorDisplayField>SI_OppoLeadSec__c</errorDisplayField>
+ <errorMessage>杞琒I璇环闇�瑕佸～鍐欒浠峰壇鎷呭綋</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Lead/validationRules/Should_Be_Dept_Check.validationRule-meta.xml b/force-app/main/default/objects/Lead/validationRules/Should_Be_Dept_Check.validationRule-meta.xml
new file mode 100644
index 0000000..8405546
--- /dev/null
+++ b/force-app/main/default/objects/Lead/validationRules/Should_Be_Dept_Check.validationRule-meta.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Should_Be_Dept_Check</fullName>
+ <active>true</active>
+ <description>蹇呴』鏄叿浣撶殑绉戝
+0708 璺宠繃绠＄悊鍛�</description>
+ <errorConditionFormula>$User.Batch_User__c ==FALSE && ( $User.ProfileId <> "00e10000000Y3o5")&& Hospital_Name__r.RecordType.DeveloperName<>'Department_GS'&&
+Hospital_Name__r.RecordType.DeveloperName<>'Department_OTH'&&
+Hospital_Name__r.RecordType.DeveloperName<>'Department_ENT'&&
+Hospital_Name__r.RecordType.DeveloperName<>'Department_GYN'&&
+Hospital_Name__r.RecordType.DeveloperName<>'Department_URO'&&
+Hospital_Name__r.RecordType.DeveloperName<>'Department_BF'&&
+Hospital_Name__r.RecordType.DeveloperName<>'Department_GI'&&
+Hospital_Name__r.RecordType.DeveloperName<>'Agency'
+&& $User.Username !='buli@deloitte.com.cn'</errorConditionFormula>
+ <errorDisplayField>Hospital_Name__c</errorDisplayField>
+ <errorMessage>蹇呴』鏄叿浣撶殑绉戝</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Lead/validationRules/StateJudgment.validationRule-meta.xml b/force-app/main/default/objects/Lead/validationRules/StateJudgment.validationRule-meta.xml
new file mode 100644
index 0000000..5626891
--- /dev/null
+++ b/force-app/main/default/objects/Lead/validationRules/StateJudgment.validationRule-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>StateJudgment</fullName>
+ <active>true</active>
+ <description>宸叉湁璇环鍚嶇О涓虹┖鏃讹紝鐘舵�佷笉鑳介�変负鈥滃凡鏈夎浠封�濄��</description>
+ <errorConditionFormula>AND( ISBLANK( Opp_Name_Search__c ), TEXT( Status ) == '涓嶇敤(閲嶅)', $User.Username !='buli@deloitte.com.cn', $User.Username !='it_prectech@olympus.com.cn')</errorConditionFormula>
+ <errorDisplayField>Status</errorDisplayField>
+ <errorMessage>宸叉湁璇环鍚嶇О涓虹┖鏃讹紝鐘舵�佷笉鑳介�変负鈥滃凡鏈夎浠封�濄��</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Lead/validationRules/Status_Check.validationRule-meta.xml b/force-app/main/default/objects/Lead/validationRules/Status_Check.validationRule-meta.xml
new file mode 100644
index 0000000..8bb2464
--- /dev/null
+++ b/force-app/main/default/objects/Lead/validationRules/Status_Check.validationRule-meta.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Status_Check</fullName>
+ <active>true</active>
+ <description>鎰忓悜鐘舵�佸洖閫�鍒ゆ柇</description>
+ <errorConditionFormula>AND( ISCHANGED(Status), Text(Status) = '鏈窡杩�' , OR(NOT(ISNULL(begin_opp_name__c)) ,NOT(ISNULL( Opp_Name_Search__c ))) )</errorConditionFormula>
+ <errorMessage>鎰忓悜宸茶浆鍖栬浠凤紝涓嶈兘淇敼鐘舵��</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Lead/webLinks/AltavistaNews.webLink-meta.xml b/force-app/main/default/objects/Lead/webLinks/AltavistaNews.webLink-meta.xml
new file mode 100644
index 0000000..54c6167
--- /dev/null
+++ b/force-app/main/default/objects/Lead/webLinks/AltavistaNews.webLink-meta.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>AltavistaNews</fullName>
+ <availability>online</availability>
+ <displayType>link</displayType>
+ <encodingKey>UTF-8</encodingKey>
+ <hasMenubar>true</hasMenubar>
+ <hasScrollbars>true</hasScrollbars>
+ <hasToolbar>true</hasToolbar>
+ <height>600</height>
+ <isResizable>true</isResizable>
+ <linkType>url</linkType>
+ <masterLabel>Altavista News</masterLabel>
+ <openType>newWindow</openType>
+ <position>none</position>
+ <protected>false</protected>
+ <showsLocation>true</showsLocation>
+ <showsStatus>true</showsStatus>
+ <url>http://news.altavista.com/search?nc=0&q={!Lead.Company}</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Lead/webLinks/Cancel_Lead_Btn.webLink-meta.xml b/force-app/main/default/objects/Lead/webLinks/Cancel_Lead_Btn.webLink-meta.xml
new file mode 100644
index 0000000..31935e0
--- /dev/null
+++ b/force-app/main/default/objects/Lead/webLinks/Cancel_Lead_Btn.webLink-meta.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Cancel_Lead_Btn</fullName>
+ <availability>online</availability>
+ <displayType>button</displayType>
+ <linkType>javascript</linkType>
+ <masterLabel>鍙栨秷</masterLabel>
+ <openType>onClickJavaScript</openType>
+ <protected>false</protected>
+ <url>{!RequireScript("/soap/ajax/51.0/connection.js")}
+{!RequireScript("/soap/ajax/51.0/apex.js")}
+
+if ('{!Lead.Cancel_Reason__c}' == '') {
+alert("璇峰～鍐欏彇娑堝師鍥�");
+} else {
+var result = sforce.connection.query("select id,Status from lead where id = '{!Lead.Id}'");
+var records = result.getArray("records");
+
+var Leadslist = new Array();
+for (i = 0; i < records.length; i++) {
+var Leads = new sforce.SObject("lead");
+Leads.id = records[i].Id;
+Leads.Status = '涓嶈';
+Leadslist.push(Leads);
+}
+
+if (Leadslist.length > 0) {
+var updResult = sforce.connection.update(Leadslist);
+if (updResult[0].getBoolean("success")) {
+location.href = "/{!URLENCODE(Lead.Id)}";
+}else{
+var ermsg = updResult[0].errors.message;
+alert(ermsg);
+}
+}
+//alert("鍣楀櫁浣犱釜鍣楀櫁"+records );
+}</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Lead/webLinks/CopyPI.webLink-meta.xml b/force-app/main/default/objects/Lead/webLinks/CopyPI.webLink-meta.xml
new file mode 100644
index 0000000..ed7f982
--- /dev/null
+++ b/force-app/main/default/objects/Lead/webLinks/CopyPI.webLink-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>CopyPI</fullName>
+ <availability>online</availability>
+ <displayType>button</displayType>
+ <linkType>javascript</linkType>
+ <masterLabel>CopyPI</masterLabel>
+ <openType>onClickJavaScript</openType>
+ <protected>false</protected>
+ <url>window.location.href = '/{!Lead.Id}/e?newclone=1';</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Lead/webLinks/Create_Key_product_evaluation.webLink-meta.xml b/force-app/main/default/objects/Lead/webLinks/Create_Key_product_evaluation.webLink-meta.xml
new file mode 100644
index 0000000..59d04a7
--- /dev/null
+++ b/force-app/main/default/objects/Lead/webLinks/Create_Key_product_evaluation.webLink-meta.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Create_Key_product_evaluation</fullName>
+ <availability>online</availability>
+ <displayType>button</displayType>
+ <encodingKey>UTF-8</encodingKey>
+ <hasMenubar>false</hasMenubar>
+ <hasScrollbars>true</hasScrollbars>
+ <hasToolbar>false</hasToolbar>
+ <height>600</height>
+ <isResizable>true</isResizable>
+ <linkType>url</linkType>
+ <masterLabel>鏂板缓瀵归噸瑕佷骇鍝�/鍔熻兘鐨勮瘎浠疯〃</masterLabel>
+ <openType>newWindow</openType>
+ <position>none</position>
+ <protected>false</protected>
+ <showsLocation>false</showsLocation>
+ <showsStatus>false</showsStatus>
+ <url>/setup/ui/recordtypeselect.jsp?ent=01I10000000u0VA&retURL=%2F{!Lead.Id}&save_new_url=%2Fa1E%2Fe%3FretURL%3D%252F{!Lead.Id}
+%2600N100000048SSr%3D{!SUBSTITUTE(Text(TODAY()), "-", "%2F")}
+%26CF00N1000000484Jx%3D{!Lead.Name}
+%26CF00N1000000484Jx_lkid%3D{!Lead.Id}
+%26CF00N100000048SOz%3D{!Lead.CreatedBy_Name__c}
+%26CF00N100000048SOz_lkid%3D{!Lead.CreatedById}</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Lead/webLinks/GoogleMaps.webLink-meta.xml b/force-app/main/default/objects/Lead/webLinks/GoogleMaps.webLink-meta.xml
new file mode 100644
index 0000000..9d2e989
--- /dev/null
+++ b/force-app/main/default/objects/Lead/webLinks/GoogleMaps.webLink-meta.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>GoogleMaps</fullName>
+ <availability>online</availability>
+ <displayType>link</displayType>
+ <encodingKey>UTF-8</encodingKey>
+ <hasMenubar>false</hasMenubar>
+ <hasScrollbars>true</hasScrollbars>
+ <hasToolbar>false</hasToolbar>
+ <height>600</height>
+ <isResizable>true</isResizable>
+ <linkType>url</linkType>
+ <masterLabel>Google Maps</masterLabel>
+ <openType>newWindow</openType>
+ <position>none</position>
+ <protected>false</protected>
+ <showsLocation>false</showsLocation>
+ <showsStatus>false</showsStatus>
+ <url>http://maps.google.com/maps?f=q&hl=en&q={!Lead.Street}+{!Lead.City}+{!Lead.State}&om=1</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Lead/webLinks/GoogleNews.webLink-meta.xml b/force-app/main/default/objects/Lead/webLinks/GoogleNews.webLink-meta.xml
new file mode 100644
index 0000000..1994bb2
--- /dev/null
+++ b/force-app/main/default/objects/Lead/webLinks/GoogleNews.webLink-meta.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>GoogleNews</fullName>
+ <availability>online</availability>
+ <displayType>link</displayType>
+ <encodingKey>UTF-8</encodingKey>
+ <hasMenubar>false</hasMenubar>
+ <hasScrollbars>true</hasScrollbars>
+ <hasToolbar>false</hasToolbar>
+ <height>600</height>
+ <isResizable>true</isResizable>
+ <linkType>url</linkType>
+ <masterLabel>Google News</masterLabel>
+ <openType>newWindow</openType>
+ <position>none</position>
+ <protected>false</protected>
+ <showsLocation>false</showsLocation>
+ <showsStatus>false</showsStatus>
+ <url>http://www.google.com/news?&q={!Lead.Company}&btnG=Search+News</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Lead/webLinks/GoogleSearch.webLink-meta.xml b/force-app/main/default/objects/Lead/webLinks/GoogleSearch.webLink-meta.xml
new file mode 100644
index 0000000..3ad8341
--- /dev/null
+++ b/force-app/main/default/objects/Lead/webLinks/GoogleSearch.webLink-meta.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>GoogleSearch</fullName>
+ <availability>online</availability>
+ <displayType>link</displayType>
+ <encodingKey>UTF-8</encodingKey>
+ <hasMenubar>false</hasMenubar>
+ <hasScrollbars>true</hasScrollbars>
+ <hasToolbar>false</hasToolbar>
+ <height>600</height>
+ <isResizable>true</isResizable>
+ <linkType>url</linkType>
+ <masterLabel>Google Search</masterLabel>
+ <openType>newWindow</openType>
+ <position>none</position>
+ <protected>false</protected>
+ <showsLocation>false</showsLocation>
+ <showsStatus>false</showsStatus>
+ <url>http://www.google.com/search?q={!Lead.Company}</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Lead/webLinks/HooversProfile.webLink-meta.xml b/force-app/main/default/objects/Lead/webLinks/HooversProfile.webLink-meta.xml
new file mode 100644
index 0000000..ea3a86d
--- /dev/null
+++ b/force-app/main/default/objects/Lead/webLinks/HooversProfile.webLink-meta.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>HooversProfile</fullName>
+ <availability>online</availability>
+ <displayType>link</displayType>
+ <encodingKey>UTF-8</encodingKey>
+ <hasMenubar>true</hasMenubar>
+ <hasScrollbars>true</hasScrollbars>
+ <hasToolbar>true</hasToolbar>
+ <height>600</height>
+ <isResizable>true</isResizable>
+ <linkType>url</linkType>
+ <masterLabel>Hoovers Profile</masterLabel>
+ <openType>newWindow</openType>
+ <position>none</position>
+ <protected>false</protected>
+ <showsLocation>true</showsLocation>
+ <showsStatus>true</showsStatus>
+ <url>http://search.hoovers.com/cgi-bin/hol_search?which=company&query_string={!Lead.Company}</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Lead/webLinks/NewLead_FromContact2.webLink-meta.xml b/force-app/main/default/objects/Lead/webLinks/NewLead_FromContact2.webLink-meta.xml
new file mode 100644
index 0000000..f46d54a
--- /dev/null
+++ b/force-app/main/default/objects/Lead/webLinks/NewLead_FromContact2.webLink-meta.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>NewLead_FromContact2</fullName>
+ <availability>online</availability>
+ <description>浠庡鎴蜂汉鍛橀〉闈㈡潵鏂板缓璐拱鎰忓悜
+UTF8瀵瑰簲鍓�
+/00Q/e?retURL=%2F00Q%2Fo&RecordType=01210000000QiRf&ent=Lead&CF00N10000006ps6f={!HTMLENCODE(Contact.Name)}&CF00N10000006ps6f_lkid={!HTMLENCODE(Contact.Id)}&CF00N10000002CvC5={!HTMLENCODE(Account.Name)}&CF00N10000002CvC5_lkid={!HTMLENCODE(Account.Id)}&lea3={!HTMLENCODE('涓嶇敤濉啓')}&name_lastlea2={!HTMLENCODE('涓嶇敤濉啓')}&CF00N10000006qNtt={!HTMLENCODE(Account.Department_Class__c)}</description>
+ <displayType>massActionButton</displayType>
+ <encodingKey>UTF-8</encodingKey>
+ <linkType>url</linkType>
+ <masterLabel>鏂板缓璐拱鎰忓悜</masterLabel>
+ <openType>replace</openType>
+ <protected>false</protected>
+ <requireRowSelection>false</requireRowSelection>
+ <url>/00Q/e?retURL=%2F00Q%2Fo&RecordType=01210000000QiRf&ent=Lead&CF00N10000006ps6f={!HTMLENCODE(Contact.Name)}&CF00N10000006ps6f_lkid={!HTMLENCODE(Contact.Id)}&CF00N10000002CvC5={!HTMLENCODE(Account.Name)}&CF00N10000002CvC5_lkid={!HTMLENCODE(Account.Id)}&lea3=%e4%b8%8d%e7%94%a8%e5%a1%ab%e5%86%99&name_lastlea2=%e4%b8%8d%e7%94%a8%e5%a1%ab%e5%86%99&CF00N10000006qNtt_lkid = {!HTMLENCODE(Account.Department_Class__c)}&CF00N10000006qNtt={!HTMLENCODE(Account.Department_Class__c)}</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Lead/webLinks/Quotation_request.webLink-meta.xml b/force-app/main/default/objects/Lead/webLinks/Quotation_request.webLink-meta.xml
new file mode 100644
index 0000000..220c617
--- /dev/null
+++ b/force-app/main/default/objects/Lead/webLinks/Quotation_request.webLink-meta.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Quotation_request</fullName>
+ <availability>online</availability>
+ <displayType>button</displayType>
+ <linkType>javascript</linkType>
+ <masterLabel>鎶ヤ环濮旀墭</masterLabel>
+ <openType>onClickJavaScript</openType>
+ <protected>false</protected>
+ <url>{!RequireScript("/soap/ajax/51.0/connection.js")}
+{!RequireScript("/resource/CommonUtilJs")}
+
+if('{!TEXT(Lead.Status)}' == '鏈窡杩�'){
+window.open("/apex/NewQuoteIrai?leadid="+'{!Lead.Id}'+"&tenderid="+'{!Lead.Tender_informationId__c}');
+}else{
+alert('鎰忓悜宸茬粨鏉熶笉鑳藉仛鎶ヤ环濮旀墭');
+}</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Lead/webLinks/SendGmail.webLink-meta.xml b/force-app/main/default/objects/Lead/webLinks/SendGmail.webLink-meta.xml
new file mode 100644
index 0000000..09d70da
--- /dev/null
+++ b/force-app/main/default/objects/Lead/webLinks/SendGmail.webLink-meta.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>SendGmail</fullName>
+ <availability>online</availability>
+ <displayType>link</displayType>
+ <encodingKey>UTF-8</encodingKey>
+ <hasMenubar>false</hasMenubar>
+ <hasScrollbars>true</hasScrollbars>
+ <hasToolbar>false</hasToolbar>
+ <height>600</height>
+ <isResizable>true</isResizable>
+ <linkType>url</linkType>
+ <masterLabel>Gmail 銇�佷俊</masterLabel>
+ <openType>newWindow</openType>
+ <position>none</position>
+ <protected>false</protected>
+ <showsLocation>false</showsLocation>
+ <showsStatus>false</showsStatus>
+ <url>https://mail.google.com/mail?view=cm&tf=0&to={!Lead.Email}<{!Lead.LastName}, {!Lead.FirstName}>&tf=1</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Lead/webLinks/Start_Trading.webLink-meta.xml b/force-app/main/default/objects/Lead/webLinks/Start_Trading.webLink-meta.xml
new file mode 100644
index 0000000..b5b9279
--- /dev/null
+++ b/force-app/main/default/objects/Lead/webLinks/Start_Trading.webLink-meta.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Start_Trading</fullName>
+ <availability>online</availability>
+ <displayType>button</displayType>
+ <linkType>javascript</linkType>
+ <masterLabel>鍙栧紩銇枊濮�</masterLabel>
+ <openType>onClickJavaScript</openType>
+ <protected>false</protected>
+ <url>{!REQUIRESCRIPT('/soap/ajax/51.0/connection.js')}
+{!REQUIRESCRIPT('/soap/ajax/51.0/apex.js')}
+//2021-10-21 gwy 鐗堟湰鏇存敼涓�51.0
+//var url = '006/e?retURL=%2F006%2Fo&RecordType=01210000000QekK&ent=Opportunity';
+//var siurl = '/006/e?retURL=%2F006%2Fo&RecordType=012100000006KMe&ent=Opportunity';
+
+var status_list = ['瀹屾瘯','鏃犻渶姹�','宸叉湁璇环','纰鸿獚娓堛伩','涓嶈','寮�濮嬭浠�'];
+var lead_status = '{!Lead.Status}';
+
+if('{!Lead.Hospital_Name__c}' == ''){
+ alert('鐥呴櫌鍚嶇О銈掕ō瀹氥仐銇︺亸銇犮仌銇�');
+} else if ('{!Lead.Close_Forecasted_Date__c}' < '{!TODAY()}') {
+ alert('棰勬祴OCSM绛剧害鏃ヤ笉鑳藉皬浜庝粖澶�');
+} else if (!{!ISNULL(Lead.Opp_Name_Search__c)} || !{!ISNULL(Lead.begin_opp_name__c)} || status_list.includes(lead_status)) {
+ alert('宸插瓨鍦ㄨ浆鍖栫殑璇环鎴栦笉闇�瑕佽浆鍖栬浠�');
+} else{
+ //if({!Lead.SI_PromoteInquiry__c} == false){
+ // window.open(url);
+ //}else{
+ // window.open(siurl);
+ //}
+ window.open("/apex/StartTrading?leadId={!URLENCODE(Lead.Id)}");
+}</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Lead/webLinks/YahooMaps.webLink-meta.xml b/force-app/main/default/objects/Lead/webLinks/YahooMaps.webLink-meta.xml
new file mode 100644
index 0000000..2512ddc
--- /dev/null
+++ b/force-app/main/default/objects/Lead/webLinks/YahooMaps.webLink-meta.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>YahooMaps</fullName>
+ <availability>online</availability>
+ <displayType>link</displayType>
+ <encodingKey>UTF-8</encodingKey>
+ <hasMenubar>true</hasMenubar>
+ <hasScrollbars>true</hasScrollbars>
+ <hasToolbar>true</hasToolbar>
+ <height>600</height>
+ <isResizable>true</isResizable>
+ <linkType>url</linkType>
+ <masterLabel>Yahoo Maps</masterLabel>
+ <openType>newWindow</openType>
+ <position>none</position>
+ <protected>false</protected>
+ <showsLocation>true</showsLocation>
+ <showsStatus>true</showsStatus>
+ <url>http://maps.yahoo.com/py/maps.py?cn={!Lead.Country}&csz={!Lead.City}+{!Lead.State}+{!Lead.PostalCode}+&addr={!Lead.Street}</url>
+</WebLink>
diff --git a/force-app/main/default/objects/LostReport_Detail__c/validationRules/Cancel_Mustinput_DeleteReason.validationRule-meta.xml b/force-app/main/default/objects/LostReport_Detail__c/validationRules/Cancel_Mustinput_DeleteReason.validationRule-meta.xml
index a5e13d9..1ba8613 100644
--- a/force-app/main/default/objects/LostReport_Detail__c/validationRules/Cancel_Mustinput_DeleteReason.validationRule-meta.xml
+++ b/force-app/main/default/objects/LostReport_Detail__c/validationRules/Cancel_Mustinput_DeleteReason.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Cancel_Mustinput_DeleteReason</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>LostReport_Status_F__c != '鑽夋涓�'
&& CancelLostReport__c && ISBLANK(DeleteLostReport_Detail_Reason__c )</errorConditionFormula>
<errorDisplayField>DeleteLostReport_Detail_Reason__c</errorDisplayField>
diff --git a/force-app/main/default/objects/LostReport__c/fields/isBeipin__c.field-meta.xml b/force-app/main/default/objects/LostReport__c/fields/isBeipin__c.field-meta.xml
index cfe13b3..85db891 100644
--- a/force-app/main/default/objects/LostReport__c/fields/isBeipin__c.field-meta.xml
+++ b/force-app/main/default/objects/LostReport__c/fields/isBeipin__c.field-meta.xml
@@ -3,8 +3,7 @@
<fullName>isBeipin__c</fullName>
<externalId>false</externalId>
<formula>/*鍒ゆ柇褰撳墠璁板綍鐨勫垱寤轰汉 鎴栬�� 鎵�鏈変汉鐨勭畝妗ｆ槸鍚︿负澶囧搧 濡傛灉鏄殑璇� 瀹℃壒娴佽蛋澶囧搧涓績鎻愪氦*/
-/*IF(AND( OR(Owner:User.ProfileId = '00e10000000xnoT',Owner:User.ProfileId = '00e10000000xnoY', Owner:User.ProfileId = '00e100000012CwP',Owner:User.ProfileId = '00e10000000xnod',Owner:User.ProfileId = '00e100000012CwK'),OR(CreatedBy.ProfileId = '00e10000000xnoT',CreatedBy.ProfileId = '00e10000000xnoY',CreatedBy.ProfileId = '00e100000012CwP',CreatedBy.ProfileId = '00e10000000xnod',CreatedBy.ProfileId = '00e100000012CwK') ),true,false )*/
-IF(AND( OR(Owner:User.ProfileId = '00eC600000004y5IAA',Owner:User.ProfileId = '00eC600000004y6', Owner:User.ProfileId = '00eC600000004y7',Owner:User.ProfileId = '00eC600000004y9',Owner:User.ProfileId = '00eC600000004yA'),OR(CreatedBy.ProfileId = '00eC600000004y5IAA',CreatedBy.ProfileId = '00eC600000004y6',CreatedBy.ProfileId = '00eC600000004y7',CreatedBy.ProfileId = '00eC600000004y9',CreatedBy.ProfileId = '00eC600000004yA') ),true,false )</formula>
+IF(AND( OR(Owner:User.ProfileId = '00e10000000xnoT',Owner:User.ProfileId = '00e10000000xnoY', Owner:User.ProfileId = '00e100000012CwP',Owner:User.ProfileId = '00e10000000xnod',Owner:User.ProfileId = '00e100000012CwK'),OR(CreatedBy.ProfileId = '00e10000000xnoT',CreatedBy.ProfileId = '00e10000000xnoY',CreatedBy.ProfileId = '00e100000012CwP',CreatedBy.ProfileId = '00e10000000xnod',CreatedBy.ProfileId = '00e100000012CwK') ),true,false )</formula>
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
<label>绠�妗ｆ槸鍚︿负澶囧搧</label>
<trackTrending>false</trackTrending>
diff --git a/force-app/main/default/objects/LostReport__c/validationRules/Cannot_Create_When_IH_Not_App.validationRule-meta.xml b/force-app/main/default/objects/LostReport__c/validationRules/Cannot_Create_When_IH_Not_App.validationRule-meta.xml
index b6c5226..ef9223b 100644
--- a/force-app/main/default/objects/LostReport__c/validationRules/Cannot_Create_When_IH_Not_App.validationRule-meta.xml
+++ b/force-app/main/default/objects/LostReport__c/validationRules/Cannot_Create_When_IH_Not_App.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Cannot_Create_When_IH_Not_App</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>NOT(ISBLANK(Inventory_Header__c))
&& NOT( ISPICKVAL(Inventory_Header__r.Inventory_Status__c, '宸叉壒鍑�'))
&& ISNEW()</errorConditionFormula>
diff --git a/force-app/main/default/objects/LostReport__c/validationRules/Cannot_Submit_App_When_HaveNot_Detail.validationRule-meta.xml b/force-app/main/default/objects/LostReport__c/validationRules/Cannot_Submit_App_When_HaveNot_Detail.validationRule-meta.xml
index 5761c86..da9c67a 100644
--- a/force-app/main/default/objects/LostReport__c/validationRules/Cannot_Submit_App_When_HaveNot_Detail.validationRule-meta.xml
+++ b/force-app/main/default/objects/LostReport__c/validationRules/Cannot_Submit_App_When_HaveNot_Detail.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Cannot_Submit_App_When_HaveNot_Detail</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>LostReport_Detail_Count__c = 0 && ISPICKVAL(Status__c, '濉啓瀹屾瘯')</errorConditionFormula>
<errorMessage>娌℃湁閬楀け鎶ュ憡鏄庣粏涓嶈兘鎻愪氦瀹℃壒</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/LostReport__c/validationRules/Cannot_Submit_When_NOTHave_ManagerBuzhan.validationRule-meta.xml b/force-app/main/default/objects/LostReport__c/validationRules/Cannot_Submit_When_NOTHave_ManagerBuzhan.validationRule-meta.xml
index 77fd82f..f0034f4 100644
--- a/force-app/main/default/objects/LostReport__c/validationRules/Cannot_Submit_When_NOTHave_ManagerBuzhan.validationRule-meta.xml
+++ b/force-app/main/default/objects/LostReport__c/validationRules/Cannot_Submit_When_NOTHave_ManagerBuzhan.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Cannot_Submit_When_NOTHave_ManagerBuzhan</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>ISPICKVAL(Status__c, '濉啓瀹屾瘯')
&& ISBLANK(RA_SalesManager__c)
&& ISBLANK(RA_BuchangApprovalManagerSales__c)</errorConditionFormula>
diff --git a/force-app/main/default/objects/LostReport__c/validationRules/Submit_AppV_Check.validationRule-meta.xml b/force-app/main/default/objects/LostReport__c/validationRules/Submit_AppV_Check.validationRule-meta.xml
index 91c0b59..b5ff142 100644
--- a/force-app/main/default/objects/LostReport__c/validationRules/Submit_AppV_Check.validationRule-meta.xml
+++ b/force-app/main/default/objects/LostReport__c/validationRules/Submit_AppV_Check.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Submit_AppV_Check</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>ISPICKVAL(Status__c, '濉啓瀹屾瘯')
&& (ISBLANK(Situation_description__c) || ISBLANK(Confirmation_process__c) )</errorConditionFormula>
<errorMessage>蹇呴』濉啓 澶囧搧鍘诲悜涓嶆槑(閬楀け銉荤洏浜忥級鎯呭喌鐨勯檲杩� 鍜� 纭杩囩▼ 鎵嶅彲浠ユ彁浜ゅ鎵�</errorMessage>
diff --git a/force-app/main/default/objects/Lost_Report__c/Lost_Report__c.object-meta.xml b/force-app/main/default/objects/Lost_Report__c/Lost_Report__c.object-meta.xml
index a82dd87..550160e 100644
--- a/force-app/main/default/objects/Lost_Report__c/Lost_Report__c.object-meta.xml
+++ b/force-app/main/default/objects/Lost_Report__c/Lost_Report__c.object-meta.xml
@@ -160,13 +160,13 @@
<type>AutoNumber</type>
</nameField>
<searchLayouts>
+ <excludedStandardButtons>Import</excludedStandardButtons>
<excludedStandardButtons>OpenListInQuip</excludedStandardButtons>
<excludedStandardButtons>NewFromDocument</excludedStandardButtons>
- <excludedStandardButtons>Accept</excludedStandardButtons>
<excludedStandardButtons>PrintableListView</excludedStandardButtons>
- <excludedStandardButtons>Import</excludedStandardButtons>
- <excludedStandardButtons>MassChangeOwner</excludedStandardButtons>
<excludedStandardButtons>ChangeOwner</excludedStandardButtons>
+ <excludedStandardButtons>MassChangeOwner</excludedStandardButtons>
+ <excludedStandardButtons>Accept</excludedStandardButtons>
</searchLayouts>
<sharingModel>ControlledByParent</sharingModel>
<visibility>Public</visibility>
diff --git a/force-app/main/default/objects/Lost_Report__c/validationRules/Other_Reasons_Is.validationRule-meta.xml b/force-app/main/default/objects/Lost_Report__c/validationRules/Other_Reasons_Is.validationRule-meta.xml
index 626305e..9669595 100644
--- a/force-app/main/default/objects/Lost_Report__c/validationRules/Other_Reasons_Is.validationRule-meta.xml
+++ b/force-app/main/default/objects/Lost_Report__c/validationRules/Other_Reasons_Is.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Other_Reasons_Is</fullName>
- <active>false</active>
+ <active>true</active>
<description>"鍏蜂綋鍘熷洜"涓衡�樺叾浠栤�欐椂锛屽簲璇︾粏璇存槑</description>
<errorConditionFormula>TEXT(Specific_Reasons__c)=='鍏朵粬锛堟墜鍐欙級'&&Other_Reasons__c==''</errorConditionFormula>
<errorDisplayField>Other_Reasons__c</errorDisplayField>
diff --git a/force-app/main/default/objects/Lost_Report__c/validationRules/Third_Party_Company_Is.validationRule-meta.xml b/force-app/main/default/objects/Lost_Report__c/validationRules/Third_Party_Company_Is.validationRule-meta.xml
index a279995..7cebddb 100644
--- a/force-app/main/default/objects/Lost_Report__c/validationRules/Third_Party_Company_Is.validationRule-meta.xml
+++ b/force-app/main/default/objects/Lost_Report__c/validationRules/Third_Party_Company_Is.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Third_Party_Company_Is</fullName>
- <active>false</active>
+ <active>true</active>
<description>"鍘诲悜"涓衡�樼涓夋柟鍏徃鈥欙紝搴旇缁嗚鏄庡悕绉板拰鎴愮害浠�</description>
<errorConditionFormula>TEXT(To_Where__c)=='鍖婚櫌閫夋嫨绗笁鏂�'&& ( Third_Party_Company__c=='' || ISNULL(Third_Party_Contract_Price__c) )</errorConditionFormula>
<errorDisplayField>Third_Party_Company__c</errorDisplayField>
diff --git a/force-app/main/default/objects/Lost_Report__c/validationRules/To_Where_Other.validationRule-meta.xml b/force-app/main/default/objects/Lost_Report__c/validationRules/To_Where_Other.validationRule-meta.xml
index ff02012..4f17190 100644
--- a/force-app/main/default/objects/Lost_Report__c/validationRules/To_Where_Other.validationRule-meta.xml
+++ b/force-app/main/default/objects/Lost_Report__c/validationRules/To_Where_Other.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>To_Where_Other</fullName>
- <active>false</active>
+ <active>true</active>
<description>鍘诲悜涓衡�樺叾浠栤�欐椂锛屽簲鍏蜂綋璇存槑</description>
<errorConditionFormula>TEXT(To_Where__c)=='鍏朵粬'&&Other__c==''</errorConditionFormula>
<errorDisplayField>Other__c</errorDisplayField>
diff --git a/force-app/main/default/objects/MaintanceContractPackEstimate__c/webLinks/DBPast2YearsRepairPriceReport.webLink-meta.xml b/force-app/main/default/objects/MaintanceContractPackEstimate__c/webLinks/DBPast2YearsRepairPriceReport.webLink-meta.xml
index e7fcdf2..8b87662 100644
--- a/force-app/main/default/objects/MaintanceContractPackEstimate__c/webLinks/DBPast2YearsRepairPriceReport.webLink-meta.xml
+++ b/force-app/main/default/objects/MaintanceContractPackEstimate__c/webLinks/DBPast2YearsRepairPriceReport.webLink-meta.xml
@@ -16,5 +16,5 @@
<protected>false</protected>
<showsLocation>false</showsLocation>
<showsStatus>false</showsStatus>
- <url>/00OC60000000VRw?pv0={!MaintanceContractPackEstimate__c.Maintenance_Contract_Estimate__c}</url>
+ <url>/00O100000058Bzh?pv0={!MaintanceContractPackEstimate__c.Maintenance_Contract_Estimate__c}</url>
</WebLink>
diff --git a/force-app/main/default/objects/MaintanceContractPack__c/MaintanceContractPack__c.object-meta.xml b/force-app/main/default/objects/MaintanceContractPack__c/MaintanceContractPack__c.object-meta.xml
index 22ee30e..5a19ce0 100644
--- a/force-app/main/default/objects/MaintanceContractPack__c/MaintanceContractPack__c.object-meta.xml
+++ b/force-app/main/default/objects/MaintanceContractPack__c/MaintanceContractPack__c.object-meta.xml
@@ -128,16 +128,22 @@
</actionOverrides>
<actionOverrides>
<actionName>View</actionName>
- <type>Default</type>
- </actionOverrides>
- <actionOverrides>
- <actionName>View</actionName>
+ <comment>Action override created by Lightning App Builder during activation.</comment>
+ <content>FlexiPage914006</content>
<formFactor>Large</formFactor>
- <type>Default</type>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>Flexipage</type>
</actionOverrides>
<actionOverrides>
<actionName>View</actionName>
+ <comment>Action override created by Lightning App Builder during activation.</comment>
+ <content>FlexiPage914006</content>
<formFactor>Small</formFactor>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>Flexipage</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>View</actionName>
<type>Default</type>
</actionOverrides>
<allowInChatterGroups>false</allowInChatterGroups>
@@ -161,13 +167,13 @@
</nameField>
<recordTypeTrackHistory>false</recordTypeTrackHistory>
<searchLayouts>
+ <excludedStandardButtons>ChangeOwner</excludedStandardButtons>
<excludedStandardButtons>OpenListInQuip</excludedStandardButtons>
<excludedStandardButtons>NewFromDocument</excludedStandardButtons>
- <excludedStandardButtons>Accept</excludedStandardButtons>
<excludedStandardButtons>PrintableListView</excludedStandardButtons>
<excludedStandardButtons>Import</excludedStandardButtons>
<excludedStandardButtons>MassChangeOwner</excludedStandardButtons>
- <excludedStandardButtons>ChangeOwner</excludedStandardButtons>
+ <excludedStandardButtons>Accept</excludedStandardButtons>
</searchLayouts>
<sharingModel>Read</sharingModel>
<visibility>Public</visibility>
diff --git a/force-app/main/default/objects/MaintanceContractPack__c/fields/Limit_Price_Amount__c.field-meta.xml b/force-app/main/default/objects/MaintanceContractPack__c/fields/Limit_Price_Amount__c.field-meta.xml
index f73e784..cfda392 100644
--- a/force-app/main/default/objects/MaintanceContractPack__c/fields/Limit_Price_Amount__c.field-meta.xml
+++ b/force-app/main/default/objects/MaintanceContractPack__c/fields/Limit_Price_Amount__c.field-meta.xml
@@ -3,7 +3,7 @@
<fullName>Limit_Price_Amount__c</fullName>
<externalId>false</externalId>
<label>涓婇檺閲戦锛堝ぇ锛�</label>
- <precision>18</precision>
+ <precision>16</precision>
<required>false</required>
<scale>2</scale>
<trackHistory>false</trackHistory>
diff --git a/force-app/main/default/objects/MaintanceContractPack__c/listViews/All.listView-meta.xml b/force-app/main/default/objects/MaintanceContractPack__c/listViews/All.listView-meta.xml
index 08befc9..c3661c1 100644
--- a/force-app/main/default/objects/MaintanceContractPack__c/listViews/All.listView-meta.xml
+++ b/force-app/main/default/objects/MaintanceContractPack__c/listViews/All.listView-meta.xml
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<ListView xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>All</fullName>
+ <columns>NAME</columns>
+ <columns>Management_Code__c</columns>
<filterScope>Everything</filterScope>
<label>鍏ㄩ儴</label>
</ListView>
diff --git a/force-app/main/default/objects/Maintenance_Contract_Asset_Estimate__c/Maintenance_Contract_Asset_Estimate__c.object-meta.xml b/force-app/main/default/objects/Maintenance_Contract_Asset_Estimate__c/Maintenance_Contract_Asset_Estimate__c.object-meta.xml
index 0fc7a2d..763ddc1 100644
--- a/force-app/main/default/objects/Maintenance_Contract_Asset_Estimate__c/Maintenance_Contract_Asset_Estimate__c.object-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract_Asset_Estimate__c/Maintenance_Contract_Asset_Estimate__c.object-meta.xml
@@ -165,10 +165,10 @@
<searchLayouts>
<excludedStandardButtons>OpenListInQuip</excludedStandardButtons>
<excludedStandardButtons>NewFromDocument</excludedStandardButtons>
- <excludedStandardButtons>MassChangeOwner</excludedStandardButtons>
- <excludedStandardButtons>ChangeOwner</excludedStandardButtons>
<excludedStandardButtons>Import</excludedStandardButtons>
<excludedStandardButtons>Accept</excludedStandardButtons>
+ <excludedStandardButtons>ChangeOwner</excludedStandardButtons>
+ <excludedStandardButtons>MassChangeOwner</excludedStandardButtons>
</searchLayouts>
<sharingModel>ControlledByParent</sharingModel>
<visibility>Public</visibility>
diff --git a/force-app/main/default/objects/Maintenance_Contract_Asset_Estimate__c/validationRules/Comment_length_limit.validationRule-meta.xml b/force-app/main/default/objects/Maintenance_Contract_Asset_Estimate__c/validationRules/Comment_length_limit.validationRule-meta.xml
index b5ec253..e71a910 100644
--- a/force-app/main/default/objects/Maintenance_Contract_Asset_Estimate__c/validationRules/Comment_length_limit.validationRule-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract_Asset_Estimate__c/validationRules/Comment_length_limit.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Comment_length_limit</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>LEN(Comment__c) > 15</errorConditionFormula>
<errorDisplayField>Comment__c</errorDisplayField>
<errorMessage>澶囨敞鏈�澶氳緭鍏�15涓瓧</errorMessage>
diff --git a/force-app/main/default/objects/Maintenance_Contract_Asset__c/webLinks/SelectAssets.webLink-meta.xml b/force-app/main/default/objects/Maintenance_Contract_Asset__c/webLinks/SelectAssets.webLink-meta.xml
index 2ea07f7..669b92b 100644
--- a/force-app/main/default/objects/Maintenance_Contract_Asset__c/webLinks/SelectAssets.webLink-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract_Asset__c/webLinks/SelectAssets.webLink-meta.xml
@@ -8,5 +8,5 @@
<openType>onClickJavaScript</openType>
<protected>false</protected>
<requireRowSelection>false</requireRowSelection>
- <url>window.open( "");</url>
+ <url>window.open( "/apex/SelectAsset?targetContractId={!URLENCODE(Maintenance_Contract__c.Id)}", "_top");</url>
</WebLink>
diff --git a/force-app/main/default/objects/Maintenance_Contract_Estimate__c/Maintenance_Contract_Estimate__c.object-meta.xml b/force-app/main/default/objects/Maintenance_Contract_Estimate__c/Maintenance_Contract_Estimate__c.object-meta.xml
index 4ccf904..a6f0bba 100644
--- a/force-app/main/default/objects/Maintenance_Contract_Estimate__c/Maintenance_Contract_Estimate__c.object-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract_Estimate__c/Maintenance_Contract_Estimate__c.object-meta.xml
@@ -65,13 +65,11 @@
</actionOverrides>
<actionOverrides>
<actionName>Edit</actionName>
- <content>lexSelectAssetEstimateJumpAura</content>
- <formFactor>Small</formFactor>
- <skipRecordTypeSelect>false</skipRecordTypeSelect>
- <type>LightningComponent</type>
+ <type>Default</type>
</actionOverrides>
<actionOverrides>
<actionName>Edit</actionName>
+ <formFactor>Small</formFactor>
<type>Default</type>
</actionOverrides>
<actionOverrides>
diff --git a/force-app/main/default/objects/Maintenance_Contract_Estimate__c/fields/DealerType__c.field-meta.xml b/force-app/main/default/objects/Maintenance_Contract_Estimate__c/fields/DealerType__c.field-meta.xml
index 471c7e5..75aa89c 100644
--- a/force-app/main/default/objects/Maintenance_Contract_Estimate__c/fields/DealerType__c.field-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract_Estimate__c/fields/DealerType__c.field-meta.xml
@@ -2,7 +2,7 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>DealerType__c</fullName>
<externalId>false</externalId>
- <formula>if(isBlank(Dealer__c) || Dealer__r.RecordTypeId != '012C600000003HF',
+ <formula>if(isBlank(Dealer__c) || Dealer__r.RecordTypeId != '01210000000Qem1',
'',
Dealer__r.DealerTypeSum__c
)</formula>
diff --git a/force-app/main/default/objects/Maintenance_Contract_Estimate__c/fields/Estimate_Price_range__c.field-meta.xml b/force-app/main/default/objects/Maintenance_Contract_Estimate__c/fields/Estimate_Price_range__c.field-meta.xml
index 169d9e8..4b01097 100644
--- a/force-app/main/default/objects/Maintenance_Contract_Estimate__c/fields/Estimate_Price_range__c.field-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract_Estimate__c/fields/Estimate_Price_range__c.field-meta.xml
@@ -1,15 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Estimate_Price_range__c</fullName>
- <description>if( ISPICKVAL( New_Contract_Type_TxT__c , '鏂板搧鍚堝悓'),'浣庝簬鏍囧噯浠风殑鏈�浣庝环鏍�' ,)</description>
- <externalId>false</externalId>
- <formula>if(Submit_quotation_day__c <= DATE(2020,03,31),'',
+ <description>if(Submit_quotation_day__c <= DATE(2020,03,31),'',
if(Request_quotation_Amount__c < GuidePrice_Down__c,
if( ISPICKVAL( New_Contract_Type_TxT__c , '鏂板搧鍚堝悓'),'浣庝簬鏈�浣庝环鏍�' ,
if( ISPICKVAL( New_Contract_Type_TxT__c , '棣栫鍚堝悓'),if( Consumption_rate_Forecast__c > 1,'浣庝簬鏈�浣庝环鏍�,棰勬祴娑堣垂鐜囧湪100%浠ヤ笂' ,'浣庝簬鏈�浣庝环鏍�,棰勬祴娑堣垂鐜囧湪100%浠ュ唴'),if(Cost_rate_Forecast__c > 1,'浣庝簬鏈�浣庝环鏍�,棰勬祴鎴愭湰鐜囧湪100%浠ヤ笂' ,'浣庝簬鏈�浣庝环鏍�,棰勬祴鎴愭湰鐜囧湪100%浠ュ唴')
)) ,
if(and( Request_quotation_Amount__c >= GuidePrice_Down__c,Request_quotation_Amount__c <= GuidePrice_Up__c) ,'鏍囧噯浠锋牸鐨勮寖鍥村唴',
-if(Request_quotation_Amount__c <= GuidePrice_Up__c * 2 ,'鏈�楂樹环鏍肩殑200%浠ュ唴' ,'鏈�楂樹环鏍肩殑200%浠ヤ笂'))))</formula>
+if(Request_quotation_Amount__c <= GuidePrice_Up__c * 2 ,'鏈�楂樹环鏍肩殑200%浠ュ唴' ,'鏈�楂樹环鏍肩殑200%浠ヤ笂'))))</description>
+ <externalId>false</externalId>
+ <formula>if(Submit_quotation_day__c <= DATE(2020,03,31),'',
+if(Request_quotation_Amount__c < if(renewTen_OFF__c,GuidePrice_Down__c * 0.9,GuidePrice_Down__c),
+if( ISPICKVAL( New_Contract_Type_TxT__c , '鏂板搧鍚堝悓'),'浣庝簬鏈�浣庝环鏍�' ,
+if( ISPICKVAL( New_Contract_Type_TxT__c , '棣栫鍚堝悓'),if( Consumption_rate_Forecast__c > 1,'浣庝簬鏈�浣庝环鏍�,棰勬祴娑堣垂鐜囧湪100%浠ヤ笂' ,'浣庝簬鏈�浣庝环鏍�,棰勬祴娑堣垂鐜囧湪100%浠ュ唴'),if(Cost_rate_Forecast__c > 1,'浣庝簬鏈�浣庝环鏍�,棰勬祴鎴愭湰鐜囧湪100%浠ヤ笂' ,'浣庝簬鏈�浣庝环鏍�,棰勬祴鎴愭湰鐜囧湪100%浠ュ唴')
+)) ,
+if(and( Request_quotation_Amount__c >= if(renewTen_OFF__c,GuidePrice_Down__c * 0.9,GuidePrice_Down__c),Request_quotation_Amount__c <= if(renewTen_OFF__c,GuidePrice_Up__c * 0.9,GuidePrice_Up__c)) ,'鏍囧噯浠锋牸鐨勮寖鍥村唴',
+if(Request_quotation_Amount__c <= if(renewTen_OFF__c,GuidePrice_Up__c * 0.9,GuidePrice_Up__c) * 2 ,'鏈�楂樹环鏍肩殑200%浠ュ唴' ,'鏈�楂樹环鏍肩殑200%浠ヤ笂'))))</formula>
<label>浠锋牸鑼冨洿</label>
<required>false</required>
<trackHistory>false</trackHistory>
diff --git a/force-app/main/default/objects/Maintenance_Contract_Estimate__c/fields/renewTen_OFF__c.field-meta.xml b/force-app/main/default/objects/Maintenance_Contract_Estimate__c/fields/renewTen_OFF__c.field-meta.xml
index 25b70db..5fcb347 100644
--- a/force-app/main/default/objects/Maintenance_Contract_Estimate__c/fields/renewTen_OFF__c.field-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract_Estimate__c/fields/renewTen_OFF__c.field-meta.xml
@@ -3,7 +3,7 @@
<fullName>renewTen_OFF__c</fullName>
<defaultValue>false</defaultValue>
<externalId>false</externalId>
- <label>鏃犵紳缁10%OFF</label>
+ <label>鏃犵紳缁鎶樻墸</label>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Checkbox</type>
diff --git a/force-app/main/default/objects/Maintenance_Contract_Estimate__c/validationRules/ContractAmountDecimalCheck.validationRule-meta.xml b/force-app/main/default/objects/Maintenance_Contract_Estimate__c/validationRules/ContractAmountDecimalCheck.validationRule-meta.xml
index 861c0bd..19c2199 100644
--- a/force-app/main/default/objects/Maintenance_Contract_Estimate__c/validationRules/ContractAmountDecimalCheck.validationRule-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract_Estimate__c/validationRules/ContractAmountDecimalCheck.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>ContractAmountDecimalCheck</fullName>
- <active>false</active>
+ <active>true</active>
<description>濡傛灉淇悊鍚堝悓浠锋牸灏忔暟鐐瑰悗鏈夊�硷紝涓嶅彲浠ヤ繚瀛樻姤浠�</description>
<errorConditionFormula>Maintenance_Price__c <> Maintenance_Price_4s5r__c && !hasCommaContract__c</errorConditionFormula>
<errorMessage>缁翠慨鍚堝悓鏈�缁堝悎鍚屼环鏍煎皬鏁扮偣鍚庢湁鍊硷紝璇蜂慨鏀瑰悗淇濆瓨鎶ヤ环锛�</errorMessage>
diff --git a/force-app/main/default/objects/Maintenance_Contract_Estimate__c/validationRules/Contract_Esti_Start_Date_GT_CreateDate.validationRule-meta.xml b/force-app/main/default/objects/Maintenance_Contract_Estimate__c/validationRules/Contract_Esti_Start_Date_GT_CreateDate.validationRule-meta.xml
index e7b9d4b..e3c637b 100644
--- a/force-app/main/default/objects/Maintenance_Contract_Estimate__c/validationRules/Contract_Esti_Start_Date_GT_CreateDate.validationRule-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract_Estimate__c/validationRules/Contract_Esti_Start_Date_GT_CreateDate.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Contract_Esti_Start_Date_GT_CreateDate</fullName>
- <active>false</active>
+ <active>true</active>
<description>鍚堝悓寮�濮嬮瀹氭棩瑕佸湪CreateDate鍚�
(Not(IsChanged(IsSyncing__c)) && IsChanged(Estimation_Decision__c)
diff --git a/force-app/main/default/objects/Maintenance_Contract_Estimate__c/validationRules/Contract_Start_Date_GT_CreateDate.validationRule-meta.xml b/force-app/main/default/objects/Maintenance_Contract_Estimate__c/validationRules/Contract_Start_Date_GT_CreateDate.validationRule-meta.xml
index d184064..a24fb3e 100644
--- a/force-app/main/default/objects/Maintenance_Contract_Estimate__c/validationRules/Contract_Start_Date_GT_CreateDate.validationRule-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract_Estimate__c/validationRules/Contract_Start_Date_GT_CreateDate.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Contract_Start_Date_GT_CreateDate</fullName>
- <active>false</active>
+ <active>true</active>
<description>鍚堝悓寮�濮嬫棩瑕佸湪CreateDate鍚�</description>
<errorConditionFormula>((IsNew()
&& Contract_Start_Date__c < Today()
diff --git a/force-app/main/default/objects/Maintenance_Contract_Estimate__c/validationRules/Discount_Changed_Check.validationRule-meta.xml b/force-app/main/default/objects/Maintenance_Contract_Estimate__c/validationRules/Discount_Changed_Check.validationRule-meta.xml
index 0a89cb2..bb89f03 100644
--- a/force-app/main/default/objects/Maintenance_Contract_Estimate__c/validationRules/Discount_Changed_Check.validationRule-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract_Estimate__c/validationRules/Discount_Changed_Check.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Discount_Changed_Check</fullName>
- <active>false</active>
+ <active>true</active>
<description>鎶ヤ环鐘舵�佷负鐢宠涓垨鎵瑰噯鏃讹紝涓嶈兘鏇存柊浼樻儬鐜囷紙浠锋牸锛�</description>
<errorConditionFormula>AND(OR(ISPICKVAL(Process_Status__c, '鐢宠涓�'), ISPICKVAL(Process_Status__c, '鎵瑰噯')), OR(ISCHANGED(Discount_Percentage__c), ISCHANGED(Discount_Price__c)))</errorConditionFormula>
<errorMessage>鎶ヤ环鐘舵�佷负鐢宠涓垨鎵瑰噯鏃讹紝涓嶈兘鏇存柊浼樻儬鐜囷紙浠锋牸锛�</errorMessage>
diff --git a/force-app/main/default/objects/Maintenance_Contract_Estimate__c/validationRules/When_Apply_Required.validationRule-meta.xml b/force-app/main/default/objects/Maintenance_Contract_Estimate__c/validationRules/When_Apply_Required.validationRule-meta.xml
index 7798ca7..2579a20 100644
--- a/force-app/main/default/objects/Maintenance_Contract_Estimate__c/validationRules/When_Apply_Required.validationRule-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract_Estimate__c/validationRules/When_Apply_Required.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>When_Apply_Required</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>Ischanged(ApprovalProcess_Status__c) && Text(ApprovalProcess_Status__c) = '宸插～鍐欏畬骞剁敵璇�'
&& OR(
Isnull(Maintenance_Contract__r.Service_Contract_Staff__c)
diff --git a/force-app/main/default/objects/Maintenance_Contract_Estimate__c/validationRules/contactRecord_check.validationRule-meta.xml b/force-app/main/default/objects/Maintenance_Contract_Estimate__c/validationRules/contactRecord_check.validationRule-meta.xml
index 684bcb1..a2ce87b 100644
--- a/force-app/main/default/objects/Maintenance_Contract_Estimate__c/validationRules/contactRecord_check.validationRule-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract_Estimate__c/validationRules/contactRecord_check.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>contactRecord_check</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>AND( ISNEW() ,RecordType_DeveloperName__c = 'Maintenance_Quote', Maintenance_Contract__r.RecordType_DeveloperName__c = 'NewMaintenance_Contract')</errorConditionFormula>
<errorMessage>鏈嶅姟鍚堝悓涓嶈兘鏂板缓缁翠慨鍚堝悓鎶ヤ环</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Maintenance_Contract_Estimate__c/webLinks/CustomNew.webLink-meta.xml b/force-app/main/default/objects/Maintenance_Contract_Estimate__c/webLinks/CustomNew.webLink-meta.xml
index 4e1b8fc..9f55f0d 100644
--- a/force-app/main/default/objects/Maintenance_Contract_Estimate__c/webLinks/CustomNew.webLink-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract_Estimate__c/webLinks/CustomNew.webLink-meta.xml
@@ -11,7 +11,7 @@
<url>if ("{!Maintenance_Contract__c.Status__c}" != "寮曞悎涓�") {
alert("缁翠慨鍚堝悓涓嶆槸璇环涓殑鐘舵�侊紝涓嶈兘鏂板缓鎶ヤ环");
} else {
- if("{!Maintenance_Contract__c.RecordTypeId}" == "012C600000003Iv"){
+ if("{!Maintenance_Contract__c.RecordTypeId}" == "01210000000gTYq"){
window.open( "/apex/SelectAssetEstimateVM?mcid={!URLENCODE(Maintenance_Contract__c.Id)}", "_top");
}else{
window.open( "/apex/SelectAssetEstimate?mcid={!URLENCODE(Maintenance_Contract__c.Id)}", "_top");
diff --git a/force-app/main/default/objects/Maintenance_Contract__c/Maintenance_Contract__c.object-meta.xml b/force-app/main/default/objects/Maintenance_Contract__c/Maintenance_Contract__c.object-meta.xml
index 5c6fc2f..70618ab 100644
--- a/force-app/main/default/objects/Maintenance_Contract__c/Maintenance_Contract__c.object-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract__c/Maintenance_Contract__c.object-meta.xml
@@ -129,16 +129,16 @@
<actionOverrides>
<actionName>View</actionName>
<comment>Action override created by Lightning App Builder during activation.</comment>
- <content>FlexiPage11213344</content>
- <formFactor>Small</formFactor>
+ <content>FlexiPage2</content>
+ <formFactor>Large</formFactor>
<skipRecordTypeSelect>false</skipRecordTypeSelect>
<type>Flexipage</type>
</actionOverrides>
<actionOverrides>
<actionName>View</actionName>
<comment>Action override created by Lightning App Builder during activation.</comment>
- <content>FlexiPage11213344</content>
- <formFactor>Large</formFactor>
+ <content>FlexiPage2</content>
+ <formFactor>Small</formFactor>
<skipRecordTypeSelect>false</skipRecordTypeSelect>
<type>Flexipage</type>
</actionOverrides>
diff --git a/force-app/main/default/objects/Maintenance_Contract__c/fields/Abandonment_Number_Summary__c.field-meta.xml b/force-app/main/default/objects/Maintenance_Contract__c/fields/Abandonment_Number_Summary__c.field-meta.xml
index 57d4635..373ad00 100644
--- a/force-app/main/default/objects/Maintenance_Contract__c/fields/Abandonment_Number_Summary__c.field-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract__c/fields/Abandonment_Number_Summary__c.field-meta.xml
@@ -3,7 +3,7 @@
<fullName>Abandonment_Number_Summary__c</fullName>
<description>P</description>
<externalId>false</externalId>
- <label>鍖婚櫌鏀惧純鏁帮紙绱锛�</label>
+ <label>鍖婚櫌鏀惧純鏁帮紙鍚堝悓锛�</label>
<summarizedField>Inspectup_Plan__c.Abandonment_Number__c</summarizedField>
<summaryFilterItems>
<field>Inspectup_Plan__c.Abandonment_Number__c</field>
diff --git a/force-app/main/default/objects/Maintenance_Contract__c/fields/Actual_Execute_Num_Summary__c.field-meta.xml b/force-app/main/default/objects/Maintenance_Contract__c/fields/Actual_Execute_Num_Summary__c.field-meta.xml
index 6558d70..d27280c 100644
--- a/force-app/main/default/objects/Maintenance_Contract__c/fields/Actual_Execute_Num_Summary__c.field-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract__c/fields/Actual_Execute_Num_Summary__c.field-meta.xml
@@ -3,7 +3,7 @@
<fullName>Actual_Execute_Num_Summary__c</fullName>
<description>fxk</description>
<externalId>false</externalId>
- <label>瀹為檯鎵ц鏁帮紙绱锛�</label>
+ <label>瀹為檯鎵ц鏁帮紙鍚堝悓锛�</label>
<summarizedField>Inspectup_Plan__c.Actual_Execute_Num__c</summarizedField>
<summaryForeignKey>Inspectup_Plan__c.Maintenance_Contract__c</summaryForeignKey>
<summaryOperation>sum</summaryOperation>
diff --git a/force-app/main/default/objects/Maintenance_Contract__c/fields/Actual_Execution_Quantity_Inplan_Sum__c.field-meta.xml b/force-app/main/default/objects/Maintenance_Contract__c/fields/Actual_Execution_Quantity_Inplan_Sum__c.field-meta.xml
index e5c77c6..95ebc53 100644
--- a/force-app/main/default/objects/Maintenance_Contract__c/fields/Actual_Execution_Quantity_Inplan_Sum__c.field-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract__c/fields/Actual_Execution_Quantity_Inplan_Sum__c.field-meta.xml
@@ -4,7 +4,7 @@
<externalId>false</externalId>
<inlineHelpText>O
姣忔鐐规涓紝鍦ㄨ鍒掓湡闄愬唴瀹為檯鎵ц鏁扮殑绱鍊�</inlineHelpText>
- <label>鎸夎鍒掑畬鎴愯澶囨暟锛堢疮璁★級</label>
+ <label>鎸夎鍒掑畬鎴愯澶囨暟锛堝悎鍚岋級</label>
<summarizedField>Inspectup_Plan__c.Planned_check_equipment_Num__c</summarizedField>
<summaryFilterItems>
<field>Inspectup_Plan__c.Planned_check_equipment_Num__c</field>
diff --git a/force-app/main/default/objects/Maintenance_Contract__c/fields/Contract_Type__c.field-meta.xml b/force-app/main/default/objects/Maintenance_Contract__c/fields/Contract_Type__c.field-meta.xml
index 2f78d58..940f588 100644
--- a/force-app/main/default/objects/Maintenance_Contract__c/fields/Contract_Type__c.field-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract__c/fields/Contract_Type__c.field-meta.xml
@@ -2,7 +2,7 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Contract_Type__c</fullName>
<externalId>false</externalId>
- <formula>IF( agree_Upper_limit__c ==true && Limit_Price__c ==true, '涓婇檺鍚堝悓', IF(agree_Upper_limit__c ==true && URF_Contract__c ==true, '闄愭鍚堝悓', '鏈嶅姟鍚堝悓') )</formula>
+ <formula>IF(RecordType.DeveloperName=='VM_Contract', '澶氬勾淇濅慨鍚堝悓', IF(RecordType.DeveloperName=='Maintenance_Contract', '缁翠慨鍚堝悓', IF( agree_Upper_limit__c ==true && Limit_Price__c ==true, '涓婇檺鍚堝悓', IF(agree_Upper_limit__c ==true && URF_Contract__c ==true, '闄愭鍚堝悓', '鏈嶅姟鍚堝悓') )))</formula>
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
<label>鍚堝悓鍒嗙被</label>
<required>false</required>
diff --git a/force-app/main/default/objects/Maintenance_Contract__c/fields/DealerType__c.field-meta.xml b/force-app/main/default/objects/Maintenance_Contract__c/fields/DealerType__c.field-meta.xml
index 65b7024..6976638 100644
--- a/force-app/main/default/objects/Maintenance_Contract__c/fields/DealerType__c.field-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract__c/fields/DealerType__c.field-meta.xml
@@ -2,7 +2,7 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>DealerType__c</fullName>
<externalId>false</externalId>
- <formula>if(isBlank(Dealer__c) || Dealer__r.RecordTypeId != '012C600000003HF',
+ <formula>if(isBlank(Dealer__c) || Dealer__r.RecordTypeId != '01210000000Qem1',
'',
Dealer__r.DealerTypeSum__c
)</formula>
diff --git a/force-app/main/default/objects/Maintenance_Contract__c/fields/Forecast_Selling_Price__c.field-meta.xml b/force-app/main/default/objects/Maintenance_Contract__c/fields/Forecast_Selling_Price__c.field-meta.xml
index c17b3da..13621d3 100644
--- a/force-app/main/default/objects/Maintenance_Contract__c/fields/Forecast_Selling_Price__c.field-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract__c/fields/Forecast_Selling_Price__c.field-meta.xml
@@ -2,7 +2,7 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Forecast_Selling_Price__c</fullName>
<externalId>false</externalId>
- <label>棰勬祴鎴愪氦浠锋牸</label>
+ <label>棰勬祴鎴愪氦浠锋牸锛堝繀濉級</label>
<precision>18</precision>
<required>false</required>
<scale>2</scale>
diff --git a/force-app/main/default/objects/Maintenance_Contract__c/fields/Implementation_Rate_Summary__c.field-meta.xml b/force-app/main/default/objects/Maintenance_Contract__c/fields/Implementation_Rate_Summary__c.field-meta.xml
index 4fb3a99..0fcb9aa 100644
--- a/force-app/main/default/objects/Maintenance_Contract__c/fields/Implementation_Rate_Summary__c.field-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract__c/fields/Implementation_Rate_Summary__c.field-meta.xml
@@ -5,7 +5,7 @@
<externalId>false</externalId>
<formula>IF(Check_Object_Quantity1__c*Due_Inspection_sum__c==0, 0, Actual_Execution_Quantity_Summary__c/(Check_Object_Quantity1__c*Due_Inspection_sum__c))</formula>
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
- <label>鐐规瀹炴柦鐜囷紙绱锛�</label>
+ <label>鐐规瀹炴柦鐜囷紙鍚堝悓锛�</label>
<precision>18</precision>
<required>false</required>
<scale>2</scale>
diff --git a/force-app/main/default/objects/Maintenance_Contract__c/fields/MaintanceContractPack__c.field-meta.xml b/force-app/main/default/objects/Maintenance_Contract__c/fields/MaintanceContractPack__c.field-meta.xml
index 6cef34e..bc340fb 100644
--- a/force-app/main/default/objects/Maintenance_Contract__c/fields/MaintanceContractPack__c.field-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract__c/fields/MaintanceContractPack__c.field-meta.xml
@@ -5,7 +5,7 @@
<externalId>false</externalId>
<label>鏈嶅姟鍚堝悓鎵撳寘</label>
<referenceTo>MaintanceContractPack__c</referenceTo>
- <relationshipLabel>缁翠慨鍚堝悓</relationshipLabel>
+ <relationshipLabel>鏈嶅姟鍚堝悓</relationshipLabel>
<relationshipName>MaintanceContractPackGuBX</relationshipName>
<required>false</required>
<trackHistory>false</trackHistory>
diff --git a/force-app/main/default/objects/Maintenance_Contract__c/fields/Negotiation_Start_Date__c.field-meta.xml b/force-app/main/default/objects/Maintenance_Contract__c/fields/Negotiation_Start_Date__c.field-meta.xml
index 1fb9b38..bc2cbdb 100644
--- a/force-app/main/default/objects/Maintenance_Contract__c/fields/Negotiation_Start_Date__c.field-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract__c/fields/Negotiation_Start_Date__c.field-meta.xml
@@ -2,7 +2,7 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Negotiation_Start_Date__c</fullName>
<externalId>false</externalId>
- <label>璋堝垽寮�濮嬫棩</label>
+ <label>璋堝垽寮�濮嬫棩锛堝繀濉級</label>
<required>false</required>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
diff --git a/force-app/main/default/objects/Maintenance_Contract__c/fields/Opportunity_Stage__c.field-meta.xml b/force-app/main/default/objects/Maintenance_Contract__c/fields/Opportunity_Stage__c.field-meta.xml
index d5c0bad..1ecd3f4 100644
--- a/force-app/main/default/objects/Maintenance_Contract__c/fields/Opportunity_Stage__c.field-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract__c/fields/Opportunity_Stage__c.field-meta.xml
@@ -2,7 +2,7 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Opportunity_Stage__c</fullName>
<externalId>false</externalId>
- <label>璇环杩涘睍鐘舵��</label>
+ <label>璇环杩涘睍鐘舵�侊紙蹇呭～锛�</label>
<required>false</required>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
diff --git a/force-app/main/default/objects/Maintenance_Contract__c/fields/Recycling_Predetermined_Day__c.field-meta.xml b/force-app/main/default/objects/Maintenance_Contract__c/fields/Recycling_Predetermined_Day__c.field-meta.xml
index 4e65375..be0cd0e 100644
--- a/force-app/main/default/objects/Maintenance_Contract__c/fields/Recycling_Predetermined_Day__c.field-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract__c/fields/Recycling_Predetermined_Day__c.field-meta.xml
@@ -4,7 +4,7 @@
<externalId>false</externalId>
<label>棰勮鏈�鍚庡洖娆炬棩</label>
<required>false</required>
- <trackHistory>true</trackHistory>
+ <trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Date</type>
</CustomField>
diff --git a/force-app/main/default/objects/Maintenance_Contract__c/fields/Sales_Method__c.field-meta.xml b/force-app/main/default/objects/Maintenance_Contract__c/fields/Sales_Method__c.field-meta.xml
index 78f0a68..ce5dc21 100644
--- a/force-app/main/default/objects/Maintenance_Contract__c/fields/Sales_Method__c.field-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract__c/fields/Sales_Method__c.field-meta.xml
@@ -2,12 +2,13 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Sales_Method__c</fullName>
<externalId>false</externalId>
- <label>鎷涙爣鏂瑰紡</label>
+ <label>鎷涙爣鏂瑰紡锛堝繀濉級</label>
<required>false</required>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Picklist</type>
<valueSet>
+ <restricted>true</restricted>
<valueSetDefinition>
<sorted>false</sorted>
<value>
diff --git a/force-app/main/default/objects/Maintenance_Contract__c/fields/Service_Contract_Staff__c.field-meta.xml b/force-app/main/default/objects/Maintenance_Contract__c/fields/Service_Contract_Staff__c.field-meta.xml
index 629aab8..f2624aa 100644
--- a/force-app/main/default/objects/Maintenance_Contract__c/fields/Service_Contract_Staff__c.field-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract__c/fields/Service_Contract_Staff__c.field-meta.xml
@@ -13,14 +13,14 @@
<value>閿�鍞湇鍔�</value>
</filterItems>
<filterItems>
+ <field>$Source.CreatedDate</field>
+ <operation>lessThan</operation>
+ <value>7/13/2019 12:00 涓婂崍</value>
+ </filterItems>
+ <filterItems>
<field>$Profile.Id</field>
<operation>startsWith</operation>
<value>00E10000001R1E4</value>
- </filterItems>
- <filterItems>
- <field>$Source.CreatedDate</field>
- <operation>greaterThan</operation>
- <value>7/13/2019 12:00 AM</value>
</filterItems>
<isOptional>false</isOptional>
</lookupFilter>
diff --git a/force-app/main/default/objects/Maintenance_Contract__c/fields/Sum_repair_price_new__c.field-meta.xml b/force-app/main/default/objects/Maintenance_Contract__c/fields/Sum_repair_price_new__c.field-meta.xml
index 5b123d3..fb320ea 100644
--- a/force-app/main/default/objects/Maintenance_Contract__c/fields/Sum_repair_price_new__c.field-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract__c/fields/Sum_repair_price_new__c.field-meta.xml
@@ -6,7 +6,7 @@
<precision>18</precision>
<required>false</required>
<scale>2</scale>
- <trackHistory>false</trackHistory>
+ <trackHistory>true</trackHistory>
<trackTrending>false</trackTrending>
<type>Currency</type>
</CustomField>
diff --git a/force-app/main/default/objects/Maintenance_Contract__c/fields/hospitalQuotationTextSum__c.field-meta.xml b/force-app/main/default/objects/Maintenance_Contract__c/fields/hospitalQuotationTextSum__c.field-meta.xml
index fa6bb1e..28affc0 100644
--- a/force-app/main/default/objects/Maintenance_Contract__c/fields/hospitalQuotationTextSum__c.field-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract__c/fields/hospitalQuotationTextSum__c.field-meta.xml
@@ -2,7 +2,7 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>hospitalQuotationTextSum__c</fullName>
<externalId>false</externalId>
- <label>瀵瑰尰闄㈠悎鍚屼慨鐞嗛噾棰濓紙涓婁紶-鎶ュ憡涔︼級</label>
+ <label>鍚堝悓鏈熼棿淇悊閲戦锛堜笂浼狅級</label>
<precision>18</precision>
<required>false</required>
<scale>2</scale>
diff --git a/force-app/main/default/objects/Maintenance_Contract__c/listViews/X02_Selling.listView-meta.xml b/force-app/main/default/objects/Maintenance_Contract__c/listViews/X02_Selling.listView-meta.xml
index 2e707f4..312f7e6 100644
--- a/force-app/main/default/objects/Maintenance_Contract__c/listViews/X02_Selling.listView-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract__c/listViews/X02_Selling.listView-meta.xml
@@ -12,6 +12,8 @@
<columns>Inspection_Date__c</columns>
<columns>Contract_Start_Date__c</columns>
<columns>Contract_End_Date__c</columns>
+ <columns>Contract_quotation_or_not__c</columns>
+ <columns>Status2__c</columns>
<filterScope>Everything</filterScope>
<filters>
<field>Status__c</field>
@@ -24,5 +26,4 @@
<value>宸插喅瀹�</value>
</filters>
<label>02.璇环涓殑缁翠慨鍚堝悓璇环</label>
- <language>ja</language>
</ListView>
diff --git a/force-app/main/default/objects/Maintenance_Contract__c/validationRules/Agree_Upper_Limit_Check.validationRule-meta.xml b/force-app/main/default/objects/Maintenance_Contract__c/validationRules/Agree_Upper_Limit_Check.validationRule-meta.xml
index 31813dd..9e8efba 100644
--- a/force-app/main/default/objects/Maintenance_Contract__c/validationRules/Agree_Upper_Limit_Check.validationRule-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract__c/validationRules/Agree_Upper_Limit_Check.validationRule-meta.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Agree_Upper_Limit_Check</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>AND(agree_Upper_limit__c, NOT( OR(URF_Contract__c,Limit_Price__c)))
&&
-$User.Id != '005C60000001UFN' /* Batch User 涓嶆姤閿� */</errorConditionFormula>
+$User.Id != '00510000000fSYI' /* Batch User 涓嶆姤閿� */</errorConditionFormula>
<errorDisplayField>agree_Upper_limit__c</errorDisplayField>
<errorMessage>鍚屾剰涓婇檺涓嶈兘鍗曠嫭閫夋嫨</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Maintenance_Contract__c/validationRules/Cannot_Create_Old_Contract.validationRule-meta.xml b/force-app/main/default/objects/Maintenance_Contract__c/validationRules/Cannot_Create_Old_Contract.validationRule-meta.xml
index 9f6e005..14985e8 100644
--- a/force-app/main/default/objects/Maintenance_Contract__c/validationRules/Cannot_Create_Old_Contract.validationRule-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract__c/validationRules/Cannot_Create_Old_Contract.validationRule-meta.xml
@@ -2,6 +2,6 @@
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Cannot_Create_Old_Contract</fullName>
<active>true</active>
- <errorConditionFormula>RecordTypeId == '012C600000003Iu' && (!Hospital__r.Service_customer__c) && (ISNEW()|| ISCHANGED( RecordTypeId))&& not( $User.ProfileId == '00eC800000005Cb')</errorConditionFormula>
+ <errorConditionFormula>RecordTypeId == '01210000000QjeFAAS' && (!Hospital__r.Service_customer__c) && (ISNEW()|| ISCHANGED( RecordTypeId))&& not( $User.ProfileId == '00e10000000Y3o5')</errorConditionFormula>
<errorMessage>璇ュ尰闄㈠彧鑳界璁㈡柊缁翠慨鍚堝悓銆�</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Maintenance_Contract__c/validationRules/CheckDepartRecord.validationRule-meta.xml b/force-app/main/default/objects/Maintenance_Contract__c/validationRules/CheckDepartRecord.validationRule-meta.xml
index 11bef9a..a24ecdb 100644
--- a/force-app/main/default/objects/Maintenance_Contract__c/validationRules/CheckDepartRecord.validationRule-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract__c/validationRules/CheckDepartRecord.validationRule-meta.xml
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>CheckDepartRecord</fullName>
- <active>false</active>
+ <active>true</active>
<description>闄ょ鐞嗗憳batch鐢ㄦ埛绛夛紝绉戝鍙兘濉涓夌骇銆�</description>
- <errorConditionFormula>Not(Or(Department__r.RecordTypeId ='012C600000003HJ',
-Department__r.RecordTypeId ='012C600000003HT',
-Department__r.RecordTypeId ='012C600000003HU',
-Department__r.RecordTypeId='012C600000003HV',
-Department__r.RecordTypeId='012C600000003HX',
-Department__r.RecordTypeId='012C600000003HW',
-Department__r.RecordTypeId='012C600000003HY',
+ <errorConditionFormula>Not(Or(Department__r.RecordTypeId ='01210000000QfmM',
+Department__r.RecordTypeId ='01210000000QfmH',
+Department__r.RecordTypeId ='01210000000QfmC',
+Department__r.RecordTypeId='01210000000Qfm7',
+Department__r.RecordTypeId='01210000000Qfm2',
+Department__r.RecordTypeId='01210000000Qfmb',
+Department__r.RecordTypeId='01210000000QfmR',
$User.Batch_User__c
))</errorConditionFormula>
<errorDisplayField>Department__c</errorDisplayField>
diff --git a/force-app/main/default/objects/Maintenance_Contract__c/validationRules/CheckService_Contract_Staff.validationRule-meta.xml b/force-app/main/default/objects/Maintenance_Contract__c/validationRules/CheckService_Contract_Staff.validationRule-meta.xml
index c4f7abf..fe41b56 100644
--- a/force-app/main/default/objects/Maintenance_Contract__c/validationRules/CheckService_Contract_Staff.validationRule-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract__c/validationRules/CheckService_Contract_Staff.validationRule-meta.xml
@@ -3,7 +3,7 @@
<fullName>CheckService_Contract_Staff</fullName>
<active>true</active>
<description>闄や簡鏂板缓鍜岀户缁悎鍚岋紝涓绘媴褰撹�呭繀濉�</description>
- <errorConditionFormula>And(Not( ISNEw() || ISClone() || CreatedDate <= DATETIMEVALUE("2019-07-13 00:00:00") || $Profile.Id = '00eC800000005Cb' || $Profile.Id !='00E10000001R1E4'),
+ <errorConditionFormula>And(Not( ISNEw() || ISClone() || CreatedDate <= DATETIMEVALUE("2019-07-13 00:00:00") || $Profile.Id = '00e10000000Y3o5' || $Profile.Id !='00E10000001R1E4'),
ISBLANK(Service_Contract_Staff__c) )</errorConditionFormula>
<errorDisplayField>Service_Contract_Staff__c</errorDisplayField>
<errorMessage>璇峰～鍐欎富鎷呭綋鑰�</errorMessage>
diff --git a/force-app/main/default/objects/Maintenance_Contract__c/validationRules/CheckUpper_limitReason.validationRule-meta.xml b/force-app/main/default/objects/Maintenance_Contract__c/validationRules/CheckUpper_limitReason.validationRule-meta.xml
index bd051a6..616bcb2 100644
--- a/force-app/main/default/objects/Maintenance_Contract__c/validationRules/CheckUpper_limitReason.validationRule-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract__c/validationRules/CheckUpper_limitReason.validationRule-meta.xml
@@ -3,7 +3,7 @@
<fullName>CheckUpper_limitReason</fullName>
<active>true</active>
<description>涓嶅悓鎰忎笂闄愮悊鐢辨椂锛屽閫夊拰鍏朵粬蹇呴』鏈変竴涓�</description>
- <errorConditionFormula>AND( $Profile.Id != '00eC800000005Cb', $Profile.Id != '00e10000000dzzG',$Profile.Id != '00eC600000003SX',NOT(agree_Upper_limit__c) ,
+ <errorConditionFormula>AND( $Profile.Id != '00e10000000Y3o5', $Profile.Id != '00e10000000dzzG',$Profile.Id != '00e10000000dEQx',NOT(agree_Upper_limit__c) ,
AND(
ISBLANK( Not_Upper_limit_reason__c ),ISBLANK( Not_Upper_limit_reasonSelect__c )),
ISBLANK(contractNextYear__c),
diff --git a/force-app/main/default/objects/Maintenance_Contract__c/validationRules/CheckUpper_limitReason2.validationRule-meta.xml b/force-app/main/default/objects/Maintenance_Contract__c/validationRules/CheckUpper_limitReason2.validationRule-meta.xml
index 62d5434..33b4851 100644
--- a/force-app/main/default/objects/Maintenance_Contract__c/validationRules/CheckUpper_limitReason2.validationRule-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract__c/validationRules/CheckUpper_limitReason2.validationRule-meta.xml
@@ -3,7 +3,7 @@
<fullName>CheckUpper_limitReason2</fullName>
<active>true</active>
<description>AND(agree_Upper_limit__c , NOT(ISBLANK( Not_Upper_limit_reasonSelect__c)))</description>
- <errorConditionFormula>AND( $Profile.Id != '00eC800000005Cb', $Profile.Id != '00e10000000dzzG',$Profile.Id != '00eC600000003SX', AND(agree_Upper_limit__c ,
+ <errorConditionFormula>AND( $Profile.Id != '00e10000000Y3o5', $Profile.Id != '00e10000000dzzG',$Profile.Id != '00e10000000dEQx', AND(agree_Upper_limit__c ,
NOT(ISBLANK( Not_Upper_limit_reasonSelect__c))),
ISBLANK(contractNextYear__c),
RecordType.DeveloperName = 'NewMaintenance_Contract' )</errorConditionFormula>
diff --git a/force-app/main/default/objects/Maintenance_Contract__c/validationRules/CheckUpper_limitReasonOther.validationRule-meta.xml b/force-app/main/default/objects/Maintenance_Contract__c/validationRules/CheckUpper_limitReasonOther.validationRule-meta.xml
index 28ece65..898f661 100644
--- a/force-app/main/default/objects/Maintenance_Contract__c/validationRules/CheckUpper_limitReasonOther.validationRule-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract__c/validationRules/CheckUpper_limitReasonOther.validationRule-meta.xml
@@ -3,7 +3,7 @@
<fullName>CheckUpper_limitReasonOther</fullName>
<active>false</active>
<description>涓嶅悓鎰忎笂闄愮悊鐢盻鍏朵粬</description>
- <errorConditionFormula>and($Profile.Id != '00eC800000005Cb', $Profile.Id != '00e10000000dzzG',$Profile.Id != '00eC600000003SX',OR( AND(INCLUDES(Not_Upper_limit_reasonSelect__c, '10銆佸叾浠�'), ISBLANK( Not_Upper_limit_reason__c )),AND(NOT(INCLUDES(Not_Upper_limit_reasonSelect__c, '10銆佸叾浠�')), NOT(ISBLANK( Not_Upper_limit_reason__c )))))</errorConditionFormula>
+ <errorConditionFormula>and($Profile.Id != '00e10000000Y3o5', $Profile.Id != '00e10000000dzzG',$Profile.Id != '00e10000000dEQx',OR( AND(INCLUDES(Not_Upper_limit_reasonSelect__c, '10銆佸叾浠�'), ISBLANK( Not_Upper_limit_reason__c )),AND(NOT(INCLUDES(Not_Upper_limit_reasonSelect__c, '10銆佸叾浠�')), NOT(ISBLANK( Not_Upper_limit_reason__c )))))</errorConditionFormula>
<errorDisplayField>Not_Upper_limit_reason__c</errorDisplayField>
<errorMessage>閫夋嫨鍏朵粬鏃讹紝璇峰綍鍏ュ叿浣撳師鍥�</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Maintenance_Contract__c/validationRules/Estimate_Target_Agency_Require.validationRule-meta.xml b/force-app/main/default/objects/Maintenance_Contract__c/validationRules/Estimate_Target_Agency_Require.validationRule-meta.xml
index f615ef0..a6b0b55 100644
--- a/force-app/main/default/objects/Maintenance_Contract__c/validationRules/Estimate_Target_Agency_Require.validationRule-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract__c/validationRules/Estimate_Target_Agency_Require.validationRule-meta.xml
@@ -2,9 +2,9 @@
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Estimate_Target_Agency_Require</fullName>
<active>true</active>
- <errorConditionFormula>$Profile.Id != '00eC600000003SX' /* GPI_绯荤粺绠＄悊鍛� 涓嶆姤閿� */
+ <errorConditionFormula>$Profile.Id != '00e10000000dEQx' /* GPI_绯荤粺绠＄悊鍛� 涓嶆姤閿� */
&&
-$User.Id != '005C60000001UFN' /* Batch User 涓嶆姤閿� */
+$User.Id != '00510000000fSYI' /* Batch User 涓嶆姤閿� */
&&
!$User.Batch_User__c /* Batch User 涓嶆姤閿� */
&&
diff --git a/force-app/main/default/objects/Maintenance_Contract__c/validationRules/Need_ContractDate_When_Contract.validationRule-meta.xml b/force-app/main/default/objects/Maintenance_Contract__c/validationRules/Need_ContractDate_When_Contract.validationRule-meta.xml
index 284d738..c9237dc 100644
--- a/force-app/main/default/objects/Maintenance_Contract__c/validationRules/Need_ContractDate_When_Contract.validationRule-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract__c/validationRules/Need_ContractDate_When_Contract.validationRule-meta.xml
@@ -2,11 +2,11 @@
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Need_ContractDate_When_Contract</fullName>
<active>true</active>
- <errorConditionFormula>$Profile.Id != '00eC600000003SX' /* GPI_绯荤粺绠＄悊鍛� 涓嶆姤閿� */
+ <errorConditionFormula>$Profile.Id != '00e10000000dEQx' /* GPI_绯荤粺绠＄悊鍛� 涓嶆姤閿� */
&&
-$Profile.Id != '00eC800000005Cb' /* 绯荤粺绠＄悊鍛� 涓嶆姤閿� */
+$Profile.Id != '00e10000000Y3o5' /* 绯荤粺绠＄悊鍛� 涓嶆姤閿� */
&&
-$User.Id != '005C60000001UFN' /* Batch User 涓嶆姤閿� */
+$User.Id != '00510000000fSYI' /* Batch User 涓嶆姤閿� */
&&
Len( Maintenance_Contract_No__c ) > 1 && Isnull(Contract_Conclusion_Date__c)</errorConditionFormula>
<errorDisplayField>Contract_Conclusion_Date__c</errorDisplayField>
diff --git a/force-app/main/default/objects/Maintenance_Contract__c/validationRules/Need_SalesOfficeCode_When_Contract.validationRule-meta.xml b/force-app/main/default/objects/Maintenance_Contract__c/validationRules/Need_SalesOfficeCode_When_Contract.validationRule-meta.xml
index ace45bd..9ee2925 100644
--- a/force-app/main/default/objects/Maintenance_Contract__c/validationRules/Need_SalesOfficeCode_When_Contract.validationRule-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract__c/validationRules/Need_SalesOfficeCode_When_Contract.validationRule-meta.xml
@@ -3,9 +3,9 @@
<fullName>Need_SalesOfficeCode_When_Contract</fullName>
<active>true</active>
<description>Len( Maintenance_Contract_No__c ) > 1 && Isnull(SalesOfficeCode_selection__c)</description>
- <errorConditionFormula>$Profile.Id != '00eC600000003SX' /* GPI_绯荤粺绠＄悊鍛� 涓嶆姤閿� */
+ <errorConditionFormula>$Profile.Id != '00e10000000dEQx' /* GPI_绯荤粺绠＄悊鍛� 涓嶆姤閿� */
&&
-$User.Id != '005C60000001UFN' /* Batch User 涓嶆姤閿� */
+$User.Id != '00510000000fSYI' /* Batch User 涓嶆姤閿� */
&&
/* 缁翠慨鍚堝悓鐘舵�佹洿鏂板埌-鍚堝悓 WF 銇潯浠� */
AND(Isblank(PriorValue(Maintenance_Contract_No__c)),
diff --git a/force-app/main/default/objects/Maintenance_Contract__c/validationRules/Opportunity_Stage_check.validationRule-meta.xml b/force-app/main/default/objects/Maintenance_Contract__c/validationRules/Opportunity_Stage_check.validationRule-meta.xml
index eb58e82..bb84aef 100644
--- a/force-app/main/default/objects/Maintenance_Contract__c/validationRules/Opportunity_Stage_check.validationRule-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract__c/validationRules/Opportunity_Stage_check.validationRule-meta.xml
@@ -2,7 +2,7 @@
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Opportunity_Stage_check</fullName>
<active>true</active>
- <errorConditionFormula>AND( $Profile.Id != '00eC800000005Cb', $Profile.Id != '00e10000000dzzG',$Profile.Id != '00eC600000003SX',
+ <errorConditionFormula>AND( $Profile.Id != '00e10000000Y3o5', $Profile.Id != '00e10000000dzzG',$Profile.Id != '00e10000000dEQx',
RecordType.DeveloperName = 'NewMaintenance_Contract',
TODAY() >= DATE(2021,10,01),
ISNEW(),
diff --git a/force-app/main/default/objects/Maintenance_Product_Data_Details__c/fields/ProductsID__c.field-meta.xml b/force-app/main/default/objects/Maintenance_Product_Data_Details__c/fields/ProductsID__c.field-meta.xml
index 7d8290e..9f9f95e 100644
--- a/force-app/main/default/objects/Maintenance_Product_Data_Details__c/fields/ProductsID__c.field-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Product_Data_Details__c/fields/ProductsID__c.field-meta.xml
@@ -5,7 +5,7 @@
<externalId>false</externalId>
<label>浜у搧</label>
<lookupFilter>
- <active>false</active>
+ <active>true</active>
<errorMessage>璇烽�夋嫨濂ユ灄宸存柉浜у搧</errorMessage>
<filterItems>
<field>Product2.RecordTypeId</field>
diff --git a/force-app/main/default/objects/Maintenance_Product_Data__c/listViews/draft.listView-meta.xml b/force-app/main/default/objects/Maintenance_Product_Data__c/listViews/draft.listView-meta.xml
index 3477ecd..8cc8a1e 100644
--- a/force-app/main/default/objects/Maintenance_Product_Data__c/listViews/draft.listView-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Product_Data__c/listViews/draft.listView-meta.xml
@@ -4,6 +4,7 @@
<columns>NAME</columns>
<columns>Status__c</columns>
<columns>ApplyPersion__c</columns>
+ <columns>RECORDTYPE</columns>
<columns>GuranteeType_Sum__c</columns>
<columns>Intra_Trade_Gurantee_RMB_Sum__c</columns>
<columns>isAttachment__c</columns>
diff --git a/force-app/main/default/objects/Monthly_Report__c/validationRules/Not_Update_By_Owner_After_Submit.validationRule-meta.xml b/force-app/main/default/objects/Monthly_Report__c/validationRules/Not_Update_By_Owner_After_Submit.validationRule-meta.xml
index 5ae39c7..af5862b 100644
--- a/force-app/main/default/objects/Monthly_Report__c/validationRules/Not_Update_By_Owner_After_Submit.validationRule-meta.xml
+++ b/force-app/main/default/objects/Monthly_Report__c/validationRules/Not_Update_By_Owner_After_Submit.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Not_Update_By_Owner_After_Submit</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>AND(
( OwnerId = $User.Id),
(Submit__c = True) )</errorConditionFormula>
diff --git a/force-app/main/default/objects/OPDPlan__c/OPDPlan__c.object-meta.xml b/force-app/main/default/objects/OPDPlan__c/OPDPlan__c.object-meta.xml
index ae90fdc..aad66cd 100644
--- a/force-app/main/default/objects/OPDPlan__c/OPDPlan__c.object-meta.xml
+++ b/force-app/main/default/objects/OPDPlan__c/OPDPlan__c.object-meta.xml
@@ -129,7 +129,7 @@
<actionOverrides>
<actionName>View</actionName>
<comment>Action override created by Lightning App Builder during activation.</comment>
- <content>OPD1</content>
+ <content>OPD</content>
<formFactor>Large</formFactor>
<skipRecordTypeSelect>false</skipRecordTypeSelect>
<type>Flexipage</type>
@@ -176,7 +176,7 @@
<excludedStandardButtons>Import</excludedStandardButtons>
<excludedStandardButtons>MassChangeOwner</excludedStandardButtons>
<excludedStandardButtons>Accept</excludedStandardButtons>
- <searchResultsAdditionalFields>OPDPlanOCM_man_province_HP__c</searchResultsAdditionalFields>
+ <searchResultsAdditionalFields>OPDPlanOCM_man_province__c</searchResultsAdditionalFields>
<searchResultsAdditionalFields>Status__c</searchResultsAdditionalFields>
<searchResultsAdditionalFields>Account_Laboratory__c</searchResultsAdditionalFields>
<searchResultsAdditionalFields>OPDPlan_ImplementDate__c</searchResultsAdditionalFields>
diff --git a/force-app/main/default/objects/OPDPlan__c/fields/OPDLendSortBefore__c.field-meta.xml b/force-app/main/default/objects/OPDPlan__c/fields/OPDLendSortBefore__c.field-meta.xml
index e74be9b..b58a13b 100644
--- a/force-app/main/default/objects/OPDPlan__c/fields/OPDLendSortBefore__c.field-meta.xml
+++ b/force-app/main/default/objects/OPDPlan__c/fields/OPDLendSortBefore__c.field-meta.xml
@@ -2,7 +2,7 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>OPDLendSortBefore__c</fullName>
<externalId>false</externalId>
- <label>澶囧搧鍑哄�熶紭鍏堝害锛堜笂鏈堬級</label>
+ <label>OPD浼樺厛搴︼紙涓婃湀锛�</label>
<precision>18</precision>
<required>false</required>
<scale>0</scale>
diff --git a/force-app/main/default/objects/OPDPlan__c/listViews/On_prosess.listView-meta.xml b/force-app/main/default/objects/OPDPlan__c/listViews/On_prosess.listView-meta.xml
index cf18a20..2104bf7 100644
--- a/force-app/main/default/objects/OPDPlan__c/listViews/On_prosess.listView-meta.xml
+++ b/force-app/main/default/objects/OPDPlan__c/listViews/On_prosess.listView-meta.xml
@@ -6,10 +6,9 @@
<columns>Status__c</columns>
<columns>Account_Laboratory__c</columns>
<columns>OPDPlan_ImplementDate__c</columns>
- <columns>Purpose__c</columns>
<columns>NewestRentalCode__c</columns>
<columns>NewestRentalStatus__c</columns>
- <columns>Related_Opportunity1__c</columns>
+ <columns>Related_Opportunity1_ID__c</columns>
<filterScope>Everything</filterScope>
<filters>
<field>Status__c</field>
@@ -17,5 +16,4 @@
<value>璁″垝涓�</value>
</filters>
<label>02. 璁″垝涓殑OPD璁″垝</label>
- <language>zh_CN</language>
</ListView>
diff --git a/force-app/main/default/objects/OPDPlan__c/listViews/On_prosessforconfirm.listView-meta.xml b/force-app/main/default/objects/OPDPlan__c/listViews/On_prosessforconfirm.listView-meta.xml
index d54d23e..ce00dee 100644
--- a/force-app/main/default/objects/OPDPlan__c/listViews/On_prosessforconfirm.listView-meta.xml
+++ b/force-app/main/default/objects/OPDPlan__c/listViews/On_prosessforconfirm.listView-meta.xml
@@ -7,9 +7,8 @@
<columns>Account_Laboratory__c</columns>
<columns>OWNER.ALIAS</columns>
<columns>OPDPlan_ImplementDate__c</columns>
- <columns>Purpose__c</columns>
<columns>NewestRentalStatus__c</columns>
- <columns>Related_Opportunity1__c</columns>
+ <columns>Related_Opportunity1_ID__c</columns>
<columns>NoOpp_Reason__c</columns>
<columns>CREATED_DATE</columns>
<filterScope>Everything</filterScope>
@@ -19,5 +18,4 @@
<value>瀹℃壒涓�</value>
</filters>
<label>01. 寰呭鎵筄PD璁″垝</label>
- <language>zh_CN</language>
</ListView>
diff --git a/force-app/main/default/objects/OPDPlan__c/listViews/WaitReport.listView-meta.xml b/force-app/main/default/objects/OPDPlan__c/listViews/WaitReport.listView-meta.xml
index dda3ad8..63d1cab 100644
--- a/force-app/main/default/objects/OPDPlan__c/listViews/WaitReport.listView-meta.xml
+++ b/force-app/main/default/objects/OPDPlan__c/listViews/WaitReport.listView-meta.xml
@@ -9,15 +9,19 @@
<columns>OPDType__c</columns>
<columns>ThisMonthPlan__c</columns>
<columns>ThisMonthExecute__c</columns>
- <columns>Purpose__c</columns>
<columns>NewestRentalStatus__c</columns>
- <columns>Related_Opportunity1__c</columns>
+ <columns>OPDPlanSalesdepartment__c</columns>
+ <columns>OPDPlanOCM_man_province__c</columns>
<filterScope>Everything</filterScope>
<filters>
<field>Status__c</field>
<operation>equals</operation>
<value>寰呮彁浜ゆ姤鍛�</value>
</filters>
+ <filters>
+ <field>OPDType__c</field>
+ <operation>notEqual</operation>
+ <value>瀛︿細</value>
+ </filters>
<label>06. 寰呮彁浜ゆ姤鍛婄殑OPD璁″垝</label>
- <language>zh_CN</language>
</ListView>
diff --git a/force-app/main/default/objects/OPDPlan__c/validationRules/IF_Status_jhz.validationRule-meta.xml b/force-app/main/default/objects/OPDPlan__c/validationRules/IF_Status_jhz.validationRule-meta.xml
index 7786fb8..bd23535 100644
--- a/force-app/main/default/objects/OPDPlan__c/validationRules/IF_Status_jhz.validationRule-meta.xml
+++ b/force-app/main/default/objects/OPDPlan__c/validationRules/IF_Status_jhz.validationRule-meta.xml
@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>IF_Status_jhz</fullName>
- <active>false</active>
+ <active>true</active>
<description>OPD璁″垝鐘舵�佷负璁″垝涓紝绉戝銆佽浠�1銆佹棤璇环鐞嗙敱 涓嶅厑璁稿彉鏇�</description>
<errorConditionFormula>$User.Batch_User__c = false &&
Text(Status__c)='璁″垝涓�'&&(ISCHANGED( Account_Laboratory__c ) || ISCHANGED( NoOpp_Reason__c ) ||ISCHANGED( Related_Opportunity1_ID__c) || ISCHANGED( Related_Opportunity2_ID__c))</errorConditionFormula>
- <errorDisplayField>Main_Visit_Location__c</errorDisplayField>
<errorMessage>OPD璁″垝鐘舵�佷负璁″垝涓紝绉戝銆佽浠�1銆佹棤璇环鐞嗙敱 涓嶅厑璁稿彉鏇�</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/OPDPlan__c/validationRules/OPDDateCheck.validationRule-meta.xml b/force-app/main/default/objects/OPDPlan__c/validationRules/OPDDateCheck.validationRule-meta.xml
index bcfcb63..44560b4 100644
--- a/force-app/main/default/objects/OPDPlan__c/validationRules/OPDDateCheck.validationRule-meta.xml
+++ b/force-app/main/default/objects/OPDPlan__c/validationRules/OPDDateCheck.validationRule-meta.xml
@@ -6,7 +6,7 @@
(isNew()|| ISCHANGED(OPDPlan_ImplementDate__c )) &&
((OPDPlan_ImplementDate__c - TODAY() > 60) ||
(OPDPlan_ImplementDate__c - TODAY() < 1)) &&
-$User.ProfileId <>'00eC800000005Cb'&&
+$User.ProfileId <>'00e10000000Y3o5'&&
ISBLANK(OriginalOpdPlanRental__c)&& SkipValidationRulesAndWorkflows__c != true</errorConditionFormula>
<errorDisplayField>OPDPlan_ImplementDate__c</errorDisplayField>
<errorMessage>璁″垝瀹炴柦鏃ユ湡鍙兘鍦�60澶╀互鍐呫��</errorMessage>
diff --git a/force-app/main/default/objects/OPDPlan__c/validationRules/isNewCheckAccount.validationRule-meta.xml b/force-app/main/default/objects/OPDPlan__c/validationRules/isNewCheckAccount.validationRule-meta.xml
index d0f01cf..a0b71b8 100644
--- a/force-app/main/default/objects/OPDPlan__c/validationRules/isNewCheckAccount.validationRule-meta.xml
+++ b/force-app/main/default/objects/OPDPlan__c/validationRules/isNewCheckAccount.validationRule-meta.xml
@@ -3,13 +3,13 @@
<fullName>isNewCheckAccount</fullName>
<active>true</active>
<errorConditionFormula>(isNew()||ISCHANGED(Account_Laboratory__c))
-&& !isBlank(Account_Laboratory__c) && LEFT(Account_Laboratory__r.RecordTypeId, 15) != '012C600000003HU'
-&& LEFT(Account_Laboratory__r.RecordTypeId, 15) != '012C600000003HJ'
-&& LEFT(Account_Laboratory__r.RecordTypeId, 15) != '012C600000003HW'
-&& LEFT(Account_Laboratory__r.RecordTypeId, 15) != '012C600000003HV'
-&& LEFT(Account_Laboratory__r.RecordTypeId, 15) != '012C600000003HY'
-&& LEFT(Account_Laboratory__r.RecordTypeId, 15) != '012C600000003HT'
-&& LEFT(Account_Laboratory__r.RecordTypeId, 15) != '012C600000003HX'</errorConditionFormula>
+&& !isBlank(Account_Laboratory__c) && LEFT(Account_Laboratory__r.RecordTypeId, 15) != '01210000000Qfm7'
+&& LEFT(Account_Laboratory__r.RecordTypeId, 15) != '01210000000QfmR'
+&& LEFT(Account_Laboratory__r.RecordTypeId, 15) != '01210000000QfmM'
+&& LEFT(Account_Laboratory__r.RecordTypeId, 15) != '01210000000QfmH'
+&& LEFT(Account_Laboratory__r.RecordTypeId, 15) != '01210000000QfmC'
+&& LEFT(Account_Laboratory__r.RecordTypeId, 15) != '01210000000Qfm2'
+&& LEFT(Account_Laboratory__r.RecordTypeId, 15) != '01210000000Qfmb'</errorConditionFormula>
<errorDisplayField>Account_Laboratory__c</errorDisplayField>
<errorMessage>璇峰～鍐欐纭殑绉戝</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/OPDPlan__c/validationRules/isNewNull.validationRule-meta.xml b/force-app/main/default/objects/OPDPlan__c/validationRules/isNewNull.validationRule-meta.xml
index 852d14e..d294666 100644
--- a/force-app/main/default/objects/OPDPlan__c/validationRules/isNewNull.validationRule-meta.xml
+++ b/force-app/main/default/objects/OPDPlan__c/validationRules/isNewNull.validationRule-meta.xml
@@ -4,6 +4,5 @@
<active>true</active>
<description>濡傛灉鏉ユ簮涓虹┖锛屼笉鍏佽鏂板缓OPD璁″垝</description>
<errorConditionFormula>isNew() && isBlank(Text(OPDType__c))&& Not($User.Batch_User__c )</errorConditionFormula>
- <errorDisplayField>Main_Visit_Location__c</errorDisplayField>
<errorMessage>璇蜂粠鏂板缓浜嬩欢銆佺瀹ゃ�佽浠锋垨鏃ユ姤涓柊寤篛PD璁″垝 銆�</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/OTS_order__c/OTS_order__c.object-meta.xml b/force-app/main/default/objects/OTS_order__c/OTS_order__c.object-meta.xml
index 377a1d1..21f8149 100644
--- a/force-app/main/default/objects/OTS_order__c/OTS_order__c.object-meta.xml
+++ b/force-app/main/default/objects/OTS_order__c/OTS_order__c.object-meta.xml
@@ -161,13 +161,13 @@
<type>Text</type>
</nameField>
<searchLayouts>
+ <excludedStandardButtons>PrintableListView</excludedStandardButtons>
<excludedStandardButtons>OpenListInQuip</excludedStandardButtons>
<excludedStandardButtons>NewFromDocument</excludedStandardButtons>
- <excludedStandardButtons>Accept</excludedStandardButtons>
<excludedStandardButtons>ChangeOwner</excludedStandardButtons>
<excludedStandardButtons>Import</excludedStandardButtons>
<excludedStandardButtons>MassChangeOwner</excludedStandardButtons>
- <excludedStandardButtons>PrintableListView</excludedStandardButtons>
+ <excludedStandardButtons>Accept</excludedStandardButtons>
</searchLayouts>
<sharingModel>ReadWrite</sharingModel>
<visibility>Public</visibility>
diff --git a/force-app/main/default/objects/On_Call__c/On_Call__c.object-meta.xml b/force-app/main/default/objects/On_Call__c/On_Call__c.object-meta.xml
index ade041a..a875f99 100644
--- a/force-app/main/default/objects/On_Call__c/On_Call__c.object-meta.xml
+++ b/force-app/main/default/objects/On_Call__c/On_Call__c.object-meta.xml
@@ -58,11 +58,13 @@
</actionOverrides>
<actionOverrides>
<actionName>Edit</actionName>
- <type>Default</type>
+ <content>LexOnCallPIPLAura</content>
+ <formFactor>Large</formFactor>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>LightningComponent</type>
</actionOverrides>
<actionOverrides>
<actionName>Edit</actionName>
- <formFactor>Large</formFactor>
<type>Default</type>
</actionOverrides>
<actionOverrides>
@@ -86,11 +88,13 @@
</actionOverrides>
<actionOverrides>
<actionName>New</actionName>
- <type>Default</type>
+ <content>LexOnCallPIPLAura</content>
+ <formFactor>Large</formFactor>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>LightningComponent</type>
</actionOverrides>
<actionOverrides>
<actionName>New</actionName>
- <formFactor>Large</formFactor>
<type>Default</type>
</actionOverrides>
<actionOverrides>
diff --git a/force-app/main/default/objects/On_Call__c/fields/Hospital__c.field-meta.xml b/force-app/main/default/objects/On_Call__c/fields/Hospital__c.field-meta.xml
index 393a4f9..215be38 100644
--- a/force-app/main/default/objects/On_Call__c/fields/Hospital__c.field-meta.xml
+++ b/force-app/main/default/objects/On_Call__c/fields/Hospital__c.field-meta.xml
@@ -3,10 +3,10 @@
<fullName>Hospital__c</fullName>
<deleteConstraint>SetNull</deleteConstraint>
<externalId>false</externalId>
- <inlineHelpText>When the department is changed, please c</inlineHelpText>
+ <inlineHelpText>鍙樻洿浜嗙瀹や互鍚庯紝璇锋墜鍔ㄥ皢姝ゅ瓧娈电殑鍊兼洿鏀逛负绉戝鎵�灞炵殑鍖婚櫌</inlineHelpText>
<label>鍖婚櫌</label>
<lookupFilter>
- <active>false</active>
+ <active>true</active>
<booleanFilter>1 OR 2</booleanFilter>
<errorMessage>On-Call鍖婚櫌鐨勫�间笉瀛樺湪鎴栦笌绛涢�夋潯浠朵笉鍖归厤銆�</errorMessage>
<filterItems>
diff --git a/force-app/main/default/objects/On_Call__c/fields/Oncall_Equipment__c.field-meta.xml b/force-app/main/default/objects/On_Call__c/fields/Oncall_Equipment__c.field-meta.xml
index 022bfd6..5802eb5 100644
--- a/force-app/main/default/objects/On_Call__c/fields/Oncall_Equipment__c.field-meta.xml
+++ b/force-app/main/default/objects/On_Call__c/fields/Oncall_Equipment__c.field-meta.xml
@@ -5,7 +5,7 @@
<externalId>false</externalId>
<label>瀵硅薄浜у搧</label>
<lookupFilter>
- <active>false</active>
+ <active>true</active>
<booleanFilter>1 OR 2</booleanFilter>
<filterItems>
<field>Asset.Hospital__c</field>
diff --git a/force-app/main/default/objects/On_Call__c/fields/segment__c.field-meta.xml b/force-app/main/default/objects/On_Call__c/fields/segment__c.field-meta.xml
index 0119a85..d1127ba 100644
--- a/force-app/main/default/objects/On_Call__c/fields/segment__c.field-meta.xml
+++ b/force-app/main/default/objects/On_Call__c/fields/segment__c.field-meta.xml
@@ -5,7 +5,7 @@
<externalId>false</externalId>
<label>绉戝</label>
<lookupFilter>
- <active>false</active>
+ <active>true</active>
<filterItems>
<field>Account.RecordTypeId</field>
<operation>equals</operation>
diff --git a/force-app/main/default/objects/On_Call__c/validationRules/First_follow_up_time.validationRule-meta.xml b/force-app/main/default/objects/On_Call__c/validationRules/First_follow_up_time.validationRule-meta.xml
index b9c36bf..d4c61d9 100644
--- a/force-app/main/default/objects/On_Call__c/validationRules/First_follow_up_time.validationRule-meta.xml
+++ b/force-app/main/default/objects/On_Call__c/validationRules/First_follow_up_time.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>First_follow_up_time</fullName>
- <active>false</active>
+ <active>true</active>
<description>濡傛灉鐜板満妫�娴嬫椂闂�(From)瀵规瘮鏁呴殰鍙戠敓鏃堕棿鏃╃殑璇濓紝涓嶈兘淇濆瓨</description>
<errorConditionFormula>Text(Status_c__c) = '瀹屾瘯' && Taking_call_Time_c__c > From_c__c
&&
diff --git a/force-app/main/default/objects/On_Call__c/validationRules/Is_Active_Account.validationRule-meta.xml b/force-app/main/default/objects/On_Call__c/validationRules/Is_Active_Account.validationRule-meta.xml
index 5cf99e4..57c65d4 100644
--- a/force-app/main/default/objects/On_Call__c/validationRules/Is_Active_Account.validationRule-meta.xml
+++ b/force-app/main/default/objects/On_Call__c/validationRules/Is_Active_Account.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Is_Active_Account</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>(Isnew() || Ischanged(segment__c)) && Not(Isblank(segment__c)) && OR (
/* 鏃犳晥 ==> 鎶ラ敊 */
segment__r.Is_Active_Formula__c == "鏃犳晥",
diff --git a/force-app/main/default/objects/On_Call__c/validationRules/Is_Active_Hospital.validationRule-meta.xml b/force-app/main/default/objects/On_Call__c/validationRules/Is_Active_Hospital.validationRule-meta.xml
index bf4d29e..99301c4 100644
--- a/force-app/main/default/objects/On_Call__c/validationRules/Is_Active_Hospital.validationRule-meta.xml
+++ b/force-app/main/default/objects/On_Call__c/validationRules/Is_Active_Hospital.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Is_Active_Hospital</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>(Isnew() || Ischanged(Hospital__c) || Ischanged(segment__c)) && OR (
/* 鍜岀瀹ょ殑鍖婚櫌涓嶄竴鏍� ==> 鎶ラ敊 */
Hospital__c <> segment__r.Parent.ParentId
diff --git a/force-app/main/default/objects/On_Call__c/validationRules/Need_Follow_up_result.validationRule-meta.xml b/force-app/main/default/objects/On_Call__c/validationRules/Need_Follow_up_result.validationRule-meta.xml
index 5a07800..78dd066 100644
--- a/force-app/main/default/objects/On_Call__c/validationRules/Need_Follow_up_result.validationRule-meta.xml
+++ b/force-app/main/default/objects/On_Call__c/validationRules/Need_Follow_up_result.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Need_Follow_up_result</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>Text(Status_c__c) = '瀹屾瘯' && Isblank
(Customer_Problem_c__c )
&&
diff --git a/force-app/main/default/objects/On_Call__c/validationRules/On_call_finish_time.validationRule-meta.xml b/force-app/main/default/objects/On_Call__c/validationRules/On_call_finish_time.validationRule-meta.xml
index 6d858d8..2633e18 100644
--- a/force-app/main/default/objects/On_Call__c/validationRules/On_call_finish_time.validationRule-meta.xml
+++ b/force-app/main/default/objects/On_Call__c/validationRules/On_call_finish_time.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>On_call_finish_time</fullName>
- <active>false</active>
+ <active>true</active>
<description>濡傛灉On-Call瀹屾瘯鏃堕棿瀵规瘮鏁呴殰鍙戠敓鏃堕棿鏃╃殑璇濓紝涓嶈兘淇濆瓨</description>
<errorConditionFormula>Taking_call_Time_c__c > FinishDataTime__c
&&
diff --git a/force-app/main/default/objects/On_Call__c/validationRules/Request_on_call_document_number.validationRule-meta.xml b/force-app/main/default/objects/On_Call__c/validationRules/Request_on_call_document_number.validationRule-meta.xml
index ddca6d1..5cb4a26 100644
--- a/force-app/main/default/objects/On_Call__c/validationRules/Request_on_call_document_number.validationRule-meta.xml
+++ b/force-app/main/default/objects/On_Call__c/validationRules/Request_on_call_document_number.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Request_on_call_document_number</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>Text(Status_c__c) = '瀹屾瘯' && Isblank
(Oncall_report_number_c__c)
&&
diff --git a/force-app/main/default/objects/On_Call__c/validationRules/Request_on_call_follow_time_from.validationRule-meta.xml b/force-app/main/default/objects/On_Call__c/validationRules/Request_on_call_follow_time_from.validationRule-meta.xml
index 089ea51..bdf1457 100644
--- a/force-app/main/default/objects/On_Call__c/validationRules/Request_on_call_follow_time_from.validationRule-meta.xml
+++ b/force-app/main/default/objects/On_Call__c/validationRules/Request_on_call_follow_time_from.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Request_on_call_follow_time_from</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>Text(Status_c__c) = '瀹屾瘯' && Isblank
(From_c__c )
&&
diff --git a/force-app/main/default/objects/On_Call__c/validationRules/Request_on_call_follow_time_to.validationRule-meta.xml b/force-app/main/default/objects/On_Call__c/validationRules/Request_on_call_follow_time_to.validationRule-meta.xml
index 6da3476..f9a8aec 100644
--- a/force-app/main/default/objects/On_Call__c/validationRules/Request_on_call_follow_time_to.validationRule-meta.xml
+++ b/force-app/main/default/objects/On_Call__c/validationRules/Request_on_call_follow_time_to.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Request_on_call_follow_time_to</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>Text(Status_c__c) = '瀹屾瘯' && Isblank
(To_c__c )
&&
diff --git a/force-app/main/default/objects/On_Call__c/validationRules/Requst_On_call_complete_time.validationRule-meta.xml b/force-app/main/default/objects/On_Call__c/validationRules/Requst_On_call_complete_time.validationRule-meta.xml
index e9608e5..d3e52ed 100644
--- a/force-app/main/default/objects/On_Call__c/validationRules/Requst_On_call_complete_time.validationRule-meta.xml
+++ b/force-app/main/default/objects/On_Call__c/validationRules/Requst_On_call_complete_time.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Requst_On_call_complete_time</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>Text(Status_c__c) = '瀹屾瘯' && Isblank
(FinishDataTime__c )
&&
diff --git a/force-app/main/default/objects/On_Line_Survey__c/fields/Case_category2__c.field-meta.xml b/force-app/main/default/objects/On_Line_Survey__c/fields/Case_category2__c.field-meta.xml
index 0d6ff02..bebfdbe 100644
--- a/force-app/main/default/objects/On_Line_Survey__c/fields/Case_category2__c.field-meta.xml
+++ b/force-app/main/default/objects/On_Line_Survey__c/fields/Case_category2__c.field-meta.xml
@@ -152,6 +152,12 @@
</value>
</valueSetDefinition>
<valueSettings>
+ <controllingFieldValue>TCR</controllingFieldValue>
+ <controllingFieldValue>TURP</controllingFieldValue>
+ <controllingFieldValue>TUR-Bt</controllingFieldValue>
+ <valueName>鍒囬櫎鏈�</valueName>
+ </valueSettings>
+ <valueSettings>
<controllingFieldValue>涓婃秷鍖栭亾</controllingFieldValue>
<valueName>鑳冨ぇ閮ㄥ垏闄ゆ湳</valueName>
</valueSettings>
@@ -250,12 +256,6 @@
<valueSettings>
<controllingFieldValue>濡囩</controllingFieldValue>
<valueName>寮備綅濡婂鍒囬櫎鏈�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>TURP</controllingFieldValue>
- <controllingFieldValue>TUR-Bt</controllingFieldValue>
- <controllingFieldValue>TCR</controllingFieldValue>
- <valueName>鍒囬櫎鏈�</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>TURP</controllingFieldValue>
diff --git a/force-app/main/default/objects/On_Line_Survey__c/validationRules/Input_Colon_Other_product_name.validationRule-meta.xml b/force-app/main/default/objects/On_Line_Survey__c/validationRules/Input_Colon_Other_product_name.validationRule-meta.xml
index c6a4b92..a160a92 100644
--- a/force-app/main/default/objects/On_Line_Survey__c/validationRules/Input_Colon_Other_product_name.validationRule-meta.xml
+++ b/force-app/main/default/objects/On_Line_Survey__c/validationRules/Input_Colon_Other_product_name.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Input_Colon_Other_product_name</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>And(text(ESD_colon_flexbile_use__c)
="鍏朵粬",ISBLANK(colon_other_product__c))</errorConditionFormula>
<errorMessage>濡傛灉缁撹偁ESD 甯歌浣跨敤浜у搧鏄�"鍏朵粬",璇疯緭鍏ュ叾浠栦骇鍝佸悕绉�</errorMessage>
diff --git a/force-app/main/default/objects/On_Line_Survey__c/validationRules/Input_Esopha_Other_product_name.validationRule-meta.xml b/force-app/main/default/objects/On_Line_Survey__c/validationRules/Input_Esopha_Other_product_name.validationRule-meta.xml
index 4bb91ee..1aa0216 100644
--- a/force-app/main/default/objects/On_Line_Survey__c/validationRules/Input_Esopha_Other_product_name.validationRule-meta.xml
+++ b/force-app/main/default/objects/On_Line_Survey__c/validationRules/Input_Esopha_Other_product_name.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Input_Esopha_Other_product_name</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>And(text(ESD_flexible_use__c)
="鍏朵粬",ISBLANK(Esopha_other_product__c))</errorConditionFormula>
<errorMessage>濡傛灉椋熼亾ESD 甯歌浣跨敤浜у搧鏄�"鍏朵粬",璇疯緭鍏ュ叾浠栦骇鍝佸悕绉�</errorMessage>
diff --git a/force-app/main/default/objects/On_Line_Survey__c/validationRules/Input_stomach_Other_product_name.validationRule-meta.xml b/force-app/main/default/objects/On_Line_Survey__c/validationRules/Input_stomach_Other_product_name.validationRule-meta.xml
index 6777197..78c779b 100644
--- a/force-app/main/default/objects/On_Line_Survey__c/validationRules/Input_stomach_Other_product_name.validationRule-meta.xml
+++ b/force-app/main/default/objects/On_Line_Survey__c/validationRules/Input_stomach_Other_product_name.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Input_stomach_Other_product_name</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>And(text(ESD_stomach_flexible_use__c)
="鍏朵粬",ISBLANK(Stomach_other_product__c))</errorConditionFormula>
<errorMessage>濡傛灉鑳僂SD 甯歌浣跨敤浜у搧鏄�"鍏朵粬",璇疯緭鍏ュ叾浠栦骇鍝佸悕绉�</errorMessage>
diff --git a/force-app/main/default/objects/Opponent_Bid_Information__c/validationRules/Dummy_product_brand_request.validationRule-meta.xml b/force-app/main/default/objects/Opponent_Bid_Information__c/validationRules/Dummy_product_brand_request.validationRule-meta.xml
index a149466..1c8f159 100644
--- a/force-app/main/default/objects/Opponent_Bid_Information__c/validationRules/Dummy_product_brand_request.validationRule-meta.xml
+++ b/force-app/main/default/objects/Opponent_Bid_Information__c/validationRules/Dummy_product_brand_request.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Dummy_product_brand_request</fullName>
- <active>false</active>
+ <active>true</active>
<description>鍦ㄦ墜鍔ㄧ櫥褰曠珵浜夊鎵嬩骇鍝佸搴斾腑锛岃杈撳叆姝ゆ鐧诲綍鐨勭珵浜夊鎵嬪搧鐗屽悕</description>
<errorConditionFormula>ISBLANK(Lost_By_Brand__c) && OR( !ISNULL(CompetitorProduct1__c)&&CompetitorProduct1__r.Competitor_product_dummy__c= true,!ISNULL(CompetitorProduct2__c)&& CompetitorProduct2__r.Competitor_product_dummy__c= true,!ISNULL(CompetitorProduct3__c)&& CompetitorProduct3__r.Competitor_product_dummy__c= true,!ISNULL(CompetitorProduct4__c)&&CompetitorProduct4__r.Competitor_product_dummy__c= true)</errorConditionFormula>
<errorDisplayField>Lost_By_Brand__c</errorDisplayField>
diff --git a/force-app/main/default/objects/Opponent_Bid_Information__c/validationRules/Dummy_product_request.validationRule-meta.xml b/force-app/main/default/objects/Opponent_Bid_Information__c/validationRules/Dummy_product_request.validationRule-meta.xml
index b717d9f..da34020 100644
--- a/force-app/main/default/objects/Opponent_Bid_Information__c/validationRules/Dummy_product_request.validationRule-meta.xml
+++ b/force-app/main/default/objects/Opponent_Bid_Information__c/validationRules/Dummy_product_request.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Dummy_product_request</fullName>
- <active>false</active>
+ <active>true</active>
<description>鍦ㄦ墜鍔ㄧ櫥褰曠珵浜夊鎵嬩骇鍝佸搴斾腑锛岃杈撳叆姝ゆ鎵嬪姩鐧诲綍鐨勪骇鍝佸瀷鍙�</description>
<errorConditionFormula>ISBLANK(Lost_By_Product__c) && OR( !ISNULL(CompetitorProduct1__c)&&CompetitorProduct1__r.Competitor_product_dummy__c= true,!ISNULL(CompetitorProduct2__c)&& CompetitorProduct2__r.Competitor_product_dummy__c= true,!ISNULL(CompetitorProduct3__c)&& CompetitorProduct3__r.Competitor_product_dummy__c= true,!ISNULL(CompetitorProduct4__c)&&CompetitorProduct4__r.Competitor_product_dummy__c= true)</errorConditionFormula>
<errorDisplayField>Lost_By_Product__c</errorDisplayField>
diff --git a/force-app/main/default/objects/Opportunity/Opportunity.object-meta.xml b/force-app/main/default/objects/Opportunity/Opportunity.object-meta.xml
new file mode 100644
index 0000000..d8708e4
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/Opportunity.object-meta.xml
@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomObject xmlns="http://soap.sforce.com/2006/04/metadata">
+ <actionOverrides>
+ <actionName>AddInfluence</actionName>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>AddInfluence</actionName>
+ <formFactor>Large</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>AddInfluence</actionName>
+ <formFactor>Small</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>CancelEdit</actionName>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>CancelEdit</actionName>
+ <formFactor>Large</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>CancelEdit</actionName>
+ <formFactor>Small</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>Clone</actionName>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>Clone</actionName>
+ <formFactor>Large</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>Clone</actionName>
+ <formFactor>Small</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>Delete</actionName>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>Delete</actionName>
+ <formFactor>Large</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>Delete</actionName>
+ <formFactor>Small</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>Edit</actionName>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>Edit</actionName>
+ <formFactor>Large</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>Edit</actionName>
+ <formFactor>Small</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>List</actionName>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>List</actionName>
+ <formFactor>Large</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>List</actionName>
+ <formFactor>Small</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>New</actionName>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>New</actionName>
+ <formFactor>Large</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>New</actionName>
+ <formFactor>Small</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>SaveEdit</actionName>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>SaveEdit</actionName>
+ <formFactor>Large</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>SaveEdit</actionName>
+ <formFactor>Small</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>Tab</actionName>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>Tab</actionName>
+ <formFactor>Large</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>Tab</actionName>
+ <formFactor>Small</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>View</actionName>
+ <comment>Action override created by Lightning App Builder during activation.</comment>
+ <content>FlexiPage_Opp</content>
+ <formFactor>Large</formFactor>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>Flexipage</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>View</actionName>
+ <comment>Action override created by Lightning App Builder during activation.</comment>
+ <content>FlexiPage_Opp</content>
+ <formFactor>Small</formFactor>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>Flexipage</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>View</actionName>
+ <type>Default</type>
+ </actionOverrides>
+ <compactLayoutAssignment>SYSTEM</compactLayoutAssignment>
+ <enableEnhancedLookup>true</enableEnhancedLookup>
+ <enableFeeds>true</enableFeeds>
+ <enableHistory>true</enableHistory>
+ <externalSharingModel>Private</externalSharingModel>
+ <recordTypeTrackFeedHistory>false</recordTypeTrackFeedHistory>
+ <recordTypeTrackHistory>false</recordTypeTrackHistory>
+ <searchLayouts>
+ <customTabListAdditionalFields>OPPORTUNITY.NAME</customTabListAdditionalFields>
+ <customTabListAdditionalFields>Opportunity_No__c</customTabListAdditionalFields>
+ <customTabListAdditionalFields>ACCOUNT.NAME</customTabListAdditionalFields>
+ <customTabListAdditionalFields>Opportunity_Category__c</customTabListAdditionalFields>
+ <customTabListAdditionalFields>OPPORTUNITY.STAGE_NAME</customTabListAdditionalFields>
+ <customTabListAdditionalFields>Competitor__c</customTabListAdditionalFields>
+ <customTabListAdditionalFields>Close_Forecasted_Date__c</customTabListAdditionalFields>
+ <customTabListAdditionalFields>Wholesale_Price_F__c</customTabListAdditionalFields>
+ <excludedStandardButtons>OpenListInQuip</excludedStandardButtons>
+ <excludedStandardButtons>NewFromDocument</excludedStandardButtons>
+ <excludedStandardButtons>Import</excludedStandardButtons>
+ <excludedStandardButtons>MassAddToActionableList</excludedStandardButtons>
+ <excludedStandardButtons>PipelineInspection</excludedStandardButtons>
+ <excludedStandardButtons>PrintableListView</excludedStandardButtons>
+ <excludedStandardButtons>New</excludedStandardButtons>
+ <lookupDialogsAdditionalFields>OPPORTUNITY.NAME</lookupDialogsAdditionalFields>
+ <lookupDialogsAdditionalFields>Estimation_No__c</lookupDialogsAdditionalFields>
+ <lookupDialogsAdditionalFields>ACCOUNT.NAME</lookupDialogsAdditionalFields>
+ <lookupDialogsAdditionalFields>Opportunity_Category__c</lookupDialogsAdditionalFields>
+ <lookupDialogsAdditionalFields>OPPORTUNITY.AMOUNT</lookupDialogsAdditionalFields>
+ <lookupDialogsAdditionalFields>OPPORTUNITY.CLOSE_DATE</lookupDialogsAdditionalFields>
+ <lookupDialogsAdditionalFields>OPPORTUNITY.STAGE_NAME</lookupDialogsAdditionalFields>
+ <lookupPhoneDialogsAdditionalFields>OPPORTUNITY.NAME</lookupPhoneDialogsAdditionalFields>
+ <lookupPhoneDialogsAdditionalFields>ACCOUNT.NAME</lookupPhoneDialogsAdditionalFields>
+ <lookupPhoneDialogsAdditionalFields>ACCOUNT.SITE</lookupPhoneDialogsAdditionalFields>
+ <searchFilterFields>OPPORTUNITY.NAME</searchFilterFields>
+ <searchFilterFields>ACCOUNT.NAME</searchFilterFields>
+ <searchFilterFields>OPPORTUNITY.RECORDTYPE</searchFilterFields>
+ <searchFilterFields>OPPORTUNITY.AMOUNT</searchFilterFields>
+ <searchFilterFields>Opportunity_Category__c</searchFilterFields>
+ <searchFilterFields>OPPORTUNITY.STAGE_NAME</searchFilterFields>
+ <searchFilterFields>Status_Formula__c</searchFilterFields>
+ <searchFilterFields>CORE.USERS.ALIAS</searchFilterFields>
+ <searchResultsAdditionalFields>OPPORTUNITY.NAME</searchResultsAdditionalFields>
+ <searchResultsAdditionalFields>ACCOUNT.NAME</searchResultsAdditionalFields>
+ <searchResultsAdditionalFields>OCM_man_province_cus__c</searchResultsAdditionalFields>
+ <searchResultsAdditionalFields>Opportunity_No__c</searchResultsAdditionalFields>
+ <searchResultsAdditionalFields>OPPORTUNITY.STAGE_NAME</searchResultsAdditionalFields>
+ <searchResultsAdditionalFields>Wholesale_Price_F__c</searchResultsAdditionalFields>
+ <searchResultsAdditionalFields>OCSM_RMB_Without_Tax_1000__c</searchResultsAdditionalFields>
+ <searchResultsAdditionalFields>OCSM_RMB_Without_Tax_1000TR__c</searchResultsAdditionalFields>
+ <searchResultsAdditionalFields>Dealer_Final_Price_Notax__c</searchResultsAdditionalFields>
+ <searchResultsAdditionalFields>OPPORTUNITY.CLOSE_DATE</searchResultsAdditionalFields>
+ </searchLayouts>
+ <sharingModel>Private</sharingModel>
+</CustomObject>
diff --git "a/force-app/main/default/objects/Opportunity/businessProcesses/\345\274\225\345\220\210.businessProcess-meta.xml" "b/force-app/main/default/objects/Opportunity/businessProcesses/\345\274\225\345\220\210.businessProcess-meta.xml"
new file mode 100644
index 0000000..1fb3a5e
--- /dev/null
+++ "b/force-app/main/default/objects/Opportunity/businessProcesses/\345\274\225\345\220\210.businessProcess-meta.xml"
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<BusinessProcess xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>寮曞悎</fullName>
+ <description>寮曞悎銇鐞嗐伄闅涖伀浣跨敤銇欍倠</description>
+ <isActive>true</isActive>
+ <values>
+ <fullName>寮曞悎</fullName>
+ <default>false</default>
+ </values>
+</BusinessProcess>
diff --git "a/force-app/main/default/objects/Opportunity/businessProcesses/\347\233\256\346\250\231.businessProcess-meta.xml" "b/force-app/main/default/objects/Opportunity/businessProcesses/\347\233\256\346\250\231.businessProcess-meta.xml"
new file mode 100644
index 0000000..12de0e9
--- /dev/null
+++ "b/force-app/main/default/objects/Opportunity/businessProcesses/\347\233\256\346\250\231.businessProcess-meta.xml"
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<BusinessProcess xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>鐩</fullName>
+ <description>鐩銈掔鐞嗐仚銈嬮殯銇娇鐢ㄣ仚銈�</description>
+ <isActive>true</isActive>
+ <values>
+ <fullName>鐩</fullName>
+ <default>false</default>
+ </values>
+</BusinessProcess>
diff --git a/force-app/main/default/objects/Opportunity/compactLayouts/SI_lightning.compactLayout-meta.xml b/force-app/main/default/objects/Opportunity/compactLayouts/SI_lightning.compactLayout-meta.xml
new file mode 100644
index 0000000..6cd5d9c
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/compactLayouts/SI_lightning.compactLayout-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CompactLayout xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>SI_lightning</fullName>
+ <fields>Name</fields>
+ <fields>AccountId</fields>
+ <fields>StageName</fields>
+ <fields>Purchase_Reason__c</fields>
+ <fields>Trade__c</fields>
+ <fields>Close_Forecasted_Date__c</fields>
+ <fields>Hospital__c</fields>
+ <fields>Probability</fields>
+ <fields>Promise_Class__c</fields>
+ <fields>CloseDate</fields>
+ <label>SI璇环lightning甯冨眬</label>
+</CompactLayout>
diff --git a/force-app/main/default/objects/Opportunity/compactLayouts/lightning_target.compactLayout-meta.xml b/force-app/main/default/objects/Opportunity/compactLayouts/lightning_target.compactLayout-meta.xml
new file mode 100644
index 0000000..fd5d9c9
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/compactLayouts/lightning_target.compactLayout-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CompactLayout xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>lightning_target</fullName>
+ <fields>Name</fields>
+ <fields>Target_category__c</fields>
+ <fields>CloseDate</fields>
+ <fields>CurrencyIsoCode</fields>
+ <fields>StageName</fields>
+ <fields>Probability</fields>
+ <fields>AccountId</fields>
+ <label>鐩爣lightning甯冨眬</label>
+</CompactLayout>
diff --git a/force-app/main/default/objects/Opportunity/fieldSets/Customer_enquiry.fieldSet-meta.xml b/force-app/main/default/objects/Opportunity/fieldSets/Customer_enquiry.fieldSet-meta.xml
new file mode 100644
index 0000000..7708ca9
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fieldSets/Customer_enquiry.fieldSet-meta.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<FieldSet xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Customer_enquiry</fullName>
+ <description>鐢ㄤ簬Dealer_enquiryController涓幏鍙朞CM瀛楁闆�</description>
+ <displayedFields>
+ <field>Name</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>Opp_Changed_Field__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>Opportunity_No__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>Hospital__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>Department_Name__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>Opportunity_stage__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>Competitor__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>Bid_Date__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>Closing_Bid_Date__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>Close_Forecasted_Date__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>CloseDate</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>Created_Day__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>Agency1__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>OwnerId</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <label>璇环-缁忛攢鍟嗚浠穇鍙宠竟</label>
+</FieldSet>
diff --git a/force-app/main/default/objects/Opportunity/fieldSets/Opportunity_PCL.fieldSet-meta.xml b/force-app/main/default/objects/Opportunity/fieldSets/Opportunity_PCL.fieldSet-meta.xml
new file mode 100644
index 0000000..9ed6e2f
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fieldSets/Opportunity_PCL.fieldSet-meta.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<FieldSet xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Opportunity_PCL</fullName>
+ <description>OpportunityPCLNew</description>
+ <displayedFields>
+ <field>Opportunity_stage__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>Competitor__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>Fund_Basis__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>Opp_order_Type__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>TenderBeginDate__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>Bid_Date__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>Closing_Bid_Date__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>Close_Forecasted_Date__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>CloseDate</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>Sales_incharge__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>Agency1__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>Important_Rroduct_Flg__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>OCSM_RMB_Without_Tax_1000__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>OCSM_RMB_Without_Tax_1000TR__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>City__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>Forecast_this_month__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>Create_Activity__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>if_NeedImportDemonstration__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>ImportDemonstration_Filing_date__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>ImportDemonstration_Approval_date__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>ImportDemonstration_Rejection_date__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>ImportDemonstration_state__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <label>鍛ㄤ細-鍙宠竟</label>
+</FieldSet>
diff --git a/force-app/main/default/objects/Opportunity/fieldSets/Opportunity_PCL_L.fieldSet-meta.xml b/force-app/main/default/objects/Opportunity/fieldSets/Opportunity_PCL_L.fieldSet-meta.xml
new file mode 100644
index 0000000..e599b46
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fieldSets/Opportunity_PCL_L.fieldSet-meta.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<FieldSet xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Opportunity_PCL_L</fullName>
+ <description>OpportunityPCLNew</description>
+ <displayedFields>
+ <field>Opportunity_No__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>Hospital__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>Status_Formula__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>Department_Name__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>Name</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <label>鍛ㄤ細-宸﹁竟鍥哄畾</label>
+</FieldSet>
diff --git a/force-app/main/default/objects/Opportunity/fieldSets/Opportunity_PCL_Mark.fieldSet-meta.xml b/force-app/main/default/objects/Opportunity/fieldSets/Opportunity_PCL_Mark.fieldSet-meta.xml
new file mode 100644
index 0000000..b80b8ff
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fieldSets/Opportunity_PCL_Mark.fieldSet-meta.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<FieldSet xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Opportunity_PCL_Mark</fullName>
+ <description>OpportunityPCLNew</description>
+ <displayedFields>
+ <field>Last_opd_date__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>Stage2_last_update_day__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>Follow_up_plan_last_update__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>Closing_Bid_date_last_update_day__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>OPP_rank_Last_update_day__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>Situation_last_update_day__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>Opp_forecast_day_last_update_day__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>Bid_date_last_update_day__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>Forecast_amount_last_update_day__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>Forecast_shipping_day_last_update__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>Agent_Hospital_Contract_day_last_update__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <displayedFields>
+ <field>Agency_Contract_Date_last_update__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <label>鍛ㄤ細-鏍囪</label>
+</FieldSet>
diff --git a/force-app/main/default/objects/Opportunity/fieldSets/Opportunity_PCL_Sum.fieldSet-meta.xml b/force-app/main/default/objects/Opportunity/fieldSets/Opportunity_PCL_Sum.fieldSet-meta.xml
new file mode 100644
index 0000000..83a23b7
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fieldSets/Opportunity_PCL_Sum.fieldSet-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<FieldSet xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Opportunity_PCL_Sum</fullName>
+ <description>OpportunityPCLNew</description>
+ <displayedFields>
+ <field>OCSM_RMB_Without_Tax_1000__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
+ <label>鍛ㄤ細-閲戦鍚堣</label>
+</FieldSet>
diff --git a/force-app/main/default/objects/Opportunity/fields/AccDealerBlacklist__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/AccDealerBlacklist__c.field-meta.xml
new file mode 100644
index 0000000..4b7d356
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/AccDealerBlacklist__c.field-meta.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>AccDealerBlacklist__c</fullName>
+ <externalId>false</externalId>
+ <formula>if(AND(Hospital__r.IFTradeComplianceIntercept__c =='intercept',Agency1__r.IFTradeComplianceIntercept__c =='intercept',Agency2__r.IFTradeComplianceIntercept__c =='intercept'),'123',
+if(AND(Hospital__r.IFTradeComplianceIntercept__c =='intercept',Agency1__r.IFTradeComplianceIntercept__c =='intercept'),'12',
+if(AND(Agency1__r.IFTradeComplianceIntercept__c =='intercept',Agency2__r.IFTradeComplianceIntercept__c =='intercept'),'23',
+if(AND(Hospital__r.IFTradeComplianceIntercept__c =='intercept',Agency2__r.IFTradeComplianceIntercept__c =='intercept'),'13',
+if(Hospital__r.IFTradeComplianceIntercept__c =='intercept','1',
+if(Agency1__r.IFTradeComplianceIntercept__c =='intercept','2',
+if(Agency2__r.IFTradeComplianceIntercept__c =='intercept','3',
+if(AND(Hospital__r.IFTradeComplianceIntercept__c =='WarningList',Agency1__r.IFTradeComplianceIntercept__c =='WarningList',Agency2__r.IFTradeComplianceIntercept__c =='WarningList'),'567',
+if(AND(Hospital__r.IFTradeComplianceIntercept__c =='WarningList',Agency1__r.IFTradeComplianceIntercept__c =='WarningList'),'56',
+if(AND(Agency1__r.IFTradeComplianceIntercept__c =='WarningList',Agency2__r.IFTradeComplianceIntercept__c =='intercept'),'67',
+if(AND(Hospital__r.IFTradeComplianceIntercept__c =='WarningList',Agency2__r.IFTradeComplianceIntercept__c =='WarningList'),'57',
+if(Hospital__r.IFTradeComplianceIntercept__c =='WarningList','5',
+if(Agency1__r.IFTradeComplianceIntercept__c =='WarningList','6',
+if(Agency2__r.IFTradeComplianceIntercept__c =='WarningList','7','4'
+)))))))
+)))))))</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>瀹㈡埛/缁忛攢鍟嗕负榛戝悕鍗�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/AccountId.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/AccountId.field-meta.xml
new file mode 100644
index 0000000..1df13d8
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/AccountId.field-meta.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>AccountId</fullName>
+ <lookupFilter>
+ <active>true</active>
+ <filterItems>
+ <field>Account.RecordTypeId</field>
+ <operation>equals</operation>
+ <value>瑷虹檪绉� 銇濄伄浠�, 瑷虹檪绉� 鍛煎惛绉�, 瑷虹檪绉� 濠︿汉绉�, 瑷虹檪绉� 鏅绉�, 瑷虹檪绉� 娉屽翱绉�, 瑷虹檪绉� 娑堝寲绉�, 瑷虹檪绉� 鑰抽蓟鍠夌, 濂戠磩</value>
+ </filterItems>
+ <filterItems>
+ <field>Account.Is_Active_Formula__c</field>
+ <operation>notEqual</operation>
+ <value>鏃犳晥</value>
+ </filterItems>
+ <isOptional>true</isOptional>
+ </lookupFilter>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>true</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/AccountParentId__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/AccountParentId__c.field-meta.xml
new file mode 100644
index 0000000..5f12cf3
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/AccountParentId__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>AccountParentId__c</fullName>
+ <externalId>false</externalId>
+ <formula>Account.ParentId</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>AccountParentId</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/AccountParentParentId__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/AccountParentParentId__c.field-meta.xml
new file mode 100644
index 0000000..0a3a149
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/AccountParentParentId__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>AccountParentParentId__c</fullName>
+ <externalId>false</externalId>
+ <formula>Account.Parent.ParentId</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>AccountParentParentId</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/AccountType__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/AccountType__c.field-meta.xml
new file mode 100644
index 0000000..8964725
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/AccountType__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>AccountType__c</fullName>
+ <externalId>false</externalId>
+ <formula>Account.RecordType.DeveloperName</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>瀹㈡埛绫诲瀷</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Account_Is_Active__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Account_Is_Active__c.field-meta.xml
new file mode 100644
index 0000000..f567685
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Account_Is_Active__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Account_Is_Active__c</fullName>
+ <externalId>false</externalId>
+ <formula>TEXT(Account.Is_Active__c)</formula>
+ <label>绉戝鏈夋晥/鏃犳晥</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Account_Name_F__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Account_Name_F__c.field-meta.xml
new file mode 100644
index 0000000..14617ac
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Account_Name_F__c.field-meta.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Account_Name_F__c</fullName>
+ <description>2023-11-08 鍘嗗彶閫昏緫宸蹭笉浣跨敤
+IF(SAP_Send_OK__c && (Agency1__r.Special__c || Agency2__r.Special__c || Account.Parent.Special__c) && $User.ViewSpecialAgencyAmout__c == False, null,
+ Account.Name
+)</description>
+ <externalId>false</externalId>
+ <formula>Account.Name</formula>
+ <label>瀹㈡埛(鎶ヨ〃鐢�)</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/AcecideCntCheck__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/AcecideCntCheck__c.field-meta.xml
new file mode 100644
index 0000000..fcc35ce
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/AcecideCntCheck__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>AcecideCntCheck__c</fullName>
+ <externalId>false</externalId>
+ <formula>if(Is_Corrosion__c,DetailNum__c == CorrosionNumber__c,CorrosionNumber__c==0)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>闃胯タ璧涘浜у搧鏁伴噺鍚堟牸(鍚庡彴鐢�)</label>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/AdvanceTarget__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/AdvanceTarget__c.field-meta.xml
new file mode 100644
index 0000000..c5cfb34
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/AdvanceTarget__c.field-meta.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>AdvanceTarget__c</fullName>
+ <externalId>false</externalId>
+ <label>鏈湡杈炬垚鐩爣</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+ <valueSet>
+ <restricted>true</restricted>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>蹇呰揪</fullName>
+ <default>false</default>
+ <label>蹇呰揪</label>
+ </value>
+ <value>
+ <fullName>浜夊彇</fullName>
+ <default>false</default>
+ <label>浜夊彇</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/After_tender_past_2week__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/After_tender_past_2week__c.field-meta.xml
new file mode 100644
index 0000000..8b83ca2
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/After_tender_past_2week__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>After_tender_past_2week__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(Elapsed_day_after_tender__c >= 14,1,0)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>宸蹭腑鏍囩姸鎬佸悗瓒呰繃2鍛�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/AgenBusiness_Authorization_No__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/AgenBusiness_Authorization_No__c.field-meta.xml
new file mode 100644
index 0000000..6b8ad66
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/AgenBusiness_Authorization_No__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>AgenBusiness_Authorization_No__c</fullName>
+ <externalId>false</externalId>
+ <formula>Agency1__r.Business_Authorization_No__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>缁忛攢鍟嗚惀涓氭墽鐓ф敞鍐屽彿</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/AgenBusiness_Paper_Expiration_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/AgenBusiness_Paper_Expiration_Date__c.field-meta.xml
new file mode 100644
index 0000000..61b7c8f
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/AgenBusiness_Paper_Expiration_Date__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>AgenBusiness_Paper_Expiration_Date__c</fullName>
+ <externalId>false</externalId>
+ <formula>Agency1__r.Business_Paper_Expiration_Date__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>缁忛攢鍟嗚惀涓氭墽鐓ф湁鏁堟湡闄�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/AgenMedical_Equipment_Expiration_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/AgenMedical_Equipment_Expiration_Date__c.field-meta.xml
new file mode 100644
index 0000000..5b6eff0
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/AgenMedical_Equipment_Expiration_Date__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>AgenMedical_Equipment_Expiration_Date__c</fullName>
+ <externalId>false</externalId>
+ <formula>Agency1__r.Medical_Equipment_Expiration_Date__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>缁忛攢鍟嗗尰鐤楀櫒姊扮粡钀ヤ紒涓氳鍙瘉鏈夋晥鏈熼檺</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/AgenMedical_Equipment_Num__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/AgenMedical_Equipment_Num__c.field-meta.xml
new file mode 100644
index 0000000..fc3098e
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/AgenMedical_Equipment_Num__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>AgenMedical_Equipment_Num__c</fullName>
+ <externalId>false</externalId>
+ <formula>Agency1__r.Medical_Equipment_Num__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>缁忛攢鍟嗗尰鐤楀櫒姊扮粡钀ヤ紒涓氳鍙瘉</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/AgenTax_Practice_Expiration_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/AgenTax_Practice_Expiration_Date__c.field-meta.xml
new file mode 100644
index 0000000..ede8ed0
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/AgenTax_Practice_Expiration_Date__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>AgenTax_Practice_Expiration_Date__c</fullName>
+ <externalId>false</externalId>
+ <formula>Agency1__r.Tax_Practice_Expiration_Date__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>缁忛攢鍟嗙◣鍔＄櫥璁拌瘉鏈夋晥鏈熼檺</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/AgenTax_Practice_No__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/AgenTax_Practice_No__c.field-meta.xml
new file mode 100644
index 0000000..97361bc
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/AgenTax_Practice_No__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>AgenTax_Practice_No__c</fullName>
+ <externalId>false</externalId>
+ <formula>Agency1__r.Tax_Practice_No__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>缁忛攢鍟嗙◣鍔＄櫥璁拌瘉鍙�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Agencies__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Agencies__c.field-meta.xml
new file mode 100644
index 0000000..6be986f
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Agencies__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Agencies__c</fullName>
+ <externalId>false</externalId>
+ <label>涓爣缁忛攢鍟�</label>
+ <length>32768</length>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>LongTextArea</type>
+ <visibleLines>3</visibleLines>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Agency1_ID_18__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Agency1_ID_18__c.field-meta.xml
new file mode 100644
index 0000000..b9c87db
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Agency1_ID_18__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Agency1_ID_18__c</fullName>
+ <externalId>false</externalId>
+ <formula>casesafeid(Agency1__c)</formula>
+ <label>缁忛攢鍟�1ID(18浣�)</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Agency1_Name_F__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Agency1_Name_F__c.field-meta.xml
new file mode 100644
index 0000000..9bee90e
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Agency1_Name_F__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Agency1_Name_F__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(SAP_Send_OK__c && (Agency1__r.Special__c || Agency2__r.Special__c || Account.Parent.Special__c) && $User.ViewSpecialAgencyAmout__c == False, null,
+ Agency1__r.Name
+)</formula>
+ <label>缁忛攢鍟�1(鎶ヨ〃鐢�)</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Agency1_Profit_Rate__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Agency1_Profit_Rate__c.field-meta.xml
new file mode 100644
index 0000000..f2ea59f
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Agency1_Profit_Rate__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Agency1_Profit_Rate__c</fullName>
+ <externalId>false</externalId>
+ <label>(鍚庡彴鐢�)/缁忛攢鍟�1鍒╂鼎姣旂巼</label>
+ <precision>5</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Percent</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Agency1_Profit__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Agency1_Profit__c.field-meta.xml
new file mode 100644
index 0000000..dffd7aa
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Agency1_Profit__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Agency1_Profit__c</fullName>
+ <externalId>false</externalId>
+ <label>(鍚庡彴鐢�)/缁忛攢鍟�1鍒╂鼎閲戦</label>
+ <precision>15</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Agency1__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Agency1__c.field-meta.xml
new file mode 100644
index 0000000..29024ef
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Agency1__c.field-meta.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Agency1__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <description>(1娆¤博澹插簵)
+2012/08/30
+銉囥儮銇儑銉笺偪绉昏鏅傘伀璨╁２搴椼伀绱愪粯銇戙仾銇嬨仯銇熴伄銇с�併仐銇般倝銇忛潪琛ㄧず銇仚銈�</description>
+ <externalId>false</externalId>
+ <label>缁忛攢鍟�1</label>
+ <lookupFilter>
+ <active>true</active>
+ <filterItems>
+ <field>Account.RecordTypeId</field>
+ <operation>equals</operation>
+ <value>璨╁２搴�</value>
+ </filterItems>
+ <isOptional>false</isOptional>
+ </lookupFilter>
+ <referenceTo>Account</referenceTo>
+ <relationshipLabel>寮曞悎锛�1娆¤博澹插簵锛�</relationshipLabel>
+ <relationshipName>Opp_Account1</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Agency2_Name_F__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Agency2_Name_F__c.field-meta.xml
new file mode 100644
index 0000000..5a44b26
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Agency2_Name_F__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Agency2_Name_F__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(SAP_Send_OK__c && (Agency1__r.Special__c || Agency2__r.Special__c || Account.Parent.Special__c) && $User.ViewSpecialAgencyAmout__c == False, null,
+ Agency2__r.Name
+)</formula>
+ <label>缁忛攢鍟�2(鎶ヨ〃鐢�)</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Agency2_Profit_F__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Agency2_Profit_F__c.field-meta.xml
new file mode 100644
index 0000000..c761b78
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Agency2_Profit_F__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Agency2_Profit_F__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(SAP_Send_OK__c && (Agency1__r.Special__c || Agency2__r.Special__c || Account.Parent.Special__c) && $User.ViewSpecialAgencyAmout__c == False, null,
+ Agency2_Profit__c
+)</formula>
+ <label>缁忛攢鍟�2鍒╂鼎棰�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Agency2_Profit_Rate_F__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Agency2_Profit_Rate_F__c.field-meta.xml
new file mode 100644
index 0000000..4ead722
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Agency2_Profit_Rate_F__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Agency2_Profit_Rate_F__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(SAP_Send_OK__c && (Agency1__r.Special__c || Agency2__r.Special__c || Account.Parent.Special__c) && $User.ViewSpecialAgencyAmout__c == False, null,
+ Agency2_Profit_Rate__c
+)</formula>
+ <label>缁忛攢鍟�2鍒╂鼎鐜�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Percent</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Agency2_Profit_Rate__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Agency2_Profit_Rate__c.field-meta.xml
new file mode 100644
index 0000000..77c9d77
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Agency2_Profit_Rate__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Agency2_Profit_Rate__c</fullName>
+ <externalId>false</externalId>
+ <label>缁忛攢鍟�2鍒╂鼎鐜嘷鍏�</label>
+ <precision>5</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Percent</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Agency2_Profit__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Agency2_Profit__c.field-meta.xml
new file mode 100644
index 0000000..30988f8
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Agency2_Profit__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Agency2_Profit__c</fullName>
+ <externalId>false</externalId>
+ <label>缁忛攢鍟�2鍒╂鼎閲戦_鍏�</label>
+ <precision>15</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Agency2__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Agency2__c.field-meta.xml
new file mode 100644
index 0000000..4e3dd4e
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Agency2__c.field-meta.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Agency2__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <description>(2娆¤博澹插簵)
+
+2012/08/30
+銉囥儮銇儑銉笺偪绉昏鏅傘伀璨╁２搴椼伀绱愪粯銇戙仾銇嬨仯銇熴伄銇с�併仐銇般倝銇忛潪琛ㄧず銇仚銈�</description>
+ <externalId>false</externalId>
+ <label>缁忛攢鍟�2</label>
+ <lookupFilter>
+ <active>true</active>
+ <filterItems>
+ <field>Account.RecordTypeId</field>
+ <operation>equals</operation>
+ <value>璨╁２搴�</value>
+ </filterItems>
+ <isOptional>false</isOptional>
+ </lookupFilter>
+ <referenceTo>Account</referenceTo>
+ <relationshipLabel>寮曞悎锛�2娆¤博澹插簵锛�</relationshipLabel>
+ <relationshipName>Opp_Account2</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/AgencyBid_Planned_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/AgencyBid_Planned_Date__c.field-meta.xml
new file mode 100644
index 0000000..0737487
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/AgencyBid_Planned_Date__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>AgencyBid_Planned_Date__c</fullName>
+ <externalId>false</externalId>
+ <formula>Agency_Opportunity__r.Bid_Planned_Date__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>缁忛攢鍟嗘嫑鏍囨棩</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/AgencyDiscount__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/AgencyDiscount__c.field-meta.xml
new file mode 100644
index 0000000..5a42d77
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/AgencyDiscount__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>AgencyDiscount__c</fullName>
+ <externalId>false</externalId>
+ <label>缁忛攢鍟嗘姌鎵�</label>
+ <precision>5</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Percent</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/AgencyOpp_Amount__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/AgencyOpp_Amount__c.field-meta.xml
new file mode 100644
index 0000000..88a23dc
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/AgencyOpp_Amount__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>AgencyOpp_Amount__c</fullName>
+ <externalId>false</externalId>
+ <formula>Agency_Opportunity__r.Amount__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>缁忛攢鍟嗛娴嬩笌鍖婚櫌鍚堝悓閲戦(鍚◣)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/AgencyOpp_Close_Forecasted_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/AgencyOpp_Close_Forecasted_Date__c.field-meta.xml
new file mode 100644
index 0000000..38d79ed
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/AgencyOpp_Close_Forecasted_Date__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>AgencyOpp_Close_Forecasted_Date__c</fullName>
+ <externalId>false</externalId>
+ <formula>Agency_Opportunity__r.Close_Forecasted_Date__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>缁忛攢鍟嗚浠烽娴嬬绾︽棩</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/AgencyOpp_FromOCM__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/AgencyOpp_FromOCM__c.field-meta.xml
new file mode 100644
index 0000000..1b35952
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/AgencyOpp_FromOCM__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>AgencyOpp_FromOCM__c</fullName>
+ <externalId>false</externalId>
+ <formula>Agency_Opportunity__r.OCM_Change_To_Opportunity_Flg__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>缁忛攢鍟嗚浠锋潵鑷狾CSM</label>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/AgencyOpp_No__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/AgencyOpp_No__c.field-meta.xml
new file mode 100644
index 0000000..f0ac6b4
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/AgencyOpp_No__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>AgencyOpp_No__c</fullName>
+ <externalId>false</externalId>
+ <formula>Agency_Opportunity__r.Agency_Opportunity_No__c</formula>
+ <label>缁忛攢鍟嗚浠风紪鐮�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/AgencyOpp_OCMSale_Price__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/AgencyOpp_OCMSale_Price__c.field-meta.xml
new file mode 100644
index 0000000..e8f3a5c
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/AgencyOpp_OCMSale_Price__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>AgencyOpp_OCMSale_Price__c</fullName>
+ <externalId>false</externalId>
+ <formula>Agency_Opportunity__r.OCMSale_Price__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>缁忛攢鍟嗛娴嬩笌OCSM鍚堝悓閲戦(鍚◣)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/AgencyOpp_OCM_Term__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/AgencyOpp_OCM_Term__c.field-meta.xml
new file mode 100644
index 0000000..28b1c00
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/AgencyOpp_OCM_Term__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>AgencyOpp_OCM_Term__c</fullName>
+ <externalId>false</externalId>
+ <formula>Agency_Opportunity__r.Tem_OCM_Term__c</formula>
+ <label>缁忛攢鍟嗚浠稯CSM鏈�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/AgencyOpp_StageName__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/AgencyOpp_StageName__c.field-meta.xml
new file mode 100644
index 0000000..dd9b7f7
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/AgencyOpp_StageName__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>AgencyOpp_StageName__c</fullName>
+ <externalId>false</externalId>
+ <formula>text(Agency_Opportunity__r.StageName__c)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>缁忛攢鍟嗚浠烽樁娈�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/AgencyQuolified_Flag__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/AgencyQuolified_Flag__c.field-meta.xml
new file mode 100644
index 0000000..a198055
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/AgencyQuolified_Flag__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>AgencyQuolified_Flag__c</fullName>
+ <description>鏍囪瘑閭欢鍙戦�佸璞�</description>
+ <externalId>false</externalId>
+ <label>缁忛攢鍟嗚祫璐ㄥ埌鏈熼偖浠舵爣璇�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Agency_Contract_Date1__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Agency_Contract_Date1__c.field-meta.xml
new file mode 100644
index 0000000..b57230c
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Agency_Contract_Date1__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Agency_Contract_Date1__c</fullName>
+ <externalId>false</externalId>
+ <label>15.OCSM-缁忛攢鍟嗙绾︽棩</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>true</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Agency_Contract_Date_last_update__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Agency_Contract_Date_last_update__c.field-meta.xml
new file mode 100644
index 0000000..836df7e
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Agency_Contract_Date_last_update__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Agency_Contract_Date_last_update__c</fullName>
+ <externalId>false</externalId>
+ <label>鏈�鍚庢洿鏂版棩-OCSM-缁忛攢鍟嗙绾︽棩(涓嶇敤)</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Agency_Intelligence_Expire_Remind_Flag__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Agency_Intelligence_Expire_Remind_Flag__c.field-meta.xml
new file mode 100644
index 0000000..ae9c175
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Agency_Intelligence_Expire_Remind_Flag__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Agency_Intelligence_Expire_Remind_Flag__c</fullName>
+ <externalId>false</externalId>
+ <label>缁忛攢鍟�1璧勮川鍒版湡鎻愰啋閭欢鏍囪瘑</label>
+ <precision>2</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Agency_Is_Delete__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Agency_Is_Delete__c.field-meta.xml
new file mode 100644
index 0000000..f8222ac
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Agency_Is_Delete__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Agency_Is_Delete__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(Account.Is_Active_Formula__c = "鏃犳晥" && Account.Contract_Quote_Decide_Flag_checkbox__c = false, "鈭�", "")</formula>
+ <label>缁忛攢鍟嗗悎鍚屽垹闄�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Agency_Opportunity__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Agency_Opportunity__c.field-meta.xml
new file mode 100644
index 0000000..976e717
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Agency_Opportunity__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Agency_Opportunity__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>缁忛攢鍟嗚浠�</label>
+ <referenceTo>Agency_Opportunity__c</referenceTo>
+ <relationshipLabel>鍟嗚珖</relationshipLabel>
+ <relationshipName>Opportunity</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Agent1_Agent2_Price_F__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Agent1_Agent2_Price_F__c.field-meta.xml
new file mode 100644
index 0000000..8d83e1d
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Agent1_Agent2_Price_F__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Agent1_Agent2_Price_F__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(SAP_Send_OK__c && (Agency1__r.Special__c || Agency2__r.Special__c || Account.Parent.Special__c) && $User.ViewSpecialAgencyAmout__c == False, null,
+ Agent1_Agent2_Price__c
+)</formula>
+ <label>缁忛攢鍟�1-缁忛攢鍟�2閲戦</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Agent1_Agent2_Price__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Agent1_Agent2_Price__c.field-meta.xml
new file mode 100644
index 0000000..83cc61e
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Agent1_Agent2_Price__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Agent1_Agent2_Price__c</fullName>
+ <externalId>false</externalId>
+ <label>(鍚庡彴鐢�)/缁忛攢鍟�1-缁忛攢鍟�2閲戦</label>
+ <precision>15</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Agent_Hospital_Contract_day_last_update__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Agent_Hospital_Contract_day_last_update__c.field-meta.xml
new file mode 100644
index 0000000..081e38d
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Agent_Hospital_Contract_day_last_update__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Agent_Hospital_Contract_day_last_update__c</fullName>
+ <externalId>false</externalId>
+ <label>鏈�鍚庢洿鏂版棩-缁忛攢鍟�-鍖婚櫌绛剧害鏃�(涓嶈)</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Amount.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Amount.field-meta.xml
new file mode 100644
index 0000000..e3afb76
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Amount.field-meta.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Amount</fullName>
+ <trackFeedHistory>true</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Amount_F__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Amount_F__c.field-meta.xml
new file mode 100644
index 0000000..15e3e2b
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Amount_F__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Amount_F__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(SAP_Send_OK__c && (Agency1__r.Special__c || Agency2__r.Special__c || Account.Parent.Special__c) && $User.ViewSpecialAgencyAmout__c == False, null,
+ Amount__c
+)</formula>
+ <label>鎶ヤ环鎬婚</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Amount_Without_Tax_F__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Amount_Without_Tax_F__c.field-meta.xml
new file mode 100644
index 0000000..390230b
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Amount_Without_Tax_F__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Amount_Without_Tax_F__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(SAP_Send_OK__c && (Agency1__r.Special__c || Agency2__r.Special__c || Account.Parent.Special__c) && $User.ViewSpecialAgencyAmout__c == False, null,
+ Amount_Without_Tax__c
+)</formula>
+ <label>涓嶄娇鐢細OCSM棰勬祴鎴愪氦閲戦(涓嶅惈绋�)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Amount_Without_Tax_Thousand_F__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Amount_Without_Tax_Thousand_F__c.field-meta.xml
new file mode 100644
index 0000000..21e8fd3
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Amount_Without_Tax_Thousand_F__c.field-meta.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Amount_Without_Tax_Thousand_F__c</fullName>
+ <description>/** 姹囩巼鍙樹簡浠ュ悗杩欓噷涔熻鏀� **/
+IF(TEXT(Trade__c) = "鍐呰部", Wholesale_Price_F__c / 1.17 / 1000, Wholesale_Price_F__c * 6.8 / 1000)</description>
+ <externalId>false</externalId>
+ <formula>IF(TEXT(Trade__c) = "鍐呰部", Wholesale_Price_F__c / Tax_Intra_F_Copy__c / 1000, Wholesale_Price_F__c * Tax_Foreign_F_Copy__c / 1000)</formula>
+ <label>棰勬祴鍚堝悓閲戦(KRMB)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Amount_Without_Tax__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Amount_Without_Tax__c.field-meta.xml
new file mode 100644
index 0000000..c483a0a
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Amount_Without_Tax__c.field-meta.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Amount_Without_Tax__c</fullName>
+ <description>绋庢姕銇嶃伄瑷堢畻
+鍐呰部锛圧MB锛夛細 / 1.17
+澶栬部锛圲SD锛�
+銆�2012骞�10鏈堜互鍓嶃伄鍑鸿嵎 x 0.846153
+ 2012骞�10鏈堜互闄嶃伄鍑鸿嵎 x 0.8076915
+ 2016骞�7鏈堜互鍚庡嚭搴� x 0.8333325
+2016骞�12鏈堜互鍚庡嚭搴� x 0.871794</description>
+ <externalId>false</externalId>
+ <formula>Case( Trade__c,
+"鍐呰部", Wholesale_Price__c / Tax_Intra_F_Copy__c ,
+"澶栬部", Wholesale_Price__c * Tax_Foreign_F_Copy__c ,
+Wholesale_Price__c * 1
+)</formula>
+ <label>(鍚庡彴鐢�)/OCSM棰勬祴鎴愪氦閲戦(涓嶅惈绋�)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Amount__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Amount__c.field-meta.xml
new file mode 100644
index 0000000..3f2bb8c
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Amount__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Amount__c</fullName>
+ <description>鎶ヤ环LIST PRICE绱</description>
+ <externalId>false</externalId>
+ <label>鏍囧噯鎶ヤ环閲戦锛堢疮璁★級</label>
+ <summarizedField>OpportunityLineItem.TotalPrice__c</summarizedField>
+ <summaryForeignKey>OpportunityLineItem.OpportunityId</summaryForeignKey>
+ <summaryOperation>sum</summaryOperation>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Summary</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Analysiz_target_dinghuo_forecast__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Analysiz_target_dinghuo_forecast__c.field-meta.xml
new file mode 100644
index 0000000..78665ba
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Analysiz_target_dinghuo_forecast__c.field-meta.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Analysiz_target_dinghuo_forecast__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(
+ MONTH(Today())=12,
+ IF(
+ order_Date_For_Report__c >= DATE(YEAR(today()),01,01),
+ 1,
+ 0
+ ),
+ IF( order_Date_For_Report__c >= DATE(YEAR(today())-1,MONTH(Today())+1,01),
+ 1,
+ 0
+ )
+)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>缁熻寮�濮嬫棩(1骞村墠) 璁㈣揣棰勬祴鏃�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Application_Amount_Submit__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Application_Amount_Submit__c.field-meta.xml
new file mode 100644
index 0000000..40fac35
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Application_Amount_Submit__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Application_Amount_Submit__c</fullName>
+ <externalId>false</externalId>
+ <label>鐢宠閲戦(鍏�)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/ApprovedNum__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/ApprovedNum__c.field-meta.xml
new file mode 100644
index 0000000..4110ead
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/ApprovedNum__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ApprovedNum__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF( ISBLANK(Contract_DB_SalesDept_complite_day__c ) ,0,1)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鍚堝悓鐢宠鏁�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Area_Authorized_dealer__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Area_Authorized_dealer__c.field-meta.xml
new file mode 100644
index 0000000..f484a0a
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Area_Authorized_dealer__c.field-meta.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Area_Authorized_dealer__c</fullName>
+ <externalId>false</externalId>
+ <formula>/* 01210000000QemG == 鍖婚櫌鐨勮褰曠被鍨嬬殑Id */
+IF(Account.Parent.Parent.RecordTypeId = "01210000000QemG",
+ Account.Parent.Agency1__r.Name,
+ ""
+)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鍖哄煙鐗圭害缁忛攢鍟�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/ArgumentsSubmittedNumber__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/ArgumentsSubmittedNumber__c.field-meta.xml
new file mode 100644
index 0000000..787029a
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/ArgumentsSubmittedNumber__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ArgumentsSubmittedNumber__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF( ImportDemonstration_state__c == '宸叉彁浜�', 1, 0)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>璁鸿瘉鎻愪氦鏁�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Assistant_Applied_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Assistant_Applied_Date__c.field-meta.xml
new file mode 100644
index 0000000..6cdadcd
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Assistant_Applied_Date__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Assistant_Applied_Date__c</fullName>
+ <externalId>false</externalId>
+ <label>14.鍚堝悓鐢宠鏃�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Assistant_Applied__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Assistant_Applied__c.field-meta.xml
new file mode 100644
index 0000000..310cfb3
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Assistant_Applied__c.field-meta.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Assistant_Applied__c</fullName>
+ <description>2023/2/6ws淇敼鍓嶏細
+if(text(ConfirmationofAward__c) == 'OLY涓爣',IF( ISNULL(Assistant_Applied_Date__c) , IF(TODAY() - ConfirmationofAward_createTime__c <=30, null, 0) , IF( ConfirmationofAward_createTime__c - Assistant_Applied_Date__c <= 30 , 1, 0 ) ),null)</description>
+ <externalId>false</externalId>
+ <formula>if(text(ConfirmationofAward__c) == 'OLY涓爣',IF( ISNULL(Assistant_Applied_Date__c) , IF(TODAY() - ConfirmationofAward_createTime__c <=30, null, 0) , IF( Assistant_Applied_Date__c -
+ConfirmationofAward_createTime__c <= 30 , 1, 0 ) ),null)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏄惁鎸夋椂鍚堝悓鐢宠</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Attribute_Type__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Attribute_Type__c.field-meta.xml
new file mode 100644
index 0000000..a1ab517
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Attribute_Type__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Attribute_Type__c</fullName>
+ <externalId>false</externalId>
+ <formula>Text(Account.Parent.Parent.Attribute_Type__c)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鍖婚櫌鎵�灞炴�ц川</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Autholization_Activated_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Autholization_Activated_Date__c.field-meta.xml
new file mode 100644
index 0000000..98d2224
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Autholization_Activated_Date__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Autholization_Activated_Date__c</fullName>
+ <externalId>false</externalId>
+ <label>11.鎺堟潈鎴嚦鏃�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Authorized_DB_No__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Authorized_DB_No__c.field-meta.xml
new file mode 100644
index 0000000..cb64124
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Authorized_DB_No__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Authorized_DB_No__c</fullName>
+ <externalId>false</externalId>
+ <label>鎺堟潈鐢宠缂栫爜</label>
+ <length>50</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>true</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Authorized_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Authorized_Date__c.field-meta.xml
new file mode 100644
index 0000000..a32dc5b
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Authorized_Date__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Authorized_Date__c</fullName>
+ <externalId>false</externalId>
+ <label>11.鎺堟潈鏃�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Authorized_Finish_Sales__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Authorized_Finish_Sales__c.field-meta.xml
new file mode 100644
index 0000000..3e3fe53
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Authorized_Finish_Sales__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Authorized_Finish_Sales__c</fullName>
+ <externalId>false</externalId>
+ <label>鎺堟潈鐨勭粡閿�鍟�</label>
+ <length>255</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Authorized_Start_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Authorized_Start_Date__c.field-meta.xml
new file mode 100644
index 0000000..a48560b
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Authorized_Start_Date__c.field-meta.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Authorized_Start_Date__c</fullName>
+ <externalId>false</externalId>
+ <formula>if (
+ isblank( Authorized_Date__c),
+ if (
+ isblank( Autholization_Activated_Date__c),
+ if (
+ isblank( Bid_Date__c),
+ null,
+ Bid_Date__c
+ ),
+ Autholization_Activated_Date__c
+ ),
+ Authorized_Date__c
+)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>涓嶄娇鐢� 鎺堟潈鏃�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Authorized_start__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Authorized_start__c.field-meta.xml
new file mode 100644
index 0000000..fa7b437
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Authorized_start__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Authorized_start__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>鎺堟潈寮�濮�</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/BC_Wave__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/BC_Wave__c.field-meta.xml
new file mode 100644
index 0000000..5cc5ede
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/BC_Wave__c.field-meta.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>BC_Wave__c</fullName>
+ <externalId>false</externalId>
+ <formula>Case(SAP_Province__c,
+"瀹夊窘鐪�","鍗庝笢涓夐儴",
+"OSH-瀹夊窘鐪�","鍗庝笢涓夐儴",
+"鍖椾含甯�","鍗庡寳涓�閮�",
+"绂忓缓鐪�","鍗庝笢浜岄儴",
+"鐢樿們鐪�","瑗垮寳涓夐儴",
+"骞夸笢鐪�","鍗庡崡涓�閮�",
+"娣卞湷甯�","鍗庡崡浜岄儴",
+"骞胯タ鑷不鍖�","鍗庡崡涓夐儴",
+"璐靛窞鐪�","瑗垮崡浜岄儴",
+"娌冲寳鐪�","鍗庡寳浜岄儴",
+"娌冲崡鐪�","瑗垮寳浜岄儴",
+"榛戦緳姹熺渷","涓滃寳涓�閮�",
+"婀栧寳鐪�","鍗庡崡涓夐儴",
+"婀栧崡鐪�","鍗庡崡涓夐儴",
+"鍚夋灄鐪�","涓滃寳涓�閮�",
+"姹熻嫃鐪�","鍗庝笢浜岄儴",
+"姹熻タ鐪�","鍗庝笢浜岄儴",
+"杈藉畞鐪�","涓滃寳浜岄儴",
+"澶ц繛甯�","涓滃寳浜岄儴",
+"鍐呰挋鍙�","鍗庡寳浜岄儴",
+"瀹佸鑷不鍖�","瑗垮寳浜岄儴",
+"闈掓捣鐪�","瑗垮寳浜岄儴",
+"灞变笢鐪�","鍗庡寳涓夐儴",
+"闈掑矝甯�","鍗庡寳涓夐儴",
+"灞辫タ鐪�","瑗垮寳涓�閮�",
+"闄曡タ鐪�","瑗垮寳涓�閮�",
+"涓婃捣甯�","鍗庝笢涓�閮�",
+"鍥涘窛鐪�","瑗垮崡涓�閮�",
+"澶╂触甯�","鍗庡寳浜岄儴",
+"鏂扮枂鑷不鍖�","瑗垮寳涓夐儴",
+"浜戝崡鐪�","瑗垮崡浜岄儴",
+"娴欐睙鐪�","鍗庝笢涓夐儴",
+"閲嶅簡甯�","瑗垮崡涓�閮�",
+"娴峰崡鐪�","鍗庡崡浜岄儴",
+"瑗胯棌鑷不鍖�","瑗垮崡涓�閮�",
+"")</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>閮� Wave</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/BO_Forecast_ThousandY__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/BO_Forecast_ThousandY__c.field-meta.xml
new file mode 100644
index 0000000..e5f0a5c
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/BO_Forecast_ThousandY__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>BO_Forecast_ThousandY__c</fullName>
+ <externalId>false</externalId>
+ <formula>BO_Forecast__c/1000</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>6.娉ㄦ畫(KRMB)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/BO_Forecast__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/BO_Forecast__c.field-meta.xml
new file mode 100644
index 0000000..cae39a9
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/BO_Forecast__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>BO_Forecast__c</fullName>
+ <description>CASE( StageName , "娉ㄦ畫", Amount_Without_Tax_F__c , 0)</description>
+ <externalId>false</externalId>
+ <formula>if(text(Trade__c)=='澶栬部',Forecast_Amount_All_withouttax_F__c*Tax_Foreign_F_Copy__c,Forecast_Amount_All_withouttax_F__c)</formula>
+ <label>閫昏緫鐢細3.浠婂勾娉ㄦ畫(涓嶅惈绋�)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/BO_Forecast_incl_tax__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/BO_Forecast_incl_tax__c.field-meta.xml
new file mode 100644
index 0000000..595bea9
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/BO_Forecast_incl_tax__c.field-meta.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>BO_Forecast_incl_tax__c</fullName>
+ <description>2018/1/31 淇敼鍓�
+3.浠婂勾娉ㄦ畫(鍚◣) [鍏紡(甯佺)]</description>
+ <externalId>false</externalId>
+ <formula>Forecast_Amount_All_F__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>3.浠婂勾娉ㄦ畫(鍚◣)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/B_1_shipping_date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/B_1_shipping_date__c.field-meta.xml
new file mode 100644
index 0000000..ea27906
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/B_1_shipping_date__c.field-meta.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>B_1_shipping_date__c</fullName>
+ <externalId>false</externalId>
+ <formula>if ( or( text(StageName) = '鍑鸿嵎', text(StageName) = '娉ㄦ畫', text(StageName) = '瀹屼簡'), Last_Shipping_Date__c ,
+IF(
+ AND(Sum_SAIsCompleted__c > 0,
+MONTH(TODAY()) = MONTH(Last_Shipping_Date__c),
+ YEAR(TODAY()) = YEAR(Last_Shipping_Date__c)) , Last_Shipping_Date__c, null))</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>22.鏈�鏂板彂璐ф棩锛圔-1鎶ヨ〃鐢級</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/BackOfficeUseForecastAmount_PBI__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/BackOfficeUseForecastAmount_PBI__c.field-meta.xml
new file mode 100644
index 0000000..502ee98
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/BackOfficeUseForecastAmount_PBI__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>BackOfficeUseForecastAmount_PBI__c</fullName>
+ <externalId>false</externalId>
+ <label>鍚庡彴鐢�-棰勬祴閲戦锛堟崲绠楀�硷級锛圥BI锛�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>true</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Backup_order_number__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Backup_order_number__c.field-meta.xml
new file mode 100644
index 0000000..bfc0083
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Backup_order_number__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Backup_order_number__c</fullName>
+ <externalId>false</externalId>
+ <label>澶囪揣璁㈠崟鏁�</label>
+ <summarizedField>Statu_Achievements__c.Backup_order_number__c</summarizedField>
+ <summaryForeignKey>Statu_Achievements__c.Opportunity__c</summaryForeignKey>
+ <summaryOperation>sum</summaryOperation>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Summary</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Ban_On_Use_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Ban_On_Use_Date__c.field-meta.xml
new file mode 100644
index 0000000..2eb7aa0
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Ban_On_Use_Date__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Ban_On_Use_Date__c</fullName>
+ <externalId>false</externalId>
+ <formula>Agency1__r.Ban_On_Use_Date__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>绂佺敤鏃ユ湡</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/BeforeSSoppUp__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/BeforeSSoppUp__c.field-meta.xml
new file mode 100644
index 0000000..683ca13
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/BeforeSSoppUp__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>BeforeSSoppUp__c</fullName>
+ <externalId>false</externalId>
+ <formula>Inquiry_forcast_date_copy__c != Inquiry_forcast_date_formular__c || OCM_man_province_cus__c != OCM_man_province_cus__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏇存柊鏍囪</label>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Bid60Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Bid60Date__c.field-meta.xml
new file mode 100644
index 0000000..a3a6a47
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Bid60Date__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Bid60Date__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(NOT(ISBLANK(Closing_Bid_Date__c)),Closing_Bid_Date__c+60,null)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>涓爣鏃�+60澶╂棩鏈�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Bid60NextMonth__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Bid60NextMonth__c.field-meta.xml
new file mode 100644
index 0000000..85a2524
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Bid60NextMonth__c.field-meta.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Bid60NextMonth__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(NOT(ISBLANK(Closing_Bid_Date__c)) ,
+ IF((DATE(IF(MONTH(TODAY()) = 12, YEAR(TODAY())+1, YEAR(TODAY())),IF(MONTH(TODAY()) = 12, 1, MONTH(TODAY())+1), 1) -1 -Closing_Bid_Date__c < 60) &&
+ (DATE(IF(MONTH(TODAY()) = 12, YEAR(TODAY())+1, YEAR(TODAY())),IF(MONTH(TODAY()) = 12, 1, MONTH(TODAY())+1), 1) -1 -Closing_Bid_Date__c + 30 >= 60),'鏄�', '鍚�') ,
+
+'-')</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>涓爣鏃�+60澶╂槸鍚︽鏈�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Bid60NextNextMonth__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Bid60NextNextMonth__c.field-meta.xml
new file mode 100644
index 0000000..6399e01
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Bid60NextNextMonth__c.field-meta.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Bid60NextNextMonth__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(NOT(ISBLANK(Closing_Bid_Date__c)) ,
+ IF((DATE(IF(MONTH(TODAY()) = 12, YEAR(TODAY())+1, YEAR(TODAY())),IF(MONTH(TODAY()) = 12, 1, MONTH(TODAY())+1), 1) -1 -Closing_Bid_Date__c + 30 < 60) &&
+ (DATE(IF(MONTH(TODAY()) = 12, YEAR(TODAY())+1, YEAR(TODAY())),IF(MONTH(TODAY()) = 12, 1, MONTH(TODAY())+1), 1) -1 -Closing_Bid_Date__c + 60 >= 60),'鏄�', '鍚�') ,
+
+'-')</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>涓爣鏃�+60澶╂槸鍚︿笅涓嬫湀</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Bid60ThisMonth__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Bid60ThisMonth__c.field-meta.xml
new file mode 100644
index 0000000..180d0c9
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Bid60ThisMonth__c.field-meta.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Bid60ThisMonth__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(NOT(ISBLANK(Closing_Bid_Date__c)) ,
+ IF(DATE(IF(MONTH(TODAY()) = 12, YEAR(TODAY())+1, YEAR(TODAY())),IF(MONTH(TODAY()) = 12, 1, MONTH(TODAY())+1), 1) -1 -Closing_Bid_Date__c >=60 ,'鏄�', '鍚�') ,
+
+'-')</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>涓爣鏃�+60澶╂槸鍚︽湰鏈�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/BidWinningNumber__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/BidWinningNumber__c.field-meta.xml
new file mode 100644
index 0000000..242aed0
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/BidWinningNumber__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>BidWinningNumber__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(OR(TEXT(ConfirmationofAward__c)=='OLY涓爣',NOT(ISBLANK(NotesApprovedNo__c)),SAP_Send_OK__c, Status_Formula__c == '10 宸蹭腑鏍�', Status_Formula__c == '11 浠锋牸鐢宠涓�'), 1, 0)</formula>
+ <label>涓爣鏁�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Bid_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Bid_Date__c.field-meta.xml
new file mode 100644
index 0000000..7748baf
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Bid_Date__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Bid_Date__c</fullName>
+ <externalId>false</externalId>
+ <label>12.鎷涙爣鏃�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Bid_Planned_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Bid_Planned_Date__c.field-meta.xml
new file mode 100644
index 0000000..4d7ed25
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Bid_Planned_Date__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Bid_Planned_Date__c</fullName>
+ <externalId>false</externalId>
+ <label>棰勬祴鎷涙爣鏃�(涓嶄娇鐢�)</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Bid_Publish_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Bid_Publish_Date__c.field-meta.xml
new file mode 100644
index 0000000..18b3103
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Bid_Publish_Date__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Bid_Publish_Date__c</fullName>
+ <externalId>false</externalId>
+ <label>鍙戝竷鏃ユ湡</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Bid_date_last_update_day__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Bid_date_last_update_day__c.field-meta.xml
new file mode 100644
index 0000000..68d1d8b
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Bid_date_last_update_day__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Bid_date_last_update_day__c</fullName>
+ <externalId>false</externalId>
+ <label>鏈�鍚庢洿鏂版棩-鎷涙爣鏃�(涓嶈)</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Bidding_Company__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Bidding_Company__c.field-meta.xml
new file mode 100644
index 0000000..3a8053b
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Bidding_Company__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Bidding_Company__c</fullName>
+ <externalId>false</externalId>
+ <label>鎷涙爣鍏徃</label>
+ <length>255</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Bidding_Content__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Bidding_Content__c.field-meta.xml
new file mode 100644
index 0000000..48c3756
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Bidding_Content__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Bidding_Content__c</fullName>
+ <externalId>false</externalId>
+ <label>鎷涙爣鍐呭</label>
+ <length>255</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Bidding_Domestic_Or_Import__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Bidding_Domestic_Or_Import__c.field-meta.xml
new file mode 100644
index 0000000..df11dd5
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Bidding_Domestic_Or_Import__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Bidding_Domestic_Or_Import__c</fullName>
+ <externalId>false</externalId>
+ <formula>TEXT(Bidding_Project_Name_Bid__r.Domestic_Or_Import__c)</formula>
+ <label>椤圭洰:鍥戒骇/杩涘彛</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Bidding_Flag__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Bidding_Flag__c.field-meta.xml
new file mode 100644
index 0000000..d247625
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Bidding_Flag__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Bidding_Flag__c</fullName>
+ <defaultValue>false</defaultValue>
+ <description>璇环鐘舵�佹洿鏂颁负 澶卞崟,鍙栨秷,WIN鐨勬椂鍊�,鏇存柊鏍囪瘑涓簍rue
+鐩殑 : 鐢ㄦ潵鏇存柊鎷涙姇鏍囦俊鎭殑<QLY纭鐘舵��></description>
+ <externalId>false</externalId>
+ <label>鎷涙姇鏍囨爣璇�</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Bidding_No_Bid__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Bidding_No_Bid__c.field-meta.xml
new file mode 100644
index 0000000..ef0143e
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Bidding_No_Bid__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Bidding_No_Bid__c</fullName>
+ <externalId>false</externalId>
+ <formula>Bidding_Project_Name_Bid__r.XmNumber__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>椤圭洰:鎷涙爣缂栫爜</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Bidding_No__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Bidding_No__c.field-meta.xml
new file mode 100644
index 0000000..93ba3bb
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Bidding_No__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Bidding_No__c</fullName>
+ <externalId>false</externalId>
+ <label>鎷涙爣缂栧彿(鎵嬪～)</label>
+ <length>255</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Bidding_Project_Name_Bid__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Bidding_Project_Name_Bid__c.field-meta.xml
new file mode 100644
index 0000000..45b343c
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Bidding_Project_Name_Bid__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Bidding_Project_Name_Bid__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>椤圭洰:椤圭洰鍚�</label>
+ <referenceTo>Tender_information__c</referenceTo>
+ <relationshipLabel>璇环锛堟嫑鎶曟爣锛�</relationshipLabel>
+ <relationshipName>Tender_informations</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Bidding_Project_Name__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Bidding_Project_Name__c.field-meta.xml
new file mode 100644
index 0000000..3698538
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Bidding_Project_Name__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Bidding_Project_Name__c</fullName>
+ <externalId>false</externalId>
+ <label>鎷涙爣椤圭洰鍚�</label>
+ <length>255</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Bidding_Project_SFDC_No__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Bidding_Project_SFDC_No__c.field-meta.xml
new file mode 100644
index 0000000..f7a2e2f
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Bidding_Project_SFDC_No__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Bidding_Project_SFDC_No__c</fullName>
+ <externalId>false</externalId>
+ <formula>Bidding_Project_Name_Bid__r.TenderManageCode__c</formula>
+ <label>椤圭洰:SFDC缂栫爜(鏃犻摼鎺�)</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Bool_Create_Day__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Bool_Create_Day__c.field-meta.xml
new file mode 100644
index 0000000..4b5d451
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Bool_Create_Day__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Bool_Create_Day__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(TODAY() - Created_Day__c <732, true, IF(MONTH(TODAY())>3 , IF( DATE( YEAR( TODAY() )-2 ,4,1) <= Created_Day__c , true, false) , IF( DATE( YEAR( TODAY() )-3 ,4,1) <= Created_Day__c , true, false) ) )</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鍒涘缓鏃ュ垽鏂紙璐㈠勾锛�</label>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/BudgetAmount__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/BudgetAmount__c.field-meta.xml
new file mode 100644
index 0000000..ef00ad1
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/BudgetAmount__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>BudgetAmount__c</fullName>
+ <description>Bidding_Project_Name_Bid__r.BudgetAmount__c</description>
+ <externalId>false</externalId>
+ <formula>Bidding_Project_Name_Bid__r.BudgetAmount__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>椤圭洰:棰勭畻閲戦</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Budget_Amount_Approval__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Budget_Amount_Approval__c.field-meta.xml
new file mode 100644
index 0000000..89cdee0
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Budget_Amount_Approval__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Budget_Amount_Approval__c</fullName>
+ <externalId>false</externalId>
+ <label>鎵瑰噯閲戦(鍏�)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Budget_application_date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Budget_application_date__c.field-meta.xml
new file mode 100644
index 0000000..83c61da
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Budget_application_date__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Budget_application_date__c</fullName>
+ <externalId>false</externalId>
+ <label>4.棰勭畻鐢宠鏃�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Budget_approval_date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Budget_approval_date__c.field-meta.xml
new file mode 100644
index 0000000..8e94aa3
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Budget_approval_date__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Budget_approval_date__c</fullName>
+ <externalId>false</externalId>
+ <label>5.棰勭畻鎵瑰噯鏃�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Budget_unapproved_date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Budget_unapproved_date__c.field-meta.xml
new file mode 100644
index 0000000..cb73932
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Budget_unapproved_date__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Budget_unapproved_date__c</fullName>
+ <externalId>false</externalId>
+ <label>6.棰勭畻鏈壒鍑嗘棩</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/BusinessFileArchived__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/BusinessFileArchived__c.field-meta.xml
new file mode 100644
index 0000000..a67f523
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/BusinessFileArchived__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>BusinessFileArchived__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>涓氬姟鏂囦欢宸插瓨妗�</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/CDS_Opp__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/CDS_Opp__c.field-meta.xml
new file mode 100644
index 0000000..4ff31e9
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/CDS_Opp__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>CDS_Opp__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>CDS璇环</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/CHECK1__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/CHECK1__c.field-meta.xml
new file mode 100644
index 0000000..38abbac
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/CHECK1__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>CHECK1__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(
+Account.Parent.Owner.Id = Owner.Id,true,false)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>闇�瑕佺‘璁�,鎷呭綋浜烘槸鍚︿竴鑷�</label>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/CHECK2__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/CHECK2__c.field-meta.xml
new file mode 100644
index 0000000..bfd874b
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/CHECK2__c.field-meta.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>CHECK2__c</fullName>
+ <externalId>false</externalId>
+ <formula>if (
+ abs( Wholesale_Price__c - Sum_ContractAmount__c) >= 10,
+ 1,
+ 0
+)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>涓嶅噯纭�-璇环</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/CHECK2_baojia__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/CHECK2_baojia__c.field-meta.xml
new file mode 100644
index 0000000..3d198b4
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/CHECK2_baojia__c.field-meta.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>CHECK2_baojia__c</fullName>
+ <externalId>false</externalId>
+ <formula>if (
+abs( OCM_Agent1_Price__c - Sum_ContractAmount__c) >= 10,
+1,
+0
+)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>涓嶅噯纭�-鎶ヤ环</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/CLBIC_Category__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/CLBIC_Category__c.field-meta.xml
new file mode 100644
index 0000000..6fb05e6
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/CLBIC_Category__c.field-meta.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>CLBIC_Category__c</fullName>
+ <externalId>false</externalId>
+ <label>OCSM GBIC鍒嗙被</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+ <valueSet>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>GI</fullName>
+ <default>false</default>
+ <label>GI</label>
+ </value>
+ <value>
+ <fullName>ET</fullName>
+ <default>false</default>
+ <label>ET</label>
+ </value>
+ <value>
+ <fullName>BF</fullName>
+ <default>false</default>
+ <label>BF</label>
+ </value>
+ <value>
+ <fullName>GS</fullName>
+ <default>false</default>
+ <label>GS</label>
+ </value>
+ <value>
+ <fullName>URO</fullName>
+ <default>false</default>
+ <label>URO</label>
+ </value>
+ <value>
+ <fullName>GYN</fullName>
+ <default>false</default>
+ <label>GYN</label>
+ </value>
+ <value>
+ <fullName>ENT</fullName>
+ <default>false</default>
+ <label>ENT</label>
+ </value>
+ <value>
+ <fullName>CLBIC-00800:ENERGY</fullName>
+ <default>false</default>
+ <label>CLBIC-00800:ENERGY</label>
+ </value>
+ <value>
+ <fullName>CLBIC-00900:OTH</fullName>
+ <default>false</default>
+ <label>CLBIC-00900:OTH</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Calendar_Created_Date_ID__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Calendar_Created_Date_ID__c.field-meta.xml
new file mode 100644
index 0000000..5338546
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Calendar_Created_Date_ID__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Calendar_Created_Date_ID__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>浣滄垚-鏃ュ巻</label>
+ <referenceTo>OlympusCalendar__c</referenceTo>
+ <relationshipLabel>涓氬姟鏈轰細</relationshipLabel>
+ <relationshipName>Opp_Calendar_Created_Date</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Calendar_Forecast_Date_ID__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Calendar_Forecast_Date_ID__c.field-meta.xml
new file mode 100644
index 0000000..b45a437
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Calendar_Forecast_Date_ID__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Calendar_Forecast_Date_ID__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>棰勬祴OCSM绛剧害-鏃ュ巻</label>
+ <referenceTo>OlympusCalendar__c</referenceTo>
+ <relationshipLabel>涓氬姟鏈轰細 (棰勬祴OCM绛剧害-鏃ュ巻)</relationshipLabel>
+ <relationshipName>Opp_Calendar_Forecast_Date_ID</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Calendar_Forecast_Shipping_Date_ID__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Calendar_Forecast_Shipping_Date_ID__c.field-meta.xml
new file mode 100644
index 0000000..1dce526
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Calendar_Forecast_Shipping_Date_ID__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Calendar_Forecast_Shipping_Date_ID__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>棰勬祴鍙戣揣-鏃ュ巻</label>
+ <referenceTo>OlympusCalendar__c</referenceTo>
+ <relationshipLabel>涓氬姟鏈轰細 (Calendar Forecast Shipping Date ID)</relationshipLabel>
+ <relationshipName>Opp_Calendar_Forecast_Shipping_Date_ID</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Calendar_Forecast_Tender_Date_ID__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Calendar_Forecast_Tender_Date_ID__c.field-meta.xml
new file mode 100644
index 0000000..05668e6
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Calendar_Forecast_Tender_Date_ID__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Calendar_Forecast_Tender_Date_ID__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>(涓嶄娇鐢�)棰勬祴鎷涙爣-鏃ュ巻</label>
+ <referenceTo>OlympusCalendar__c</referenceTo>
+ <relationshipLabel>涓氬姟鏈轰細 (棰勬祴鎷涙爣-鏃ュ巻)</relationshipLabel>
+ <relationshipName>Opp_Calendar_Forecast_Tender_Date_ID</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Caluculated_start_day__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Caluculated_start_day__c.field-meta.xml
new file mode 100644
index 0000000..ded1d3d
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Caluculated_start_day__c.field-meta.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Caluculated_start_day__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(
+ MONTH(Today())=12,
+ IF(
+ Created_Day__c >= DATE(YEAR(today()),01,01),
+ 1,
+ 0
+ ),
+ IF( Created_Day__c >= DATE(YEAR(today())-1,MONTH(Today())+1,01),
+ 1,
+ 0
+ )
+)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>缁熻寮�濮嬫棩(1骞村墠) 鍒涘缓鏃�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/CampaignId.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/CampaignId.field-meta.xml
new file mode 100644
index 0000000..fe6ae0c
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/CampaignId.field-meta.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>CampaignId</fullName>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Cancel_Comment__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Cancel_Comment__c.field-meta.xml
new file mode 100644
index 0000000..7ba1ce1
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Cancel_Comment__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Cancel_Comment__c</fullName>
+ <externalId>false</externalId>
+ <label>鍙栨秷鐞嗙敱锛堟枃鏈級</label>
+ <length>255</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Category__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Category__c.field-meta.xml
new file mode 100644
index 0000000..58e22a5
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Category__c.field-meta.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Category__c</fullName>
+ <description>鏄惁涓氱哗 瀹屾瘯/鍙戣揣=涓氱哗锛屾敞娈�/璇环=棰勬祴
+
+閲戦銇疧CM浜堟脯閲戦锛堢◣鎶溿亶锛夈倰浣跨敤
+
+鐘舵厠1-澹蹭笂锛堝嚭鑽凤級
+寮曞悎 -瑕嬭炯
+娉ㄦ畫 -瑕嬭炯
+鍑鸿嵎 -瀹熺妇
+瀹屼簡 -瀹熺妇
+
+闆嗚▓鏅傘伄瀵捐薄銇棩浠橈細鍑鸿嵎浜堟脯鏃� /鍑鸿嵎浠ラ檷銇嚭鑽峰畬浜嗘棩</description>
+ <externalId>false</externalId>
+ <formula>CASE(StageName,
+ "瀹屼簡", "瀹熺妇",
+ "鍑鸿嵎", "瀹熺妇",
+ "娉ㄦ畫", "瑕嬭炯",
+ "鐩", "鐩",
+ "鏁楁垿","涓嶆垚绔�",
+ "鍓婇櫎","涓嶆垚绔�",
+ "鍙栨秷","涓嶆垚绔�",
+ "瑕嬭炯"
+)</formula>
+ <label>璇环鐘舵��1(绠�鍗曞寲)</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/CelonOpportunity__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/CelonOpportunity__c.field-meta.xml
new file mode 100644
index 0000000..69ea023
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/CelonOpportunity__c.field-meta.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>CelonOpportunity__c</fullName>
+ <externalId>false</externalId>
+ <label>Celon璇环</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+ <valueSet>
+ <restricted>true</restricted>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>Celon涓绘満</fullName>
+ <default>false</default>
+ <label>Celon涓绘満</label>
+ </value>
+ <value>
+ <fullName>Celon鑰楁潗</fullName>
+ <default>false</default>
+ <label>Celon鑰楁潗</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/City_Text__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/City_Text__c.field-meta.xml
new file mode 100644
index 0000000..849b37d
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/City_Text__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>City_Text__c</fullName>
+ <externalId>false</externalId>
+ <label>甯傦紙鏂囨湰锛�</label>
+ <length>20</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/City__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/City__c.field-meta.xml
new file mode 100644
index 0000000..3ad2d99
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/City__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>City__c</fullName>
+ <externalId>false</externalId>
+ <formula>/* trigger銇仸瑷畾銇椼仧City_Text__c銈掍娇銇� */
+City_Text__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>甯�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Click_Close_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Click_Close_Date__c.field-meta.xml
new file mode 100644
index 0000000..110ee9f
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Click_Close_Date__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Click_Close_Date__c</fullName>
+ <externalId>false</externalId>
+ <label>Click Close Date</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/CloseDate.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/CloseDate.field-meta.xml
new file mode 100644
index 0000000..1fb4520
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/CloseDate.field-meta.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>CloseDate</fullName>
+ <trackFeedHistory>true</trackFeedHistory>
+ <trackHistory>true</trackHistory>
+ <trackTrending>false</trackTrending>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/CloseDate_in3month__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/CloseDate_in3month__c.field-meta.xml
new file mode 100644
index 0000000..a9f2a5a
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/CloseDate_in3month__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>CloseDate_in3month__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(AND(NOT(ISBLANK(Shipping_Date_For_Report__c)), Shipping_Date_For_Report__c < DATE(YEAR(ADDMONTHS(TODAY(), 3)), MONTH(ADDMONTHS(TODAY(), 3)), 1)), 1, 0)</formula>
+ <label>棰勬祴鍙戣揣涓変釜鏈堝唴</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Close_Forecasted_Assume_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Close_Forecasted_Assume_Date__c.field-meta.xml
new file mode 100644
index 0000000..da3a4e1
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Close_Forecasted_Assume_Date__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Close_Forecasted_Assume_Date__c</fullName>
+ <externalId>false</externalId>
+ <label>棰勬祴OCSM绛剧害鏃�(鎷呭綋)</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Close_Forecasted_Date_ThisMonth__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Close_Forecasted_Date_ThisMonth__c.field-meta.xml
new file mode 100644
index 0000000..9fafdf8
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Close_Forecasted_Date_ThisMonth__c.field-meta.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Close_Forecasted_Date_ThisMonth__c</fullName>
+ <description>鎴愮磩浜堟脯鏃ャ亴 浠婃湀浠ュ墠銇犮仺 1銆佹潵鏈堜互闄嶃仩銇� 0銈掕繑銇椼伨銇欍��</description>
+ <externalId>false</externalId>
+ <formula>if( Close_Forecasted_Date__c < DATE( year( today()), if( month( today()) < 12, month( today()) + 1, 1), 1), 1, 0)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鎴愮磩浜堟脯鏃ャ伅浠婃湀浠ュ墠銇嬶紵</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Close_Forecasted_Date_ThisMonth_long__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Close_Forecasted_Date_ThisMonth_long__c.field-meta.xml
new file mode 100644
index 0000000..62d2bb1
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Close_Forecasted_Date_ThisMonth_long__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Close_Forecasted_Date_ThisMonth_long__c</fullName>
+ <externalId>false</externalId>
+ <label>鎴愮磩浜堟脯鏃ャ伅褰撲細瑷堝勾搴︿互闄嶃亱锛�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Close_Forecasted_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Close_Forecasted_Date__c.field-meta.xml
new file mode 100644
index 0000000..6469e9f
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Close_Forecasted_Date__c.field-meta.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Close_Forecasted_Date__c</fullName>
+ <defaultValue>IF($RecordType.Id != '01210000000QekP',
+ ADDMONTHS( TODAY() ,2),
+ null
+)</defaultValue>
+ <description>2022-05-27淇敼 鐩爣褰曞叆鐨勬椂鍊欎笉璁剧疆榛樿鍊�</description>
+ <externalId>false</externalId>
+ <label>棰勬祴OCSM绛剧害鏃�(KPI)</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>true</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Closeing_day_catagory__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Closeing_day_catagory__c.field-meta.xml
new file mode 100644
index 0000000..5714625
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Closeing_day_catagory__c.field-meta.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Closeing_day_catagory__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(Close_Forecasted_Date__c < today(), "1.瓒呰繃棰勬祴绛剧害鏃�",
+IF(TEXT(Year(Close_Forecasted_Date__c)) & TEXT(month(Close_Forecasted_Date__c) )
+ = TEXT(Year(today())) & TEXT(month(today())),"2.鏈湀棰勬祴",
+IF(TEXT(Year(Close_Forecasted_Date__c)) & TEXT(month(Close_Forecasted_Date__c) )
+ = TEXT(Year(today())) & TEXT(month(today())+1),"3.涓嬩釜鏈堥娴�","4.涓�鑸浠�"
+)
+)
+)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>棰勬祴绛剧害鏃ュ垎绫�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Closing_Bid_Company_Bid__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Closing_Bid_Company_Bid__c.field-meta.xml
new file mode 100644
index 0000000..d7727c9
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Closing_Bid_Company_Bid__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Closing_Bid_Company_Bid__c</fullName>
+ <externalId>false</externalId>
+ <formula>Bidding_Project_Name_Bid__r.ZhongBiaoUnit1__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>椤圭洰:涓爣鍏徃</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Closing_Bid_Company__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Closing_Bid_Company__c.field-meta.xml
new file mode 100644
index 0000000..ce97b72
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Closing_Bid_Company__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Closing_Bid_Company__c</fullName>
+ <externalId>false</externalId>
+ <label>涓爣鍏徃</label>
+ <length>255</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Closing_Bid_Date_Bid__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Closing_Bid_Date_Bid__c.field-meta.xml
new file mode 100644
index 0000000..4570803
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Closing_Bid_Date_Bid__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Closing_Bid_Date_Bid__c</fullName>
+ <description>20220221娌箂an璇鹃:XYOU-CBU8TZ锛�20220720 XLIU-CGGDMS 澶囦唤Bidding_Project_Name_Bid__r.ResultDate__c
+20230626璇鹃DB202306401410淇敼鍓嶏細
+Bidding_Project_Name_Bid__r.Bid_Winning_Date__c</description>
+ <externalId>false</externalId>
+ <formula>if(TEXT(Bidding_Project_Name_Bid__r.TerminateApprovalStatus__c) = '鎵瑰噯',NULL,Bidding_Project_Name_Bid__r.Bid_Winning_Date__c)</formula>
+ <label>椤圭洰:涓爣鏃�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Closing_Bid_Date_Over_60Days__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Closing_Bid_Date_Over_60Days__c.field-meta.xml
new file mode 100644
index 0000000..7335285
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Closing_Bid_Date_Over_60Days__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Closing_Bid_Date_Over_60Days__c</fullName>
+ <externalId>false</externalId>
+ <formula>TODAY()-Closing_Bid_Date__c >= 60</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏄惁涓爣鏃ヨ繃浜�60澶�</label>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Closing_Bid_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Closing_Bid_Date__c.field-meta.xml
new file mode 100644
index 0000000..15886ec
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Closing_Bid_Date__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Closing_Bid_Date__c</fullName>
+ <externalId>false</externalId>
+ <label>13.涓爣鏃�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>true</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Closing_Bid_Price_BId__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Closing_Bid_Price_BId__c.field-meta.xml
new file mode 100644
index 0000000..84ebdda
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Closing_Bid_Price_BId__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Closing_Bid_Price_BId__c</fullName>
+ <description>Bidding_Project_Name_Bid__r.WinnerAmount__c</description>
+ <externalId>false</externalId>
+ <formula>Bidding_Project_Name_Bid__r.WinnerAmount__c</formula>
+ <label>椤圭洰:涓爣浠锋牸</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Closing_Bid_Price__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Closing_Bid_Price__c.field-meta.xml
new file mode 100644
index 0000000..c3ba6b9
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Closing_Bid_Price__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Closing_Bid_Price__c</fullName>
+ <externalId>false</externalId>
+ <label>涓爣浠锋牸</label>
+ <precision>15</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Closing_Bid_date_last_update_day__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Closing_Bid_date_last_update_day__c.field-meta.xml
new file mode 100644
index 0000000..58a10c3
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Closing_Bid_date_last_update_day__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Closing_Bid_date_last_update_day__c</fullName>
+ <externalId>false</externalId>
+ <label>鏈�鍚庢洿鏂版棩-涓爣鏃�(涓嶈锛�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Cnt_Lost_cancel_Draft__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Cnt_Lost_cancel_Draft__c.field-meta.xml
new file mode 100644
index 0000000..9d7bd77
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Cnt_Lost_cancel_Draft__c.field-meta.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Cnt_Lost_cancel_Draft__c</fullName>
+ <externalId>false</externalId>
+ <label>澶卞崟鎶ュ憡鏁�(鑽夋涓�)</label>
+ <summaryFilterItems>
+ <field>Lost_cancel_report__c.Report_Status__c</field>
+ <operation>equals</operation>
+ <value>鑽夋</value>
+ </summaryFilterItems>
+ <summaryFilterItems>
+ <field>Lost_cancel_report__c.RecordTypeId</field>
+ <operation>equals</operation>
+ <value>璇环鍙栨秷鎶ュ憡, 璇环澶卞崟鎶ュ憡</value>
+ </summaryFilterItems>
+ <summaryFilterItems>
+ <field>Lost_cancel_report__c.ModifyAfterApproval__c</field>
+ <operation>equals</operation>
+ <value>False</value>
+ </summaryFilterItems>
+ <summaryForeignKey>Lost_cancel_report__c.Opportunity__c</summaryForeignKey>
+ <summaryOperation>count</summaryOperation>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Summary</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Cnt_Lost_cancel_report__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Cnt_Lost_cancel_report__c.field-meta.xml
new file mode 100644
index 0000000..45c941c
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Cnt_Lost_cancel_report__c.field-meta.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Cnt_Lost_cancel_report__c</fullName>
+ <externalId>false</externalId>
+ <label>Cnt_Lost_cancel_report</label>
+ <summaryFilterItems>
+ <field>Lost_cancel_report__c.Report_Status__c</field>
+ <operation>equals</operation>
+ <value>鎵瑰噯, 鎻愪氦, 鑽夋, 鐢宠涓�</value>
+ </summaryFilterItems>
+ <summaryFilterItems>
+ <field>Lost_cancel_report__c.RecordTypeId</field>
+ <operation>equals</operation>
+ <value>璇环鍙栨秷鎶ュ憡, 璇环澶卞崟鎶ュ憡</value>
+ </summaryFilterItems>
+ <summaryForeignKey>Lost_cancel_report__c.Opportunity__c</summaryForeignKey>
+ <summaryOperation>count</summaryOperation>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Summary</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Cnt_Opponent_Bid_Info__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Cnt_Opponent_Bid_Info__c.field-meta.xml
new file mode 100644
index 0000000..14c5c7e
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Cnt_Opponent_Bid_Info__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Cnt_Opponent_Bid_Info__c</fullName>
+ <externalId>false</externalId>
+ <label>瀵规墜涓爣淇℃伅鎶ュ憡鏁�</label>
+ <summaryForeignKey>Opponent_Bid_Information__c.Opportunity__c</summaryForeignKey>
+ <summaryOperation>count</summaryOperation>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Summary</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Collect_Customer_sign__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Collect_Customer_sign__c.field-meta.xml
new file mode 100644
index 0000000..2601adc
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Collect_Customer_sign__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Collect_Customer_sign__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>閰嶇疆宸茬瀛�</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Collect_Customer_sign_number__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Collect_Customer_sign_number__c.field-meta.xml
new file mode 100644
index 0000000..e485c58
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Collect_Customer_sign_number__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Collect_Customer_sign_number__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(Collect_Customer_sign__c = True,1,0)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>閰嶇疆绛惧瓧娆℃暟</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Comments_Confirmation__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Comments_Confirmation__c.field-meta.xml
new file mode 100644
index 0000000..4030d23
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Comments_Confirmation__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Comments_Confirmation__c</fullName>
+ <externalId>false</externalId>
+ <label>璇环纭鎰忚</label>
+ <length>255</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Competitor__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Competitor__c.field-meta.xml
new file mode 100644
index 0000000..9444926
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Competitor__c.field-meta.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Competitor__c</fullName>
+ <externalId>false</externalId>
+ <inlineHelpText>A1锛氭彁鍑轰环鏍肩敵璇枫�丱LY涓爣
+A锛氬凡鎺堟潈銆佺‘瀹氫簡OLY鍙傛暟
+B锛氳繘鍙ｈ璇佸凡閫氳繃銆佸弬鏁颁笉纭畾
+C锛氬凡鎸傜綉銆侀绠楀凡瀹℃壒銆佺‘瀹氫簡瀵规墜鍙傛暟
+D锛氭棤棰勭畻銆佹彁鍑轰簡棰勭畻鐢宠銆侀绠楁病鏈夊鎵�</inlineHelpText>
+ <label>璇环绛夌骇</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>true</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+ <valueSet>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>A1</fullName>
+ <default>false</default>
+ <label>A1</label>
+ </value>
+ <value>
+ <fullName>A</fullName>
+ <default>false</default>
+ <label>A</label>
+ </value>
+ <value>
+ <fullName>B</fullName>
+ <default>false</default>
+ <label>B</label>
+ </value>
+ <value>
+ <fullName>C</fullName>
+ <default>false</default>
+ <label>C</label>
+ </value>
+ <value>
+ <fullName>D</fullName>
+ <default>false</default>
+ <label>D</label>
+ </value>
+ <value>
+ <fullName>E</fullName>
+ <default>false</default>
+ <label>E</label>
+ </value>
+ <value>
+ <fullName>F</fullName>
+ <default>false</default>
+ <label>F</label>
+ </value>
+ <value>
+ <fullName>銇濄伄浠�</fullName>
+ <default>false</default>
+ <label>銇濄伄浠�</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Competitor_copy__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Competitor_copy__c.field-meta.xml
new file mode 100644
index 0000000..25db509
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Competitor_copy__c.field-meta.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Competitor_copy__c</fullName>
+ <externalId>false</externalId>
+ <label>璇环绛夌骇(鏈堝垵)</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+ <valueSet>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>A1</fullName>
+ <default>false</default>
+ <label>A1</label>
+ </value>
+ <value>
+ <fullName>A</fullName>
+ <default>false</default>
+ <label>A</label>
+ </value>
+ <value>
+ <fullName>B</fullName>
+ <default>false</default>
+ <label>B</label>
+ </value>
+ <value>
+ <fullName>C</fullName>
+ <default>false</default>
+ <label>C</label>
+ </value>
+ <value>
+ <fullName>D</fullName>
+ <default>false</default>
+ <label>D</label>
+ </value>
+ <value>
+ <fullName>E</fullName>
+ <default>false</default>
+ <label>E</label>
+ </value>
+ <value>
+ <fullName>F</fullName>
+ <default>false</default>
+ <label>F</label>
+ </value>
+ <value>
+ <fullName>銇濄伄浠�</fullName>
+ <default>false</default>
+ <label>銇濄伄浠�</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Configuration_Suggestion_Feedback__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Configuration_Suggestion_Feedback__c.field-meta.xml
new file mode 100644
index 0000000..95a0c47
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Configuration_Suggestion_Feedback__c.field-meta.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Configuration_Suggestion_Feedback__c</fullName>
+ <externalId>false</externalId>
+ <label>閰嶇疆寤鸿鍙嶉</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+ <valueSet>
+ <restricted>true</restricted>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>閲囩撼寤鸿</fullName>
+ <default>false</default>
+ <label>閲囩撼寤鸿</label>
+ </value>
+ <value>
+ <fullName>涓嶉噰绾冲缓璁�</fullName>
+ <default>false</default>
+ <label>涓嶉噰绾冲缓璁�</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Configuration_Suggestion__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Configuration_Suggestion__c.field-meta.xml
new file mode 100644
index 0000000..dc3ce4b
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Configuration_Suggestion__c.field-meta.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Configuration_Suggestion__c</fullName>
+ <externalId>false</externalId>
+ <label>閰嶇疆寤鸿</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+ <valueSet>
+ <restricted>true</restricted>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>鏃犲缓璁�</fullName>
+ <default>false</default>
+ <label>鏃犲缓璁�</label>
+ </value>
+ <value>
+ <fullName>鏈夊缓璁�</fullName>
+ <default>false</default>
+ <label>鏈夊缓璁�</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Configuration_Suggestions_Feedback__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Configuration_Suggestions_Feedback__c.field-meta.xml
new file mode 100644
index 0000000..a22da2e
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Configuration_Suggestions_Feedback__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Configuration_Suggestions_Feedback__c</fullName>
+ <externalId>false</externalId>
+ <label>閰嶇疆寤鸿鍙嶉鍐呭</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>TextArea</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Configuration_Suggestions__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Configuration_Suggestions__c.field-meta.xml
new file mode 100644
index 0000000..8b82893
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Configuration_Suggestions__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Configuration_Suggestions__c</fullName>
+ <externalId>false</externalId>
+ <label>閰嶇疆寤鸿鍐呭</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>TextArea</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/ConfirmationofAward__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/ConfirmationofAward__c.field-meta.xml
new file mode 100644
index 0000000..e5a3654
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/ConfirmationofAward__c.field-meta.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ConfirmationofAward__c</fullName>
+ <externalId>false</externalId>
+ <label>涓爣纭缁撴灉</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>true</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+ <valueSet>
+ <restricted>true</restricted>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>绔炰簤瀵规墜涓爣</fullName>
+ <default>false</default>
+ <label>绔炰簤瀵规墜涓爣</label>
+ </value>
+ <value>
+ <fullName>OLY涓爣</fullName>
+ <default>false</default>
+ <label>OLY涓爣</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/ConfirmationofAward_createTime__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/ConfirmationofAward_createTime__c.field-meta.xml
new file mode 100644
index 0000000..ac511c1
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/ConfirmationofAward_createTime__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ConfirmationofAward_createTime__c</fullName>
+ <externalId>false</externalId>
+ <label>涓爣缁撴灉纭鏃�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Consumable_Order__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Consumable_Order__c.field-meta.xml
new file mode 100644
index 0000000..e3f0472
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Consumable_Order__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Consumable_Order__c</fullName>
+ <externalId>false</externalId>
+ <formula>BEGINS( Estimation_Id__c , 'a2K')</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>杩芥函璁㈠崟锛堜复鏃剁敤锛�</label>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/ContractId.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/ContractId.field-meta.xml
new file mode 100644
index 0000000..69dce11
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/ContractId.field-meta.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ContractId</fullName>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/ContractNum__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/ContractNum__c.field-meta.xml
new file mode 100644
index 0000000..d740aee
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/ContractNum__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ContractNum__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF( ISBLANK(Contract_recognized_day_1__c) ,0, 1)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>绛剧害鏁�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Contract_Authorize_Lock__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Contract_Authorize_Lock__c.field-meta.xml
new file mode 100644
index 0000000..d8ef194
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Contract_Authorize_Lock__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Contract_Authorize_Lock__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>SPO鍚堝悓鐢宠</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Contract_Authorize__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Contract_Authorize__c.field-meta.xml
new file mode 100644
index 0000000..8661039
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Contract_Authorize__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Contract_Authorize__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>鍚堝悓鐢宠鎸夐挳锛堟棫锛�</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Contract_DB_Finalcomplite_day__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Contract_DB_Finalcomplite_day__c.field-meta.xml
new file mode 100644
index 0000000..32bbb05
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Contract_DB_Finalcomplite_day__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Contract_DB_Finalcomplite_day__c</fullName>
+ <externalId>false</externalId>
+ <label>14.鍚堝悓鍙樻洿瀹℃壒缁撴潫鏃�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Contract_DB_SalesDept_complite_day__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Contract_DB_SalesDept_complite_day__c.field-meta.xml
new file mode 100644
index 0000000..d7a46e7
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Contract_DB_SalesDept_complite_day__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Contract_DB_SalesDept_complite_day__c</fullName>
+ <externalId>false</externalId>
+ <label>14.钀ヤ笟閮ㄥ悎鍚屽鎵圭粨鏉熸棩</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Contract_DB_complite_day__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Contract_DB_complite_day__c.field-meta.xml
new file mode 100644
index 0000000..31900e7
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Contract_DB_complite_day__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Contract_DB_complite_day__c</fullName>
+ <externalId>false</externalId>
+ <label>14.鍚堝悓鏈�缁堝鎵圭粨鏉熸棩</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Contract_DB_request_reason__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Contract_DB_request_reason__c.field-meta.xml
new file mode 100644
index 0000000..d18d38a
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Contract_DB_request_reason__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Contract_DB_request_reason__c</fullName>
+ <externalId>false</externalId>
+ <label>鍚堝悓DB鐗逛环鐢宠鍘熷洜 鏃犱娇鐢�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>TextArea</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Contract_Invalid_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Contract_Invalid_Date__c.field-meta.xml
new file mode 100644
index 0000000..36ee7c1
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Contract_Invalid_Date__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Contract_Invalid_Date__c</fullName>
+ <description>WF銆愬晢璜� 鍚堝悓鏃犳晥銆戙伀銇﹁ō瀹�</description>
+ <externalId>false</externalId>
+ <label>SAP璁㈠崟鏃犳晥鏃�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Contract_Invalid_Total__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Contract_Invalid_Total__c.field-meta.xml
new file mode 100644
index 0000000..f813357
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Contract_Invalid_Total__c.field-meta.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Contract_Invalid_Total__c</fullName>
+ <externalId>false</externalId>
+ <label>鏃犳晥璁㈠崟鎬绘暟</label>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.OverviewStatus__c</field>
+ <operation>equals</operation>
+ <value>鏃犳晥鍚堝悓</value>
+ </summaryFilterItems>
+ <summaryForeignKey>Statu_Achievements__c.Opportunity__c</summaryForeignKey>
+ <summaryOperation>count</summaryOperation>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Summary</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Contract_Number_Input_Total__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Contract_Number_Input_Total__c.field-meta.xml
new file mode 100644
index 0000000..eb937c2
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Contract_Number_Input_Total__c.field-meta.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Contract_Number_Input_Total__c</fullName>
+ <externalId>false</externalId>
+ <label>娉ㄦ畫鍚堝悓鍙风爜_鍚堣鏁�(绯荤粺鐢�)</label>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.ContractNO__c</field>
+ <operation>notEqual</operation>
+ <value></value>
+ </summaryFilterItems>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.Valid_Statu_Achievements__c</field>
+ <operation>equals</operation>
+ <value>1</value>
+ </summaryFilterItems>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.FALSE_Order__c</field>
+ <operation>notEqual</operation>
+ <value>FALSE</value>
+ </summaryFilterItems>
+ <summaryForeignKey>Statu_Achievements__c.Opportunity__c</summaryForeignKey>
+ <summaryOperation>count</summaryOperation>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Summary</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Contract_Once_Recognize_Day__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Contract_Once_Recognize_Day__c.field-meta.xml
new file mode 100644
index 0000000..2f5f182
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Contract_Once_Recognize_Day__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Contract_Once_Recognize_Day__c</fullName>
+ <externalId>false</externalId>
+ <label>18.鍒濆鏃�(璁㈣揣IF)</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Contract_Recieve_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Contract_Recieve_Date__c.field-meta.xml
new file mode 100644
index 0000000..17c7ac3
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Contract_Recieve_Date__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Contract_Recieve_Date__c</fullName>
+ <externalId>false</externalId>
+ <label>17.鏀跺埌鍚堝悓鏃�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Contract_less_ThisMonthSS__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Contract_less_ThisMonthSS__c.field-meta.xml
new file mode 100644
index 0000000..2ab5b0a
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Contract_less_ThisMonthSS__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Contract_less_ThisMonthSS__c</fullName>
+ <externalId>false</externalId>
+ <formula>Contract_recognized_day_1__c < Owner.This_Month_SS_day__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鍒濆鏃�<鏈湀绗笁涓伐浣滄棩</label>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Contract_recognized_day_1__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Contract_recognized_day_1__c.field-meta.xml
new file mode 100644
index 0000000..aea34a3
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Contract_recognized_day_1__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Contract_recognized_day_1__c</fullName>
+ <description>2016/9/2涔嬪墠
+Contract_Once_Recognize_Day__c
+璁板綍澶氫釜娉ㄦ畫涓殑鏈�灏忓垵瀹℃棩鏈燂紝鐢ㄤ簬鍒ゆ柇璇环鐘舵��1杩涘叆娉ㄦ畫</description>
+ <externalId>false</externalId>
+ <formula>Min_FirstApproveDate__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>18.鍒濆鏃�(璁㈣揣鏃�)</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/ConvertCnt__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/ConvertCnt__c.field-meta.xml
new file mode 100644
index 0000000..cae2234
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/ConvertCnt__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ConvertCnt__c</fullName>
+ <externalId>false</externalId>
+ <formula>Owner.Category6__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>杞崲鏁帮紙澶囩敤锛�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/CorrosionNumber__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/CorrosionNumber__c.field-meta.xml
new file mode 100644
index 0000000..8bd7aed
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/CorrosionNumber__c.field-meta.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>CorrosionNumber__c</fullName>
+ <externalId>false</externalId>
+ <label>闃胯タ璧涘浜у搧鏁伴噺</label>
+ <summaryFilterItems>
+ <field>OpportunityLineItem.Is_DangerousChemicals__c</field>
+ <operation>equals</operation>
+ <value>True</value>
+ </summaryFilterItems>
+ <summaryForeignKey>OpportunityLineItem.OpportunityId</summaryForeignKey>
+ <summaryOperation>count</summaryOperation>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Summary</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Create_Activity__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Create_Activity__c.field-meta.xml
new file mode 100644
index 0000000..0c22713
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Create_Activity__c.field-meta.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Create_Activity__c</fullName>
+ <description>2019-02-22 CHAN-B9M9KA
+鍘熷唴瀹癸細 HYPERLINK
+("/00U/e?retURL=%2Fapex%2FVFClosePage&accid="&AccountId&"&oid="&Id, "鏂板缓璁″垝")</description>
+ <externalId>false</externalId>
+ <formula>HYPERLINK
+("/00U/e?retURL=%2Fapex%2FVFClosePage&accid="&AccountId&"&oid="&Id&"&source=AccountPCL", "鏂板缓璁″垝")</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏂板缓璁″垝</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Create_Comment__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Create_Comment__c.field-meta.xml
new file mode 100644
index 0000000..610f8e2
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Create_Comment__c.field-meta.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Create_Comment__c</fullName>
+ <description>HYPERLINK(
+"/a0G/e?CF00N10000002CZd2="
+&Name &
+"&CF00N10000002CZd2_lkid="
+& Id &
+"&retURL=%2"
+&Id
+,"鈻�")
+
+2012/12/13
+HYPERLINK(
+"/a0G/e?CF00N10000002CZd2="
+&Name &
+"&CF00N10000002CZd2_lkid="
+& Id &
+"&retURL=%2"
+&Id
+,"鈻�")</description>
+ <externalId>false</externalId>
+ <formula>HYPERLINK(
+"/a0P/e?CF00N10000002DxBn="
+&Name &
+"&CF00N10000002CZd2_lkid="
+& Id &
+"&retURL=%2"
+&Id
+,"鈻�")</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鍒涘缓璇环鎰忚</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Create_leed__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Create_leed__c.field-meta.xml
new file mode 100644
index 0000000..92cd9f8
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Create_leed__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Create_leed__c</fullName>
+ <externalId>false</externalId>
+ <formula>HYPERLINK("/00Q/e?01210000000QiRf&ent=Lead", '鏂板缓鎰忓悜')</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏂板缓璐拱鎰忓悜</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Created_Day__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Created_Day__c.field-meta.xml
new file mode 100644
index 0000000..464e825
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Created_Day__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Created_Day__c</fullName>
+ <externalId>false</externalId>
+ <formula>datevalue(CreatedDate)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>1.鍒涘缓鏃�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Created_ID__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Created_ID__c.field-meta.xml
new file mode 100644
index 0000000..1efe9f4
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Created_ID__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Created_ID__c</fullName>
+ <externalId>false</externalId>
+ <formula>CreatedById</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鍒涘缓浜篒D</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/CurrencyIsoCode.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/CurrencyIsoCode.field-meta.xml
new file mode 100644
index 0000000..7d38008
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/CurrencyIsoCode.field-meta.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>CurrencyIsoCode</fullName>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Custmor_pic_ID__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Custmor_pic_ID__c.field-meta.xml
new file mode 100644
index 0000000..2854777
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Custmor_pic_ID__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Custmor_pic_ID__c</fullName>
+ <description>Account.Parent.OwnerId</description>
+ <externalId>false</externalId>
+ <formula>IF( Account.RecordType.DeveloperName = 'AgencyContract', Account.OwnerId , Account.Parent.OwnerId)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鎴樼暐绉戝鎷呭綋ID</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Custmor_pic_IsActive__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Custmor_pic_IsActive__c.field-meta.xml
new file mode 100644
index 0000000..588ec64
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Custmor_pic_IsActive__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Custmor_pic_IsActive__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(Account.RecordType.DeveloperName = 'AgencyContract', Account.Owner.IsActive, Account.Parent.Owner.IsActive)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鎴樼暐绉戝鎷呭綋鍚敤</label>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Custmor_pic__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Custmor_pic__c.field-meta.xml
new file mode 100644
index 0000000..5a884ff
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Custmor_pic__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Custmor_pic__c</fullName>
+ <description>鍘熷唴瀹癸細
+Account.Parent.Owner.Alias__c</description>
+ <externalId>false</externalId>
+ <formula>IF( Account.RecordType.DeveloperName = 'AgencyContract', Account.Owner.Name__c , Account.Parent.Owner.Alias__c)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鎴樼暐绉戝鎷呭綋</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Date_InAdvance_Delay__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Date_InAdvance_Delay__c.field-meta.xml
new file mode 100644
index 0000000..239e849
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Date_InAdvance_Delay__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Date_InAdvance_Delay__c</fullName>
+ <externalId>false</externalId>
+ <label>鏃ユ湡鎻愬墠/寤跺悗</label>
+ <length>64</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Days_Between_Bid_And_Contract__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Days_Between_Bid_And_Contract__c.field-meta.xml
new file mode 100644
index 0000000..57b858d
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Days_Between_Bid_And_Contract__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Days_Between_Bid_And_Contract__c</fullName>
+ <externalId>false</externalId>
+ <formula>if((isblank(Assistant_Applied_Date__c)),null,(Assistant_Applied_Date__c - Closing_Bid_Date__c))</formula>
+ <label>TAT锛氫腑鏍�-鎻愪氦鐢宠鏃ユ暟</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Dealer_Contract_No__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Dealer_Contract_No__c.field-meta.xml
new file mode 100644
index 0000000..7671258
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Dealer_Contract_No__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Dealer_Contract_No__c</fullName>
+ <externalId>false</externalId>
+ <label>缁忛攢鍟嗗悎鍚岀紪鐮�</label>
+ <length>255</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Dealer_Final_Price_F__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Dealer_Final_Price_F__c.field-meta.xml
new file mode 100644
index 0000000..898fa57
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Dealer_Final_Price_F__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Dealer_Final_Price_F__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(SAP_Send_OK__c && (Agency1__r.Special__c || Agency2__r.Special__c || Account.Parent.Special__c) && $User.ViewSpecialAgencyAmout__c == False, null,
+ Dealer_Final_Price__c
+)</formula>
+ <label>鍖婚櫌鍚堝悓閲戦</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Dealer_Final_Price_Notax__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Dealer_Final_Price_Notax__c.field-meta.xml
new file mode 100644
index 0000000..5837a91
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Dealer_Final_Price_Notax__c.field-meta.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Dealer_Final_Price_Notax__c</fullName>
+ <description>2023-01-16 璋冩暣瀛楁绫诲瀷锛屽幓鎺夊竵绉嶏紝鍙繚鐣欐暟瀛�</description>
+ <externalId>false</externalId>
+ <formula>Dealer_Final_Price_F__c/1.13/1000</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鍖婚櫌鍚堝悓閲戦(KRMB)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Dealer_Final_Price__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Dealer_Final_Price__c.field-meta.xml
new file mode 100644
index 0000000..f5a29b3
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Dealer_Final_Price__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Dealer_Final_Price__c</fullName>
+ <externalId>false</externalId>
+ <label>(鍚庡彴鐢�)/鍖婚櫌鍚堝悓閲戦</label>
+ <precision>15</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Dealer_sharing__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Dealer_sharing__c.field-meta.xml
new file mode 100644
index 0000000..5e58187
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Dealer_sharing__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Dealer_sharing__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(Agency_Opportunity__r.OCM_Change_To_Opportunity_Flg__c,1,0)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>缁忛攢鍟嗗叡浜�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/DecideQuoteDate__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/DecideQuoteDate__c.field-meta.xml
new file mode 100644
index 0000000..35ea0ee
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/DecideQuoteDate__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>DecideQuoteDate__c</fullName>
+ <externalId>false</externalId>
+ <label>鍐冲畾鎶ヤ环(DECIDE) 鏃ユ湡</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Decided_Estimation__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Decided_Estimation__c.field-meta.xml
new file mode 100644
index 0000000..7ae3636
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Decided_Estimation__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Decided_Estimation__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(Estimation_Decision__c, IF(ISBLANK(Estimation_Id__c), Estimation_No__c, HYPERLINK("/" + Estimation_Id__c + "/e", Estimation_No__c, "_self")), "")</formula>
+ <label>鍐冲畾鐨勬姤浠�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Decision_Maker__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Decision_Maker__c.field-meta.xml
new file mode 100644
index 0000000..770b935
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Decision_Maker__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Decision_Maker__c</fullName>
+ <externalId>false</externalId>
+ <label>鍐崇瓥浜�</label>
+ <length>50</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Deleted_Reason__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Deleted_Reason__c.field-meta.xml
new file mode 100644
index 0000000..5e1e2cb
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Deleted_Reason__c.field-meta.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Deleted_Reason__c</fullName>
+ <externalId>false</externalId>
+ <label>鍙栨秷鐞嗙敱</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+ <valueSet>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>璇环閲嶅</fullName>
+ <default>false</default>
+ <label>璇环閲嶅</label>
+ </value>
+ <value>
+ <fullName>璐拱璁″垝鏆傜紦</fullName>
+ <default>false</default>
+ <label>璐拱璁″垝鍙栨秷</label>
+ </value>
+ <value>
+ <fullName>鍖婚櫌浜轰簨鍙樺姩</fullName>
+ <default>false</default>
+ <label>鍖婚櫌浜轰簨鍙樺姩</label>
+ </value>
+ <value>
+ <fullName>鍖婚櫌璧勯噾绱у紶</fullName>
+ <default>false</default>
+ <label>棰勭畻鍙栨秷</label>
+ </value>
+ <value>
+ <fullName>璁″垝鏈幏瀹℃壒</fullName>
+ <default>false</default>
+ <label>璁″垝鏈幏瀹℃壒</label>
+ </value>
+ <value>
+ <fullName>閲囪喘浜у搧鍋滀骇</fullName>
+ <default>false</default>
+ <label>閲囪喘浜у搧鍋滀骇</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/DeliveryDate__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/DeliveryDate__c.field-meta.xml
new file mode 100644
index 0000000..b6f649b
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/DeliveryDate__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>DeliveryDate__c</fullName>
+ <externalId>false</externalId>
+ <label>22.鍙戣揣鏃�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/DeliveryForecastMonth__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/DeliveryForecastMonth__c.field-meta.xml
new file mode 100644
index 0000000..97314f3
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/DeliveryForecastMonth__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>DeliveryForecastMonth__c</fullName>
+ <externalId>false</externalId>
+ <formula>MONTH(Shipping_Date_For_Report__c)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>棰勬祴鍙戣揣鏈�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Department_Class__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Department_Class__c.field-meta.xml
new file mode 100644
index 0000000..8e357a5
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Department_Class__c.field-meta.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Department_Class__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <description>(绉戝鍒嗛)</description>
+ <externalId>false</externalId>
+ <label>鎴樼暐绉戝鍒嗙被</label>
+ <lookupFilter>
+ <active>false</active>
+ <filterItems>
+ <field>Account.RecordTypeId</field>
+ <operation>equals</operation>
+ <value>鎴︾暐绉戝鍒嗛 銇濄伄浠�, 鎴︾暐绉戝鍒嗛 涓嶆槑, 鎴︾暐绉戝鍒嗛 鍛煎惛绉�, 鎴︾暐绉戝鍒嗛 濠︿汉绉�, 鎴︾暐绉戝鍒嗛 鏅绉�, 鎴︾暐绉戝鍒嗛 娉屽翱绉�, 鎴︾暐绉戝鍒嗛 娑堝寲绉�, 鎴︾暐绉戝鍒嗛 鑰抽蓟鍠夌, 鎴︾暐绉戝鍒嗛ET</value>
+ </filterItems>
+ <isOptional>false</isOptional>
+ </lookupFilter>
+ <referenceTo>Account</referenceTo>
+ <relationshipLabel>寮曞悎</relationshipLabel>
+ <relationshipName>Opp_Account_Dept</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Department_Name__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Department_Name__c.field-meta.xml
new file mode 100644
index 0000000..2812e36
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Department_Name__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Department_Name__c</fullName>
+ <externalId>false</externalId>
+ <formula>Account.Department_Name__c</formula>
+ <label>绉戝</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Department_Snapshot__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Department_Snapshot__c.field-meta.xml
new file mode 100644
index 0000000..574c5c5
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Department_Snapshot__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Department_Snapshot__c</fullName>
+ <externalId>false</externalId>
+ <formula>if( ISBLANK(Department_lastmonth__c),Department__c,Department_lastmonth__c )</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>閿�鍞儴(蹇収鐢�)</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Department__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Department__c.field-meta.xml
new file mode 100644
index 0000000..87820f7
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Department__c.field-meta.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Department__c</fullName>
+ <description>2022-04-08 璐㈠勾鍒囨崲瀵瑰簲
+鑳介噺鏈儴鍘绘帀锛涜タ鍖楅儴璋冩暣</description>
+ <externalId>false</externalId>
+ <formula>if(OCM_man_province_txt__c='鍏朵粬','鍏朵粬',
+if(OCM_man_province_txt__c='澶栫鏈儴','澶栫',
+if(OCM_man_province_txt__c='甯傚満浼佸垝鏈儴','甯傚満浼佸垝鏈儴',
+if(OCM_man_province_txt__c='缁忛攢鍟嗙鐞嗘湰閮�','缁忛攢鍟�',
+ Case(OCM_man_province_cus_txt__c,
+ '灞辫タ','瑗垮寳涓夐儴',
+ '闄曡タ','瑗垮寳涓�閮�',
+ '娌冲崡','瑗垮寳浜岄儴',
+ '鏂扮枂','瑗垮寳涓夐儴',
+ '鐢樿們','瑗垮寳鍥涢儴',
+ '瀹佸','瑗垮寳涓�閮�',
+ '闈掓捣','瑗垮寳鍥涢儴',
+ '鍥涘窛/瑗胯棌','瑗垮崡涓�閮�',
+ '閲嶅簡','瑗垮崡涓�閮�',
+ '璐靛窞','瑗垮崡浜岄儴',
+ '浜戝崡','瑗垮崡浜岄儴',
+ '涓婃捣','鍗庝笢涓�閮�',
+ '姹熻嫃','鍗庝笢浜岄儴',
+ '绂忓缓','鍗庝笢浜岄儴',
+ '姹熻タ','鍗庝笢浜岄儴',
+ '娴欐睙','鍗庝笢涓夐儴',
+ '瀹夊窘','鍗庝笢涓夐儴',
+ '骞夸笢','鍗庡崡涓�閮�',
+ '娣卞湷','鍗庡崡浜岄儴',
+ '娴峰崡','鍗庡崡浜岄儴',
+ '婀栧寳','鍗庡崡涓夐儴',
+ '婀栧崡','鍗庡崡涓夐儴',
+ '骞胯タ','鍗庡崡涓�閮�',
+ '鍖椾含','鍗庡寳涓�閮�',
+ '鍐呰挋鍙�','鍗庡寳浜岄儴',
+ '娌冲寳','鍗庡寳浜岄儴',
+ '澶╂触','鍗庡寳浜岄儴',
+ '灞变笢','鍗庡寳涓夐儴',
+ '闈掑矝','鍗庡寳涓夐儴', /*20230407 lt add*/
+ '榛戦緳姹�','涓滃寳涓�閮�',
+ '鍚夋灄','涓滃寳涓�閮�',
+ '杈藉畞','涓滃寳浜岄儴',
+ '澶ц繛','涓滃寳浜岄儴',
+ '娌堥槼','涓滃寳浜岄儴',
+ ''
+)))))</formula>
+ <label>閿�鍞儴锛堥娴嬶級</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Department_lastmonth__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Department_lastmonth__c.field-meta.xml
new file mode 100644
index 0000000..99bd9ef
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Department_lastmonth__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Department_lastmonth__c</fullName>
+ <externalId>false</externalId>
+ <label>閿�鍞儴锛堜笂鏈堥娴嬶級</label>
+ <length>255</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Deposit_In_Full_Day__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Deposit_In_Full_Day__c.field-meta.xml
new file mode 100644
index 0000000..cde3cef
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Deposit_In_Full_Day__c.field-meta.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Deposit_In_Full_Day__c</fullName>
+ <externalId>false</externalId>
+ <label>21.浠樺叏娆炬棩(IF)</label>
+ <summarizedField>Statu_Achievements__c.Deposit_In_Full_Day__c</summarizedField>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.Status_1_text__c</field>
+ <operation>notEqual</operation>
+ <value>鏃犳晥,閫�璐�</value>
+ </summaryFilterItems>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.Expire__c</field>
+ <operation>notEqual</operation>
+ <value>True</value>
+ </summaryFilterItems>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.Valid_Statu_Achievements__c</field>
+ <operation>equals</operation>
+ <value>1</value>
+ </summaryFilterItems>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.FALSE_Order__c</field>
+ <operation>notEqual</operation>
+ <value>FALSE</value>
+ </summaryFilterItems>
+ <summaryForeignKey>Statu_Achievements__c.Opportunity__c</summaryForeignKey>
+ <summaryOperation>max</summaryOperation>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Summary</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Description.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Description.field-meta.xml
new file mode 100644
index 0000000..991cffd
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Description.field-meta.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Description</fullName>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/DetailNum__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/DetailNum__c.field-meta.xml
new file mode 100644
index 0000000..7aa08a7
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/DetailNum__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>DetailNum__c</fullName>
+ <externalId>false</externalId>
+ <label>鎶ヤ环浜у搧浠舵暟</label>
+ <summaryForeignKey>OpportunityLineItem.OpportunityId</summaryForeignKey>
+ <summaryOperation>count</summaryOperation>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Summary</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Detail_Suggestion__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Detail_Suggestion__c.field-meta.xml
new file mode 100644
index 0000000..6b1e3b9
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Detail_Suggestion__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Detail_Suggestion__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>鏄惁鎻愭</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Determine_competitor_parameter_date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Determine_competitor_parameter_date__c.field-meta.xml
new file mode 100644
index 0000000..5dfecf6
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Determine_competitor_parameter_date__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Determine_competitor_parameter_date__c</fullName>
+ <externalId>false</externalId>
+ <label>10.纭畾瀵规墜鍙傛暟鏃�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Determine_oly_parameter_day__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Determine_oly_parameter_day__c.field-meta.xml
new file mode 100644
index 0000000..a4ec310
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Determine_oly_parameter_day__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Determine_oly_parameter_day__c</fullName>
+ <externalId>false</externalId>
+ <label>10.纭畾OLY鍙傛暟鏃�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Dicision_Maker__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Dicision_Maker__c.field-meta.xml
new file mode 100644
index 0000000..4c4a290
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Dicision_Maker__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Dicision_Maker__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>璐拱鍐崇瓥鑰�</label>
+ <referenceTo>Contact</referenceTo>
+ <relationshipLabel>鍏ユ湱姹哄畾妯┿伄銇傘倠寮曞悎銇�</relationshipLabel>
+ <relationshipName>Opp_Contact</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/DirectLossFLG__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/DirectLossFLG__c.field-meta.xml
new file mode 100644
index 0000000..0a8783d
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/DirectLossFLG__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>DirectLossFLG__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>鍚庡彴鐢�-鎷涙爣椤圭洰鐩存帴澶卞崟鏍囪</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Direct_Separate__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Direct_Separate__c.field-meta.xml
new file mode 100644
index 0000000..617b1ed
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Direct_Separate__c.field-meta.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Direct_Separate__c</fullName>
+ <description>鈶營F(AND(NOT(ISBLANK(Agency1__c)),ISBLANK(Agency2__c)), '鐩村２', IF(AND(NOT(ISBLANK(Agency1__c)),NOT(ISBLANK(Agency2__c))), '鍒嗗２' , 'OCM鐩村２'))
+鈶F(AND(NOT(ISBLANK(OCM_Agent1_Price__c)),ISBLANK(Agent1_Agent2_Price__c)), '鐩村２', IF(AND(NOT(ISBLANK(OCM_Agent1_Price__c)),NOT(ISBLANK(Agent1_Agent2_Price__c))), '鍒嗗２' , 'OCM鐩村２'))
+
+2012/1/9
+寮曞悎銇磹浠樸亸瑕嬬銇岀劇銇勫牬鍚堛伅銆佺┖鐧姐仺銇倠銇熴倎銆佹潯浠躲伀銆孖F( ISNULL(Wholesale_Price__c), '', 銆嶃倰杩藉姞
+
+2013/5/20
+寮曞悎銇磹浠樸亸瑕嬬銇岀劇銇勫牬鍚堛伅銆佺┖鐧姐仺銇倠銇熴倎銆佹潯浠躲伀銆孖F( ISBLANK(TEXT(Sales_Root__c )), '', 銆嶃倰杩藉姞</description>
+ <externalId>false</externalId>
+ <formula>IF( ISBLANK(TEXT(Sales_Root__c )), '',
+
+IF( ISNULL(Wholesale_Price__c), '',
+IF(AND(ISBLANK(Agency1__c),ISBLANK(Agency2__c)),"",
+
+IF(ISPICKVAL(Sales_Root__c, 'OCM鐩存帴璨╁２'), 'OCM鐩撮攢', IF(AND(NOT(ISBLANK(Agency1__c)),ISBLANK(Agency2__c)), '缁忛攢鍟嗙洿閿�', '缁忛攢鍟嗗垎閿�') ))))</formula>
+ <label>鐩撮攢/鍒嗛攢</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Discount__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Discount__c.field-meta.xml
new file mode 100644
index 0000000..f2afcdf
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Discount__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Discount__c</fullName>
+ <externalId>false</externalId>
+ <label>鎶樻墸1</label>
+ <length>255</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Distributor_InCharge_opp__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Distributor_InCharge_opp__c.field-meta.xml
new file mode 100644
index 0000000..b52770a
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Distributor_InCharge_opp__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Distributor_InCharge_opp__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>缁忛攢鍟嗙鐞嗚璐熻矗鐨勮浠�</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/DoNTC__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/DoNTC__c.field-meta.xml
new file mode 100644
index 0000000..64aee8a
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/DoNTC__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>DoNTC__c</fullName>
+ <externalId>false</externalId>
+ <formula>if ( Num_Of_NTC__c > 0, 1, 0)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏄惁鍋歂TC</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/DoOPD__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/DoOPD__c.field-meta.xml
new file mode 100644
index 0000000..4f6346e
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/DoOPD__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>DoOPD__c</fullName>
+ <externalId>false</externalId>
+ <formula>if ( Num_Of_OPD__c > 0, 1, 0)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏄惁鍋歄PD</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/ENG2_Opp__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/ENG2_Opp__c.field-meta.xml
new file mode 100644
index 0000000..c6d049c
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/ENG2_Opp__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ENG2_Opp__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>ENG2璇环</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/EPT1_count__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/EPT1_count__c.field-meta.xml
new file mode 100644
index 0000000..7835465
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/EPT1_count__c.field-meta.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>EPT1_count__c</fullName>
+ <externalId>false</externalId>
+ <label>EPT1鏁伴噺</label>
+ <summaryFilterItems>
+ <field>OpportunityLineItem.If_EP_T1_F__c</field>
+ <operation>equals</operation>
+ <value>True</value>
+ </summaryFilterItems>
+ <summaryForeignKey>OpportunityLineItem.OpportunityId</summaryForeignKey>
+ <summaryOperation>count</summaryOperation>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Summary</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/ETPromoteSale__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/ETPromoteSale__c.field-meta.xml
new file mode 100644
index 0000000..ee15f25
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/ETPromoteSale__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ETPromoteSale__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>浣跨敤ET淇冮攢鏀跨瓥</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/ET_SP_Consumption__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/ET_SP_Consumption__c.field-meta.xml
new file mode 100644
index 0000000..6dd0f35
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/ET_SP_Consumption__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ET_SP_Consumption__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>鑰楁潗璁㈠崟</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/EffectiveRentalApply__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/EffectiveRentalApply__c.field-meta.xml
new file mode 100644
index 0000000..861f3a4
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/EffectiveRentalApply__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>EffectiveRentalApply__c</fullName>
+ <externalId>false</externalId>
+ <label>鏈夋晥澶囧搧鐢宠</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Elapsed_day_after_authorized_doc__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Elapsed_day_after_authorized_doc__c.field-meta.xml
new file mode 100644
index 0000000..3aba94e
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Elapsed_day_after_authorized_doc__c.field-meta.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Elapsed_day_after_authorized_doc__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(NOT(ISNULL( SAP_Send_OK_Date__c )), null,
+if(isnull(Authorized_Date__c ),null, today() - Authorized_Date__c ) )</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鎺堟潈鍚庣粡杩囧ぉ鏁�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Elapsed_day_after_create_opportunity__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Elapsed_day_after_create_opportunity__c.field-meta.xml
new file mode 100644
index 0000000..1850609
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Elapsed_day_after_create_opportunity__c.field-meta.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Elapsed_day_after_create_opportunity__c</fullName>
+ <description>2/8銇儸銉濄兗銉堛儉銉冦偡銉ャ儨銉笺儔銉囥儮銇仧銈併伀杩藉姞銆�</description>
+ <externalId>false</externalId>
+ <formula>ABS(if (ISNULL(SFDCLast_Process_Date__c) ,null, SFDCLast_Process_Date__c - DATEVALUE(CreatedDate) ))</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏂板缓璇环鍚庤繃鍘诲ぉ鏁�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Elapsed_day_after_tender__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Elapsed_day_after_tender__c.field-meta.xml
new file mode 100644
index 0000000..6461d70
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Elapsed_day_after_tender__c.field-meta.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Elapsed_day_after_tender__c</fullName>
+ <description>2/8銇儸銉濄兗銉堛儉銉冦偡銉ャ儨銉笺儔銉囥儮銇仧銈併伀杩藉姞銆�
+if(isnull(Bid_Date__c),null, today() - Bid_Date__c )</description>
+ <externalId>false</externalId>
+ <formula>Case(text(StageName),"寮曞悎",
+IF(NOT(ISBLANK(Contract_Once_Recognize_Day__c)),today()-Contract_Once_Recognize_Day__c,
+IF(NOT(ISBLANK(SFDCLast_Process_Date__c)),today()-SFDCLast_Process_Date__c,
+IF(NOT(ISBLANK(Sales_Shop_Hospital_Contract__c)),today()-Sales_Shop_Hospital_Contract__c,
+IF(NOT(ISBLANK(Agency_Contract_Date1__c)),today()-Agency_Contract_Date1__c,
+IF(NOT(ISBLANK(Contract_DB_complite_day__c)),today()-Contract_DB_complite_day__c,
+IF(NOT(ISBLANK(Contract_DB_SalesDept_complite_day__c)),today()-Contract_DB_SalesDept_complite_day__c,
+IF(NOT(ISBLANK(Assistant_Applied_Date__c)),today()-Assistant_Applied_Date__c,
+IF(NOT(ISBLANK(Closing_Bid_Date__c)),today()-Closing_Bid_Date__c,NULL
+)
+)
+)
+)
+)
+)
+)
+),NULL)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>涓爣鍚庡悇涓姸鎬佺暀鍦ㄥぉ鏁�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/End_of_this_period__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/End_of_this_period__c.field-meta.xml
new file mode 100644
index 0000000..390ddee
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/End_of_this_period__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>End_of_this_period__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(month(today())=1,DATE(YEAR( today() ),3,31),
+IF(month(today())=2,DATE(YEAR( today() ),3,31),
+IF(month(today())=3,DATE(YEAR( today() ),3,31),DATE(YEAR( today() )+1,3,31))))</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏈湡鏈�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/EnergyHost__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/EnergyHost__c.field-meta.xml
new file mode 100644
index 0000000..8a88a02
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/EnergyHost__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>EnergyHost__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>鑳介噺涓绘満</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Equipment_Order_Flg__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Equipment_Order_Flg__c.field-meta.xml
new file mode 100644
index 0000000..df02b4c
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Equipment_Order_Flg__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Equipment_Order_Flg__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>璁＄畻鍒板叏鍥�</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Estimation_Confirm_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Estimation_Confirm_Date__c.field-meta.xml
new file mode 100644
index 0000000..5ad78c8
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Estimation_Confirm_Date__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Estimation_Confirm_Date__c</fullName>
+ <description>SI璇环鐢�</description>
+ <externalId>false</externalId>
+ <inlineHelpText>鏍规嵁鍖婚櫌鐩栧崟纭鏃ュ～鍐�</inlineHelpText>
+ <label>鎶ヤ环纭鏃�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Estimation_Confirm_Qty_Trans__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Estimation_Confirm_Qty_Trans__c.field-meta.xml
new file mode 100644
index 0000000..ce8d554
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Estimation_Confirm_Qty_Trans__c.field-meta.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Estimation_Confirm_Qty_Trans__c</fullName>
+ <externalId>false</externalId>
+ <formula>if(addMonths(today(),36) >= Close_Forecasted_Date__c,
+case(Competitor__c,
+'A1',1,
+'A', 0.8,
+'B', 0.5,
+'C', 0.3,
+0)
+* Estimation_Confirm_Qty__c , 0)</formula>
+ <label>SI鎶ヤ环纭鍙版暟锛堟崲绠楀�硷級</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>1</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Estimation_Confirm_Qty__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Estimation_Confirm_Qty__c.field-meta.xml
new file mode 100644
index 0000000..4297d61
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Estimation_Confirm_Qty__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Estimation_Confirm_Qty__c</fullName>
+ <externalId>false</externalId>
+ <label>鎶ヤ环纭鐨凷I鍙版暟</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Estimation_Decision__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Estimation_Decision__c.field-meta.xml
new file mode 100644
index 0000000..3495cd9
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Estimation_Decision__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Estimation_Decision__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>鍐冲畾鎶ヤ环(DECIDE)</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>true</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Estimation_Id__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Estimation_Id__c.field-meta.xml
new file mode 100644
index 0000000..57468c3
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Estimation_Id__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Estimation_Id__c</fullName>
+ <externalId>false</externalId>
+ <label>鎶ヤ环ID</label>
+ <length>18</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Estimation_List_Price_Without_Tax__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Estimation_List_Price_Without_Tax__c.field-meta.xml
new file mode 100644
index 0000000..3413a4b
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Estimation_List_Price_Without_Tax__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Estimation_List_Price_Without_Tax__c</fullName>
+ <description>Estimation_List_Price__c / 1.17</description>
+ <externalId>false</externalId>
+ <formula>Estimation_List_Price__c / Tax_Intra_F_Copy__c</formula>
+ <label>涓嶄娇鐢細鏍囧噯瀹氫环鎬婚(涓嶅惈绋�)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Estimation_List_Price__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Estimation_List_Price__c.field-meta.xml
new file mode 100644
index 0000000..dfc242c
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Estimation_List_Price__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Estimation_List_Price__c</fullName>
+ <externalId>false</externalId>
+ <label>鏍囧噯瀹氫环鎬婚</label>
+ <precision>15</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Estimation_Name__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Estimation_Name__c.field-meta.xml
new file mode 100644
index 0000000..d23e8da
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Estimation_Name__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Estimation_Name__c</fullName>
+ <externalId>false</externalId>
+ <label>鎶ヤ环鍚嶇О</label>
+ <length>255</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Estimation_No__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Estimation_No__c.field-meta.xml
new file mode 100644
index 0000000..2b33f8c
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Estimation_No__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Estimation_No__c</fullName>
+ <externalId>false</externalId>
+ <label>鎶ヤ环鍙风爜</label>
+ <length>255</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Estimation_Proposal_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Estimation_Proposal_Date__c.field-meta.xml
new file mode 100644
index 0000000..f8b6ddd
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Estimation_Proposal_Date__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Estimation_Proposal_Date__c</fullName>
+ <externalId>false</externalId>
+ <label>3.鎶ヤ环鎻愪氦鏃�(鎵撳嵃鏃�)</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/ExpectedRevenue.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/ExpectedRevenue.field-meta.xml
new file mode 100644
index 0000000..d907caa
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/ExpectedRevenue.field-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ExpectedRevenue</fullName>
+ <trackTrending>false</trackTrending>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Field1__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Field1__c.field-meta.xml
new file mode 100644
index 0000000..3b86ce8
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Field1__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Field1__c</fullName>
+ <externalId>false</externalId>
+ <label>鎬讳欢鏁�</label>
+ <summaryForeignKey>Statu_Achievements__c.Opportunity__c</summaryForeignKey>
+ <summaryOperation>count</summaryOperation>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Summary</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Final_Contract_Proceeded_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Final_Contract_Proceeded_Date__c.field-meta.xml
new file mode 100644
index 0000000..5711b39
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Final_Contract_Proceeded_Date__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Final_Contract_Proceeded_Date__c</fullName>
+ <externalId>false</externalId>
+ <label>16.鍙栨秷/澶卞崟鏃�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/First_Review_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/First_Review_Date__c.field-meta.xml
new file mode 100644
index 0000000..cb37d46
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/First_Review_Date__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>First_Review_Date__c</fullName>
+ <externalId>false</externalId>
+ <label>18.鍒濆鏃�(SI锛�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/First_Review_Date_in3month__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/First_Review_Date_in3month__c.field-meta.xml
new file mode 100644
index 0000000..615921f
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/First_Review_Date_in3month__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>First_Review_Date_in3month__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(AND(NOT(ISBLANK(order_Date_For_Report__c)), order_Date_For_Report__c < DATE(YEAR(ADDMONTHS(TODAY(), 3)), MONTH(ADDMONTHS(TODAY(), 3)), 1)), 1, 0)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>棰勬祴璁㈣揣涓変釜鏈堝唴</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/First_Shipping_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/First_Shipping_Date__c.field-meta.xml
new file mode 100644
index 0000000..124ef78
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/First_Shipping_Date__c.field-meta.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>First_Shipping_Date__c</fullName>
+ <description>璇环涓嬫渶鑰佹渶寮�澶寸殑娉ㄦ畫鍙戣揣鏃ユ湡锛岀▼搴忛噷鐢ㄦ潵鏇存柊鍖婚櫌鐨�<绗竴绗旀垚浜ゆ棩></description>
+ <externalId>false</externalId>
+ <label>鏈�鑰佸彂璐ф棩</label>
+ <summarizedField>Statu_Achievements__c.DeliveryDate__c</summarizedField>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.FALSE_Order__c</field>
+ <operation>notEqual</operation>
+ <value>False</value>
+ </summaryFilterItems>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.Valid_Statu_Achievements__c</field>
+ <operation>equals</operation>
+ <value>1</value>
+ </summaryFilterItems>
+ <summaryForeignKey>Statu_Achievements__c.Opportunity__c</summaryForeignKey>
+ <summaryOperation>min</summaryOperation>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Summary</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Fixed_Check__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Fixed_Check__c.field-meta.xml
new file mode 100644
index 0000000..51588de
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Fixed_Check__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Fixed_Check__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>涓嶄娇鐢ㄧ‘璁や腑 娉ㄦ畫淇℃伅鍒ゆ柇缁撴灉(绯荤粺鐢�)</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Follow_Start_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Follow_Start_Date__c.field-meta.xml
new file mode 100644
index 0000000..644bd9d
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Follow_Start_Date__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Follow_Start_Date__c</fullName>
+ <externalId>false</externalId>
+ <label>涓嶄娇鐢� 寮�濮嬭窡杩涙棩</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Follow_or_not__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Follow_or_not__c.field-meta.xml
new file mode 100644
index 0000000..0025d91
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Follow_or_not__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Follow_or_not__c</fullName>
+ <externalId>false</externalId>
+ <formula>if ( Xin_Gross_Follow_Num__c > 0, 1, 0)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏄惁鎷滆</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Follow_up_comment__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Follow_up_comment__c.field-meta.xml
new file mode 100644
index 0000000..7aa4d4c
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Follow_up_comment__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Follow_up_comment__c</fullName>
+ <description>鏂囨湰鏈�闀�256瀛楁瘝</description>
+ <externalId>false</externalId>
+ <label>璇环鏈�鍚庤窡杩涙儏鍐�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>true</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>TextArea</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Follow_up_plan_last_update__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Follow_up_plan_last_update__c.field-meta.xml
new file mode 100644
index 0000000..c4ee8c0
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Follow_up_plan_last_update__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Follow_up_plan_last_update__c</fullName>
+ <externalId>false</externalId>
+ <label>鏈�鍚庢洿鏂版棩-鎺ㄨ繘璁″垝锛堜笉瑕�)</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/ForecastAccuracyObject__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/ForecastAccuracyObject__c.field-meta.xml
new file mode 100644
index 0000000..342aa47
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/ForecastAccuracyObject__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ForecastAccuracyObject__c</fullName>
+ <description>20190226 CHAN-B9R472 Add 鍙樻洿鐢ㄦ埛璇环涓篢rue锛屼笉璁＄畻棰勬祴绮惧害
+2022414 ljh SWAG-CCK8V4 Celon涓绘満浣滀负棰勬祴绮惧害瀵硅薄锛屽叾浠栦笉鏄�</description>
+ <externalId>false</externalId>
+ <formula>IF((AND(!ET_SP_Consumption__c && Text(Opp_order_Type__c) != 'ENG') && !ThisPhase_Ship_Forecast__c && !Equipment_Order_Flg__c &&
+ISBLANK(old_Oppo_No__c) && !If_Account_Change__c && !Is_Corrosion__c && ISBLANK(TEXT(CelonOpportunity__c)))
+|| ISPICKVAL(CelonOpportunity__c, 'Celon涓绘満'), true, false)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>棰勬祴绮惧害瀵硅薄</label>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/ForecastApprovalTime__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/ForecastApprovalTime__c.field-meta.xml
new file mode 100644
index 0000000..d01fccb
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/ForecastApprovalTime__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ForecastApprovalTime__c</fullName>
+ <externalId>false</externalId>
+ <label>棰勬祴鍙樻洿鎵瑰噯鏃堕棿(鍚庡彴鐢�)</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>DateTime</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Forecast_3month__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Forecast_3month__c.field-meta.xml
new file mode 100644
index 0000000..0cbb52d
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Forecast_3month__c.field-meta.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Forecast_3month__c</fullName>
+ <externalId>false</externalId>
+ <label>鏄惁3涓湀棰勬祴璇环</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+ <valueSet>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>3涓湀鍐呰鍙戣揣棰勬祴(鍙璐�)</fullName>
+ <default>false</default>
+ <label>3涓湀鍐呰鍙戣揣棰勬祴(鍙璐�)</label>
+ </value>
+ <value>
+ <fullName>3涓湀鍐呰鍙戣揣棰勬祴</fullName>
+ <default>false</default>
+ <label>3涓湀鍐呰鍙戣揣棰勬祴</label>
+ </value>
+ <value>
+ <fullName>3涓湀鍐呰璐ч娴�</fullName>
+ <default>false</default>
+ <label>3涓湀鍐呰璐ч娴�</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Forecast_3month_formula__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Forecast_3month_formula__c.field-meta.xml
new file mode 100644
index 0000000..0414b70
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Forecast_3month_formula__c.field-meta.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Forecast_3month_formula__c</fullName>
+ <description>IF(Monthly3_ship_target_stock__c=True,"3涓湀鍐呰鍙戣揣棰勬祴(鍙璐�)",
+IF(Monthly3_ship_target__c=True,"3涓湀鍐呰鍙戣揣棰勬祴",
+IF(Monthly3_order_target__c=True,"3涓湀鍐呰璐ч娴�","")))</description>
+ <externalId>false</externalId>
+ <formula>/*Monthly3_ship_target__c銇仼銇暟寮忋亴闁撻仌銇ｃ仧銆佷絾銇椼�佷慨姝ｃ仐銇︺倐闀枫仚銇庛�乼xt__c銈掍娇銇�*/
+/*txt__c銇疻F銇仸瑷畾*/
+IF(Monthly3_ship_target_stock_txt__c = '1',"3涓湀鍐呰鍙戣揣棰勬祴(鍙璐�)",
+IF(Monthly3_ship_target_txt__c = '1',"3涓湀鍐呰鍙戣揣棰勬祴",
+IF(Monthly3_order_target_txt__c = '1',"3涓湀鍐呰璐ч娴�","")))</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏄惁3涓湀棰勬祴璇环(鍏紡)</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Forecast_Amount_All_F__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Forecast_Amount_All_F__c.field-meta.xml
new file mode 100644
index 0000000..329f04f
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Forecast_Amount_All_F__c.field-meta.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Forecast_Amount_All_F__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(SAP_Send_OK__c && (Agency1__r.Special__c || Agency2__r.Special__c || Account.Parent.Special__c) && $User.ViewSpecialAgencyAmout__c == False, null,
+UnshippedAmount_DN__c
+)</formula>
+ <inlineHelpText>Forecast_Amount_All__c</inlineHelpText>
+ <label>娉ㄦ畫閲戦(鍚◣)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Forecast_Amount_All_withouttax_F_TY__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Forecast_Amount_All_withouttax_F_TY__c.field-meta.xml
new file mode 100644
index 0000000..17b9b93
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Forecast_Amount_All_withouttax_F_TY__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Forecast_Amount_All_withouttax_F_TY__c</fullName>
+ <externalId>false</externalId>
+ <formula>Forecast_Amount_All_withouttax_F__c/1000</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>娉ㄦ畫閲戦(KRMB)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Forecast_Amount_All_withouttax_F__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Forecast_Amount_All_withouttax_F__c.field-meta.xml
new file mode 100644
index 0000000..e801bb2
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Forecast_Amount_All_withouttax_F__c.field-meta.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Forecast_Amount_All_withouttax_F__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(SAP_Send_OK__c && (Agency1__r.Special__c || Agency2__r.Special__c || Account.Parent.Special__c) && $User.ViewSpecialAgencyAmout__c == False, null,
+ UnshippedAmount_without_tax__c
+
+)</formula>
+ <label>閫昏緫鐢細娉ㄦ畫閲戦(涓嶅惈绋�)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Forecast_Collect_Money__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Forecast_Collect_Money__c.field-meta.xml
new file mode 100644
index 0000000..8901a4a
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Forecast_Collect_Money__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Forecast_Collect_Money__c</fullName>
+ <externalId>false</externalId>
+ <label>棰勬祴鏀舵鏃�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Forecast_amount_last_update_day__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Forecast_amount_last_update_day__c.field-meta.xml
new file mode 100644
index 0000000..52ab7ec
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Forecast_amount_last_update_day__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Forecast_amount_last_update_day__c</fullName>
+ <externalId>false</externalId>
+ <label>鏈�鍚庢洿鏂版棩-棰勬祴鎴愪氦閲戦(鍚◣)</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Forecast_last_month__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Forecast_last_month__c.field-meta.xml
new file mode 100644
index 0000000..414fab6
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Forecast_last_month__c.field-meta.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Forecast_last_month__c</fullName>
+ <externalId>false</externalId>
+ <label>鏄惁涓婃湀棰勬祴璇环</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+ <valueSet>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>鏈湀璁㈠彂璐ч娴�</fullName>
+ <default>false</default>
+ <label>鏈湀璁㈠彂璐ч娴�</label>
+ </value>
+ <value>
+ <fullName>鏈湀璁㈣揣棰勬祴</fullName>
+ <default>false</default>
+ <label>鏈湀璁㈣揣棰勬祴</label>
+ </value>
+ <value>
+ <fullName>鏈湀璁㈣揣(鍙璐�)</fullName>
+ <default>false</default>
+ <label>鏈湀璁㈣揣(鍙璐�)</label>
+ </value>
+ <value>
+ <fullName>鏈湀鍙戣揣棰勬祴</fullName>
+ <default>false</default>
+ <label>鏈湀鍙戣揣棰勬祴</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Forecast_ship_monthly_mannual__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Forecast_ship_monthly_mannual__c.field-meta.xml
new file mode 100644
index 0000000..f579e15
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Forecast_ship_monthly_mannual__c.field-meta.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Forecast_ship_monthly_mannual__c</fullName>
+ <externalId>false</externalId>
+ <label>棰勬祴鍙戣揣鍛�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+ <valueSet>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>绗竴鍛�</fullName>
+ <default>false</default>
+ <label>绗竴鍛�</label>
+ </value>
+ <value>
+ <fullName>绗簩鍛�</fullName>
+ <default>false</default>
+ <label>绗簩鍛�</label>
+ </value>
+ <value>
+ <fullName>绗笁鍛�</fullName>
+ <default>false</default>
+ <label>绗笁鍛�</label>
+ </value>
+ <value>
+ <fullName>绗洓鍛�</fullName>
+ <default>false</default>
+ <label>绗洓鍛�</label>
+ </value>
+ <value>
+ <fullName>绗簲鍛�</fullName>
+ <default>false</default>
+ <label>绗簲鍛�</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Forecast_shipping_day_last_update__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Forecast_shipping_day_last_update__c.field-meta.xml
new file mode 100644
index 0000000..6bb19a1
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Forecast_shipping_day_last_update__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Forecast_shipping_day_last_update__c</fullName>
+ <externalId>false</externalId>
+ <label>鏈�鍚庢洿鏂版棩-棰勬祴鍙戣揣鏃�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Forecast_target_ship_lastmonth__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Forecast_target_ship_lastmonth__c.field-meta.xml
new file mode 100644
index 0000000..c4ed12d
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Forecast_target_ship_lastmonth__c.field-meta.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Forecast_target_ship_lastmonth__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(AND(ISPICKVAL(Forecast_this_month__c, "鏈湀璁㈠彂璐ч娴�"),
+ NOT(ISBLANK(
+
+if(or(text(StageName) = '鍑鸿嵎',text(StageName) = '瀹屼簡'), Last_Shipping_Date__c,
+IF(
+AND(Sum_SAIsCompleted__c > 0,
+MONTH(Last_Shipping_Date__c) = IF(MONTH(TODAY())=1, 12, MONTH(TODAY())-1),
+YEAR(Last_Shipping_Date__c) = IF(MONTH(TODAY()) = 1, YEAR(TODAY())-1, YEAR(TODAY()))), Last_Shipping_Date__c, null))
+
+ ))
+ ),
+1,
+0)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>涓婃湀棰勬祴鍐呭彂璐ц浠锋潯鏁�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Forecast_target_ship_nextmonth__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Forecast_target_ship_nextmonth__c.field-meta.xml
new file mode 100644
index 0000000..c2b890f
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Forecast_target_ship_nextmonth__c.field-meta.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Forecast_target_ship_nextmonth__c</fullName>
+ <description>IF(AND(OR(NM_Forecast_onemonth_before__c = "娆℃湀鍙戣揣棰勬祴",NM_Forecast_onemonth_before__c = "娆℃湀璁㈠彂璐ч娴�"),
+MONTH(B_1_shipping_date__c) = IF(MONTH(TODAY()) = 1, 12, MONTH(TODAY())-1),
+YEAR(B_1_shipping_date__c) = IF(MONTH(TODAY()) = 1, YEAR(TODAY())-1, YEAR(TODAY()))),
+1,0)</description>
+ <externalId>false</externalId>
+ <formula>IF(AND(OR(NM_Forecast_onemonth_before__c = "娆℃湀鍙戣揣棰勬祴",NM_Forecast_onemonth_before__c = "娆℃湀璁㈠彂璐ч娴�"),
+MONTH(B_1_shipping_date__c) = MONTH( TODAY()),YEAR(B_1_shipping_date__c) = YEAR(TODAY())),1,0)</formula>
+ <label>娆℃湀棰勬祴鍐呭彂璐ц浠锋潯鏁�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Forecast_target_ship_prospect__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Forecast_target_ship_prospect__c.field-meta.xml
new file mode 100644
index 0000000..7badc63
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Forecast_target_ship_prospect__c.field-meta.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Forecast_target_ship_prospect__c</fullName>
+ <description>IF(AND(OR(ISPICKVAL(Forecast_this_month__c, "鏈湀璁㈠彂璐ч娴�"),ISPICKVAL(Forecast_this_month__c, "鏈湀鍙戣揣棰勬祴")),NOT(ISBLANK(B_1_shipping_date__c))),1,0)</description>
+ <externalId>false</externalId>
+ <formula>IF(AND(ISPICKVAL(Forecast_this_month__c, "鏈湀璁㈠彂璐ч娴�"),NOT(ISBLANK(B_1_shipping_date__c))),1,0)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏈湀棰勬祴鍐呭彂璐ц浠锋潯鏁�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Forecast_target_ship_thismonth__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Forecast_target_ship_thismonth__c.field-meta.xml
new file mode 100644
index 0000000..3b54896
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Forecast_target_ship_thismonth__c.field-meta.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Forecast_target_ship_thismonth__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(AND(OR(NM_Forecast_onemonth_before__c = "娆℃湀鍙戣揣棰勬祴",NM_Forecast_onemonth_before__c = "娆℃湀璁㈠彂璐ч娴�"),
+MONTH(B_1_shipping_date__c) = IF(MONTH(TODAY()) = 1, 12, MONTH(TODAY())-1),
+YEAR(B_1_shipping_date__c) = IF(MONTH(TODAY()) = 1, YEAR(TODAY())-1, YEAR(TODAY()))),
+1,0)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>娆℃湀鐨勪笂鏈堥娴嬪唴鍙戣揣璇环鏉℃暟</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Forecast_this_month1__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Forecast_this_month1__c.field-meta.xml
new file mode 100644
index 0000000..aa360c2
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Forecast_this_month1__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Forecast_this_month1__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(ISBLANK(text(Forecast_this_month__c)),0,1)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏈湀棰勬祴鍐呰浠锋暟閲�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Forecast_this_month1_copy__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Forecast_this_month1_copy__c.field-meta.xml
new file mode 100644
index 0000000..382fc61
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Forecast_this_month1_copy__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Forecast_this_month1_copy__c</fullName>
+ <externalId>false</externalId>
+ <label>鏈湀棰勬祴鍐呰浠锋暟閲�(鏈堝垵)</label>
+ <precision>16</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Forecast_this_month2__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Forecast_this_month2__c.field-meta.xml
new file mode 100644
index 0000000..d3fa6a6
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Forecast_this_month2__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Forecast_this_month2__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(ISBLANK(Forecast_this_month_formula__c),0,1)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏈湀棰勬祴鍐呰浠锋暟閲�(鏈堝垵鎷疯礉鍏�)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Forecast_this_month__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Forecast_this_month__c.field-meta.xml
new file mode 100644
index 0000000..e1af989
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Forecast_this_month__c.field-meta.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Forecast_this_month__c</fullName>
+ <externalId>false</externalId>
+ <label>鏄惁鏈湀棰勬祴璇环</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>true</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+ <valueSet>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>鏈湀璁㈠彂璐ч娴�</fullName>
+ <default>false</default>
+ <label>鏈湀璁㈠彂璐ч娴�</label>
+ </value>
+ <value>
+ <fullName>鏈湀璁㈣揣棰勬祴</fullName>
+ <default>false</default>
+ <label>鏈湀璁㈣揣棰勬祴</label>
+ </value>
+ <value>
+ <fullName>鏈湀璁㈣揣(鍙璐�)</fullName>
+ <default>false</default>
+ <label>鏈湀璁㈣揣(鍙璐�)</label>
+ </value>
+ <value>
+ <fullName>鏈湀鍙戣揣棰勬祴</fullName>
+ <default>false</default>
+ <label>鏈湀鍙戣揣棰勬祴</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Forecast_this_month_formula__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Forecast_this_month_formula__c.field-meta.xml
new file mode 100644
index 0000000..68af299
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Forecast_this_month_formula__c.field-meta.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Forecast_this_month_formula__c</fullName>
+ <description>IF(Monthly_ship_target_txt__c = '1',"鏈湀璁㈠彂璐ч娴�",
+IF(Monthly_order_target_stock_txt__c = '1',"鏈湀璁㈣揣(鍙璐�)",
+IF(Monthly_order_target_txt__c = '1',"鏈湀璁㈣揣棰勬祴","")))
+**2017/12/5**
+ ET_SP_Consumption__c = false && Distributor_InCharge_opp__c = false &&
+ Group_purchase_PCL__c = false && ThisPhase_Ship_Forecast__c = false
+ ====> 棰勬祴绮惧害瀵硅薄 = true</description>
+ <externalId>false</externalId>
+ <formula>/*Monthly_ship_target__c銇仼銇暟寮忋亴闁撻仌銇ｃ仧銆佷絾銇椼�佷慨姝ｃ仐銇︺倐闀枫仚銇庛�乼xt__c銈掍娇銇�*/
+/*txt__c銇疻F銇仸瑷畾*/
+IF(Monthly_ship_target_txt__c = '1' && StageName__c = '璇环'
+ && ForecastAccuracyObject__c = true,"鏈湀璁㈠彂璐ч娴�",
+IF(Monthly_ship_target_txt__c = '1' && StageName__c = '娉ㄦ畫'
+ && ForecastAccuracyObject__c = true,"鏈湀鍙戣揣棰勬祴",
+IF(Monthly_order_target_txt__c = '1' && (StageName__c = '璇环')
+ && ForecastAccuracyObject__c = true,"鏈湀璁㈣揣棰勬祴","")))</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏄惁鏈湀棰勬祴璇环(鍏紡)</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Forecasted_Bid_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Forecasted_Bid_Date__c.field-meta.xml
new file mode 100644
index 0000000..363e685
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Forecasted_Bid_Date__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Forecasted_Bid_Date__c</fullName>
+ <externalId>false</externalId>
+ <formula>Agency_Opportunity__r.Forecasted_Bid_Date__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>缁忛攢鍟嗕腑鏍囨棩</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/From_Lead_TF__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/From_Lead_TF__c.field-meta.xml
new file mode 100644
index 0000000..8d2b4f1
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/From_Lead_TF__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>From_Lead_TF__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>鏉ヨ嚜璐拱鎰忓悜</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/From_Today_Num__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/From_Today_Num__c.field-meta.xml
new file mode 100644
index 0000000..2f68ea0
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/From_Today_Num__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>From_Today_Num__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(ISBLANK(Close_Forecasted_Date__c), -1, Close_Forecasted_Date__c - TODAY())</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>棰勬祴OCSM绛剧害鏃ヨ窛浠婂ぉ鏁�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Fund_Basis__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Fund_Basis__c.field-meta.xml
new file mode 100644
index 0000000..73874ab
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Fund_Basis__c.field-meta.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Fund_Basis__c</fullName>
+ <externalId>false</externalId>
+ <label>璧勯噾鏉ユ簮</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+ <valueSet>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>鏀垮簻璩囬噾</fullName>
+ <default>false</default>
+ <label>鏀垮簻鎷ㄦ</label>
+ </value>
+ <value>
+ <fullName>鐥呴櫌璩囬噾</fullName>
+ <default>false</default>
+ <label>鍖婚櫌璧勯噾</label>
+ </value>
+ <value>
+ <fullName>鍥介殯璩囬噾</fullName>
+ <default>false</default>
+ <label>鍥介檯璧勯噾</label>
+ </value>
+ <value>
+ <fullName>閵�琛岃硣閲�</fullName>
+ <default>false</default>
+ <label>閾惰璧勯噾</label>
+ </value>
+ <value>
+ <fullName>浼氱ぞ/鍊嬩汉璩囬噾</fullName>
+ <default>false</default>
+ <label>鍏徃/涓汉鎶曡祫</label>
+ </value>
+ <value>
+ <fullName>铻嶈祫绉熻祦锛堛儶銉笺偣锛�</fullName>
+ <default>false</default>
+ <label>铻嶈祫绉熻祦</label>
+ </value>
+ <value>
+ <fullName>璐存伅璐锋</fullName>
+ <default>false</default>
+ <label>璐存伅璐锋</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/GeneralInquirySeparateBill__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/GeneralInquirySeparateBill__c.field-meta.xml
new file mode 100644
index 0000000..7b0488b
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/GeneralInquirySeparateBill__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>GeneralInquirySeparateBill__c</fullName>
+ <defaultValue>false</defaultValue>
+ <description>鏅�氳浠� 鐐瑰嚮 鏀垮簻鎷涙爣鎷嗗崟 鎸夐挳 杩涜鎷嗗崟鏃剁殑鏍囪
+鏈瓧娈电敤鍦ㄤ笟鍔℃満浼氬伐浣滄祦 娓呯┖ 鍘熻浠风紪鐮�</description>
+ <externalId>false</externalId>
+ <label>鏅�氳浠锋斂搴滄媶鍗曟爣璁�</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Goverment_Important_Department__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Goverment_Important_Department__c.field-meta.xml
new file mode 100644
index 0000000..f9c0e3b
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Goverment_Important_Department__c.field-meta.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Goverment_Important_Department__c</fullName>
+ <description>姣忓勾涓�娆℃敹鍒版斂搴滅殑閫氱煡鍚庯紝浠庤〃鏍糢PDATE鐨勪俊鎭�</description>
+ <externalId>false</externalId>
+ <label>鏄惁鏀垮簻閲嶇偣涓村簥绉戝</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+ <valueSet>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>鏄�</fullName>
+ <default>false</default>
+ <label>鏄�</label>
+ </value>
+ <value>
+ <fullName>鍚�</fullName>
+ <default>false</default>
+ <label>鍚�</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Goverment_important_dept__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Goverment_important_dept__c.field-meta.xml
new file mode 100644
index 0000000..63ab005
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Goverment_important_dept__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Goverment_important_dept__c</fullName>
+ <externalId>false</externalId>
+ <formula>Account.Parent.Emphasis_Purchase_Flag__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鍥藉閲嶇偣涓撶椤圭洰绉�</label>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Goverment_key_customer__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Goverment_key_customer__c.field-meta.xml
new file mode 100644
index 0000000..14c7fe4
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Goverment_key_customer__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Goverment_key_customer__c</fullName>
+ <externalId>false</externalId>
+ <formula>Text(Account.Parent.Parent.Goverment_key_customer__c)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鍥藉閲嶇偣鍖婚櫌鍒嗙被</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Grade__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Grade__c.field-meta.xml
new file mode 100644
index 0000000..f8b082d
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Grade__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Grade__c</fullName>
+ <externalId>false</externalId>
+ <formula>TEXT(Account.Parent.Parent.Grade__c )</formula>
+ <label>鏀垮簻绛夌礆</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Group_purchase_PCL__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Group_purchase_PCL__c.field-meta.xml
new file mode 100644
index 0000000..0e4e16b
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Group_purchase_PCL__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Group_purchase_PCL__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>闆嗕腑閲囪喘璇环</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Group_purchased_order__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Group_purchased_order__c.field-meta.xml
new file mode 100644
index 0000000..5948f23
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Group_purchased_order__c.field-meta.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Group_purchased_order__c</fullName>
+ <externalId>false</externalId>
+ <label>闆嗕腑閲囪喘鍒嗙被</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+ <valueSet>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>涓�鑸噰璐�</fullName>
+ <default>true</default>
+ <label>涓�鑸噰璐�</label>
+ </value>
+ <value>
+ <fullName>鍖哄煙鍐呴泦涓噰璐�</fullName>
+ <default>false</default>
+ <label>鍖哄煙鍐呴泦涓噰璐�</label>
+ </value>
+ <value>
+ <fullName>璺ㄥ尯闆嗕腑閲囪喘</fullName>
+ <default>false</default>
+ <label>璺ㄥ尯闆嗕腑閲囪喘</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Gurantee_Period__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Gurantee_Period__c.field-meta.xml
new file mode 100644
index 0000000..3576ed2
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Gurantee_Period__c.field-meta.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Gurantee_Period__c</fullName>
+ <externalId>false</externalId>
+ <label>鍚堝悓淇濅慨鏈燂紙骞达級</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+ <valueSet>
+ <restricted>true</restricted>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>1</fullName>
+ <default>true</default>
+ <label>1</label>
+ </value>
+ <value>
+ <fullName>2</fullName>
+ <default>false</default>
+ <label>2</label>
+ </value>
+ <value>
+ <fullName>3</fullName>
+ <default>false</default>
+ <label>3</label>
+ </value>
+ <value>
+ <fullName>4</fullName>
+ <default>false</default>
+ <label>4</label>
+ </value>
+ <value>
+ <fullName>5</fullName>
+ <default>false</default>
+ <label>5</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/HP_ID__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/HP_ID__c.field-meta.xml
new file mode 100644
index 0000000..2468161
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/HP_ID__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>HP_ID__c</fullName>
+ <externalId>false</externalId>
+ <formula>Hospital__c</formula>
+ <label>鍖婚櫌ID</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/HP_Management_Code__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/HP_Management_Code__c.field-meta.xml
new file mode 100644
index 0000000..b68d358
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/HP_Management_Code__c.field-meta.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>HP_Management_Code__c</fullName>
+ <externalId>false</externalId>
+ <formula>/* 01210000000QemG == 鍖婚櫌鐨勮褰曠被鍨嬬殑Id */
+IF(Account.Parent.Parent.RecordTypeId = "01210000000QemG",
+ Account.Parent.Parent.Management_Code__c,
+/* 01210000000Qem1 == 缁忛攢鍟嗙殑璁板綍绫诲瀷鐨処d */
+IF(Account.Parent.RecordTypeId = "01210000000Qem1",
+ Account.AgencyContract_Management_Code__c,
+ ""
+))</formula>
+ <label>鍖婚櫌绠＄悊缂栫爜</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/HP_Name__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/HP_Name__c.field-meta.xml
new file mode 100644
index 0000000..69e19e8
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/HP_Name__c.field-meta.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>HP_Name__c</fullName>
+ <externalId>false</externalId>
+ <formula>/* 01210000000QemG == 鍖婚櫌鐨勮褰曠被鍨嬬殑Id */
+IF(Account.Parent.Parent.RecordTypeId = "01210000000QemG",
+ Account.Parent.Parent.Name,
+/* 01210000000Qem1 == 缁忛攢鍟嗙殑璁板綍绫诲瀷鐨処d */
+IF(Account.Parent.RecordTypeId = "01210000000Qem1",
+ Account.Name,
+ ""
+))</formula>
+ <label>鍖婚櫌</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/HP_OCM_Category_From_Class__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/HP_OCM_Category_From_Class__c.field-meta.xml
new file mode 100644
index 0000000..497be49
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/HP_OCM_Category_From_Class__c.field-meta.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>HP_OCM_Category_From_Class__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(Account.Parent.Parent.RecordTypeId = '01210000000QemG',
+ Text(Account.Parent.Parent.OCM_Category__c),
+ ''
+)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>OCSM鍒嗙被(鎴樼暐绉戝)</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/HasType3Machine__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/HasType3Machine__c.field-meta.xml
new file mode 100644
index 0000000..1a4063a
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/HasType3Machine__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>HasType3Machine__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>鍖呭惈绗�3鍒嗙被鏄富鏈虹殑浜у搧</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Hospital_Budget__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Hospital_Budget__c.field-meta.xml
new file mode 100644
index 0000000..898d0a0
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Hospital_Budget__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Hospital_Budget__c</fullName>
+ <externalId>false</externalId>
+ <label>鍖婚櫌棰勭畻閲戦(鍏�)</label>
+ <precision>15</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Hospital_Is_Active__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Hospital_Is_Active__c.field-meta.xml
new file mode 100644
index 0000000..cb9c38e
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Hospital_Is_Active__c.field-meta.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Hospital_Is_Active__c</fullName>
+ <externalId>false</externalId>
+ <formula>/* 01210000000QemG == 鍖婚櫌鐨勮褰曠被鍨嬬殑Id */
+IF(Account.Parent.Parent.RecordTypeId = "01210000000QemG",
+ TEXT(Account.Parent.Parent.Is_Active__c),
+/* 01210000000Qem1 == 缁忛攢鍟嗙殑璁板綍绫诲瀷鐨処d */
+IF(Account.Parent.RecordTypeId = "01210000000Qem1",
+ TEXT(Account.Is_Active__c),
+ ""
+))</formula>
+ <label>鐥呴櫌鏈夊姽/鐒″姽</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Hospital__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Hospital__c.field-meta.xml
new file mode 100644
index 0000000..7c50189
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Hospital__c.field-meta.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Hospital__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>鍖婚櫌</label>
+ <lookupFilter>
+ <active>true</active>
+ <errorMessage>鍖婚櫌鐨勫�间笉瀛樺湪鎴栦笌绛涢�夋潯浠朵笉鍖归厤銆�</errorMessage>
+ <filterItems>
+ <field>Account.RecordTypeId</field>
+ <operation>equals</operation>
+ <value>鐥呴櫌, 濂戠磩</value>
+ </filterItems>
+ <isOptional>false</isOptional>
+ </lookupFilter>
+ <referenceTo>Account</referenceTo>
+ <relationshipLabel>寮曞悎 (鐥呴櫌)</relationshipLabel>
+ <relationshipName>Opp_Account_HP</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/ID_18__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/ID_18__c.field-meta.xml
new file mode 100644
index 0000000..4e6f52c
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/ID_18__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ID_18__c</fullName>
+ <externalId>false</externalId>
+ <formula>casesafeid( Id)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>璇环ID(18)</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/IF_Submit__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/IF_Submit__c.field-meta.xml
new file mode 100644
index 0000000..2c3fd78
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/IF_Submit__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>IF_Submit__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>宸查攣瀹氭巿鏉冨悎鍚岀敵璇�</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/IS_Price_Apply__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/IS_Price_Apply__c.field-meta.xml
new file mode 100644
index 0000000..392a586
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/IS_Price_Apply__c.field-meta.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>IS_Price_Apply__c</fullName>
+ <externalId>false</externalId>
+ <label>杩芥函璁㈠崟锛氶渶瑕佷环鏍肩敵璇�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+ <valueSet>
+ <restricted>true</restricted>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>鏄�</fullName>
+ <default>false</default>
+ <label>鏄�</label>
+ </value>
+ <value>
+ <fullName>鍚�</fullName>
+ <default>false</default>
+ <label>鍚�</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/If_30_complete__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/If_30_complete__c.field-meta.xml
new file mode 100644
index 0000000..af3af83
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/If_30_complete__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>If_30_complete__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(Contract_recognized_day_1__c - DATEVALUE(CreatedDate) <= 30, 1, 0)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏄惁30澶╁唴鎴愪氦</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/If_Account_Change__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/If_Account_Change__c.field-meta.xml
new file mode 100644
index 0000000..a039dc2
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/If_Account_Change__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>If_Account_Change__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>鍙樻洿鐢ㄦ埛璇环</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/If_Authorizing_Lock__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/If_Authorizing_Lock__c.field-meta.xml
new file mode 100644
index 0000000..9370e97
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/If_Authorizing_Lock__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>If_Authorizing_Lock__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>SPO鎺堟潈鐢宠</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/If_Authorizing__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/If_Authorizing__c.field-meta.xml
new file mode 100644
index 0000000..cc3d474
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/If_Authorizing__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>If_Authorizing__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>鎺堟潈鐢宠鎸夐挳锛堟棫锛�</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/If_Have_170__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/If_Have_170__c.field-meta.xml
new file mode 100644
index 0000000..70c033b
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/If_Have_170__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>If_Have_170__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF( Pro170_count__c > 0, true, false)
+/* SWAG-C9QCGH 銆愬鎵樸�慬閲嶈]璇环鍏变韩缁橤IR Slution閮ㄩ棬瑙勫垯寮�鍙戣瘎浼�
+False
+*/</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鍖呭惈170</label>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/If_Have_AH__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/If_Have_AH__c.field-meta.xml
new file mode 100644
index 0000000..c58ce71
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/If_Have_AH__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>If_Have_AH__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF( ProAH_count__c > 0, true, false)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鍖呭惈濂ヨ緣</label>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/If_Have_EPT1__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/If_Have_EPT1__c.field-meta.xml
new file mode 100644
index 0000000..3dc4749
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/If_Have_EPT1__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>If_Have_EPT1__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(EPT1_count__c > 0, true, false)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鍖呭惈EP-T1</label>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/If_Have_EP_T1__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/If_Have_EP_T1__c.field-meta.xml
new file mode 100644
index 0000000..3b9650b
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/If_Have_EP_T1__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>If_Have_EP_T1__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>鏄惁鍖呭惈EP-T1</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/If_Have_OERAW_F__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/If_Have_OERAW_F__c.field-meta.xml
new file mode 100644
index 0000000..d1a23d6
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/If_Have_OERAW_F__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>If_Have_OERAW_F__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(ProOER_AW_count__c> 0, true, false)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鍖呭惈OER-AW璇环</label>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/If_Have_OERAW__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/If_Have_OERAW__c.field-meta.xml
new file mode 100644
index 0000000..a0941c5
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/If_Have_OERAW__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>If_Have_OERAW__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <inlineHelpText>璇环鏉冮檺鍏变韩缁欏競鍦烘湰閮�</inlineHelpText>
+ <label>OER-AW璇环</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/If_Need_Authorize__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/If_Need_Authorize__c.field-meta.xml
new file mode 100644
index 0000000..5532be5
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/If_Need_Authorize__c.field-meta.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>If_Need_Authorize__c</fullName>
+ <description>//lt 20230524 update</description>
+ <externalId>false</externalId>
+ <formula>IF( TEXT( SAP_Province__c )=='OSH-瀹夊窘鐪�' , False, if(text(Sales_Root__c) == 'OCM鐩存帴璨╁２', False,
+if(Account.RecordTypeId == '01210000000QjCN' &&
+(Account.ET_SP_Dealer__c == True ||
+Account.ENG_Dealer__c == True ||
+Account.SP_DealerContact__c == True ||
+Account.CELON_Dealer__c == True ||
+AND(OR(ISPICKVAL(CelonOpportunity__c, 'Celon鑰楁潗'),ISPICKVAL(CelonOpportunity__c, 'Celon ENG')),Hospital__r.RecordTypeId != "01210000000QemG")
+), False,
+True))
+)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏄惁闇�瑕佹巿鏉�</label>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/If_Need_PriceApply__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/If_Need_PriceApply__c.field-meta.xml
new file mode 100644
index 0000000..73a646a
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/If_Need_PriceApply__c.field-meta.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>If_Need_PriceApply__c</fullName>
+ <description>20190531 澧炲姞鑳介噺鑰楁潗涓嶉渶瑕佷环鏍肩敵璇�
+20220414 ljh CelonOpportunity__c SWAG-CCK8V4
+//20230524 lt update
+IF( TEXT(IS_Price_Apply__c)=='鏄�' || ISPICKVAL(CelonOpportunity__c, 'Celon涓绘満') , True,
+ IF((Account.RecordTypeId == '01210000000QjCN' && LEFT(Estimation_Id__c, 3) == 'a2K')
+|| ETPromoteSale__c == true
+|| Is_Corrosion__c
+|| AND(OR(ISPICKVAL(CelonOpportunity__c, 'Celon鑰楁潗'),ISPICKVAL(CelonOpportunity__c, 'Celon ENG')),Hospital__r.RecordTypeId != "01210000000QemG") , False, True))</description>
+ <externalId>false</externalId>
+ <formula>IF( TEXT( SAP_Province__c )=='OSH-瀹夊窘鐪�', False, IF( TEXT(IS_Price_Apply__c)=='鏄�' || ISPICKVAL(CelonOpportunity__c, 'Celon涓绘満') , True,
+IF((Account.RecordTypeId == '01210000000QjCN' && LEFT(Estimation_Id__c, 3) == 'a2K')
+|| ETPromoteSale__c == true
+|| Is_Corrosion__c
+|| AND(OR(ISPICKVAL(CelonOpportunity__c, 'Celon鑰楁潗'),ISPICKVAL(CelonOpportunity__c, 'Celon ENG')),Hospital__r.RecordTypeId != "01210000000QemG") , False, True))
+)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏄惁闇�瑕佷环鏍肩敵璇�</label>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/If_UploadT1Detailed__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/If_UploadT1Detailed__c.field-meta.xml
new file mode 100644
index 0000000..f1efceb
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/If_UploadT1Detailed__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>If_UploadT1Detailed__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>鏄惁涓婁紶T1娓呭崟</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/ImportArgumentsNumber__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/ImportArgumentsNumber__c.field-meta.xml
new file mode 100644
index 0000000..5f08c18
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/ImportArgumentsNumber__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ImportArgumentsNumber__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF( ImportDemonstration_state__c == '宸叉壒鍑�', 1, 0)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>杩涘彛璁鸿瘉鏁�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/ImportDemonstration_Approval_date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/ImportDemonstration_Approval_date__c.field-meta.xml
new file mode 100644
index 0000000..5d6b14c
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/ImportDemonstration_Approval_date__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ImportDemonstration_Approval_date__c</fullName>
+ <externalId>false</externalId>
+ <label>8.杩涘彛璁鸿瘉鎵瑰噯鏃�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/ImportDemonstration_Filing_date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/ImportDemonstration_Filing_date__c.field-meta.xml
new file mode 100644
index 0000000..1ed9862
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/ImportDemonstration_Filing_date__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ImportDemonstration_Filing_date__c</fullName>
+ <externalId>false</externalId>
+ <label>7.杩涘彛璁鸿瘉鐢宠鏃�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/ImportDemonstration_Rejection_date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/ImportDemonstration_Rejection_date__c.field-meta.xml
new file mode 100644
index 0000000..2543177
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/ImportDemonstration_Rejection_date__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ImportDemonstration_Rejection_date__c</fullName>
+ <externalId>false</externalId>
+ <label>9.杩涘彛璁鸿瘉椹冲洖鏃�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/ImportDemonstration_state__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/ImportDemonstration_state__c.field-meta.xml
new file mode 100644
index 0000000..4c2df3d
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/ImportDemonstration_state__c.field-meta.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ImportDemonstration_state__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF( if_NeedImportDemonstration__c ,
+IF( NOT(ISBLANK(ImportDemonstration_Rejection_date__c)) , '澶辫触',
+IF( NOT(ISBLANK(ImportDemonstration_Approval_date__c)) , '宸叉壒鍑�',
+IF( NOT(ISBLANK(ImportDemonstration_Filing_date__c)) , '宸叉彁浜�',
+'鍑嗗涓�'))),
+'' )</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>杩涘彛璁鸿瘉鐘舵��</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Important_Contract_Remark__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Important_Contract_Remark__c.field-meta.xml
new file mode 100644
index 0000000..5d87f26
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Important_Contract_Remark__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Important_Contract_Remark__c</fullName>
+ <externalId>false</externalId>
+ <label>澶у悎鍚屾弿杩�</label>
+ <length>255</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Important_Key_product_category__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Important_Key_product_category__c.field-meta.xml
new file mode 100644
index 0000000..b908776
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Important_Key_product_category__c.field-meta.xml
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Important_Key_product_category__c</fullName>
+ <externalId>false</externalId>
+ <label>閲嶇偣浜у搧鐩爣鍖哄垎</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+ <valueSet>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>閲嶇偣浜у搧01</fullName>
+ <default>false</default>
+ <label>閲嶇偣浜у搧01</label>
+ </value>
+ <value>
+ <fullName>閲嶇偣浜у搧02</fullName>
+ <default>false</default>
+ <label>閲嶇偣浜у搧02</label>
+ </value>
+ <value>
+ <fullName>閲嶇偣浜у搧03</fullName>
+ <default>false</default>
+ <label>閲嶇偣浜у搧03</label>
+ </value>
+ <value>
+ <fullName>閲嶇偣浜у搧04</fullName>
+ <default>false</default>
+ <label>閲嶇偣浜у搧04</label>
+ </value>
+ <value>
+ <fullName>閲嶇偣浜у搧05</fullName>
+ <default>false</default>
+ <label>閲嶇偣浜у搧05</label>
+ </value>
+ <value>
+ <fullName>閲嶇偣浜у搧06</fullName>
+ <default>false</default>
+ <label>閲嶇偣浜у搧06</label>
+ </value>
+ <value>
+ <fullName>閲嶇偣浜у搧07</fullName>
+ <default>false</default>
+ <label>閲嶇偣浜у搧07</label>
+ </value>
+ <value>
+ <fullName>閲嶇偣浜у搧08</fullName>
+ <default>false</default>
+ <label>閲嶇偣浜у搧08</label>
+ </value>
+ <value>
+ <fullName>閲嶇偣浜у搧09</fullName>
+ <default>false</default>
+ <label>閲嶇偣浜у搧09</label>
+ </value>
+ <value>
+ <fullName>閲嶇偣浜у搧10</fullName>
+ <default>false</default>
+ <label>閲嶇偣浜у搧10</label>
+ </value>
+ <value>
+ <fullName>閲嶇偣浜у搧11</fullName>
+ <default>false</default>
+ <label>閲嶇偣浜у搧11</label>
+ </value>
+ <value>
+ <fullName>閲嶇偣浜у搧12</fullName>
+ <default>false</default>
+ <label>閲嶇偣浜у搧12</label>
+ </value>
+ <value>
+ <fullName>閲嶇偣浜у搧13</fullName>
+ <default>false</default>
+ <label>閲嶇偣浜у搧13</label>
+ </value>
+ <value>
+ <fullName>閲嶇偣浜у搧14</fullName>
+ <default>false</default>
+ <label>閲嶇偣浜у搧14</label>
+ </value>
+ <value>
+ <fullName>閲嶇偣浜у搧15</fullName>
+ <default>false</default>
+ <label>閲嶇偣浜у搧15</label>
+ </value>
+ <value>
+ <fullName>閲嶇偣浜у搧16</fullName>
+ <default>false</default>
+ <label>閲嶇偣浜у搧16</label>
+ </value>
+ <value>
+ <fullName>閲嶇偣浜у搧17</fullName>
+ <default>false</default>
+ <label>閲嶇偣浜у搧17</label>
+ </value>
+ <value>
+ <fullName>閲嶇偣浜у搧18</fullName>
+ <default>false</default>
+ <label>閲嶇偣浜у搧18</label>
+ </value>
+ <value>
+ <fullName>閲嶇偣浜у搧19</fullName>
+ <default>false</default>
+ <label>閲嶇偣浜у搧19</label>
+ </value>
+ <value>
+ <fullName>閲嶇偣浜у搧20</fullName>
+ <default>false</default>
+ <label>閲嶇偣浜у搧20</label>
+ </value>
+ <value>
+ <fullName>閲嶇偣浜у搧21</fullName>
+ <default>false</default>
+ <label>閲嶇偣浜у搧21</label>
+ </value>
+ <value>
+ <fullName>閲嶇偣浜у搧22</fullName>
+ <default>false</default>
+ <label>閲嶇偣浜у搧22</label>
+ </value>
+ <value>
+ <fullName>閲嶇偣浜у搧23</fullName>
+ <default>false</default>
+ <label>閲嶇偣浜у搧23</label>
+ </value>
+ <value>
+ <fullName>閲嶇偣浜у搧24</fullName>
+ <default>false</default>
+ <label>閲嶇偣浜у搧24</label>
+ </value>
+ <value>
+ <fullName>閲嶇偣浜у搧25</fullName>
+ <default>false</default>
+ <label>閲嶇偣浜у搧25</label>
+ </value>
+ <value>
+ <fullName>閲嶇偣浜у搧26</fullName>
+ <default>false</default>
+ <label>閲嶇偣浜у搧26</label>
+ </value>
+ <value>
+ <fullName>閲嶇偣浜у搧27</fullName>
+ <default>false</default>
+ <label>閲嶇偣浜у搧27</label>
+ </value>
+ <value>
+ <fullName>閲嶇偣浜у搧28</fullName>
+ <default>false</default>
+ <label>閲嶇偣浜у搧28</label>
+ </value>
+ <value>
+ <fullName>閲嶇偣浜у搧29</fullName>
+ <default>false</default>
+ <label>閲嶇偣浜у搧29</label>
+ </value>
+ <value>
+ <fullName>閲嶇偣浜у搧30</fullName>
+ <default>false</default>
+ <label>閲嶇偣浜у搧30</label>
+ </value>
+ <value>
+ <fullName>閲嶇偣浜у搧31</fullName>
+ <default>false</default>
+ <label>閲嶇偣浜у搧31</label>
+ </value>
+ <value>
+ <fullName>閲嶇偣浜у搧32</fullName>
+ <default>false</default>
+ <label>閲嶇偣浜у搧32</label>
+ </value>
+ <value>
+ <fullName>閲嶇偣浜у搧33</fullName>
+ <default>false</default>
+ <label>閲嶇偣浜у搧33</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Important_Rroduct_Count__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Important_Rroduct_Count__c.field-meta.xml
new file mode 100644
index 0000000..709769f
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Important_Rroduct_Count__c.field-meta.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Important_Rroduct_Count__c</fullName>
+ <externalId>false</externalId>
+ <label>閲嶇偣浜у搧鏁伴噺</label>
+ <summarizedField>OpportunityLineItem.Quantity</summarizedField>
+ <summaryFilterItems>
+ <field>OpportunityLineItem.Important_Rroduct__c</field>
+ <operation>equals</operation>
+ <value>true</value>
+ </summaryFilterItems>
+ <summaryForeignKey>OpportunityLineItem.OpportunityId</summaryForeignKey>
+ <summaryOperation>sum</summaryOperation>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Summary</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Important_Rroduct_Flg__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Important_Rroduct_Flg__c.field-meta.xml
new file mode 100644
index 0000000..3843ff0
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Important_Rroduct_Flg__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Important_Rroduct_Flg__c</fullName>
+ <externalId>false</externalId>
+ <formula>if (Important_Rroduct_Count__c = 0,$Label.No_Text,$Label.Yes_Text)</formula>
+ <label>鏄惁閲嶇偣浜у搧</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Important_contract__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Important_contract__c.field-meta.xml
new file mode 100644
index 0000000..0ab1178
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Important_contract__c.field-meta.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Important_contract__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(
+ AND(Wholesale_Price_F_RMB__c >=2000,
+ OR(Text(Account.Parent.Department_Class_Label__c) ="娑堝寲绉�",
+Text(Account.Parent.Department_Class_Label__c)
+="鍛煎惛绉�") ), 1,
+IF(
+ AND(Wholesale_Price_F_RMB__c >=1000,
+ OR(Text(Account.Parent.Department_Class_Label__c) ="鏅绉�",
+Text(Account.Parent.Department_Class_Label__c)
+="娉屽翱绉�",Text(Account.Parent.Department_Class_Label__c)="濡囩",
+Text(Account.Parent.Department_Class_Label__c)
+="鑰抽蓟鍠夌",Text(Account.Parent.Department_Class_Label__c)="鍏朵粬")
+ ),1,
+ 0
+)
+)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <inlineHelpText>1鏄ぇ鍚堝悓</inlineHelpText>
+ <label>鏄惁澶у悎鍚�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Inactive_PCL__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Inactive_PCL__c.field-meta.xml
new file mode 100644
index 0000000..947c96e
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Inactive_PCL__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Inactive_PCL__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(
+
+AND(SAP_Send_OK__c=True,Contract_Invalid_Total__c <> 0,Note_Shipped_Residual_Total__c = 0),True,False)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏃犳晥璇环</label>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/InfoTypeBid__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/InfoTypeBid__c.field-meta.xml
new file mode 100644
index 0000000..3ba6946
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/InfoTypeBid__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>InfoTypeBid__c</fullName>
+ <externalId>false</externalId>
+ <formula>text(Bidding_Project_Name_Bid__r.InfoType__c)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>椤圭洰:闃舵</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/InfoTypeBid_text__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/InfoTypeBid_text__c.field-meta.xml
new file mode 100644
index 0000000..1c6f944
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/InfoTypeBid_text__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>InfoTypeBid_text__c</fullName>
+ <description>鍏宠仈鎷涙姇鏍囬」鐩椂璧嬪�� 涓斿彧璧嬪�间竴娆�</description>
+ <externalId>false</externalId>
+ <label>椤圭洰闃舵(鏂囨湰)</label>
+ <length>255</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Informationcheck__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Informationcheck__c.field-meta.xml
new file mode 100644
index 0000000..391f795
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Informationcheck__c.field-meta.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Informationcheck__c</fullName>
+ <description>鎷涙爣鍙傛暟鏂囦欢涓庢嫑鏍囨枃浠� 涓�鑷存�ф鏌�</description>
+ <externalId>false</externalId>
+ <label>鎷涙爣淇℃伅鏍稿缁撴灉</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+ <valueSet>
+ <restricted>true</restricted>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>鍙傛暟鏂囦欢涓庢嫑鏍囦俊鎭笉涓�鑷达紝璇锋洿鏂伴渶姹�</fullName>
+ <default>false</default>
+ <label>鍙傛暟鏂囦欢涓庢嫑鏍囦俊鎭笉涓�鑷达紝璇锋洿鏂伴渶姹�</label>
+ </value>
+ <value>
+ <fullName>鍙傛暟鏂囦欢涓庢嫑鏍囦俊鎭笉涓�鑷达紝璇峰仛澶卞崟鎿嶄綔</fullName>
+ <default>false</default>
+ <label>鍙傛暟鏂囦欢涓庢嫑鏍囦俊鎭笉涓�鑷达紝璇峰仛澶卞崟鎿嶄綔</label>
+ </value>
+ <value>
+ <fullName>鍙傛暟鏂囦欢涓庢嫑鏍囦俊鎭竴鑷�</fullName>
+ <default>false</default>
+ <label>鍙傛暟鏂囦欢涓庢嫑鏍囦俊鎭竴鑷�</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Infrastructure_Adjust__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Infrastructure_Adjust__c.field-meta.xml
new file mode 100644
index 0000000..2e7c333
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Infrastructure_Adjust__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Infrastructure_Adjust__c</fullName>
+ <externalId>false</externalId>
+ <formula>Infrastructure_Project__r.Adjust__c</formula>
+ <label>鍩哄缓锛氬叧鑱斿害璋冩暣</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Infrastructure_Node_Options__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Infrastructure_Node_Options__c.field-meta.xml
new file mode 100644
index 0000000..5323934
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Infrastructure_Node_Options__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Infrastructure_Node_Options__c</fullName>
+ <externalId>false</externalId>
+ <formula>TEXT(Infrastructure_Project__r.Node_Options__c)</formula>
+ <label>鍩哄缓锛氶」鐩妭鐐�/闃舵杩涘害(閫夐」)</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Infrastructure_ProjectNum__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Infrastructure_ProjectNum__c.field-meta.xml
new file mode 100644
index 0000000..db3843b
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Infrastructure_ProjectNum__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Infrastructure_ProjectNum__c</fullName>
+ <externalId>false</externalId>
+ <formula>Infrastructure_Project__r.ProjectNum__c</formula>
+ <label>鍩哄缓锛歋FDC缂栫爜</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Infrastructure_Project__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Infrastructure_Project__c.field-meta.xml
new file mode 100644
index 0000000..5f9b725
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Infrastructure_Project__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Infrastructure_Project__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>鍩哄缓椤圭洰</label>
+ <referenceTo>Infrastructure_Project__c</referenceTo>
+ <relationshipLabel>涓氬姟鏈轰細</relationshipLabel>
+ <relationshipName>Infrastructure_ProjectHJN4</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Input_Dealer_HP_date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Input_Dealer_HP_date__c.field-meta.xml
new file mode 100644
index 0000000..6f329ea
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Input_Dealer_HP_date__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Input_Dealer_HP_date__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(ISBLANK(Sales_Shop_Hospital_Contract__c),0,1)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>宸叉湁缁忛攢鍟�-鍖婚櫌绛剧害鏃�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Input_win_bid_date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Input_win_bid_date__c.field-meta.xml
new file mode 100644
index 0000000..8c99de9
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Input_win_bid_date__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Input_win_bid_date__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(ISBLANK(Closing_Bid_Date__c),0,1)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>宸叉湁涓爣鏃�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/InquireNumberHosts__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/InquireNumberHosts__c.field-meta.xml
new file mode 100644
index 0000000..b3f791d
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/InquireNumberHosts__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>InquireNumberHosts__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF( TEXT(StageName) = '鏁楁垿', RivalHostsNumber__c , RivalHostsNumber__c + OlyNumberHosts__c )</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>璇环涓绘満鍙版暟</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/InquiryLeadForm__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/InquiryLeadForm__c.field-meta.xml
new file mode 100644
index 0000000..c27c4a4
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/InquiryLeadForm__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>InquiryLeadForm__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>浼氳璇㈤棶鍗�</label>
+ <referenceTo>Inquiry_form__c</referenceTo>
+ <relationshipLabel>涓氬姟鏈轰細</relationshipLabel>
+ <relationshipName>oppInquiry</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/InquiryOwner_Department_TEXT__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/InquiryOwner_Department_TEXT__c.field-meta.xml
new file mode 100644
index 0000000..bb846de
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/InquiryOwner_Department_TEXT__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>InquiryOwner_Department_TEXT__c</fullName>
+ <externalId>false</externalId>
+ <label>鏈儴(鎵�鏈変汉)鏂囨湰</label>
+ <length>255</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/InquiryOwner_Department__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/InquiryOwner_Department__c.field-meta.xml
new file mode 100644
index 0000000..4e23485
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/InquiryOwner_Department__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>InquiryOwner_Department__c</fullName>
+ <description>鐩存帴鏉ユ簮鎵�鏈変汉锛屾病鏈夊競鍦虹殑鍒ゆ柇</description>
+ <externalId>false</externalId>
+ <formula>Text(Owner.Dept__c)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏈儴(鎵�鏈変汉)</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Inquiry_Num__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Inquiry_Num__c.field-meta.xml
new file mode 100644
index 0000000..e34dd0e
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Inquiry_Num__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Inquiry_Num__c</fullName>
+ <externalId>false</externalId>
+ <label>鍜ㄨ鍗曠紪鐮�</label>
+ <length>255</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Inquiry_forcast_date_copy__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Inquiry_forcast_date_copy__c.field-meta.xml
new file mode 100644
index 0000000..d7cda00
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Inquiry_forcast_date_copy__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Inquiry_forcast_date_copy__c</fullName>
+ <externalId>false</externalId>
+ <label>璇环棰勬祴鍒ゆ柇鏃ユ湡copy</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Inquiry_forcast_date_formular__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Inquiry_forcast_date_formular__c.field-meta.xml
new file mode 100644
index 0000000..28106f7
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Inquiry_forcast_date_formular__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Inquiry_forcast_date_formular__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(StageName__c="璇环",CloseDate,
+ IF(StageName__c="娉ㄦ畫" && NOT(ISBLANK (Last_Shipping_Scheduled_Date__c )),Last_Shipping_Scheduled_Date__c,CloseDate ))</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>璇环棰勬祴鍒ゆ柇鏃ユ湡</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Inspection_explanation_day__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Inspection_explanation_day__c.field-meta.xml
new file mode 100644
index 0000000..5156c10
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Inspection_explanation_day__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Inspection_explanation_day__c</fullName>
+ <externalId>false</externalId>
+ <label>瀹夎纭涔︾櫥褰曟棩</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/InstallDate__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/InstallDate__c.field-meta.xml
new file mode 100644
index 0000000..1684185
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/InstallDate__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>InstallDate__c</fullName>
+ <externalId>false</externalId>
+ <label>23.瀹夎鏃�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Install_Status__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Install_Status__c.field-meta.xml
new file mode 100644
index 0000000..37eaa2d
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Install_Status__c.field-meta.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Install_Status__c</fullName>
+ <externalId>false</externalId>
+ <label>瀹夎鐘舵��</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+ <valueSet>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>鏈偆銉炽偣銉堛兗銉�</fullName>
+ <default>false</default>
+ <label>鏈偆銉炽偣銉堛兗銉�</label>
+ </value>
+ <value>
+ <fullName>涓�閮ㄣ偆銉炽偣銉堛兗銉�</fullName>
+ <default>false</default>
+ <label>涓�閮ㄣ偆銉炽偣銉堛兗銉�</label>
+ </value>
+ <value>
+ <fullName>銈ゃ兂銈广儓銉笺儷娓堛伩</fullName>
+ <default>false</default>
+ <label>銈ゃ兂銈广儓銉笺儷娓堛伩</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Installation_location__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Installation_location__c.field-meta.xml
new file mode 100644
index 0000000..1734cfc
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Installation_location__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Installation_location__c</fullName>
+ <externalId>false</externalId>
+ <label>涓绘満瀹夎鍦扮偣</label>
+ <length>255</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/InyiteSendEmail_flag__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/InyiteSendEmail_flag__c.field-meta.xml
new file mode 100644
index 0000000..c921fa6
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/InyiteSendEmail_flag__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>InyiteSendEmail_flag__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>鎷涙爣鍙戦�侀偖浠舵爣璇�</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/IqScore.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/IqScore.field-meta.xml
new file mode 100644
index 0000000..e7063a2
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/IqScore.field-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>IqScore</fullName>
+ <trackTrending>false</trackTrending>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/IsAuthorized__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/IsAuthorized__c.field-meta.xml
new file mode 100644
index 0000000..c8fb7ef
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/IsAuthorized__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>IsAuthorized__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>鏄惁鐗圭害缁忛攢鍟嗘巿鏉�</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/IsExcludedFromTerritory2Filter.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/IsExcludedFromTerritory2Filter.field-meta.xml
new file mode 100644
index 0000000..a47cf25
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/IsExcludedFromTerritory2Filter.field-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>IsExcludedFromTerritory2Filter</fullName>
+ <trackTrending>false</trackTrending>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/IsImport__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/IsImport__c.field-meta.xml
new file mode 100644
index 0000000..cc822b2
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/IsImport__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>IsImport__c</fullName>
+ <defaultValue>false</defaultValue>
+ <description>鏄惁鏄Щ琛屾暟鎹�</description>
+ <externalId>false</externalId>
+ <label>鏄惁浠嶴FA杞Щ鐨勫凡缁撴潫璇环</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/IsLoanSpare__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/IsLoanSpare__c.field-meta.xml
new file mode 100644
index 0000000..86e5624
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/IsLoanSpare__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>IsLoanSpare__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(!IsBlank(Spare_Application_Singular__c), IF(Spare_Application_Singular__c == 0, False,True) ,False)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏄惁鍑哄�熷鍝�</label>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/IsNextMonthOfVisit__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/IsNextMonthOfVisit__c.field-meta.xml
new file mode 100644
index 0000000..e1ebf1c
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/IsNextMonthOfVisit__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>IsNextMonthOfVisit__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>鏄惁涓嬫湀璁″垝鎷滆</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/IsPrivate.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/IsPrivate.field-meta.xml
new file mode 100644
index 0000000..6d16a69
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/IsPrivate.field-meta.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>IsPrivate</fullName>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Is_ConfirmationofAward__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Is_ConfirmationofAward__c.field-meta.xml
new file mode 100644
index 0000000..4c2a332
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Is_ConfirmationofAward__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Is_ConfirmationofAward__c</fullName>
+ <externalId>false</externalId>
+ <label>鏄惁鎸夋椂纭</label>
+ <precision>1</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Is_Corrosion__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Is_Corrosion__c.field-meta.xml
new file mode 100644
index 0000000..fba98f7
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Is_Corrosion__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Is_Corrosion__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>闃胯タ璧涘璇环</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Is_Submitontime__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Is_Submitontime__c.field-meta.xml
new file mode 100644
index 0000000..4b7d560
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Is_Submitontime__c.field-meta.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Is_Submitontime__c</fullName>
+ <description>20220920ws淇敼鍓嶏細
+IF(text(ConfirmationofAward__c) == '绔炰簤瀵规墜涓爣',IF(ISNULL(LostTask_comfirmTime__c),NULL, IF(LostTask_comfirmTime__c - ConfirmationofAward_createTime__c <= 30, 1, 0)),null)</description>
+ <externalId>false</externalId>
+ <formula>IF(
+ text(ConfirmationofAward__c) == '绔炰簤瀵规墜涓爣',
+ IF(
+ ISNULL(LostTask_comfirmTime__c),
+ IF(NOT(ISNULL(LostTask_createTime__c)),IF(Today()-LostTask_createTime__c > 30,0,NULL),NULL),
+ IF(LostTask_comfirmTime__c - LostTask_createTime__c<= 30, 1, 0)
+ ),
+ null
+)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏄惁鎸夋椂鎻愪氦澶卞崟</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Job_category__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Job_category__c.field-meta.xml
new file mode 100644
index 0000000..05c29bc
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Job_category__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Job_category__c</fullName>
+ <externalId>false</externalId>
+ <formula>text(Owner.Job_Category__c)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鑱岀</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Judge_Lost_or_Cancel__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Judge_Lost_or_Cancel__c.field-meta.xml
new file mode 100644
index 0000000..7be6d3c
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Judge_Lost_or_Cancel__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Judge_Lost_or_Cancel__c</fullName>
+ <externalId>false</externalId>
+ <label>鍒ゆ柇 : 澶卞崟:鍙栨秷</label>
+ <summarizedField>Lost_cancel_report__c.Judge_Lost_or_Cancel__c</summarizedField>
+ <summaryForeignKey>Lost_cancel_report__c.Opportunity__c</summaryForeignKey>
+ <summaryOperation>max</summaryOperation>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Summary</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Key_tipics_last_update_dayF__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Key_tipics_last_update_dayF__c.field-meta.xml
new file mode 100644
index 0000000..af6291b
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Key_tipics_last_update_dayF__c.field-meta.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Key_tipics_last_update_dayF__c</fullName>
+ <description>if(And(isBlank(Stage2_last_update_day__c),
+isBlank(OPP_rank_Last_update_day__c),
+isBlank(Situation_last_update_day__c),
+isBlank(Last_Follow_Up_Date__c),
+isBlank(Last_opd_date__c)),
+null,
+ Today()- Min(
+ Today() - NULLVALUE(Stage2_last_update_day__c, DATE(1900,1,1)),
+ Today() - NULLVALUE(OPP_rank_Last_update_day__c, DATE(1900,1,1)),
+ Today() - NULLVALUE(Situation_last_update_day__c, DATE(1900,1,1)),
+ Today() - NULLVALUE(Last_Follow_Up_Date__c, DATE(1900,1,1)),
+ Today() - NULLVALUE(Last_opd_date__c, DATE(1900,1,1))
+))</description>
+ <externalId>false</externalId>
+ <formula>if(And(isBlank(Stage2_last_update_day__c),
+isBlank(OPP_rank_Last_update_day__c),
+isBlank(Situation_last_update_day__c),
+isBlank(Last_Follow_Up_Date__c),
+isBlank(quoteSavedDate__c),
+isBlank(Last_opd_date__c)),
+null,
+ Today()- Min(
+ Today() - NULLVALUE(Stage2_last_update_day__c, DATE(1900,1,1)),
+ Today() - NULLVALUE(OPP_rank_Last_update_day__c, DATE(1900,1,1)),
+ Today() - NULLVALUE(Situation_last_update_day__c, DATE(1900,1,1)),
+ Today() - NULLVALUE(Last_Follow_Up_Date__c, DATE(1900,1,1)),
+ Today() - NULLVALUE(Last_opd_date__c, DATE(1900,1,1)),
+ Today() - NULLVALUE(quoteSavedDate__c, DATE(1900,1,1))
+))</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏈�鍚庢洿鏂版棩(璺熻繘鍏紡)</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Key_tipics_last_update_day__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Key_tipics_last_update_day__c.field-meta.xml
new file mode 100644
index 0000000..5118597
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Key_tipics_last_update_day__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Key_tipics_last_update_day__c</fullName>
+ <externalId>false</externalId>
+ <label>鏈�鍚庢洿鏂版棩(璺熻繘)</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Keyman__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Keyman__c.field-meta.xml
new file mode 100644
index 0000000..cfc9ddf
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Keyman__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Keyman__c</fullName>
+ <externalId>false</externalId>
+ <label>淇℃伅鎻愪緵浜�</label>
+ <length>50</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/LTV_Account__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/LTV_Account__c.field-meta.xml
new file mode 100644
index 0000000..5719c20
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/LTV_Account__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>LTV_Account__c</fullName>
+ <description>20210616 鏉庢椇淇敼 鍘熸湁瀛楁鏍囩鈥�1.LTV鐢ㄦ埛鐩爣(鍚◣)鈥� 璇鹃锛歋WAG-C3Z94M</description>
+ <externalId>false</externalId>
+ <formula>Objective__c * 0.7</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>1.H鐢ㄦ埛鐩爣(鍚◣)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/LTV_Account_tax__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/LTV_Account_tax__c.field-meta.xml
new file mode 100644
index 0000000..b0a5631
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/LTV_Account_tax__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>LTV_Account_tax__c</fullName>
+ <description>20210616 鏉庢椇淇敼 鍘熸湁瀛楁鏍囩鈥�1.LTV鐢ㄦ埛鐩爣(涓嶅惈绋�)鈥� 璇鹃锛歋WAG-C3Z94M</description>
+ <externalId>false</externalId>
+ <formula>Objective_Tax__c * 0.7</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>1.H鐢ㄦ埛鐩爣(涓嶅惈绋�)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Lapsed_Days__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Lapsed_Days__c.field-meta.xml
new file mode 100644
index 0000000..50c4db1
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Lapsed_Days__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Lapsed_Days__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(ISNULL(Xin_Last_Follow_Up_Date_For_Report__c), 0, Today() - Datevalue(Xin_Last_Follow_Up_Date_For_Report__c))</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏈�缁堣窡杩涜繃鍘绘棩鏈�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/LastApproveDate__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/LastApproveDate__c.field-meta.xml
new file mode 100644
index 0000000..801d2f3
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/LastApproveDate__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>LastApproveDate__c</fullName>
+ <externalId>false</externalId>
+ <label>19.缁堝鏃�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/LastModified_Day__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/LastModified_Day__c.field-meta.xml
new file mode 100644
index 0000000..d7f7544
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/LastModified_Day__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>LastModified_Day__c</fullName>
+ <externalId>false</externalId>
+ <formula>datevalue(LastModifiedDate)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>LastModified Day</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Last_Delivery_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Last_Delivery_Date__c.field-meta.xml
new file mode 100644
index 0000000..47ea304
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Last_Delivery_Date__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Last_Delivery_Date__c</fullName>
+ <externalId>false</externalId>
+ <label>鏈�鏅氫氦璐ф棩鏈�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Last_Follow_Up_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Last_Follow_Up_Date__c.field-meta.xml
new file mode 100644
index 0000000..957560f
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Last_Follow_Up_Date__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Last_Follow_Up_Date__c</fullName>
+ <description>璁板綍鏈�鍚庢嫓璁挎棩鏈熶俊鎭紝鍥犱负鐢ㄥ湪澶氫釜鍏紡涓笉鑳藉垹闄ゃ��</description>
+ <externalId>false</externalId>
+ <label>4.鏈�鍚庤窡杩涙棩</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Last_Install_Confirm_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Last_Install_Confirm_Date__c.field-meta.xml
new file mode 100644
index 0000000..08696d6
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Last_Install_Confirm_Date__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Last_Install_Confirm_Date__c</fullName>
+ <externalId>false</externalId>
+ <label>鏈�鏂板畨瑁呯‘璁や功鐧诲綍鏃�</label>
+ <summarizedField>Statu_Achievements__c.Collection_Day_Invoice__c</summarizedField>
+ <summaryForeignKey>Statu_Achievements__c.Opportunity__c</summaryForeignKey>
+ <summaryOperation>max</summaryOperation>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Summary</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Last_Install_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Last_Install_Date__c.field-meta.xml
new file mode 100644
index 0000000..81be96d
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Last_Install_Date__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Last_Install_Date__c</fullName>
+ <externalId>false</externalId>
+ <label>23.鏈�鏂板畨瑁呮棩</label>
+ <summarizedField>Statu_Achievements__c.InstallDate__c</summarizedField>
+ <summaryForeignKey>Statu_Achievements__c.Opportunity__c</summaryForeignKey>
+ <summaryOperation>max</summaryOperation>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Summary</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Last_Shipping_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Last_Shipping_Date__c.field-meta.xml
new file mode 100644
index 0000000..e4f0ac6
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Last_Shipping_Date__c.field-meta.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Last_Shipping_Date__c</fullName>
+ <externalId>false</externalId>
+ <label>22.鏈�鏂板彂璐ф棩</label>
+ <summarizedField>Statu_Achievements__c.DeliveryDate__c</summarizedField>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.Valid_Statu_Achievements__c</field>
+ <operation>equals</operation>
+ <value>1</value>
+ </summaryFilterItems>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.FALSE_Order__c</field>
+ <operation>notEqual</operation>
+ <value>FALSE</value>
+ </summaryFilterItems>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.Expire__c</field>
+ <operation>notEqual</operation>
+ <value>True</value>
+ </summaryFilterItems>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.Statu_effective__c</field>
+ <operation>equals</operation>
+ <value>1</value>
+ </summaryFilterItems>
+ <summaryForeignKey>Statu_Achievements__c.Opportunity__c</summaryForeignKey>
+ <summaryOperation>max</summaryOperation>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Summary</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Last_Shipping_Date_backup__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Last_Shipping_Date_backup__c.field-meta.xml
new file mode 100644
index 0000000..81bdad8
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Last_Shipping_Date_backup__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Last_Shipping_Date_backup__c</fullName>
+ <externalId>false</externalId>
+ <label>22.鏈�鏂板彂璐ф棩_姣�3涓伐浣滄棩</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Last_Shipping_Scheduled_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Last_Shipping_Scheduled_Date__c.field-meta.xml
new file mode 100644
index 0000000..f80b90c
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Last_Shipping_Scheduled_Date__c.field-meta.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Last_Shipping_Scheduled_Date__c</fullName>
+ <externalId>false</externalId>
+ <label>22.鏈�鏂伴娴嬪彂璐ф棩(IF)</label>
+ <summarizedField>Statu_Achievements__c.Shipping_Scheduled_Date__c</summarizedField>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.Valid_Statu_Achievements__c</field>
+ <operation>equals</operation>
+ <value>1</value>
+ </summaryFilterItems>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.FALSE_Order__c</field>
+ <operation>notEqual</operation>
+ <value>FALSE</value>
+ </summaryFilterItems>
+ <summaryForeignKey>Statu_Achievements__c.Opportunity__c</summaryForeignKey>
+ <summaryOperation>max</summaryOperation>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Summary</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Last_Shipping_Scheduled_Date_backup__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Last_Shipping_Scheduled_Date_backup__c.field-meta.xml
new file mode 100644
index 0000000..0921fad
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Last_Shipping_Scheduled_Date_backup__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Last_Shipping_Scheduled_Date_backup__c</fullName>
+ <externalId>false</externalId>
+ <label>22.鏈�鏂伴娴嬪彂璐ф棩_姣�3涓伐浣滄棩</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Last_Visit_Scheduled_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Last_Visit_Scheduled_Date__c.field-meta.xml
new file mode 100644
index 0000000..fc67e01
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Last_Visit_Scheduled_Date__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Last_Visit_Scheduled_Date__c</fullName>
+ <externalId>false</externalId>
+ <label>鏈�澶ц鍒掕闂棩</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>DateTime</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Last_alert_to_user_update__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Last_alert_to_user_update__c.field-meta.xml
new file mode 100644
index 0000000..06f5fe8
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Last_alert_to_user_update__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Last_alert_to_user_update__c</fullName>
+ <externalId>false</externalId>
+ <label>鏈�鏂版彁閱掍汉鍛樻洿鏂版椂闂�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>DateTime</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Last_month_stage2__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Last_month_stage2__c.field-meta.xml
new file mode 100644
index 0000000..4becb1c
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Last_month_stage2__c.field-meta.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Last_month_stage2__c</fullName>
+ <externalId>false</externalId>
+ <formula>case(month(today()),
+4,Rating03__c,
+5,Rating04__c,
+6,Rating05__c,
+7,Rating06__c,
+8,Rating07__c,
+9,Rating08__c,
+10,Rating09__c,
+11,Rating10__c,
+12,Rating11__c,
+1,Rating12__c,
+2,Rating01__c,
+3,Rating02__c,
+"")</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鐘舵��2(涓婁釜鏈�)</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Last_opd_date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Last_opd_date__c.field-meta.xml
new file mode 100644
index 0000000..bb5252e
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Last_opd_date__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Last_opd_date__c</fullName>
+ <externalId>false</externalId>
+ <label>5.鏈�鍚嶰PD瀹炴柦鏃�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Last_opportunity_file__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Last_opportunity_file__c.field-meta.xml
new file mode 100644
index 0000000..04306d0
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Last_opportunity_file__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Last_opportunity_file__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>鏈�鏂拌浠锋枃浠�</label>
+ <referenceTo>Opportunity_File__c</referenceTo>
+ <relationshipLabel>涓氬姟鏈轰細</relationshipLabel>
+ <relationshipName>Last_opportunityfile</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Last_opportunity_file_stage__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Last_opportunity_file_stage__c.field-meta.xml
new file mode 100644
index 0000000..4eb60be
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Last_opportunity_file_stage__c.field-meta.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Last_opportunity_file_stage__c</fullName>
+ <externalId>false</externalId>
+ <formula>CASE(TEXT(Last_opportunity_file__r.Oppor_File_Stage__c),
+'A','A.涓爣閫氱煡/鎴浘',
+'B','B.閲囪喘閫氱煡涔�',
+'C','C.鍖婚櫌鍚堝悓',
+'D','D.渚涜揣淇濊瘉涔�',
+'E','E.鐩栫珷鐨勯厤缃崟',
+'F','F.璐ㄧ枒鍑�',
+'-')</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏈�鏂拌浠锋枃浠剁被鍨�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Last_opportunity_file_time__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Last_opportunity_file_time__c.field-meta.xml
new file mode 100644
index 0000000..9852048
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Last_opportunity_file_time__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Last_opportunity_file_time__c</fullName>
+ <externalId>false</externalId>
+ <formula>Last_opportunity_file__r.Last_upload_time__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏈�鏂拌浠锋枃浠朵笂浼犳椂闂�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>DateTime</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Latest_progress_stage__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Latest_progress_stage__c.field-meta.xml
new file mode 100644
index 0000000..7d873d3
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Latest_progress_stage__c.field-meta.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Latest_progress_stage__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(SAP_Send_OK__c , 'WIN',
+ IF(TEXT( Opportunity_stage__c ) == '涓爣绛剧害', '涓爣绛剧害',
+ IF(NOT(ISBLANK( NotesApprovedNo__c )), '浠锋牸鐢宠涓�',
+ IF(OR(TEXT(ConfirmationofAward__c)=='OLY涓爣', NOT(ISBLANK(Closing_Bid_Date__c))), 'OLY涓爣',
+ IF(AND(TEXT(ConfirmationofAward__c)=='绔炰簤瀵规墜涓爣',StageName__c=='璇环'),'瀵规墜涓爣',
+ IF(TEXT( Opportunity_stage__c )=='纭畾浜哋LY鍙傛暟', '纭畾浜哋LY鍙傛暟',
+ IF(ImportDemonstration_state__c=='宸叉壒鍑�', '閫氳繃浜嗚繘鍙ｈ璇�',
+ IF(TEXT( Opportunity_stage__c )=='娌℃湁纭畾鍙傛暟', '鍙傛暟涓嶇‘瀹�',
+ IF(NOT(ISBLANK( Authorized_DB_No__c )), '宸叉巿鏉�',
+ IF(TEXT( Opportunity_stage__c )=='纭畾浜嗗鎵嬪弬鏁�', '纭畾浜嗗鎵嬪弬鏁�',
+ IF(AND(NOT(ISBLANK( Bidding_Project_Name_Bid__c )), TEXT(Bidding_Project_Name_Bid__r.InfoType__c) != '1锛氶鍛�'), '宸叉寕缃�',
+ TEXT( Opportunity_stage__c )
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+)</formula>
+ <inlineHelpText>婊¤冻浠ヤ笅鏉′欢鏃跺湪鈥濊浠疯繘灞曗�滃熀纭�涓婃彁鍗�
+鍚堝悓鐢宠涓�
+OLY涓爣
+閫氳繃浜嗚繘鍙ｈ璇�
+宸叉巿鏉�
+宸叉寕缃�</inlineHelpText>
+ <label>璇环闃舵(鑷姩)</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Latest_report_Created_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Latest_report_Created_Date__c.field-meta.xml
new file mode 100644
index 0000000..9926132
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Latest_report_Created_Date__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Latest_report_Created_Date__c</fullName>
+ <externalId>false</externalId>
+ <label>鏈�鏂版棩鎶ユ柊寤烘棩(绂佺敤)</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/LeadSource.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/LeadSource.field-meta.xml
new file mode 100644
index 0000000..f5a564c
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/LeadSource.field-meta.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>LeadSource</fullName>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Lead_CreateBy__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Lead_CreateBy__c.field-meta.xml
new file mode 100644
index 0000000..8179fa5
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Lead_CreateBy__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Lead_CreateBy__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>鎰忓悜鍒涘缓浜�</label>
+ <referenceTo>User</referenceTo>
+ <relationshipName>Lead_CreateUser</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Lead_CreateDate__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Lead_CreateDate__c.field-meta.xml
new file mode 100644
index 0000000..9cbb82a
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Lead_CreateDate__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Lead_CreateDate__c</fullName>
+ <externalId>false</externalId>
+ <label>鎰忓悜鍒涘缓鏃堕棿</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>DateTime</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Lead_Num__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Lead_Num__c.field-meta.xml
new file mode 100644
index 0000000..7cef314
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Lead_Num__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Lead_Num__c</fullName>
+ <externalId>false</externalId>
+ <label>鎰忓悜缂栫爜</label>
+ <length>255</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/LeakageNumber__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/LeakageNumber__c.field-meta.xml
new file mode 100644
index 0000000..9e97428
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/LeakageNumber__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>LeakageNumber__c</fullName>
+ <externalId>false</externalId>
+ <label>婕忔姤鏁�</label>
+ <precision>6</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/LoanApprovedDate__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/LoanApprovedDate__c.field-meta.xml
new file mode 100644
index 0000000..6a61b4a
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/LoanApprovedDate__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>LoanApprovedDate__c</fullName>
+ <externalId>false</externalId>
+ <label>3.璐锋瀹℃壒鏃�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/LostCntNum__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/LostCntNum__c.field-meta.xml
new file mode 100644
index 0000000..e5664f8
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/LostCntNum__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>LostCntNum__c</fullName>
+ <externalId>false</externalId>
+ <label>娴佸け鏁�(鍚庡彴鐢�)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/LostCnt__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/LostCnt__c.field-meta.xml
new file mode 100644
index 0000000..df4757a
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/LostCnt__c.field-meta.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>LostCnt__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(OR(AND(Final_Contract_Proceeded_Date__c >= DATE(IF(MONTH(TODAY()) <= 3,YEAR(TODAY()) - 1, YEAR(TODAY())), 4, 1),
+Final_Contract_Proceeded_Date__c < DATE(IF(MONTH(TODAY()) <= 3, YEAR(TODAY()), YEAR(TODAY()) + 1), 4, 1),OR(TEXT(StageName) = '鍓婇櫎',TEXT(StageName) = '鏁楁垿')),LostCntNum__c = 1),1,0)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>娴佸け鏁�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/LostPrices__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/LostPrices__c.field-meta.xml
new file mode 100644
index 0000000..c7a2be4
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/LostPrices__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>LostPrices__c</fullName>
+ <externalId>false</externalId>
+ <label>澶卞崟閲戦(KRMB锛�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/LostTask_comfirmTime__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/LostTask_comfirmTime__c.field-meta.xml
new file mode 100644
index 0000000..e606710
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/LostTask_comfirmTime__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>LostTask_comfirmTime__c</fullName>
+ <externalId>false</externalId>
+ <label>澶卞崟浠诲姟纭鏃�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/LostTask_createTime__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/LostTask_createTime__c.field-meta.xml
new file mode 100644
index 0000000..9faf463
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/LostTask_createTime__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>LostTask_createTime__c</fullName>
+ <externalId>false</externalId>
+ <label>澶卞崟浠诲姟鍒涘缓鏃�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/LostTypeText__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/LostTypeText__c.field-meta.xml
new file mode 100644
index 0000000..526aba9
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/LostTypeText__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>LostTypeText__c</fullName>
+ <externalId>false</externalId>
+ <label>澶卞崟绫诲瀷锛堟枃鏈級</label>
+ <length>255</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Lost_Cancel_Report__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Lost_Cancel_Report__c.field-meta.xml
new file mode 100644
index 0000000..557c86f
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Lost_Cancel_Report__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Lost_Cancel_Report__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>璇环澶卞崟/鍙栨秷鎶ュ憡</label>
+ <referenceTo>Lost_cancel_report__c</referenceTo>
+ <relationshipLabel>涓氬姟鏈轰細</relationshipLabel>
+ <relationshipName>Lost_Cancel_Report</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Lost_Opportunity_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Lost_Opportunity_Date__c.field-meta.xml
new file mode 100644
index 0000000..c923f43
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Lost_Opportunity_Date__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Lost_Opportunity_Date__c</fullName>
+ <description>鍒╃敤WF鏇存柊</description>
+ <externalId>false</externalId>
+ <label>鍙栨秷/澶卞崟鏃�(绂佺敤)</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Lost_reason_main__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Lost_reason_main__c.field-meta.xml
new file mode 100644
index 0000000..07e8e0e
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Lost_reason_main__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Lost_reason_main__c</fullName>
+ <externalId>false</externalId>
+ <label>澶卞崟鍘熷洜(涓�)</label>
+ <length>255</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/M2_special_acount_opp__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/M2_special_acount_opp__c.field-meta.xml
new file mode 100644
index 0000000..62aaae6
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/M2_special_acount_opp__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>M2_special_acount_opp__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(Agency1__r.Id = "0011000000V9RenAAF",True,False)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>缁忛攢鍟嗙鐞嗙</label>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Mail_Tar_Selector__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Mail_Tar_Selector__c.field-meta.xml
new file mode 100644
index 0000000..0d6ebaa
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Mail_Tar_Selector__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Mail_Tar_Selector__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>Cc浜哄憳鑾峰彇</label>
+ <referenceTo>User</referenceTo>
+ <relationshipName>opportZq40</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Manager_name__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Manager_name__c.field-meta.xml
new file mode 100644
index 0000000..1f09406
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Manager_name__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Manager_name__c</fullName>
+ <externalId>false</externalId>
+ <formula>Owner.SalesManagername__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>璇环鎵�鏈変汉鐨勭粡鐞�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Manager_name_text__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Manager_name_text__c.field-meta.xml
new file mode 100644
index 0000000..ecac8af
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Manager_name_text__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Manager_name_text__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>璇环鎵�鏈変汉鐨勭粡鐞�(鏂囨湰)</label>
+ <referenceTo>User</referenceTo>
+ <relationshipName>Manager_name</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/MarketAnalysisDay__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/MarketAnalysisDay__c.field-meta.xml
new file mode 100644
index 0000000..5621909
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/MarketAnalysisDay__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>MarketAnalysisDay__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(StageName__c='澶卞崟',NULLVALUE(Closing_Bid_Date_Bid__c, Final_Contract_Proceeded_Date__c),NULLVALUE(Closing_Bid_Date_Bid__c, Closing_Bid_Date__c) )</formula>
+ <label>甯傚満鍒嗘瀽鏃�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Max_LastApproveDate__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Max_LastApproveDate__c.field-meta.xml
new file mode 100644
index 0000000..8e3c2e6
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Max_LastApproveDate__c.field-meta.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Max_LastApproveDate__c</fullName>
+ <externalId>false</externalId>
+ <label>19.缁堝鏃�(鍚庡彴鐢�)</label>
+ <summarizedField>Statu_Achievements__c.LastApproveDate__c</summarizedField>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.Valid_Statu_Achievements__c</field>
+ <operation>equals</operation>
+ <value>1</value>
+ </summaryFilterItems>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.FALSE_Order__c</field>
+ <operation>notEqual</operation>
+ <value>FALSE</value>
+ </summaryFilterItems>
+ <summaryForeignKey>Statu_Achievements__c.Opportunity__c</summaryForeignKey>
+ <summaryOperation>max</summaryOperation>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Summary</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/MeetingApprovedNo__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/MeetingApprovedNo__c.field-meta.xml
new file mode 100644
index 0000000..b04e3c4
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/MeetingApprovedNo__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>MeetingApprovedNo__c</fullName>
+ <externalId>false</externalId>
+ <formula>Campaign.MeetingApprovedNo__c</formula>
+ <label>浼氳鍐宠缂栫爜</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Min_FirstApproveDate__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Min_FirstApproveDate__c.field-meta.xml
new file mode 100644
index 0000000..afda4c5
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Min_FirstApproveDate__c.field-meta.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Min_FirstApproveDate__c</fullName>
+ <externalId>false</externalId>
+ <label>18.鍒濆鏃ユ湡(璁㈣揣鏃�)+1澶�(IF鏃�)銆�</label>
+ <summarizedField>Statu_Achievements__c.FirstApproveDate__c</summarizedField>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.Valid_Statu_Achievements__c</field>
+ <operation>equals</operation>
+ <value>1</value>
+ </summaryFilterItems>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.FALSE_Order__c</field>
+ <operation>notEqual</operation>
+ <value>FALSE</value>
+ </summaryFilterItems>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.Expire__c</field>
+ <operation>notEqual</operation>
+ <value>True</value>
+ </summaryFilterItems>
+ <summaryForeignKey>Statu_Achievements__c.Opportunity__c</summaryForeignKey>
+ <summaryOperation>min</summaryOperation>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Summary</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Min_FirstApproveDate_backup__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Min_FirstApproveDate_backup__c.field-meta.xml
new file mode 100644
index 0000000..fba9c0f
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Min_FirstApproveDate_backup__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Min_FirstApproveDate_backup__c</fullName>
+ <externalId>false</externalId>
+ <label>18.鍒濆鏃�(璁㈣揣鏃�)+1澶姣�3涓伐浣滄棩銆�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Monthly3_order_target__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Monthly3_order_target__c.field-meta.xml
new file mode 100644
index 0000000..6d9193e
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Monthly3_order_target__c.field-meta.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Monthly3_order_target__c</fullName>
+ <description>IF(AND(
+StageName__c="璇环",
+Close_Forecasted_Date__c <= (DATE(YEAR(today()),MONTH(Today())+4,01)-1)),True,False)</description>
+ <externalId>false</externalId>
+ <formula>IF(AND(
+StageName__c="璇环",
+Close_Forecasted_Date__c <= IF(MONTH(today()) = 9, DATE(YEAR(today()), 12, 31),
+ IF(MONTH(today()) = 10, DATE(YEAR(today()) + 1, 1, 31),
+ IF(MONTH(today()) = 11, DATE(YEAR(today()) + 1, 3, 1) - 1,
+ IF(MONTH(today()) = 12, DATE(YEAR(today()) + 1, 3, 31),
+ DATE(YEAR(today()), MONTH(today()) + 4, 1) - 1
+ )
+ )
+ )
+)
+),True,False)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>棰勬祴瀵硅薄 : 3涓湀璁㈣揣棰勬祴(鍏紡)</label>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Monthly3_order_target_txt__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Monthly3_order_target_txt__c.field-meta.xml
new file mode 100644
index 0000000..486db67
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Monthly3_order_target_txt__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Monthly3_order_target_txt__c</fullName>
+ <externalId>false</externalId>
+ <label>棰勬祴瀵硅薄 : 3涓湀璁㈣揣棰勬祴_txt</label>
+ <length>1</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Monthly3_ship_target__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Monthly3_ship_target__c.field-meta.xml
new file mode 100644
index 0000000..906a368
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Monthly3_ship_target__c.field-meta.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Monthly3_ship_target__c</fullName>
+ <description>IF(AND(
+StageName__c="璇环",
+CloseDate <= DATE(YEAR(today()),MONTH(Today())+4,01)-1
+),True,False)</description>
+ <externalId>false</externalId>
+ <formula>IF(AND(
+StageName__c="璇环",
+CloseDate <= IF(MONTH(today()) = 9, DATE(YEAR(today()), 12, 31),
+ IF(MONTH(today()) = 10, DATE(YEAR(today()) + 1, 1, 31),
+ IF(MONTH(today()) = 11, DATE(YEAR(today()) + 1, 3, 1) - 1,
+ IF(MONTH(today()) = 12, DATE(YEAR(today()) + 1, 3, 31),
+ DATE(YEAR(today()), MONTH(today()) + 4, 1) - 1
+ )
+ )
+ )
+)
+),True,False)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>棰勬祴瀵硅薄 : 3涓湀鍙戣揣棰勬祴(鍏紡)</label>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Monthly3_ship_target_stock__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Monthly3_ship_target_stock__c.field-meta.xml
new file mode 100644
index 0000000..6818a58
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Monthly3_ship_target_stock__c.field-meta.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Monthly3_ship_target_stock__c</fullName>
+ <description>IF(AND(
+StageName__c="璇环",
+CloseDate <= (DATE(YEAR(today()),MONTH(Today())+4,01)-1),
+OR(
+Status_Formula_Text__c ="08 宸茬绾�",
+Status_Formula_Text__c ="07 鐢ㄦ埛宸茬绾�",
+Status_Formula_Text__c ="06 鐢ㄦ埛鏈绾�",
+Status_Formula_Text__c ="05 浠锋牸鐢宠涓�",
+Status_Formula_Text__c ="04 宸蹭腑鏍�",
+Status_Formula_Text__c ="03 宸叉巿鏉�")
+),True,False)
+20221125 涔嬪墠
+IF(AND(
+StageName__c="璇环",
+CloseDate <= IF(MONTH(today()) = 9, DATE(YEAR(today()), 12, 31),
+ IF(MONTH(today()) = 10, DATE(YEAR(today()) + 1, 1, 31),
+ IF(MONTH(today()) = 11, DATE(YEAR(today()) + 1, 3, 1) - 1,
+ IF(MONTH(today()) = 12, DATE(YEAR(today()) + 1, 3, 31),
+ DATE(YEAR(today()), MONTH(today()) + 4, 1) - 1
+ )
+ )
+ )
+),
+OR(
+Status_Formula_Text__c ="08 宸茬绾�",
+Status_Formula_Text__c ="07 鐢ㄦ埛宸茬绾�",
+Status_Formula_Text__c ="06 鐢ㄦ埛鏈绾�",
+Status_Formula_Text__c ="05 浠锋牸鐢宠涓�",
+Status_Formula_Text__c ="04 宸蹭腑鏍�",
+Status_Formula_Text__c ="03 宸叉巿鏉�")
+),True,False)</description>
+ <externalId>false</externalId>
+ <formula>IF(AND(
+StageName__c="璇环",
+CloseDate <= IF(MONTH(today()) = 9, DATE(YEAR(today()), 12, 31),
+ IF(MONTH(today()) = 10, DATE(YEAR(today()) + 1, 1, 31),
+ IF(MONTH(today()) = 11, DATE(YEAR(today()) + 1, 3, 1) - 1,
+ IF(MONTH(today()) = 12, DATE(YEAR(today()) + 1, 3, 31),
+ DATE(YEAR(today()), MONTH(today()) + 4, 1) - 1
+ )
+ )
+ )
+),
+OR(
+Status_Formula_Text__c ="12 宸茬绾�",
+Status_Formula_Text__c ="11 浠锋牸鐢宠涓�",
+Status_Formula_Text__c ="10 宸蹭腑鏍�",
+Status_Formula_Text__c ="08 宸叉巿鏉�")
+),True,False)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>棰勬祴瀵硅薄 : 3涓湀鍙戣揣棰勬祴 鍙璐�(鍏紡)</label>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Monthly3_ship_target_stock_txt__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Monthly3_ship_target_stock_txt__c.field-meta.xml
new file mode 100644
index 0000000..2911219
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Monthly3_ship_target_stock_txt__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Monthly3_ship_target_stock_txt__c</fullName>
+ <externalId>false</externalId>
+ <label>棰勬祴瀵硅薄 : 3涓湀鍙戣揣棰勬祴 鍙璐txt</label>
+ <length>1</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Monthly3_ship_target_txt__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Monthly3_ship_target_txt__c.field-meta.xml
new file mode 100644
index 0000000..386f7de
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Monthly3_ship_target_txt__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Monthly3_ship_target_txt__c</fullName>
+ <externalId>false</externalId>
+ <label>棰勬祴瀵硅薄 : 3涓湀鍙戣揣棰勬祴_txt</label>
+ <length>1</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Monthly_Forecast_in__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Monthly_Forecast_in__c.field-meta.xml
new file mode 100644
index 0000000..183beae
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Monthly_Forecast_in__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Monthly_Forecast_in__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(AND(NOT(ISBLANK(text(Forecast_this_month__c))),MONTH(Contract_recognized_day_1__c) = MONTH( TODAY()),YEAR(Contract_recognized_day_1__c) = YEAR(TODAY())),1,0)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏈湀棰勬祴鍐呰璐ц浠锋潯鏁�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Monthly_Forecast_in_lastmonth__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Monthly_Forecast_in_lastmonth__c.field-meta.xml
new file mode 100644
index 0000000..e834a71
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Monthly_Forecast_in_lastmonth__c.field-meta.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Monthly_Forecast_in_lastmonth__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(AND(NOT(ISBLANK(text(Forecast_this_month__c))),
+MONTH(Contract_recognized_day_1__c) = IF(MONTH(TODAY()) = 1, 12, MONTH(TODAY())-1),
+YEAR(Contract_recognized_day_1__c) = IF(MONTH(TODAY()) = 1, YEAR(TODAY())-1, YEAR(TODAY()))),
+1,0)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>涓婃湀棰勬祴鍐呰璐ц浠锋潯鏁�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Monthly_Forecast_in_nextmonth__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Monthly_Forecast_in_nextmonth__c.field-meta.xml
new file mode 100644
index 0000000..871e95d
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Monthly_Forecast_in_nextmonth__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Monthly_Forecast_in_nextmonth__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(AND(OR(NM_Forecast_onemonth_before__c = "娆℃湀璁㈣揣棰勬祴",NM_Forecast_onemonth_before__c = "娆℃湀璁㈠彂璐ч娴�"),MONTH(Contract_recognized_day_1__c) = MONTH( TODAY()),YEAR(Contract_recognized_day_1__c) = YEAR(TODAY())),1,0)</formula>
+ <label>娆℃湀棰勬祴鍐呰璐ц浠锋潯鏁�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Monthly_Forecast_in_thismonth__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Monthly_Forecast_in_thismonth__c.field-meta.xml
new file mode 100644
index 0000000..2a00fb7
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Monthly_Forecast_in_thismonth__c.field-meta.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Monthly_Forecast_in_thismonth__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(AND(OR(NM_Forecast_onemonth_before__c = "娆℃湀璁㈣揣棰勬祴",NM_Forecast_onemonth_before__c = "娆℃湀璁㈠彂璐ч娴�"),
+MONTH(Contract_recognized_day_1__c) = IF(MONTH(TODAY()) = 1, 12, MONTH(TODAY())-1),
+YEAR(Contract_recognized_day_1__c) = IF(MONTH(TODAY()) = 1, YEAR(TODAY())-1, YEAR(TODAY()))),
+1,0)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>娆℃湀鐨勪笂鏈堥娴嬪唴璁㈣揣璇环鏉℃暟</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Monthly_order_target__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Monthly_order_target__c.field-meta.xml
new file mode 100644
index 0000000..b172ff3
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Monthly_order_target__c.field-meta.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Monthly_order_target__c</fullName>
+ <description>绗�3涓伐浣滄棩涔嬪墠锛屽垵瀹￠�氳繃鐨勮浠凤紝璁＄畻浣滀负浣嗘湀鍐呮垚浜�</description>
+ <externalId>false</externalId>
+ <formula>IF(AND(
+ StageName__c="璇环",
+ Close_Forecasted_Date__c <= IF(
+ MONTH(today()) = 12,
+ DATE(YEAR(today()), 12, 31),
+ DATE(YEAR(today()), MONTH(today()) + 1, 1) - 1
+ )),
+True,False)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>棰勬祴瀵硅薄 : 鍗曟湀璁㈣揣棰勬祴(鍏紡)</label>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Monthly_order_target_changed__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Monthly_order_target_changed__c.field-meta.xml
new file mode 100644
index 0000000..cb81788
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Monthly_order_target_changed__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Monthly_order_target_changed__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(IF(Monthly_order_target_txt__c = '1', true, false) = Monthly_order_target__c, false, true)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>棰勬祴瀵硅薄 : 鍗曟湀璁㈣揣棰勬祴鏄惁鍙樺寲</label>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Monthly_order_target_stock__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Monthly_order_target_stock__c.field-meta.xml
new file mode 100644
index 0000000..bcbb07b
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Monthly_order_target_stock__c.field-meta.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Monthly_order_target_stock__c</fullName>
+ <description>20221125涔嬪墠
+IF(AND(
+StageName__c="璇环",
+Close_Forecasted_Date__c <= IF(
+ MONTH(today()) = 12,
+ DATE(YEAR(today()), 12, 31),
+ DATE(YEAR(today()), MONTH(today()) + 1, 1) - 1
+ ),
+OR(
+Status_Formula_Text__c ="08 宸茬绾�",
+Status_Formula_Text__c ="07 鐢ㄦ埛宸茬绾�",
+Status_Formula_Text__c ="06 鐢ㄦ埛鏈绾�",
+Status_Formula_Text__c ="05 浠锋牸鐢宠涓�",
+Status_Formula_Text__c ="04 宸蹭腑鏍�",
+AND(Status_Formula_Text__c ="03 宸叉巿鏉�",
+ Bid_Date__c <= IF(
+ MONTH(today()) = 12,
+ DATE(YEAR(today()), 12, 31),
+ DATE(YEAR(today()), MONTH(today()) + 1, 1) - 1
+ )
+))
+),True,False)</description>
+ <externalId>false</externalId>
+ <formula>IF(AND(
+StageName__c="璇环",
+Close_Forecasted_Date__c <= IF(
+ MONTH(today()) = 12,
+ DATE(YEAR(today()), 12, 31),
+ DATE(YEAR(today()), MONTH(today()) + 1, 1) - 1
+ ),
+OR(
+Status_Formula_Text__c ="12 宸茬绾�",
+Status_Formula_Text__c ="11 浠锋牸鐢宠涓�",
+Status_Formula_Text__c ="10 宸蹭腑鏍�",
+AND(Status_Formula_Text__c ="08 宸叉巿鏉�",
+ Bid_Date__c <= IF(
+ MONTH(today()) = 12,
+ DATE(YEAR(today()), 12, 31),
+ DATE(YEAR(today()), MONTH(today()) + 1, 1) - 1
+ )
+))
+),True,False)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>棰勬祴瀵硅薄 : 鍗曟湀璁㈣揣棰勬祴 鍙璐�(鍏紡)</label>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Monthly_order_target_stock_txt__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Monthly_order_target_stock_txt__c.field-meta.xml
new file mode 100644
index 0000000..67c9499
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Monthly_order_target_stock_txt__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Monthly_order_target_stock_txt__c</fullName>
+ <externalId>false</externalId>
+ <label>棰勬祴瀵硅薄 : 鍗曟湀璁㈣揣棰勬祴 鍙璐txt</label>
+ <length>1</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Monthly_order_target_txt__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Monthly_order_target_txt__c.field-meta.xml
new file mode 100644
index 0000000..cfc4422
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Monthly_order_target_txt__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Monthly_order_target_txt__c</fullName>
+ <externalId>false</externalId>
+ <label>棰勬祴瀵硅薄 : 鍗曟湀璁㈣揣棰勬祴_txt</label>
+ <length>1</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Monthly_ship_target__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Monthly_ship_target__c.field-meta.xml
new file mode 100644
index 0000000..e84bc0f
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Monthly_ship_target__c.field-meta.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Monthly_ship_target__c</fullName>
+ <description>* 2016/06/03涔嬪墠
+IF(
+ AND(StageName__c="璇环",Backup_order_number__c >= 1),true,
+IF(
+ AND(
+ OR(text(Opportunity_Category__c)="GI",text(Opportunity_Category__c)="BF",text(Opportunity_Category__c)="ET"),
+ StageName__c="璇环",
+ Close_Forecasted_Date__c <= IF(
+ MONTH(today()) = 12,
+ DATE(YEAR(today()), 12, 31),
+ DATE(YEAR(today()), MONTH(today()) + 1, 1) - 1),
+ Day(Close_Forecasted_Date__c) <= 15),true,false))</description>
+ <externalId>false</externalId>
+ <formula>/*IF(
+// AND(
+// StageName__c="璇环",
+// CloseDate <= IF(
+// MONTH(today()) = 12,
+// DATE(YEAR(today()), 12, 31),
+// DATE(YEAR(today()), MONTH(today()) + 1, 1) - 1)),
+// true,false
+//) */
+
+IF(
+ AND(
+ OR(StageName__c="璇环",StageName__c="娉ㄦ畫"),
+ Inquiry_forcast_date_formular__c <= IF(
+ MONTH(today()) = 12,
+ DATE(YEAR(today()), 12, 31),
+ DATE(YEAR(today()), MONTH(today()) + 1, 1) - 1)),
+ true,false
+)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>棰勬祴瀵硅薄 : 鍗曟湀鍙戣揣棰勬祴(鍏紡)</label>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Monthly_ship_target_changed__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Monthly_ship_target_changed__c.field-meta.xml
new file mode 100644
index 0000000..52077b0
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Monthly_ship_target_changed__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Monthly_ship_target_changed__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(IF(Monthly_ship_target_txt__c = '1', true, false) = Monthly_ship_target__c, false, true)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>棰勬祴瀵硅薄 : 鍗曟湀鍙戣揣棰勬祴鏄惁鍙樺寲</label>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Monthly_ship_target_txt__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Monthly_ship_target_txt__c.field-meta.xml
new file mode 100644
index 0000000..efb0b77
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Monthly_ship_target_txt__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Monthly_ship_target_txt__c</fullName>
+ <externalId>false</externalId>
+ <label>棰勬祴瀵硅薄 : 鍗曟湀鍙戣揣棰勬祴_txt</label>
+ <length>1</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Monthly_third_working_day__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Monthly_third_working_day__c.field-meta.xml
new file mode 100644
index 0000000..22a820f
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Monthly_third_working_day__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Monthly_third_working_day__c</fullName>
+ <externalId>false</externalId>
+ <label>鏈湀绗�3宸ヤ綔鏃�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/MultiYearWarrantyTotalPrice__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/MultiYearWarrantyTotalPrice__c.field-meta.xml
new file mode 100644
index 0000000..d8b5220
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/MultiYearWarrantyTotalPrice__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>MultiYearWarrantyTotalPrice__c</fullName>
+ <externalId>false</externalId>
+ <label>No Discount Price鍚堣</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/NM_Forecast__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/NM_Forecast__c.field-meta.xml
new file mode 100644
index 0000000..6ea7cb6
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/NM_Forecast__c.field-meta.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>NM_Forecast__c</fullName>
+ <externalId>false</externalId>
+ <label>鏄惁娆℃湀棰勬祴璇环</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+ <valueSet>
+ <restricted>true</restricted>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>娆℃湀璁㈣揣棰勬祴</fullName>
+ <default>false</default>
+ <label>娆℃湀璁㈣揣棰勬祴</label>
+ </value>
+ <value>
+ <fullName>娆℃湀鍙戣揣棰勬祴</fullName>
+ <default>false</default>
+ <label>娆℃湀鍙戣揣棰勬祴</label>
+ </value>
+ <value>
+ <fullName>娆℃湀璁㈠彂璐ч娴�</fullName>
+ <default>false</default>
+ <label>娆℃湀璁㈠彂璐ч娴�</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/NM_Forecast_formula__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/NM_Forecast_formula__c.field-meta.xml
new file mode 100644
index 0000000..756aef6
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/NM_Forecast_formula__c.field-meta.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>NM_Forecast_formula__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(NextMonthly_ship_target_txt__c = '1' &&
+(Close_Forecasted_Date__c > IF(
+MONTH(today()) = 12,
+DATE(YEAR(today()), 12, 31),
+DATE(YEAR(today()), MONTH(today()) + 1, 1) - 1 ) &&
+Close_Forecasted_Date__c <=IF(
+ MONTH( today() ) = 11,
+ DATE( YEAR( today() ), 12, 31 ),IF(
+ MONTH( today() ) = 12,
+ DATE( YEAR( today() ) + 1, 01, 31 ),
+ DATE( YEAR( today() ), MONTH ( today() ) + 2, 1 ) - 1 ))
+ ) && StageName__c = '璇环'
+&& ForecastAccuracyObject__c = true,"娆℃湀璁㈠彂璐ч娴�",
+IF(NextMonthly_ship_target_txt__c = '1' && StageName__c = '璇环'
+&& ForecastAccuracyObject__c = true,"娆℃湀鍙戣揣棰勬祴",
+IF(NextMonthly_order_target_txt__c = '1' && (StageName__c = '璇环')
+&& ForecastAccuracyObject__c = true,"娆℃湀璁㈣揣棰勬祴","")))</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏄惁娆℃湀棰勬祴璇环(鍏紡)</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/NM_Forecast_onemonth_before__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/NM_Forecast_onemonth_before__c.field-meta.xml
new file mode 100644
index 0000000..c88e6dc
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/NM_Forecast_onemonth_before__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>NM_Forecast_onemonth_before__c</fullName>
+ <externalId>false</externalId>
+ <label>璇环涓婃湀棰勬祴</label>
+ <length>225</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/NM_Forecast_twomonth_before__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/NM_Forecast_twomonth_before__c.field-meta.xml
new file mode 100644
index 0000000..799918b
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/NM_Forecast_twomonth_before__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>NM_Forecast_twomonth_before__c</fullName>
+ <externalId>false</externalId>
+ <label>璇环涓婁笂鏈堥娴嬶紙KPI锛�</label>
+ <length>225</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Name.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Name.field-meta.xml
new file mode 100644
index 0000000..47afa2e
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Name.field-meta.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Name</fullName>
+ <trackFeedHistory>true</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/NetWorthNoProviston_DN__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/NetWorthNoProviston_DN__c.field-meta.xml
new file mode 100644
index 0000000..fdd26fb
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/NetWorthNoProviston_DN__c.field-meta.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>NetWorthNoProviston_DN__c</fullName>
+ <externalId>false</externalId>
+ <label>(鍚庡彴鐢�)/宸插彂璐ч噾棰�(涓嶅惈绋�,涓嶅惈璁℃彁)</label>
+ <summarizedField>Statu_Achievements__c.NetWorthNoProviston_DN_A__c</summarizedField>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.FALSE_Order__c</field>
+ <operation>notEqual</operation>
+ <value>FALSE</value>
+ </summaryFilterItems>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.Valid_Statu_Achievements__c</field>
+ <operation>equals</operation>
+ <value>1</value>
+ </summaryFilterItems>
+ <summaryForeignKey>Statu_Achievements__c.Opportunity__c</summaryForeignKey>
+ <summaryOperation>sum</summaryOperation>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Summary</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/NewCnt__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/NewCnt__c.field-meta.xml
new file mode 100644
index 0000000..4aa57ab
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/NewCnt__c.field-meta.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>NewCnt__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(AND(DATEVALUE(CreatedDate) >= DATE(IF(MONTH(TODAY()) <= 3,YEAR(TODAY()) - 1, YEAR(TODAY())), 4, 1),
+DATEVALUE(CreatedDate) < DATE(IF(MONTH(TODAY()) <= 3, YEAR(TODAY()), YEAR(TODAY()) + 1), 4, 1)),1,0)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏂板缓鏁�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/New_Opportunity__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/New_Opportunity__c.field-meta.xml
new file mode 100644
index 0000000..9c76618
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/New_Opportunity__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>New_Opportunity__c</fullName>
+ <defaultValue>true</defaultValue>
+ <externalId>false</externalId>
+ <label>宸茬‘璁よ浠�</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/New_QuoteIrai__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/New_QuoteIrai__c.field-meta.xml
new file mode 100644
index 0000000..e6d808f
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/New_QuoteIrai__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>New_QuoteIrai__c</fullName>
+ <externalId>false</externalId>
+ <formula>HYPERLINK("/apex/NewQuoteIrai?oppid=" + Id
++ "&oppquoid=" + Estimation_Id__c, "鏂板缓鎶ヤ环濮旀墭" , "NewQuoteIrai")</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏂板缓鎶ヤ环濮旀墭</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/New_department_category__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/New_department_category__c.field-meta.xml
new file mode 100644
index 0000000..e0515af
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/New_department_category__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>New_department_category__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF( Account.RecordType.Id ="01210000000QjCN","1.娑堝寲绉�",Strategic_department_Class_Name__c)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鎴樼暐绉戝鍒嗙被(鏂�)</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/NextMonthly_order_target__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/NextMonthly_order_target__c.field-meta.xml
new file mode 100644
index 0000000..59f17b3
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/NextMonthly_order_target__c.field-meta.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>NextMonthly_order_target__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(AND(
+StageName__c="璇环",
+Close_Forecasted_Date__c > IF(
+MONTH(today()) = 12,
+DATE(YEAR(today()), 12, 31),
+DATE(YEAR(today()), MONTH(today()) + 1, 1) - 1 ),
+Close_Forecasted_Date__c <= IF(
+ MONTH( today() ) = 11,
+ DATE( YEAR( today() ), 12, 31 ),IF(
+ MONTH( today() ) = 12,
+ DATE( YEAR( today() ) + 1, 01, 31 ),
+ DATE( YEAR( today() ), MONTH ( today() ) + 2, 1 ) - 1 ))
+),
+True,False)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>棰勬祴瀵硅薄 : 璁㈣揣娆℃湀棰勬祴(鍏紡)</label>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/NextMonthly_order_target_txt__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/NextMonthly_order_target_txt__c.field-meta.xml
new file mode 100644
index 0000000..7e20afd
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/NextMonthly_order_target_txt__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>NextMonthly_order_target_txt__c</fullName>
+ <externalId>false</externalId>
+ <label>棰勬祴瀵硅薄 : 璁㈣揣娆℃湀棰勬祴(棰勬祴鐢�)</label>
+ <length>1</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/NextMonthly_ship_target__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/NextMonthly_ship_target__c.field-meta.xml
new file mode 100644
index 0000000..efeb057
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/NextMonthly_ship_target__c.field-meta.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>NextMonthly_ship_target__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(
+AND(
+OR(StageName__c="璇环",StageName__c="娉ㄦ畫"),
+Inquiry_forcast_date_copy__c> IF(
+MONTH(today()) = 12,
+DATE(YEAR(today()), 12, 31),
+DATE(YEAR(today()), MONTH(today()) + 1, 1) - 1 ),
+Inquiry_forcast_date_copy__c<= IF(
+ MONTH( today() ) = 11,
+ DATE( YEAR( today() ), 12, 31 ),IF(
+ MONTH( today() ) = 12,
+ DATE( YEAR( today() ) + 1, 01, 31 ),
+ DATE( YEAR( today() ), MONTH ( today() ) + 2, 1 ) - 1 ))),
+true,false
+)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>棰勬祴瀵硅薄 : 鍙戣揣娆℃湀棰勬祴(鍏紡)</label>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/NextMonthly_ship_target_txt__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/NextMonthly_ship_target_txt__c.field-meta.xml
new file mode 100644
index 0000000..c11b543
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/NextMonthly_ship_target_txt__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>NextMonthly_ship_target_txt__c</fullName>
+ <externalId>false</externalId>
+ <label>棰勬祴瀵硅薄 : 鍙戣揣娆℃湀棰勬祴(棰勬祴鐢�)</label>
+ <length>1</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/NextStep.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/NextStep.field-meta.xml
new file mode 100644
index 0000000..9bf77cf
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/NextStep.field-meta.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>NextStep</fullName>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Next_action__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Next_action__c.field-meta.xml
new file mode 100644
index 0000000..dd02b0e
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Next_action__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Next_action__c</fullName>
+ <externalId>false</externalId>
+ <label>杩涘睍鎻忚堪</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>true</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>TextArea</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/NoComputeRestender__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/NoComputeRestender__c.field-meta.xml
new file mode 100644
index 0000000..0f2a171
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/NoComputeRestender__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>NoComputeRestender__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(AND( TEXT(StageName) = '鏁楁垿', OR(Lost_reason_main__c = '鏌愮浜у搧缂哄け',Lost_reason_main__c = '鏃犱骇鍝佸簲鏍�') ) , 1, 0)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>涓嶈绠楀簲鏍�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/NoDRMB_Without_Tax_1000TR__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/NoDRMB_Without_Tax_1000TR__c.field-meta.xml
new file mode 100644
index 0000000..662b0fc
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/NoDRMB_Without_Tax_1000TR__c.field-meta.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>NoDRMB_Without_Tax_1000TR__c</fullName>
+ <externalId>false</externalId>
+ <formula>CASE(Competitor__c ,
+'A1', NoDWithout_Tax_Thousand__c* 1,
+'A', NoDWithout_Tax_Thousand__c* 0.8,
+'B', NoDWithout_Tax_Thousand__c* 0.5,
+'C', NoDWithout_Tax_Thousand__c* 0.3,
+'D', 0,
+'E', 0,
+0)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>NoD鍚堣(鎹㈢畻鍊�,KRMB)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/NoDRMB_Without_Tax__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/NoDRMB_Without_Tax__c.field-meta.xml
new file mode 100644
index 0000000..291db11
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/NoDRMB_Without_Tax__c.field-meta.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>NoDRMB_Without_Tax__c</fullName>
+ <externalId>false</externalId>
+ <formula>Case( Trade__c,
+"鍐呰部",MultiYearWarrantyTotalPrice__c/ Tax_Intra_F_Copy__c ,
+"澶栬部", MultiYearWarrantyTotalPrice__c* Tax_Foreign_F_Copy__c,
+MultiYearWarrantyTotalPrice__c* 1
+)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>NoD鍚堣閲戦(涓嶅惈绋�)_鍏�(浜у搧)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/NoDWithout_Tax_Thousand__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/NoDWithout_Tax_Thousand__c.field-meta.xml
new file mode 100644
index 0000000..aa2915b
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/NoDWithout_Tax_Thousand__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>NoDWithout_Tax_Thousand__c</fullName>
+ <externalId>false</externalId>
+ <formula>NoDRMB_Without_Tax__c/1000</formula>
+ <label>NoD鍚堣(KRMB)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/No_Parameter_date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/No_Parameter_date__c.field-meta.xml
new file mode 100644
index 0000000..a378892
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/No_Parameter_date__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>No_Parameter_date__c</fullName>
+ <externalId>false</externalId>
+ <label>10.纭畾鍙傛暟涓珛鏃�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/No_Visit_Opp__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/No_Visit_Opp__c.field-meta.xml
new file mode 100644
index 0000000..f4f244f
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/No_Visit_Opp__c.field-meta.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>No_Visit_Opp__c</fullName>
+ <description>20221125涔嬪墠
+IF(Status_Formula__c="00 杩樻病鏇存柊", 1, IF(Status_Formula__c="01 杩樻病鎷滆", 1, 0))</description>
+ <externalId>false</externalId>
+ <formula>IF(Status_Formula__c="00 鏈窡杩�", 1, 0)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>杩樻湭鎷滆鐨勮浠�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Note_Residual_Result__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Note_Residual_Result__c.field-meta.xml
new file mode 100644
index 0000000..2a59482
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Note_Residual_Result__c.field-meta.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Note_Residual_Result__c</fullName>
+ <description>鍒╃敤宸ヤ綔娴侊紝鏇存柊鍒颁竴涓嬬姸鎬�
+ 1锛氬畬浜嗭紝2锛氬嚭璐э紝3锛氭敞娈嬶紝4/0锛氳浠�</description>
+ <externalId>false</externalId>
+ <formula>IF( SAP_Send_OK__c,
+ IF ( AND(Note_Shipped_Residual_Total__c > 0 ,Note_Shipped_Residual_Total__c = Summary_Status_Total__c) , "1",
+ IF ( AND(Note_Shipped_Residual_Total__c > 0,Note_Shipped_Residual_Total__c = Note_shipped_residual__c) , "2",
+ IF ( AND(Note_Shipped_Residual_Total__c > 0,Contract_Number_Input_Total__c > 0) , "3",
+ "4"
+ )
+ )
+ ),
+ "0"
+)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <inlineHelpText>1锛氬畬浜嗭紝2锛氬嚭璐э紝3锛氭敞娈嬶紝4锛氭病鏈夋湁鏁堟敞娈嬶紝0锛氳繕娌℃湁涓婁紶SAP</inlineHelpText>
+ <label>娉ㄦ畫淇℃伅鍒ゆ柇缁撴灉</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Note_Shipped_Residual_Total__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Note_Shipped_Residual_Total__c.field-meta.xml
new file mode 100644
index 0000000..84710c7
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Note_Shipped_Residual_Total__c.field-meta.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Note_Shipped_Residual_Total__c</fullName>
+ <description>娉ㄦ畫涓殑鍐荤粨锛屾棤鏁堝悎鍚岋紝鏈夐��璐х殑鍕句互澶栫殑璁㈠崟鏁伴噺
+False閲岀殑澶囪揣绠楁湁鏁堟敞娈�</description>
+ <externalId>false</externalId>
+ <label>鏈夋晥娉ㄦ畫鍚堣鏁�(绯荤粺鐢�)</label>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.Valid_Statu_Achievements__c</field>
+ <operation>equals</operation>
+ <value>1</value>
+ </summaryFilterItems>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.FalseMinusBackup__c</field>
+ <operation>notEqual</operation>
+ <value>1</value>
+ </summaryFilterItems>
+ <summaryForeignKey>Statu_Achievements__c.Opportunity__c</summaryForeignKey>
+ <summaryOperation>count</summaryOperation>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Summary</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Note_shipped_residual__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Note_shipped_residual__c.field-meta.xml
new file mode 100644
index 0000000..c3ac44d
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Note_shipped_residual__c.field-meta.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Note_shipped_residual__c</fullName>
+ <externalId>false</externalId>
+ <label>娉ㄦ畫鍙戣揣鐘舵��(宸卞畬鍏ㄤ氦浠�)鍚堣鏁�(绯荤粺鐢�)</label>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.DeliveryStatus__c</field>
+ <operation>equals</operation>
+ <value>宸插畬鍏ㄤ氦浠�</value>
+ </summaryFilterItems>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.Valid_Statu_Achievements__c</field>
+ <operation>equals</operation>
+ <value>1</value>
+ </summaryFilterItems>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.FALSE_Order__c</field>
+ <operation>notEqual</operation>
+ <value>FALSE</value>
+ </summaryFilterItems>
+ <summaryForeignKey>Statu_Achievements__c.Opportunity__c</summaryForeignKey>
+ <summaryOperation>count</summaryOperation>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Summary</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/NotesApprovedNo_146PBACKUP__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/NotesApprovedNo_146PBACKUP__c.field-meta.xml
new file mode 100644
index 0000000..8715aaa
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/NotesApprovedNo_146PBACKUP__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>NotesApprovedNo_146PBACKUP__c</fullName>
+ <description>146P1鏈堜箣鍓岯ACKUP</description>
+ <externalId>false</externalId>
+ <label>鍚堝悓鐢宠缂栫爜(鎵嬪啓)</label>
+ <length>50</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/NotesApprovedNo__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/NotesApprovedNo__c.field-meta.xml
new file mode 100644
index 0000000..c4f82b4
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/NotesApprovedNo__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>NotesApprovedNo__c</fullName>
+ <externalId>false</externalId>
+ <label>鍚堝悓鐢宠缂栫爜</label>
+ <length>50</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>true</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Null__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Null__c.field-meta.xml
new file mode 100644
index 0000000..5d5ddad
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Null__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Null__c</fullName>
+ <externalId>false</externalId>
+ <label>绌哄�硷紙鍚庡彴鐢級</label>
+ <length>5</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Num_CurrentYearEventOppotunity__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Num_CurrentYearEventOppotunity__c.field-meta.xml
new file mode 100644
index 0000000..10a4333
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Num_CurrentYearEventOppotunity__c.field-meta.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Num_CurrentYearEventOppotunity__c</fullName>
+ <description>瑷晱鏃ャ亴褰撳勾搴︺伄娲诲嫊锛堛偒銈广偪銉狅級銇暟銈掔畻鍑恒仚銈嬬涓婇泦 瑷堥爡鐩�
+绌嶃伩涓娿亽闆嗚▓銇爡鐩暟銇屼笂闄愩倰瓒呫亪銇︺亜銈嬨仧銈�
+鏆畾銇ф暟鍊ら爡鐩仺銇椼伨銇椼仧銆�</description>
+ <externalId>false</externalId>
+ <label>褰撳勾搴﹀唴娲诲嫊鏁�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Num_Of_NTC__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Num_Of_NTC__c.field-meta.xml
new file mode 100644
index 0000000..f7d33e9
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Num_Of_NTC__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Num_Of_NTC__c</fullName>
+ <externalId>false</externalId>
+ <label>NTC娲诲姩娆℃暟</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Num_Of_OPD__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Num_Of_OPD__c.field-meta.xml
new file mode 100644
index 0000000..f942035
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Num_Of_OPD__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Num_Of_OPD__c</fullName>
+ <externalId>false</externalId>
+ <label>OPD娲诲姩娆℃暟</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Num_Of_Past_Days__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Num_Of_Past_Days__c.field-meta.xml
new file mode 100644
index 0000000..3f0c4b4
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Num_Of_Past_Days__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Num_Of_Past_Days__c</fullName>
+ <externalId>false</externalId>
+ <formula>Today() - Latest_report_Created_Date__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏈�缁堣窡杩涜繃鍘绘棩鏈�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/NumberOfBids__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/NumberOfBids__c.field-meta.xml
new file mode 100644
index 0000000..d581921
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/NumberOfBids__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>NumberOfBids__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF( ISBLANK(Authorized_DB_No__c) , 0, 1)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>搴旀爣鏁�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Number_of_OPD__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Number_of_OPD__c.field-meta.xml
new file mode 100644
index 0000000..12ae862
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Number_of_OPD__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Number_of_OPD__c</fullName>
+ <externalId>false</externalId>
+ <formula>HYPERLINK
+("/00O10000003Nq4N?pv0=" & Name & "&pv1=" & Name & "&pv2=" & Name & "&pv3=" & Name & "&pv4=" & Name, Text(Num_Of_OPD__c) & "娆�")</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>OPD娆℃暟</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Number_of_PCL__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Number_of_PCL__c.field-meta.xml
new file mode 100644
index 0000000..4894702
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Number_of_PCL__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Number_of_PCL__c</fullName>
+ <externalId>false</externalId>
+ <formula>1</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>璇环鏁伴噺</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Nunber_of_visit__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Nunber_of_visit__c.field-meta.xml
new file mode 100644
index 0000000..36d02e2
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Nunber_of_visit__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Nunber_of_visit__c</fullName>
+ <externalId>false</externalId>
+ <formula>HYPERLINK
+("/00O10000002lqdC?pv0=" + Id, TEXT(Xin_Gross_Follow_Num__c) & "娆�")</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鎷滆娆℃暟</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/OCM_15__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/OCM_15__c.field-meta.xml
new file mode 100644
index 0000000..e1188e2
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/OCM_15__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OCM_15__c</fullName>
+ <externalId>false</externalId>
+ <formula>DAY( Close_Forecasted_Date__c )</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>棰勬祴OCSM绛剧害鏃ワ紙鏁板瓧锛�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/OCM_Agent1_Price_DB__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/OCM_Agent1_Price_DB__c.field-meta.xml
new file mode 100644
index 0000000..d36cd27
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/OCM_Agent1_Price_DB__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OCM_Agent1_Price_DB__c</fullName>
+ <externalId>false</externalId>
+ <label>OCSM-Agent1(鍚堝悓DB)_鍏�</label>
+ <precision>15</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/OCM_Agent1_Price_F__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/OCM_Agent1_Price_F__c.field-meta.xml
new file mode 100644
index 0000000..3df4690
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/OCM_Agent1_Price_F__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OCM_Agent1_Price_F__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(SAP_Send_OK__c && (Agency1__r.Special__c || Agency2__r.Special__c || Account.Parent.Special__c) && $User.ViewSpecialAgencyAmout__c == False, null,
+ OCM_Agent1_Price__c
+)</formula>
+ <label>OCSM-缁忛攢鍟�1閲戦</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/OCM_Agent1_Price__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/OCM_Agent1_Price__c.field-meta.xml
new file mode 100644
index 0000000..7d033f9
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/OCM_Agent1_Price__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OCM_Agent1_Price__c</fullName>
+ <externalId>false</externalId>
+ <label>(鍚庡彴鐢�)/缁忛攢鍟�1 閲戦</label>
+ <precision>15</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/OCM_Target_period_New__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/OCM_Target_period_New__c.field-meta.xml
new file mode 100644
index 0000000..f295d7b
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/OCM_Target_period_New__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OCM_Target_period_New__c</fullName>
+ <externalId>false</externalId>
+ <formula>'FY'&TEXT(VALUE(SUBSTITUTE(OCM_Target_period__c, 'P', ''))+1868)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鐩爣OCSM鏈�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/OCM_Target_period__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/OCM_Target_period__c.field-meta.xml
new file mode 100644
index 0000000..405ecab
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/OCM_Target_period__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OCM_Target_period__c</fullName>
+ <description>鐩爣OCM鏈� (145P,146P绛�)</description>
+ <externalId>false</externalId>
+ <label>鐩爣OCSM鏈�(Old)</label>
+ <length>30</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/OCM__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/OCM__c.field-meta.xml
new file mode 100644
index 0000000..79faed9
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/OCM__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OCM__c</fullName>
+ <description>鐥呴櫌銇甇CM鍒嗛</description>
+ <externalId>false</externalId>
+ <formula>Text(Account.Parent.Parent.OCM_Category__c)</formula>
+ <label>OCSM鍒嗙被(鍖婚櫌)</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/OCM_category_HP__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/OCM_category_HP__c.field-meta.xml
new file mode 100644
index 0000000..2d6186c
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/OCM_category_HP__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OCM_category_HP__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(OCM__c = "H0", "1." & OCM__c & HP_Name__c,
+IF(OCM__c = "H1", "2." & OCM__c & HP_Name__c, "3." & OCM__c & HP_Name__c))</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>OCSM鍒嗙被+鍖婚櫌</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/OCM_department_seg__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/OCM_department_seg__c.field-meta.xml
new file mode 100644
index 0000000..9301982
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/OCM_department_seg__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OCM_department_seg__c</fullName>
+ <externalId>false</externalId>
+ <formula>text(Account.Parent.Segment__c)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>OCSM绉戝绛夌骇</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/OCM_forecast_order_day_backup__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/OCM_forecast_order_day_backup__c.field-meta.xml
new file mode 100644
index 0000000..4adbfeb
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/OCM_forecast_order_day_backup__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OCM_forecast_order_day_backup__c</fullName>
+ <externalId>false</externalId>
+ <label>棰勬祴OCSM绛剧害鏃� 姣�3涓伐浣滄棩</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/OCM_forecast_order_day_less_ThisMonth15__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/OCM_forecast_order_day_less_ThisMonth15__c.field-meta.xml
new file mode 100644
index 0000000..3803d89
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/OCM_forecast_order_day_less_ThisMonth15__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OCM_forecast_order_day_less_ThisMonth15__c</fullName>
+ <externalId>false</externalId>
+ <formula>(TEXT(Opportunity_Category__c) = "GI" || TEXT(Opportunity_Category__c) = "ET" || TEXT(Opportunity_Category__c) = "BF")
+&& Close_Forecasted_Date__c <= Owner.This_Month_15_day__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>GI/BF/ET鐨勮浠烽娴嬬绾︽棩<=鏈湀15鏃�</label>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/OCM_man_province_Snapshot__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/OCM_man_province_Snapshot__c.field-meta.xml
new file mode 100644
index 0000000..f554f79
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/OCM_man_province_Snapshot__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OCM_man_province_Snapshot__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF( ISBLANK(OCM_man_province_lastmonth__c) ,OCM_man_province__c,OCM_man_province_lastmonth__c)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鐪�(棰勬祴蹇収鐢�)</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/OCM_man_province__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/OCM_man_province__c.field-meta.xml
new file mode 100644
index 0000000..d5f9f01
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/OCM_man_province__c.field-meta.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OCM_man_province__c</fullName>
+ <description>2019/12/12淇敼鍓嶏細
+IF(Distributor_InCharge_opp__c = TRUE || Group_purchase_PCL__c = TRUE, '缁忛攢鍟嗙鐞嗘湰閮�',
+IF(TEXT(Owner.Dept__c) == '鑳介噺浜嬩笟鏈儴','鑳介噺',
+IF(TEXT(Owner.Dept__c) == '澶栫浜嬩笟鏈儴','澶栫鏈儴',
+IF( Account.RecordType.Id <> '01210000000QjCN',Hospital__r.OCM_man_province_txt__c,
+Account.OCM_man_province_txt__c )
+)
+)
+)
+20220317淇敼鍓嶏細
+IF(Distributor_InCharge_opp__c = TRUE || Group_purchase_PCL__c = TRUE || TEXT(Owner.Dept__c) == '鐗圭害缁忛攢鍟嗙鐞嗘敮鎻存湰閮�', '缁忛攢鍟嗙鐞嗘湰閮�' ,
+IF(TEXT(Owner.Dept__c) == '鑳介噺浜嬩笟鏈儴','鑳介噺',
+IF(TEXT(Owner.Dept__c) == '澶栫浜嬩笟鏈儴','澶栫鏈儴',
+IF( Account.RecordType.Id <> '01210000000QjCN',Hospital__r.OCM_man_province_txt__c,
+Account.OCM_man_province_txt__c )
+)
+)
+)</description>
+ <externalId>false</externalId>
+ <formula>IF(Equipment_Order_Flg__c = true,'鍏朵粬',
+IF(Distributor_InCharge_opp__c = TRUE || Group_purchase_PCL__c = TRUE || Owner.Salesdepartment__c='甯傚満浼佸垝鏈儴', '甯傚満' ,
+IF(TEXT(Owner.Dept__c) == '鐗圭害缁忛攢鍟嗙鐞嗘敮鎻存湰閮�','缁忛攢鍟嗙鐞嗘湰閮�',
+IF(TEXT(Owner.Dept__c) == '鑳介噺浜嬩笟鏈儴','鑳介噺',
+IF(TEXT(Owner.Dept__c) == '澶栫浜嬩笟鏈儴','澶栫鏈儴',
+IF( Account.RecordType.Id <> '01210000000QjCN',Hospital__r.OCM_man_province_txt__c,
+Account.OCM_man_province_txt__c )
+)
+)
+)
+)
+)</formula>
+ <label>鐪�(棰勬祴)</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/OCM_man_province_cus__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/OCM_man_province_cus__c.field-meta.xml
new file mode 100644
index 0000000..343567a
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/OCM_man_province_cus__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OCM_man_province_cus__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF( Account.RecordType.Id <> '01210000000QjCN',Hospital__r.OCM_man_province_txt__c,
+Account.OCM_man_province_txt__c )</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鐪�(瀹㈡埛)</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/OCM_man_province_cus_txt__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/OCM_man_province_cus_txt__c.field-meta.xml
new file mode 100644
index 0000000..569e0f5
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/OCM_man_province_cus_txt__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OCM_man_province_cus_txt__c</fullName>
+ <externalId>false</externalId>
+ <label>鐪�(瀹㈡埛鏂囨湰)</label>
+ <length>255</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/OCM_man_province_lastmonth__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/OCM_man_province_lastmonth__c.field-meta.xml
new file mode 100644
index 0000000..942838d
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/OCM_man_province_lastmonth__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OCM_man_province_lastmonth__c</fullName>
+ <externalId>false</externalId>
+ <label>鐪�(棰勬祴鐢ㄤ笂鏈�)</label>
+ <length>255</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/OCM_man_province_new__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/OCM_man_province_new__c.field-meta.xml
new file mode 100644
index 0000000..abcc8e1
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/OCM_man_province_new__c.field-meta.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OCM_man_province_new__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(Distributor_InCharge_opp__c = TRUE || Group_purchase_PCL__c = TRUE || TEXT(Owner.Dept__c) == '甯傚満浼佸垝鏈儴','甯傚満浼佸垝鏈儴',
+IF(TEXT(Owner.Dept__c) == '鐗圭害缁忛攢鍟嗙鐞嗘敮鎻存湰閮�','缁忛攢鍟嗙鐞嗘湰閮�',
+IF(Account.RecordType.Id <> '01210000000QjCN',
+Hospital__r.OCM_man_province_txt__c,
+Account.OCM_man_province_txt__c
+)
+)
+)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>OCSM绠＄悊鐪侊紙鏂帮級</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/OCM_man_province_no_dealer__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/OCM_man_province_no_dealer__c.field-meta.xml
new file mode 100644
index 0000000..2cd5e77
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/OCM_man_province_no_dealer__c.field-meta.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OCM_man_province_no_dealer__c</fullName>
+ <description>20230809璋冩暣锛岀洰鏍囪浠峰彇sap鐪侊紝涓氬姟璇环淇濇寔涓嶅彉
+IF(Equipment_Order_Flg__c = true,'鍏朵粬',
+IF(TEXT(Owner.Dept__c) == '鑳介噺浜嬩笟鏈儴','鑳介噺',
+IF( Account.RecordType.Id <> '01210000000QjCN',Hospital__r.OCM_man_province_txt__c,
+Account.OCM_man_province_txt__c )
+))</description>
+ <externalId>false</externalId>
+ <formula>if( RecordType.Id ='01210000000QekP',
+ Case(Text(SAP_Province__c),
+ '瀹夊窘鐪�','瀹夊窘',
+'鍖椾含甯�','鍖椾含',
+'绂忓缓鐪�','绂忓缓',
+'鐢樿們鐪�','鐢樿們',
+'骞夸笢鐪�','骞夸笢',
+'娣卞湷甯�','娣卞湷',
+'骞胯タ鑷不鍖�','骞胯タ',
+'璐靛窞鐪�','璐靛窞',
+'娌冲寳鐪�','娌冲寳',
+'娌冲崡鐪�','娌冲崡',
+'榛戦緳姹�','榛戦緳姹�',
+'榛戦緳姹熺渷','榛戦緳姹�',
+'婀栧崡鐪�','婀栧崡',
+'婀栧寳鐪�','婀栧寳',
+'鍚夋灄鐪�','鍚夋灄',
+'姹熻タ鐪�','姹熻タ',
+'姹熻嫃鐪�','姹熻嫃',
+'杈藉畞鐪�','娌堥槼',
+'澶ц繛甯�','澶ц繛',
+'鍐呰挋鍙�','鍐呰挋鍙�',
+'瀹佸鑷不鍖�','瀹佸',
+'闈掓捣鐪�','闈掓捣',
+'灞变笢鐪�','灞变笢',
+'闈掑矝甯�','闈掑矝',
+'灞辫タ鐪�','灞辫タ',
+'闄曡タ鐪�','闄曡タ',
+'涓婃捣甯�','涓婃捣',
+'鍥涘窛鐪�','鍥涘窛/瑗胯棌',
+'澶╂触甯�','澶╂触',
+'鏂扮枂鑷不鍖�','鏂扮枂',
+'浜戝崡鐪�','浜戝崡',
+'娴欐睙鐪�','娴欐睙',
+'閲嶅簡甯�','閲嶅簡',
+'娴峰崡鐪�','娴峰崡',
+'瑗胯棌鑷不鍖�','鍥涘窛/瑗胯棌'
+ ,'鍏朵粬')
+
+ ,IF(OR(Equipment_Order_Flg__c = true,!isBlank(Text(CelonOpportunity__c))),
+ '鍏朵粬',
+ if(Owner.Salesdepartment__c='甯傚満浼佸垝鏈儴',
+ '甯傚満',
+ IF( Account.RecordType.Id <> '01210000000QjCN',
+ Hospital__r.OCM_man_province_txt__c,
+ Account.OCM_man_province_txt__c )
+)))</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鐪�(涓氱哗)</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/OCM_man_province_no_eng__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/OCM_man_province_no_eng__c.field-meta.xml
new file mode 100644
index 0000000..1632189
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/OCM_man_province_no_eng__c.field-meta.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OCM_man_province_no_eng__c</fullName>
+ <description>20220317鍓嶄慨鏀癸細
+IF(Distributor_InCharge_opp__c = TRUE || Group_purchase_PCL__c = TRUE, '缁忛攢鍟嗙鐞嗘湰閮�',
+ IF(Account.RecordType.Id <> '01210000000QjCN',
+ Hospital__r.OCM_man_province_txt__c,
+ Account.OCM_man_province_txt__c
+ )
+)</description>
+ <externalId>false</externalId>
+ <formula>IF(Equipment_Order_Flg__c = true,'鍏朵粬',
+IF(Distributor_InCharge_opp__c = TRUE || Group_purchase_PCL__c = TRUE || TEXT(Owner.Dept__c) == '甯傚満浼佸垝鏈儴','甯傚満浼佸垝鏈儴',
+IF(TEXT(Owner.Dept__c) == '鐗圭害缁忛攢鍟嗙鐞嗘敮鎻存湰閮�','缁忛攢鍟嗙鐞嗘湰閮�',
+IF(Account.RecordType.Id <> '01210000000QjCN',
+Hospital__r.OCM_man_province_txt__c,
+Account.OCM_man_province_txt__c
+)
+)
+)
+)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鎶ヨ〃涓嶇敤锛歄CSM绠＄悊鐪�(鏃犺兘閲�)</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/OCM_man_province_txt__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/OCM_man_province_txt__c.field-meta.xml
new file mode 100644
index 0000000..c9ec64e
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/OCM_man_province_txt__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OCM_man_province_txt__c</fullName>
+ <externalId>false</externalId>
+ <label>鐪�(鏂囨湰)</label>
+ <length>255</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/OCSMRMB_Without_Tax__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/OCSMRMB_Without_Tax__c.field-meta.xml
new file mode 100644
index 0000000..9bfebba
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/OCSMRMB_Without_Tax__c.field-meta.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OCSMRMB_Without_Tax__c</fullName>
+ <description>OCSM浜у搧棰勬祴閲戦 涔樹互璇环涓婄◣鐜�
+// 2022.1.11 IF(Isblank(Estimation_Id__c),0,Case( Trade__c,
+"鍐呰部",Wholesale_Price__c / Tax_Intra_F_Copy__c ,
+"澶栬部", Wholesale_Price__c * Tax_Foreign_F_Copy__c,
+Wholesale_Price__c / Tax_Intra_F_Copy__c
+)-ProvisionPrice__c)
+20220420
+IF(Isblank(Estimation_Id__c),0,Case( Trade__c,
+"澶栬部", Wholesale_Price__c * Tax_Foreign_F_Copy__c,
+Wholesale_Price__c / Tax_Intra_F_Copy__c
+)-ProvisionPrice__c)</description>
+ <externalId>false</externalId>
+ <formula>IF(ISBLANK(Wholesale_Price__c), 0, Case( Trade__c,
+"澶栬部", (Wholesale_Price__c-ProvisionPrice__c) * Tax_Foreign_F_Copy__c,
+Wholesale_Price__c / Tax_Intra_F_Copy__c-ProvisionPrice__c
+))</formula>
+ <label>OCSM浜у搧棰勬祴閲戦锛堜笉鍚◣锛�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/OCSM_RMB_Without_Tax_1000TR__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/OCSM_RMB_Without_Tax_1000TR__c.field-meta.xml
new file mode 100644
index 0000000..e98fee4
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/OCSM_RMB_Without_Tax_1000TR__c.field-meta.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OCSM_RMB_Without_Tax_1000TR__c</fullName>
+ <description>OCSM浜у搧棰勬祴閲戦(鎹㈢畻鍊硷紝鍗冨厓RMB)</description>
+ <externalId>false</externalId>
+ <formula>IF( AND(TEXT(StageName) == '寮曞悎', TEXT(ConfirmationofAward__c) =='绔炰簤瀵规墜涓爣') ,
+0,
+IF( TEXT(AdvanceTarget__c) == '蹇呰揪', OCSMRMB_Without_Tax__c/1000,
+CASE(Competitor__c ,
+'A1', OCSMRMB_Without_Tax__c/1000,
+'A', OCSMRMB_Without_Tax__c* 0.8/1000,
+'B', OCSMRMB_Without_Tax__c* 0.5/1000,
+'C', OCSMRMB_Without_Tax__c* 0.3/1000,
+0)))</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <inlineHelpText>棰勬祴璇环閲戦脳璇环绛夌骇锛堟崲绠楀�硷級</inlineHelpText>
+ <label>棰勬祴閲戦锛堟崲绠楀�硷級</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/OCSM_RMB_Without_Tax_1000__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/OCSM_RMB_Without_Tax_1000__c.field-meta.xml
new file mode 100644
index 0000000..f6227e2
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/OCSM_RMB_Without_Tax_1000__c.field-meta.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OCSM_RMB_Without_Tax_1000__c</fullName>
+ <description>OCSM浜у搧棰勬祴閲戦锛堝崈鍏僐MB锛�
+鍘燂細OCSMRMB_Without_Tax__c/1000</description>
+ <externalId>false</externalId>
+ <formula>IF(ISBLANK(Wholesale_Price__c),0,
+IF(SAP_Send_OK__c && (Agency1__r.Special__c || Agency2__r.Special__c || Account.Parent.Special__c) && $User.ViewSpecialAgencyAmout__c == False,0,Case( Trade__c,
+"澶栬部", (Wholesale_Price__c-ProvisionPrice__c) * Tax_Foreign_F_Copy__c,
+Wholesale_Price__c / Tax_Intra_F_Copy__c-ProvisionPrice__c
+)) / 1000)</formula>
+ <inlineHelpText>璁″叆钀ヤ笟鐨勪笟缁╅噾棰濓紙涓嶅惈绋�/涓嶅惈璁℃彁锛�
+=棰勬祴鍚堝悓閲戦(鍚◣)/绋�/1000-璁℃彁</inlineHelpText>
+ <label>棰勬祴璇环閲戦</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/OFSHospitalLink__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/OFSHospitalLink__c.field-meta.xml
new file mode 100644
index 0000000..8301670
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/OFSHospitalLink__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OFSHospitalLink__c</fullName>
+ <externalId>false</externalId>
+ <formula>HYPERLINK("/apex/OFSHospitalLayout?md=1&wv=1&w=100&h=95&id=" + Hospital__c, Hospital__r.Name)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>OFS鍖婚櫌閾炬帴</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/OPD1__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/OPD1__c.field-meta.xml
new file mode 100644
index 0000000..48df801
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/OPD1__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OPD1__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>鏄惁鎻愪氦OPD鎻愭涔�</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/OPD_SIS_collect_evaluation_sight__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/OPD_SIS_collect_evaluation_sight__c.field-meta.xml
new file mode 100644
index 0000000..1aba062
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/OPD_SIS_collect_evaluation_sight__c.field-meta.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OPD_SIS_collect_evaluation_sight__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>鏈夌瀛楃殑OPD/SIS鎶ュ憡涔�</label>
+ <lookupFilter>
+ <active>true</active>
+ <filterItems>
+ <field>Report__c.RecordTypeId</field>
+ <operation>equals</operation>
+ <value>OPD銉昏窡鍙�, SIS</value>
+ </filterItems>
+ <filterItems>
+ <field>Report__c.Evaluation_PDF_number__c</field>
+ <operation>notEqual</operation>
+ <value></value>
+ </filterItems>
+ <filterItems>
+ <field>Report__c.Hospital_Reference__c</field>
+ <operation>equals</operation>
+ <valueField>$Source.Hospital__c</valueField>
+ </filterItems>
+ <isOptional>false</isOptional>
+ </lookupFilter>
+ <referenceTo>Report__c</referenceTo>
+ <relationshipLabel>鍙栧緱涓讳换绛惧瓧鐨勮浠�</relationshipLabel>
+ <relationshipName>OPD_SIS_SIGNLPSG</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/OPD_SIS_last_update__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/OPD_SIS_last_update__c.field-meta.xml
new file mode 100644
index 0000000..88e3fc1
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/OPD_SIS_last_update__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OPD_SIS_last_update__c</fullName>
+ <externalId>false</externalId>
+ <label>鏈夌瀛楃殑OPD/SIS鎶ュ憡涔�-鏈�鍚庢洿鏂拌��</label>
+ <length>100</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/OPD_target_energy__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/OPD_target_energy__c.field-meta.xml
new file mode 100644
index 0000000..4df37c9
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/OPD_target_energy__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OPD_target_energy__c</fullName>
+ <externalId>false</externalId>
+ <formula>Account.Parent.Important_Product_opd5_number__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>銉昏兘閲忎富鏈� : OPD鐩爣瀹㈡埛鏁�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/OPP_rank_Last_update_day__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/OPP_rank_Last_update_day__c.field-meta.xml
new file mode 100644
index 0000000..f1dbda8
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/OPP_rank_Last_update_day__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OPP_rank_Last_update_day__c</fullName>
+ <externalId>false</externalId>
+ <label>2.鏈�鍚庢洿鏂版棩-璇环绛夌骇</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/OP_ThousandY_Order__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/OP_ThousandY_Order__c.field-meta.xml
new file mode 100644
index 0000000..2a5f474
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/OP_ThousandY_Order__c.field-meta.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OP_ThousandY_Order__c</fullName>
+ <description>IF(Text(StageName) = "寮曞悎",
+IF(
+MONTH(TODAY()) <= 3,
+IF(
+AND(order_Date_For_Report__c< DATE(YEAR(TODAY()) ,4,1),
+order_Date_For_Report__c>= DATE(YEAR(TODAY())-1 ,4,1)),
+OCSM_RMB_Without_Tax_1000TR__c,
+0
+),
+IF(
+AND(order_Date_For_Report__c< DATE(YEAR(TODAY())+1 ,4,1),
+order_Date_For_Report__c>= DATE(YEAR(TODAY()),4,1)),
+OCSM_RMB_Without_Tax_1000TR__c,
+0
+)
+),0)</description>
+ <externalId>false</externalId>
+ <formula>IF(Text(StageName) = "寮曞悎",
+IF(AND(MONTH(TODAY()) >= 4,DAY(TODAY())>=2),
+IF(
+AND(order_Date_For_Report__c< DATE(YEAR(TODAY())+1 ,4,1),
+order_Date_For_Report__c>= DATE(YEAR(TODAY()),4,1)),
+OCSM_RMB_Without_Tax_1000TR__c,0),
+IF(
+AND(order_Date_For_Report__c< DATE(YEAR(TODAY()) ,4,1),
+order_Date_For_Report__c>= DATE(YEAR(TODAY())-1 ,4,1)),
+OCSM_RMB_Without_Tax_1000TR__c,0)
+)
+,0)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>4.1 浠婂勾璁㈣揣璇环(KRMB)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/OP_ThousandY_Target__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/OP_ThousandY_Target__c.field-meta.xml
new file mode 100644
index 0000000..2bb8d8b
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/OP_ThousandY_Target__c.field-meta.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OP_ThousandY_Target__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(Text(StageName) = "寮曞悎",
+ IF(AND(MONTH(TODAY()) >= 4,DAY(TODAY())>=2),
+ IF(
+ AND(Shipping_Date_For_Report__c< DATE(YEAR(TODAY())+1 ,4,1),
+ Shipping_Date_For_Report__c>= DATE(YEAR(TODAY()),4,1)),
+ OCSM_RMB_Without_Tax_1000TR__c,0),
+ IF(
+ AND(Shipping_Date_For_Report__c< DATE(YEAR(TODAY()) ,4,1),
+ Shipping_Date_For_Report__c>= DATE(YEAR(TODAY())-1 ,4,1)),
+ OCSM_RMB_Without_Tax_1000TR__c,0)
+ )
+,0)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>4.2 浠婂勾鍙戣揣璇环(KRMB)_C</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/OP_ThousandY__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/OP_ThousandY__c.field-meta.xml
new file mode 100644
index 0000000..1c53668
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/OP_ThousandY__c.field-meta.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OP_ThousandY__c</fullName>
+ <description>// 2022.1.11 OP__c/1000</description>
+ <externalId>false</externalId>
+ <formula>IF(Text(StageName) = "寮曞悎",
+IF(
+MONTH(TODAY()) <= 3,
+IF(
+AND(Shipping_Date_For_Report__c< DATE(YEAR(TODAY()) ,4,1),
+Shipping_Date_For_Report__c>= DATE(YEAR(TODAY())-1 ,4,1)),
+OCSM_RMB_Without_Tax_1000TR__c,
+0
+),
+IF(
+AND(Shipping_Date_For_Report__c< DATE(YEAR(TODAY())+1 ,4,1),
+Shipping_Date_For_Report__c>= DATE(YEAR(TODAY()),4,1)),
+OCSM_RMB_Without_Tax_1000TR__c,
+0
+)
+),0)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>4.2 浠婂勾鍙戣揣璇环(KRMB)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/OP__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/OP__c.field-meta.xml
new file mode 100644
index 0000000..669258c
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/OP__c.field-meta.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OP__c</fullName>
+ <description>2018/1/31 淇敼鍓嶏細
+4.璇环(涓嶅惈绋�)[鍏紡(甯佺)]</description>
+ <externalId>false</externalId>
+ <formula>IF(Text(StageName) = "寮曞悎",
+IF(
+ OR( MONTH(TODAY()) = 1 , MONTH(TODAY()) = 2 , MONTH(TODAY()) = 3),
+ IF(
+ AND(Shipping_Date_For_Report__c< DATE(YEAR(TODAY()) ,4,1),
+ Shipping_Date_For_Report__c>= DATE(YEAR(TODAY())-1 ,4,1)),
+ Amount_Without_Tax_F__c,
+ 0
+ ),
+ IF(
+ AND(Shipping_Date_For_Report__c< DATE(YEAR(TODAY())+1 ,4,1),
+ Shipping_Date_For_Report__c>= DATE(YEAR(TODAY()),4,1)),
+ Amount_Without_Tax_F__c,
+ 0
+ )
+),
+0
+)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>涓嶄娇鐢細4.浠婂勾璇环(涓嶅惈绋�)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/OP_incl_tax__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/OP_incl_tax__c.field-meta.xml
new file mode 100644
index 0000000..f3c053f
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/OP_incl_tax__c.field-meta.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OP_incl_tax__c</fullName>
+ <description>2018/1/31 淇敼鍓嶏細
+4.璇环(鍚◣)[鍏紡(甯佺)]</description>
+ <externalId>false</externalId>
+ <formula>CASE( StageName , "寮曞悎",
+IF(
+ OR( MONTH(TODAY()) = 1 , MONTH(TODAY()) = 2 , MONTH(TODAY()) = 3),
+ IF(
+ AND(Shipping_Date_For_Report__c< DATE(YEAR(TODAY()) ,4,1),
+ Shipping_Date_For_Report__c>= DATE(YEAR(TODAY())-1 ,4,1)),
+ Wholesale_Price_F__c,
+ 0
+ ),
+ IF(
+ AND(Shipping_Date_For_Report__c< DATE(YEAR(TODAY())+1 ,4,1),
+ Shipping_Date_For_Report__c>= DATE(YEAR(TODAY()),4,1)),
+ Wholesale_Price_F__c,
+ 0
+ )
+),
+ 0)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>4.浠婂勾璇环(鍚◣)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Objective_Tax1__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Objective_Tax1__c.field-meta.xml
new file mode 100644
index 0000000..fbb9306
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Objective_Tax1__c.field-meta.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Objective_Tax1__c</fullName>
+ <description>20190326鍓�
+IF ( OR ( YEAR( CloseDate ) < 2018 , AND( YEAR( CloseDate ) = 2018 , MONTH ( CloseDate ) <= 4 )) , Objective__c / 1.17 , Objective__c / 1.16)</description>
+ <externalId>false</externalId>
+ <formula>if( CloseDate < Datevalue( $Label.Tax_Date ),Objective__c/1.17,
+if(And(CloseDate >= Datevalue( $Label.Tax_Date ),CloseDate < Datevalue( $Label.Tax_Date_13 )),Objective__c/1.16,
+Objective__c/1.13))</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>1.鐩爣(涓嶅惈绋�)1</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Objective_Tax_K__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Objective_Tax_K__c.field-meta.xml
new file mode 100644
index 0000000..c344b62
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Objective_Tax_K__c.field-meta.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Objective_Tax_K__c</fullName>
+ <description>20210616 鏉庢椇鍒涘缓 璇鹃锛歋WAG-C3Z94M</description>
+ <externalId>false</externalId>
+ <formula>Objective_Tax__c / 1000</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>1.鐩爣(KRMB)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Objective_Tax__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Objective_Tax__c.field-meta.xml
new file mode 100644
index 0000000..863ba8e
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Objective_Tax__c.field-meta.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Objective_Tax__c</fullName>
+ <description>20190326鍓�
+IF ( OR ( YEAR( CloseDate ) < 2018 , AND( YEAR( CloseDate ) = 2018 , MONTH ( CloseDate ) <= 4 )) , Objective__c / 1.17 , Objective__c / 1.16)</description>
+ <externalId>false</externalId>
+ <formula>if( CloseDate < Datevalue( $Label.Tax_Date ),Objective__c/1.17,
+if(And(CloseDate >= Datevalue( $Label.Tax_Date ),CloseDate < Datevalue( $Label.Tax_Date_13 )),Objective__c/1.16,
+Objective__c/1.13))</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>1.鐩爣(涓嶅惈绋�)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Objective__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Objective__c.field-meta.xml
new file mode 100644
index 0000000..1969481
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Objective__c.field-meta.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Objective__c</fullName>
+ <externalId>false</externalId>
+ <formula>Case(Category__c, "鐩",
+ IF(Proportion__c > 0, Amount * Proportion__c, Amount),
+ 0
+)</formula>
+ <label>1.鐩爣(鍚◣)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>4</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Old_BiddingProject_Bid__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Old_BiddingProject_Bid__c.field-meta.xml
new file mode 100644
index 0000000..c96fbf5
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Old_BiddingProject_Bid__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Old_BiddingProject_Bid__c</fullName>
+ <externalId>false</externalId>
+ <label>鍘熸嫑鏍囬」鐩甀D</label>
+ <length>255</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Old_Opportunity_ID__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Old_Opportunity_ID__c.field-meta.xml
new file mode 100644
index 0000000..a13d1e4
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Old_Opportunity_ID__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Old_Opportunity_ID__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>鍘熻浠峰悕</label>
+ <referenceTo>Opportunity</referenceTo>
+ <relationshipLabel>涓氬姟鏈轰細</relationshipLabel>
+ <relationshipName>OpporaU64</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/OlyNumberHosts__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/OlyNumberHosts__c.field-meta.xml
new file mode 100644
index 0000000..a145a74
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/OlyNumberHosts__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OlyNumberHosts__c</fullName>
+ <externalId>false</externalId>
+ <label>oly涓绘満鍙版暟</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Open_Quotation__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Open_Quotation__c.field-meta.xml
new file mode 100644
index 0000000..e829ecc
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Open_Quotation__c.field-meta.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Open_Quotation__c</fullName>
+ <description>HYPERLINK
+("/00O10000002jviu?pv0=" + Id, Estimation_No__c)
+HYPERLINK("/apex/NewQuoteIrai?oppid=Opportunity.Id&oppquoid=Opportunity.Estimation_Id__c",Estimation_No__c)</description>
+ <externalId>false</externalId>
+ <formula>HYPERLINK(
+ "/apex/NewQuoteIrai?oppid=" + Id + "&oppquoid=" + Estimation_Id__c
+ , Estimation_No__c
+)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鎶ヤ环鍙风爜(杩炴帴)</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/OperationDep__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/OperationDep__c.field-meta.xml
new file mode 100644
index 0000000..5ca7046
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/OperationDep__c.field-meta.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OperationDep__c</fullName>
+ <externalId>false</externalId>
+ <formula>CASE(OCM_man_province_txt__c ,
+'澶ц繛', '涓滃寳浜岄儴',
+'娌堥槼', '涓滃寳浜岄儴',
+'榛戦緳姹�', '涓滃寳涓�閮�',
+'鍚夋灄', '涓滃寳涓�閮�',
+'娌冲寳', '鍗庡寳浜岄儴',
+'鍐呰挋鍙�', '鍗庡寳浜岄儴',
+'澶╂触', '鍗庡寳浜岄儴',
+'灞变笢', '鍗庡寳涓夐儴',
+'鍖椾含', '鍗庡寳涓�閮�',
+'绂忓缓', '鍗庝笢浜岄儴',
+'姹熻嫃', '鍗庝笢浜岄儴',
+'姹熻タ', '鍗庝笢浜岄儴',
+'瀹夊窘', '鍗庝笢涓夐儴',
+'娴欐睙', '鍗庝笢涓夐儴',
+'涓婃捣', '鍗庝笢涓�閮�',
+'娌冲崡', '瑗垮寳浜岄儴',
+'瀹佸', '瑗垮寳浜岄儴',
+'闈掓捣', '瑗垮寳浜岄儴',
+'鐢樿們', '瑗垮寳涓夐儴',
+'鏂扮枂', '瑗垮寳涓夐儴',
+'灞辫タ', '瑗垮寳涓�閮�',
+'闄曡タ', '瑗垮寳涓�閮�',
+'璐靛窞', '瑗垮崡浜岄儴',
+'浜戝崡', '瑗垮崡浜岄儴',
+'鍥涘窛/瑗胯棌', '瑗垮崡涓�閮�',
+'閲嶅簡', '瑗垮崡涓�閮�',
+'骞夸笢', '鍗庡崡涓�閮�',
+'骞胯タ', '鍗庡崡浜岄儴',
+'娴峰崡', '鍗庡崡浜岄儴',
+'婀栧寳', '鍗庡崡涓夐儴',
+'婀栧崡', '鍗庡崡涓夐儴',
+'缁忛攢鍟嗙鐞�', '缁忛攢鍟嗙鐞�',
+'鑳介噺', '鑳介噺',
+'娣卞湷', '鍗庡崡浜岄儴',
+'鍏朵粬', '鍏朵粬',
+'')</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>钀ヤ笟閮�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/OppAdvanceTarget__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/OppAdvanceTarget__c.field-meta.xml
new file mode 100644
index 0000000..97b9304
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/OppAdvanceTarget__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OppAdvanceTarget__c</fullName>
+ <externalId>false</externalId>
+ <label>鏈湡鎺ㄨ繘鐩爣</label>
+ <length>128</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Opp_Actual_ThousandY__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Opp_Actual_ThousandY__c.field-meta.xml
new file mode 100644
index 0000000..9064b23
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Opp_Actual_ThousandY__c.field-meta.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Opp_Actual_ThousandY__c</fullName>
+ <description>Opp_Actual__c/1000</description>
+ <externalId>false</externalId>
+ <formula>(X153PNetWorthNoProviston__c * if(Text(Trade__c) == "澶栬部", Tax_Foreign_F_Copy__c,1))/1000</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>2.2 浠婂勾鍙戣揣(KRMB)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Opp_Actual__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Opp_Actual__c.field-meta.xml
new file mode 100644
index 0000000..1ef9519
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Opp_Actual__c.field-meta.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Opp_Actual__c</fullName>
+ <description>2018/2/1 淇敼鍓嶏細
+ShippedAmount_ThisYear_withoutax_F__c
+
+浠婂勾鍙戣揣閲戦
+
+鐘舵��1锛氬畬姣曘�佸彂璐�
+閲戦闋呯洰锛歄CM鎴愮磩浜堟脯閲戦锛堢◣鎶溿亶锛�
+CASE( Category__c , "瀹熺妇", Amount_Without_Tax_F__c ,0)</description>
+ <externalId>false</externalId>
+ <formula>X153PNetWorthNoProviston__c * if(Text(Trade__c) == "澶栬部", Tax_Foreign_F_Copy__c,1)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>閫昏緫鐢細2.浠婂勾鍙戣揣(涓嶅惈绋�)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Opp_Actual_incl_tax__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Opp_Actual_incl_tax__c.field-meta.xml
new file mode 100644
index 0000000..d0f9a34
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Opp_Actual_incl_tax__c.field-meta.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Opp_Actual_incl_tax__c</fullName>
+ <description>2018/4/20 淇敼鍓�
+ShippedAmount_All_Cost__c
+
+2018/1/31 淇敼鍓�
+2.浠婂勾鍙戣揣(鍚◣) [鍏紡(甯佺)]
+
+浠婂勾鍙戣揣閲戦
+CASE( Category__c , "瀹熺妇", Wholesale_Price_F__c ,0)</description>
+ <externalId>false</externalId>
+ <formula>ShippedAmount153P_DN__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>2.浠婂勾鍙戣揣(鍚◣)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Opp_Bid__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Opp_Bid__c.field-meta.xml
new file mode 100644
index 0000000..a19b174
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Opp_Bid__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Opp_Bid__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>璇环涓嶅簲鏍囩敵璇�</label>
+ <referenceTo>Enquiry_No_Bidding_Apply__c</referenceTo>
+ <relationshipLabel>涓氬姟鏈轰細</relationshipLabel>
+ <relationshipName>Opp_Bid</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Opp_Changed_Field__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Opp_Changed_Field__c.field-meta.xml
new file mode 100644
index 0000000..3338f77
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Opp_Changed_Field__c.field-meta.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Opp_Changed_Field__c</fullName>
+ <description>IF(Isblank(Agency_Opportunity__c), '',
+IF(not(text(Opportunity_stage__c) = text(Agency_Opportunity__r.StageName__c))
+, '璇环闃舵鍙戠敓浜嗗彉鍖�',
+IF(not(text(Close_Forecasted_Date__c) = text(Agency_Opportunity__r.Close_Forecasted_Date__c))
+, '棰勬祴绛剧害鏃ュ彂鐢熶簡鍙樺寲',
+IF(not(text(Dealer_Final_Price__c) = text(Agency_Opportunity__r.Amount__c))
+, '鍖婚櫌鍚堝悓閲戦鍙戠敓浜嗗彉鍖�',
+IF(not(Wholesale_Price__c = Agency_Opportunity__r.OCMSale_Price__c)
+, '璁㈣揣閲戦鍙戠敓浜嗗彉鍖�',
+'娌℃湁鍙樺寲'
+)))))</description>
+ <externalId>false</externalId>
+ <formula>IF(Isblank(Agency_Opportunity__c), '',
+IF( ISBLANK(IF(not(text(Opportunity_stage__c) = text(Agency_Opportunity__r.StageName__c))
+, '璇环闃舵;','')&
+IF(not(text(Close_Forecasted_Date__c) = text(Agency_Opportunity__r.Close_Forecasted_Date__c))
+, '棰勬祴绛剧害鏃�;','')&
+IF(not(Wholesale_Price__c = Agency_Opportunity__r.OCMSale_Price__c)
+, '璁㈣揣閲戦;','')) ,
+'娌℃湁鍙樺寲',IF(not(text(Opportunity_stage__c) = text(Agency_Opportunity__r.StageName__c))
+, '璇环闃舵;','')&
+IF(not(text(Close_Forecasted_Date__c) = text(Agency_Opportunity__r.Close_Forecasted_Date__c))
+, '棰勬祴绛剧害鏃�;','')&
+IF(not(Name= Agency_Opportunity__r.Name)&&(Agency_Opportunity__r.OCM_Change_To_Opportunity_Flg__c <> true) ,'璇环鍚嶇О;','' ))
+)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>璇环宸紓瀛楁</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Opp_Code__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Opp_Code__c.field-meta.xml
new file mode 100644
index 0000000..7fa62ba
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Opp_Code__c.field-meta.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Opp_Code__c</fullName>
+ <externalId>false</externalId>
+ <formula>Case( Opportunity_Category__c ,
+"GI","GI",
+"BF","BF",
+"GS","SP",
+"EMT","SP",
+"URO","SP",
+"GYN","SP",
+"OTH","SP",
+"ENT","SP",
+"ET","ET",
+"")</formula>
+ <label>缂栫爜鐢ㄤ骇鍝佺被鍒�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Opp_Confirmation_Day__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Opp_Confirmation_Day__c.field-meta.xml
new file mode 100644
index 0000000..d67a54b
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Opp_Confirmation_Day__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Opp_Confirmation_Day__c</fullName>
+ <externalId>false</externalId>
+ <label>1.璇环纭鏃�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Opp_Delay_Mark__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Opp_Delay_Mark__c.field-meta.xml
new file mode 100644
index 0000000..fa02e74
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Opp_Delay_Mark__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Opp_Delay_Mark__c</fullName>
+ <externalId>false</externalId>
+ <label>鏈湡棰勬祴寤跺悗</label>
+ <precision>2</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Opp_Forecast_ThousandY__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Opp_Forecast_ThousandY__c.field-meta.xml
new file mode 100644
index 0000000..1c5fee6
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Opp_Forecast_ThousandY__c.field-meta.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Opp_Forecast_ThousandY__c</fullName>
+ <description>20220329BK
+Opp_Forecast__c/100020220722 ljh SWAG-CE6A58 Opp_Actual_ThousandY__c + Opportunity_ThousandY__c</description>
+ <externalId>false</externalId>
+ <formula>/*Opp_Actual_ThousandY__c + Opportunity_ThousandY__c*/
+Opp_Actual_ThousandY__c + Opportunity_ThousandY_Target__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>6.浠婂勾鍙戣揣+娉ㄦ畫(KRMB)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Opp_Forecast__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Opp_Forecast__c.field-meta.xml
new file mode 100644
index 0000000..d050b39
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Opp_Forecast__c.field-meta.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Opp_Forecast__c</fullName>
+ <description>2018/1/31 淇敼鍓嶏細
+3.浠婂勾鍙戣揣+娉ㄦ畫(涓嶅惈绋�) [鍏紡(甯佺)]
+ShippedAmount_ThisYear_withoutax_F__c + Forecast_Amount_All_withouttax_F__c
+
+2013骞�10鏈�15鏃ヤ箣鍓�
+鐘舵厠锛戯細鍑鸿嵎銆佹敞娈�
+閲戦闋呯洰锛歄CM鎴愮磩浜堟脯閲戦锛堢◣鎶溿亶锛�
+CASE( StageName , "瀹屼簡", Amount_Without_Tax_F__c ,"鍑鸿嵎",Amount_Without_Tax_F__c , "娉ㄦ畫", Amount_Without_Tax_F__c , 0)</description>
+ <externalId>false</externalId>
+ <formula>Opp_Actual__c + BO_Forecast__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>涓嶄娇鐢細5.浠婂勾鍙戣揣+娉ㄦ畫(涓嶅惈绋�)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Opp_Forecast_before_tender__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Opp_Forecast_before_tender__c.field-meta.xml
new file mode 100644
index 0000000..36db50a
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Opp_Forecast_before_tender__c.field-meta.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Opp_Forecast_before_tender__c</fullName>
+ <description>2013骞达紤锛愭湀锛戯紮鏃ヤ箣鍓�
+IF(Category__c = "瀹熺妇",Amount_Without_Tax_F__c,
+IF(Text(StageName) = "娉ㄦ畫",Amount_Without_Tax_F__c,
+IF(AND(Text(StageName) = "寮曞悎",OR
+ (Status_Formula_Text__c = "00 杩樻病璺熻繘",
+ Status_Formula_Text__c = "01 杩樻病鎷滆",
+ Status_Formula_Text__c = "02 璺熻繘涓�")),
+ 0,Amount_Without_Tax_F__c)
+)
+)
+20221125涔嬪墠
+ShippedAmount_ThisYear_withoutax_F__c + Forecast_Amount_All_withouttax_F__c +
+IF(AND(Text(StageName) = "寮曞悎",OR
+ (Status_Formula_Text__c = "00 杩樻病璺熻繘",
+ Status_Formula_Text__c = "01 杩樻病鎷滆",
+ Status_Formula_Text__c = "02 璺熻繘涓�")),
+ 0,Amount_Without_Tax_F__c)</description>
+ <externalId>false</externalId>
+ <formula>/*ShippedAmount_ThisYear_withoutax_F__c*/
+IF(SAP_Send_OK__c && (Agency1__r.Special__c || Agency2__r.Special__c || Account.Parent.Special__c) && $User.ViewSpecialAgencyAmout__c == False, null,ShippedAmount_ThisYear_withoutax_PACP__c + ShippedAmount_ThisYear_withoutax_PBCP__c)
+ + Forecast_Amount_All_withouttax_F__c +
+IF(AND(Text(StageName) = "寮曞悎",OR
+ (Status_Formula_Text__c = "00 鏈窡杩�",
+ Status_Formula_Text__c = "01 璺熻繘涓�",
+ Status_Formula_Text__c = "02 璐锋鎵瑰噯",
+ Status_Formula_Text__c = "03 宸茬敵璇烽绠�",
+ Status_Formula_Text__c = "04 棰勭畻宸叉壒鍑�",
+ Status_Formula_Text__c = "04 棰勭畻鏈壒鍑�",
+ Status_Formula_Text__c = "05 宸茬敵璇疯繘鍙ｈ璇�",
+ Status_Formula_Text__c = "06 璁鸿瘉宸查�氳繃",
+ Status_Formula_Text__c = "06 璁鸿瘉鏈�氳繃",
+ Status_Formula_Text__c = "07 宸茬‘璁ゅ弬鏁�"
+)),
+ 0,Amount_Without_Tax_F__c)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>涓嶄娇鐢細4.5 鍙戣揣+娉ㄦ畫+鎺堟潈鍚庤浠�(涓嶅惈绋�)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Opp_Forecast_incl_tax__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Opp_Forecast_incl_tax__c.field-meta.xml
new file mode 100644
index 0000000..1175356
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Opp_Forecast_incl_tax__c.field-meta.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Opp_Forecast_incl_tax__c</fullName>
+ <description>2018/1/31 淇敼鍓嶏細
+3.浠婂勾鍙戣揣+娉ㄦ畫(鍚◣) [鍏紡(甯佺)]
+ShippedAmount__c + Forecast_Amount_All_F__c
+
+2013骞�10鏈�15鏃ヤ箣鍓�
+CASE( StageName , "瀹屼簡", Wholesale_Price_F__c ,"鍑鸿嵎",Wholesale_Price_F__c , "娉ㄦ畫", Wholesale_Price_F__c , 0)</description>
+ <externalId>false</externalId>
+ <formula>Opp_Actual_incl_tax__c+BO_Forecast_incl_tax__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>5.浠婂勾鍙戣揣+娉ㄦ畫(鍚◣)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Opp_New_Mark__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Opp_New_Mark__c.field-meta.xml
new file mode 100644
index 0000000..4627675
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Opp_New_Mark__c.field-meta.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Opp_New_Mark__c</fullName>
+ <description>鎷嶇収瀵瑰簲 璁惧畾鎴鏃ユ湡涓�4鏈�2鏃�</description>
+ <externalId>false</externalId>
+ <formula>/*IF(AND(AND(DATEVALUE(CreatedDate) >= Date(IF(MONTH(TODAY()) < 3, YEAR(TODAY()) - 1, YEAR(TODAY())), 4, 1), DATEVALUE(CreatedDate) < Date(IF(MONTH(TODAY()) < 3, YEAR(TODAY()), YEAR(TODAY()) + 1), 4, 1)), AND(NULLVALUE(Close_Forecasted_Assume_Date__c, Close_Forecasted_Date__c) >= Date(IF(MONTH(TODAY()) < 3, YEAR(TODAY()) - 1, YEAR(TODAY())), 4, 1), NULLVALUE(Close_Forecasted_Assume_Date__c, Close_Forecasted_Date__c) < Date(IF(MONTH(TODAY()) < 3, YEAR(TODAY()), YEAR(TODAY()) + 1), 4, 1))), 1, 0)*/
+IF(AND(AND(DATEVALUE(CreatedDate) >= Date(IF(MONTH(TODAY()) < 3, YEAR(TODAY()) - 1, YEAR(TODAY())), 4, 1), DATEVALUE(CreatedDate) < Date(IF(MONTH(TODAY()) < 3, YEAR(TODAY()), YEAR(TODAY()) + 1), 4, 2)), AND(NULLVALUE(Close_Forecasted_Assume_Date__c, Close_Forecasted_Date__c) >= Date(IF(MONTH(TODAY()) < 3, YEAR(TODAY()) - 1, YEAR(TODAY())), 4, 1), NULLVALUE(Close_Forecasted_Assume_Date__c, Close_Forecasted_Date__c) < Date(IF(MONTH(TODAY()) < 3, YEAR(TODAY()), YEAR(TODAY()) + 1), 4, 2))), 1, 0)</formula>
+ <label>鏈湡棰勬祴鏂板缓</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Opp_Number__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Opp_Number__c.field-meta.xml
new file mode 100644
index 0000000..586d940
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Opp_Number__c.field-meta.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Opp_Number__c</fullName>
+ <displayFormat>{0000000}</displayFormat>
+ <externalId>false</externalId>
+ <label>璇环缂栫爜7浣�(涓嶄娇鐢�)</label>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>AutoNumber</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Opp_Order__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Opp_Order__c.field-meta.xml
new file mode 100644
index 0000000..0d80466
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Opp_Order__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Opp_Order__c</fullName>
+ <externalId>false</externalId>
+ <formula>Bidding_Project_Name_Bid__r.Tender_Order__c</formula>
+ <label>璇环鎷涙爣淇℃伅鏄剧ず鎺掑簭</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Opp_Retention_Days__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Opp_Retention_Days__c.field-meta.xml
new file mode 100644
index 0000000..91ffcb3
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Opp_Retention_Days__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Opp_Retention_Days__c</fullName>
+ <externalId>false</externalId>
+ <formula>today()-Opp_Update_Day__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>璇环闃舵婊炵暀澶╂暟</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Opp_Update_Day__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Opp_Update_Day__c.field-meta.xml
new file mode 100644
index 0000000..eb89b21
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Opp_Update_Day__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Opp_Update_Day__c</fullName>
+ <externalId>false</externalId>
+ <label>璇环闃舵鏇存柊鏃�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Opp_forecast_day_last_update_day__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Opp_forecast_day_last_update_day__c.field-meta.xml
new file mode 100644
index 0000000..ad90b81
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Opp_forecast_day_last_update_day__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Opp_forecast_day_last_update_day__c</fullName>
+ <externalId>false</externalId>
+ <label>鏈�鍚庢洿鏂版棩-棰勬祴OCSM绛剧害鏃�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Opp_order_Type__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Opp_order_Type__c.field-meta.xml
new file mode 100644
index 0000000..1f5caa0
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Opp_order_Type__c.field-meta.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Opp_order_Type__c</fullName>
+ <externalId>false</externalId>
+ <label>鑰楁潗璁㈠崟鍒嗙被</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>true</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+ <valueSet>
+ <restricted>true</restricted>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>ET</fullName>
+ <default>false</default>
+ <label>ET</label>
+ </value>
+ <value>
+ <fullName>SP</fullName>
+ <default>false</default>
+ <label>SP鑰楁潗</label>
+ </value>
+ <value>
+ <fullName>ENG</fullName>
+ <default>false</default>
+ <label>ENG鑰楁潗</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Opp_situation__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Opp_situation__c.field-meta.xml
new file mode 100644
index 0000000..d392f11
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Opp_situation__c.field-meta.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Opp_situation__c</fullName>
+ <externalId>false</externalId>
+ <label>璇环鐘舵��</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>true</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+ <valueSet>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>姝ｅ父</fullName>
+ <default>false</default>
+ <label>姝ｅ父</label>
+ </value>
+ <value>
+ <fullName>闂</fullName>
+ <default>false</default>
+ <label>闂</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Oppor_Number_Report__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Oppor_Number_Report__c.field-meta.xml
new file mode 100644
index 0000000..46102c6
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Oppor_Number_Report__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Oppor_Number_Report__c</fullName>
+ <externalId>false</externalId>
+ <label>璇环缂栫爜锛堟姤琛ㄧ敤锛�</label>
+ <length>200</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/OpportunitySource__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/OpportunitySource__c.field-meta.xml
new file mode 100644
index 0000000..e9f4399
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/OpportunitySource__c.field-meta.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OpportunitySource__c</fullName>
+ <externalId>false</externalId>
+ <label>璇环鏉ユ簮锛堝悗鍙扮敤锛�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+ <valueSet>
+ <restricted>true</restricted>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>娑堣�楀搧绯荤粺</fullName>
+ <default>false</default>
+ <label>娑堣�楀搧绯荤粺</label>
+ </value>
+ <value>
+ <fullName>鍏紑鎷涙爣</fullName>
+ <default>false</default>
+ <label>鍏紑鎷涙爣</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Opportunity_Category__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Opportunity_Category__c.field-meta.xml
new file mode 100644
index 0000000..9c45f38
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Opportunity_Category__c.field-meta.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Opportunity_Category__c</fullName>
+ <description>2012/10/17
+渚嬶級鑳稿绉戙伀澹层仯銇熸皸绠℃敮閺°伅銆佺瀹ゅ垎椤炪伅涓�鑸绉戙仩銇屻��
+寮曞悎绉戝鍒嗛銇懠鍚稿櫒绉戙仺銇椼仸鎵便亜銇熴亜銆�</description>
+ <externalId>false</externalId>
+ <label>璇环绉戝鍒嗙被</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+ <valueSet>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>GI</fullName>
+ <default>false</default>
+ <label>GI</label>
+ </value>
+ <value>
+ <fullName>ET</fullName>
+ <default>false</default>
+ <label>ET</label>
+ </value>
+ <value>
+ <fullName>BF</fullName>
+ <default>false</default>
+ <label>BF</label>
+ </value>
+ <value>
+ <fullName>GS</fullName>
+ <default>false</default>
+ <label>GS</label>
+ </value>
+ <value>
+ <fullName>URO</fullName>
+ <default>false</default>
+ <label>URO</label>
+ </value>
+ <value>
+ <fullName>GYN</fullName>
+ <default>false</default>
+ <label>GYN</label>
+ </value>
+ <value>
+ <fullName>ENT</fullName>
+ <default>false</default>
+ <label>ENT</label>
+ </value>
+ <value>
+ <fullName>OTH</fullName>
+ <default>false</default>
+ <label>OTH</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Opportunity_Category_for_report__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Opportunity_Category_for_report__c.field-meta.xml
new file mode 100644
index 0000000..f6d1151
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Opportunity_Category_for_report__c.field-meta.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Opportunity_Category_for_report__c</fullName>
+ <externalId>false</externalId>
+ <formula>case(text(Opportunity_Category__c),
+"GI","1.GI",
+"ET","2.ET",
+"BF","3.BF",
+"GS","4.GS",
+"URO","5.URO",
+"GYN","6.GYN",
+"ENT","7.ENT",
+"OTH","8.OTH","")</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>璇环绉戝鍒嗙被(鎶ヨ〃鐢�)</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Opportunity_No__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Opportunity_No__c.field-meta.xml
new file mode 100644
index 0000000..601b0ca
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Opportunity_No__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Opportunity_No__c</fullName>
+ <caseSensitive>false</caseSensitive>
+ <externalId>true</externalId>
+ <label>璇环缂栫爜</label>
+ <length>255</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>true</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>true</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Opportunity_No_read__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Opportunity_No_read__c.field-meta.xml
new file mode 100644
index 0000000..9564b43
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Opportunity_No_read__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Opportunity_No_read__c</fullName>
+ <externalId>false</externalId>
+ <formula>Opportunity_No__c</formula>
+ <label>璇环缂栫爜(澶嶅埗)</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Opportunity_ThousandY_Target__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Opportunity_ThousandY_Target__c.field-meta.xml
new file mode 100644
index 0000000..436e2fd
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Opportunity_ThousandY_Target__c.field-meta.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Opportunity_ThousandY_Target__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(AND(MONTH(TODAY()) >= 4,DAY(TODAY())>=2),
+
+ IF(
+ AND(CloseDate< DATE(YEAR(TODAY())+1 ,4,1),
+ CloseDate>= DATE(YEAR(TODAY()),4,1)),
+ BO_Forecast__c/1000,
+ 0
+ ),
+ IF(
+ AND(CloseDate< DATE(YEAR(TODAY()) ,4,1),
+ CloseDate>= DATE(YEAR(TODAY())-1 ,4,1)),
+ BO_Forecast__c/1000,
+ 0
+ )
+)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>3.浠婂勾娉ㄦ畫(KRMB)_C</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Opportunity_ThousandY__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Opportunity_ThousandY__c.field-meta.xml
new file mode 100644
index 0000000..0b84919
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Opportunity_ThousandY__c.field-meta.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Opportunity_ThousandY__c</fullName>
+ <description>NEW</description>
+ <externalId>false</externalId>
+ <formula>IF(
+MONTH(TODAY()) <= 3,
+IF(
+AND(CloseDate< DATE(YEAR(TODAY()) ,4,1),
+CloseDate>= DATE(YEAR(TODAY())-1 ,4,1)),
+BO_Forecast__c/1000,
+0
+),
+IF(
+AND(CloseDate< DATE(YEAR(TODAY())+1 ,4,1),
+CloseDate>= DATE(YEAR(TODAY()),4,1)),
+BO_Forecast__c/1000,
+0
+)
+)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>3.浠婂勾娉ㄦ畫(KRMB)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Opportunity__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Opportunity__c.field-meta.xml
new file mode 100644
index 0000000..ad45883
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Opportunity__c.field-meta.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Opportunity__c</fullName>
+ <description>2018/1/31 淇敼鍓嶏細
+4.鍙戣揣+娉ㄦ畫+璇环(涓嶅惈绋�)
+ShippedAmount_ThisYear_withoutax_F__c + Forecast_Amount_All_withouttax_F__c + OCMBudget__c*1000
+
+2017骞�12鏈�12鏃�
+ShippedAmount_ThisYear_withoutax_F__c + Forecast_Amount_All_withouttax_F__c +
+IF(
+AND(Text(StageName) = "寮曞悎",
+Close_Forecasted_Date__c < IF(Month(Today()) < 4, Date(Year(Today()), 4, 1), Date(Year(Today())+1, 4, 1))
+),
+CASE(Competitor__c,
+"A",0.8,
+"B",0.5,
+"C",0.3,
+ 0) * Amount_Without_Tax_F__c
+,0)
+
+2013骞�10鏈�25鏃�
+ShippedAmount_ThisYear_withoutax_F__c + Forecast_Amount_All_withouttax_F__c +
+IF(
+AND(Text(StageName) = "寮曞悎",
+Close_Forecasted_Date__c < IF(Month(Today()) < 4, Date(Year(Today()), 4, 1), Date(Year(Today())+1, 4, 1))
+),
+Amount_Without_Tax_F__c ,0
+)
+
+
+20231225淇敼鍓嶏細
+Opp_Actual__c+BO_Forecast__c+OP__c锛屽拰涓氬姟纭鍚庡皢OP__c鏇挎崲鎴�4.2 浠婂勾鍙戣揣璇环(KRMB)_C</description>
+ <externalId>false</externalId>
+ <formula>Opp_Actual__c+BO_Forecast__c+OP_ThousandY_Target__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>7.鍙戣揣+娉ㄦ畫+璇环(KRMB)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Opportunity_stage__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Opportunity_stage__c.field-meta.xml
new file mode 100644
index 0000000..129a830
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Opportunity_stage__c.field-meta.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Opportunity_stage__c</fullName>
+ <externalId>false</externalId>
+ <inlineHelpText>鎷呭綋閫夋嫨</inlineHelpText>
+ <label>璇环闃舵</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+ <valueSet>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>杩樻病鐢宠棰勭畻</fullName>
+ <default>false</default>
+ <label>杩樻病鐢宠棰勭畻</label>
+ </value>
+ <value>
+ <fullName>鎻愪氦浜嗛绠楃敵璇�</fullName>
+ <default>false</default>
+ <label>鎻愪氦浜嗛绠楃敵璇�</label>
+ </value>
+ <value>
+ <fullName>棰勭畻娌℃湁鎵瑰噯</fullName>
+ <default>false</default>
+ <label>棰勭畻娌℃湁鎵瑰噯</label>
+ </value>
+ <value>
+ <fullName>棰勭畻宸茬粡鎵瑰噯</fullName>
+ <default>false</default>
+ <label>棰勭畻宸茬粡鎵瑰噯</label>
+ </value>
+ <value>
+ <fullName>纭畾浜嗗鎵嬪弬鏁�</fullName>
+ <default>false</default>
+ <label>纭畾浜嗗鎵嬪弬鏁�</label>
+ </value>
+ <value>
+ <fullName>娌℃湁纭畾鍙傛暟</fullName>
+ <default>false</default>
+ <label>鍙傛暟涓嶇‘瀹�</label>
+ </value>
+ <value>
+ <fullName>纭畾浜哋LY鍙傛暟</fullName>
+ <default>false</default>
+ <label>纭畾浜哋LY鍙傛暟</label>
+ </value>
+ <value>
+ <fullName>涓爣绛剧害</fullName>
+ <default>false</default>
+ <label>涓爣绛剧害</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Opportunity_stms_owner__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Opportunity_stms_owner__c.field-meta.xml
new file mode 100644
index 0000000..a2cd5b5
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Opportunity_stms_owner__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Opportunity_stms_owner__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>璇环鍓媴褰�(STMS)</label>
+ <referenceTo>User</referenceTo>
+ <relationshipName>stms_user</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Opportunity_sub_owner__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Opportunity_sub_owner__c.field-meta.xml
new file mode 100644
index 0000000..6af61bc
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Opportunity_sub_owner__c.field-meta.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Opportunity_sub_owner__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>璇环浜у搧鎷呭綋</label>
+ <lookupFilter>
+ <active>true</active>
+ <filterItems>
+ <field>User.Job_Category__c</field>
+ <operation>equals</operation>
+ <value>閿�鍞帹骞�, 閿�鍞競鍦�, SP甯傚満</value>
+ </filterItems>
+ <isOptional>true</isOptional>
+ </lookupFilter>
+ <referenceTo>User</referenceTo>
+ <relationshipName>PCLN_sub_owner</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>true</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/OrderThisYearQY__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/OrderThisYearQY__c.field-meta.xml
new file mode 100644
index 0000000..cc33d44
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/OrderThisYearQY__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OrderThisYearQY__c</fullName>
+ <externalId>false</externalId>
+ <formula>(OrderThisYear__c * if(Text(Trade__c) == "澶栬部", Tax_Foreign_F_Copy__c,1) )/1000</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>2.1 浠婂勾璁㈣揣(KRMB锛�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/OrderThisYear__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/OrderThisYear__c.field-meta.xml
new file mode 100644
index 0000000..3da1680
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/OrderThisYear__c.field-meta.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OrderThisYear__c</fullName>
+ <externalId>false</externalId>
+ <label>5.浠婂勾璁㈣揣</label>
+ <summarizedField>Statu_Achievements__c.ContractAmountNoGurantee_FText__c</summarizedField>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.FirstApproveDate__c</field>
+ <operation>greaterOrEqual</operation>
+ <value>4/1/2023</value>
+ </summaryFilterItems>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.FirstApproveDate__c</field>
+ <operation>lessThan</operation>
+ <value>4/1/2024</value>
+ </summaryFilterItems>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.Valid_Statu_Achievements1__c</field>
+ <operation>equals</operation>
+ <value>1</value>
+ </summaryFilterItems>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.FALSE_Order__c</field>
+ <operation>notEqual</operation>
+ <value>FALSE</value>
+ </summaryFilterItems>
+ <summaryForeignKey>Statu_Achievements__c.Opportunity__c</summaryForeignKey>
+ <summaryOperation>sum</summaryOperation>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Summary</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Order_Process_Category__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Order_Process_Category__c.field-meta.xml
new file mode 100644
index 0000000..8f3326a
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Order_Process_Category__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Order_Process_Category__c</fullName>
+ <externalId>false</externalId>
+ <label>璁㈣喘娴佺▼鍒嗙被</label>
+ <length>255</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Order_status__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Order_status__c.field-meta.xml
new file mode 100644
index 0000000..9a1aabb
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Order_status__c.field-meta.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Order_status__c</fullName>
+ <externalId>false</externalId>
+ <formula>case(text(StageName),
+"寮曞悎","1.璇环",
+"娉ㄦ畫","2.宸茶璐�",
+"鍑鸿嵎","2.宸茶璐�",
+"瀹屼簡","2.宸茶璐�",
+"鏁楁垿","3.鍙栨秷/澶卞崟",
+"鍓婇櫎","3.鍙栨秷/澶卞崟",
+"鐩","","")</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鐘舵��1(璁㈣揣)</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Order_status_sql__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Order_status_sql__c.field-meta.xml
new file mode 100644
index 0000000..b54b9eb
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Order_status_sql__c.field-meta.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Order_status_sql__c</fullName>
+ <externalId>false</externalId>
+ <formula>case(text(StageName),
+"寮曞悎",Date(2000,1,1),
+"娉ㄦ畫",Date(2000,1,2),
+"鍑鸿嵎",Date(2000,1,2),
+"瀹屼簡",Date(2000,1,2),
+"鏁楁垿",Date(2000,1,3),
+"鍓婇櫎",Date(2000,1,3),
+"鐩",null,null)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鐘舵��1(璁㈣揣)_sql</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/OriginalAuthorizationApplicationCod__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/OriginalAuthorizationApplicationCod__c.field-meta.xml
new file mode 100644
index 0000000..8aa32c8
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/OriginalAuthorizationApplicationCod__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OriginalAuthorizationApplicationCod__c</fullName>
+ <externalId>false</externalId>
+ <label>鍘熸巿鏉冪敵璇风紪鐮�</label>
+ <length>50</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Other_Society__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Other_Society__c.field-meta.xml
new file mode 100644
index 0000000..225053d
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Other_Society__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Other_Society__c</fullName>
+ <externalId>false</externalId>
+ <label>鍏朵粬瀛︿細</label>
+ <length>255</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Over_5million_opp__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Over_5million_opp__c.field-meta.xml
new file mode 100644
index 0000000..406ff18
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Over_5million_opp__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Over_5million_opp__c</fullName>
+ <externalId>false</externalId>
+ <formula>if(OCM_Agent1_Price__c >= 5000000,True,False)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>棰勬祴500涓囦互涓婅浠�</label>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/OwnerId.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/OwnerId.field-meta.xml
new file mode 100644
index 0000000..5bd77e8
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/OwnerId.field-meta.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OwnerId</fullName>
+ <trackFeedHistory>true</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Owner_Category__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Owner_Category__c.field-meta.xml
new file mode 100644
index 0000000..c5ecd70
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Owner_Category__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Owner_Category__c</fullName>
+ <description>PBI鎶撳彇鏁版嵁鐢ㄥ瓧娈碉紝璇峰嬁鍒犻櫎</description>
+ <externalId>false</externalId>
+ <formula>Owner.Category6__c</formula>
+ <label>鎵�鏈変汉璇�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Owner_F__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Owner_F__c.field-meta.xml
new file mode 100644
index 0000000..3046484
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Owner_F__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Owner_F__c</fullName>
+ <externalId>false</externalId>
+ <formula>Owner.Alias</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鎵�鏈変汉锛堝叕寮忥級</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Owner_ID__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Owner_ID__c.field-meta.xml
new file mode 100644
index 0000000..fe075b6
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Owner_ID__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Owner_ID__c</fullName>
+ <externalId>false</externalId>
+ <formula>OwnerId</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>Owner_ID</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Owner_IsActive__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Owner_IsActive__c.field-meta.xml
new file mode 100644
index 0000000..e3e6d17
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Owner_IsActive__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Owner_IsActive__c</fullName>
+ <externalId>false</externalId>
+ <formula>Owner_System__r.IsActive</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鎵�鏈変汉銆愭湁鏁�/鏃犳晥銆�</label>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Owner_Salesdepartment__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Owner_Salesdepartment__c.field-meta.xml
new file mode 100644
index 0000000..1bd90a8
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Owner_Salesdepartment__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Owner_Salesdepartment__c</fullName>
+ <description>鐤戜技PBI鎶藉彇鏁版嵁鐢ㄥ瓧娈碉紝鍕垮垹</description>
+ <externalId>false</externalId>
+ <formula>Owner.Salesdepartment__c</formula>
+ <label>鎵�鏈変汉閿�鍞湰閮�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Owner_System__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Owner_System__c.field-meta.xml
new file mode 100644
index 0000000..b997120
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Owner_System__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Owner_System__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>鎵�鏈夎��(绂佺敤)</label>
+ <referenceTo>User</referenceTo>
+ <relationshipName>Owner_System</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Owner_department__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Owner_department__c.field-meta.xml
new file mode 100644
index 0000000..5d0779e
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Owner_department__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Owner_department__c</fullName>
+ <description>PBI鎶藉彇鏁版嵁鐢ㄥ瓧娈碉紝鍕垮垹</description>
+ <externalId>false</externalId>
+ <formula>Owner.Category5__c</formula>
+ <label>鎵�鏈変汉閮�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Owner_lastmonth__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Owner_lastmonth__c.field-meta.xml
new file mode 100644
index 0000000..b878cf6
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Owner_lastmonth__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Owner_lastmonth__c</fullName>
+ <externalId>false</externalId>
+ <label>鎵�鏈変汉锛堜笂鏈堬級</label>
+ <length>100</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/PA_PB_target__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/PA_PB_target__c.field-meta.xml
new file mode 100644
index 0000000..67d0a13
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/PA_PB_target__c.field-meta.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>PA_PB_target__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(month(CloseDate) = 4,"PA:4鏈�(1Q)",
+IF(month(CloseDate) = 5,"PA:5鏈�(1Q)",
+IF(month(CloseDate) = 6,"PA:6鏈�(1Q)",
+IF(month(CloseDate) = 7,"PA:7鏈�(2Q)",
+IF(month(CloseDate) = 8,"PA:8鏈�(2Q)",
+IF(month(CloseDate) = 9,"PA:9鏈�(2Q)",
+IF(month(CloseDate) = 10,"PB:10鏈�(3Q)",
+IF(month(CloseDate) = 11,"PB:11鏈�(3Q)",
+IF(month(CloseDate) = 12,"PB:12鏈�(3Q)",
+IF(month(CloseDate) = 1,"PB:1鏈�(4Q)",
+IF(month(CloseDate) = 2,"PB:2鏈�(4Q)",
+IF(month(CloseDate) = 3,"PB:3鏈�(4Q)",
+"")
+)
+)
+)
+)
+)
+)
+)
+)
+)
+)
+)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>1H鈥�/2H鈥�(鐩爣)</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/PackedCaculation__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/PackedCaculation__c.field-meta.xml
new file mode 100644
index 0000000..a89077b
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/PackedCaculation__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>PackedCaculation__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(STMS_Package_Sale__c = true || Salesdepartment_Owner__c = '7.鑳介噺', 1, 0)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鎵撳寘璁＄畻</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/PartnerAccountId.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/PartnerAccountId.field-meta.xml
new file mode 100644
index 0000000..5078212
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/PartnerAccountId.field-meta.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>PartnerAccountId</fullName>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Past_authorization_valide_day__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Past_authorization_valide_day__c.field-meta.xml
new file mode 100644
index 0000000..a33fcab
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Past_authorization_valide_day__c.field-meta.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Past_authorization_valide_day__c</fullName>
+ <description>20221125涔嬪墠
+IF(AND(Status_Formula__c ="03 宸叉巿鏉�",today()>Autholization_Activated_Date__c),1,0)</description>
+ <externalId>false</externalId>
+ <formula>IF(AND(Status_Formula__c ="08 宸叉巿鏉�",today()>Autholization_Activated_Date__c),1,0)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>宸茶秴杩囨巿鏉冩埅鑷虫棩鐨勮浠锋暟</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Pay_All_Money__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Pay_All_Money__c.field-meta.xml
new file mode 100644
index 0000000..cb560f1
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Pay_All_Money__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Pay_All_Money__c</fullName>
+ <externalId>false</externalId>
+ <label>21.浠樺叏娆炬棩</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Possibility_mark__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Possibility_mark__c.field-meta.xml
new file mode 100644
index 0000000..06a1500
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Possibility_mark__c.field-meta.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Possibility_mark__c</fullName>
+ <externalId>false</externalId>
+ <formula>CASE(Competitor__c,
+"A", "蹇呰揪",
+"B", "浜夊彇",
+"C", "鍌ㄥ",
+"D", "鎰忓悜",
+"E", "鎰忓悜",
+"")</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鍙兘鎬ч娴�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Post__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Post__c.field-meta.xml
new file mode 100644
index 0000000..3feac17
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Post__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Post__c</fullName>
+ <externalId>false</externalId>
+ <formula>text( Owner.Post__c)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鑱屼綅</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/PrdCntRank__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/PrdCntRank__c.field-meta.xml
new file mode 100644
index 0000000..9078f88
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/PrdCntRank__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>PrdCntRank__c</fullName>
+ <externalId>false</externalId>
+ <formula>DetailNum__c/10</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>浜у搧琛岄」鐩瓑绾�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/PredictPaymentDate__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/PredictPaymentDate__c.field-meta.xml
new file mode 100644
index 0000000..62387ea
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/PredictPaymentDate__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>PredictPaymentDate__c</fullName>
+ <externalId>false</externalId>
+ <label>棰勬祴浠樻鏃�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Predicted_date_ChangeReason__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Predicted_date_ChangeReason__c.field-meta.xml
new file mode 100644
index 0000000..1f4afc6
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Predicted_date_ChangeReason__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Predicted_date_ChangeReason__c</fullName>
+ <externalId>false</externalId>
+ <label>鏀瑰彉棰勬祴鏃ユ湡鍘熷洜</label>
+ <length>255</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Pricebook2Id.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Pricebook2Id.field-meta.xml
new file mode 100644
index 0000000..1ff7162
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Pricebook2Id.field-meta.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Pricebook2Id</fullName>
+ <trackTrending>false</trackTrending>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Pro170_count__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Pro170_count__c.field-meta.xml
new file mode 100644
index 0000000..8a6a5d7
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Pro170_count__c.field-meta.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Pro170_count__c</fullName>
+ <description>鍖呭惈濂ヨ緣璇鹃瀛楁鎭㈠</description>
+ <externalId>false</externalId>
+ <label>170鏁伴噺</label>
+ <summaryFilterItems>
+ <field>OpportunityLineItem.If_170Pro__c</field>
+ <operation>equals</operation>
+ <value>True</value>
+ </summaryFilterItems>
+ <summaryForeignKey>OpportunityLineItem.OpportunityId</summaryForeignKey>
+ <summaryOperation>count</summaryOperation>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Summary</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/ProAH_count__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/ProAH_count__c.field-meta.xml
new file mode 100644
index 0000000..18af925
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/ProAH_count__c.field-meta.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ProAH_count__c</fullName>
+ <externalId>false</externalId>
+ <label>濂ヨ緣鏁伴噺</label>
+ <summaryFilterItems>
+ <field>OpportunityLineItem.If_AHPro__c</field>
+ <operation>equals</operation>
+ <value>True</value>
+ </summaryFilterItems>
+ <summaryForeignKey>OpportunityLineItem.OpportunityId</summaryForeignKey>
+ <summaryOperation>count</summaryOperation>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Summary</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/ProOER_AW_count__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/ProOER_AW_count__c.field-meta.xml
new file mode 100644
index 0000000..b6d86b1
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/ProOER_AW_count__c.field-meta.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ProOER_AW_count__c</fullName>
+ <description>/* SWAG-C9QCGH 銆愬鎵樸�慬閲嶈]璇环鍏变韩缁橤IR Slution閮ㄩ棬瑙勫垯寮�鍙戣瘎浼�
+灏�170鏁伴噺鏇挎崲涓� OER-AW鏁伴噺
+*/</description>
+ <externalId>false</externalId>
+ <label>OER-AW鏁伴噺</label>
+ <summaryFilterItems>
+ <field>OpportunityLineItem.If_OER_AW__c</field>
+ <operation>equals</operation>
+ <value>True</value>
+ </summaryFilterItems>
+ <summaryForeignKey>OpportunityLineItem.OpportunityId</summaryForeignKey>
+ <summaryOperation>count</summaryOperation>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Summary</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Probability.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Probability.field-meta.xml
new file mode 100644
index 0000000..64d4409
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Probability.field-meta.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Probability</fullName>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Product_Rep__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Product_Rep__c.field-meta.xml
new file mode 100644
index 0000000..717be2d
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Product_Rep__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Product_Rep__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>浜у搧鎷呭綋</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Product_Sales_Category__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Product_Sales_Category__c.field-meta.xml
new file mode 100644
index 0000000..68e22ac
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Product_Sales_Category__c.field-meta.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Product_Sales_Category__c</fullName>
+ <externalId>false</externalId>
+ <formula>Case( Opportunity_Category__c,
+"GI", "GI",
+"BF","GI",
+"ET","GI",
+"GS","SP",
+"URO","SP",
+"GYN","SP",
+"ENT","SP",
+"OTH","SP",
+"")</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>浜у搧鍒嗙被</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/ProjectDescription__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/ProjectDescription__c.field-meta.xml
new file mode 100644
index 0000000..8f1ae48
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/ProjectDescription__c.field-meta.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ProjectDescription__c</fullName>
+ <externalId>false</externalId>
+ <label>椤圭洰璇存槑</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+ <valueSet>
+ <restricted>true</restricted>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>鏂板尰闄�</fullName>
+ <default>false</default>
+ <label>1.鏂板尰闄�</label>
+ </value>
+ <value>
+ <fullName>鏂伴櫌鍖�</fullName>
+ <default>false</default>
+ <label>2.鏂伴櫌鍖�</label>
+ </value>
+ <value>
+ <fullName>鏂板ぇ妤�</fullName>
+ <default>false</default>
+ <label>3.鏂板ぇ妤�</label>
+ </value>
+ <value>
+ <fullName>鎵╂敼寤�</fullName>
+ <default>false</default>
+ <label>4.鎵╂敼寤�</label>
+ </value>
+ <value>
+ <fullName>绛夊緟EUS</fullName>
+ <default>false</default>
+ <label>5.绛夊緟EUS</label>
+ </value>
+ <value>
+ <fullName>浜у搧鍑哄簱姝�</fullName>
+ <default>false</default>
+ <label>6.浜у搧鍑哄簱姝�</label>
+ </value>
+ <value>
+ <fullName>鍥借捶椤圭洰</fullName>
+ <default>false</default>
+ <label>7.鍥借捶/澶栬锤椤圭洰</label>
+ </value>
+ <value>
+ <fullName>璧勯噾闂</fullName>
+ <default>false</default>
+ <label>8.璧勯噾闂</label>
+ </value>
+ <value>
+ <fullName>9. 浜屾璁环</fullName>
+ <default>false</default>
+ <label>9. 浜屾璁环</label>
+ </value>
+ <value>
+ <fullName>绛夊緟X1</fullName>
+ <default>false</default>
+ <isActive>false</isActive>
+ <label>5.绛夊緟X1</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Project_decide_date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Project_decide_date__c.field-meta.xml
new file mode 100644
index 0000000..465bace
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Project_decide_date__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Project_decide_date__c</fullName>
+ <externalId>false</externalId>
+ <label>椤圭洰鏂规纭畾鏃�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Promise_Class__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Promise_Class__c.field-meta.xml
new file mode 100644
index 0000000..8ff358b
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Promise_Class__c.field-meta.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Promise_Class__c</fullName>
+ <externalId>false</externalId>
+ <label>鍚堝悓鍒嗙被</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+ <valueSet>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>鍐呰部</fullName>
+ <default>false</default>
+ <label>鍐呰部</label>
+ </value>
+ <value>
+ <fullName>鍏嶇◣澶栬部</fullName>
+ <default>false</default>
+ <label>鍏嶇◣澶栬部</label>
+ </value>
+ <value>
+ <fullName>闈炲厤绋庡璨�</fullName>
+ <default>false</default>
+ <label>闈炲厤绋庡璨�</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Proportion__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Proportion__c.field-meta.xml
new file mode 100644
index 0000000..2d489a8
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Proportion__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Proportion__c</fullName>
+ <defaultValue>0</defaultValue>
+ <externalId>false</externalId>
+ <label>姣旈噸</label>
+ <precision>5</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Percent</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Proposal_Competitors__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Proposal_Competitors__c.field-meta.xml
new file mode 100644
index 0000000..0c2deb4
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Proposal_Competitors__c.field-meta.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Proposal_Competitors__c</fullName>
+ <externalId>false</externalId>
+ <label>绔炰簤瀵规墜鏂规鍐呭</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+ <valueSet>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>鍊熺敤鏍锋満</fullName>
+ <default>false</default>
+ <label>鍊熺敤鏍锋満</label>
+ </value>
+ <value>
+ <fullName>鎻愪緵鍩硅鍚嶉</fullName>
+ <default>false</default>
+ <label>鎻愪緵鍩硅鍚嶉</label>
+ </value>
+ <value>
+ <fullName>寰�鍔炰簨澶勮�冨療</fullName>
+ <default>false</default>
+ <label>寰�鍔炰簨澶勮�冨療</label>
+ </value>
+ <value>
+ <fullName>寰�鍖婚櫌鑰冨療</fullName>
+ <default>false</default>
+ <label>寰�鍖婚櫌鑰冨療</label>
+ </value>
+ <value>
+ <fullName>鎻愪緵鍏朵粬鏉′欢</fullName>
+ <default>false</default>
+ <label>鎻愪緵鍏朵粬鏉′欢</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Proposal_check_number__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Proposal_check_number__c.field-meta.xml
new file mode 100644
index 0000000..894e088
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Proposal_check_number__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Proposal_check_number__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(Detail_Suggestion__c=True,1,0)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鎻愭娆℃暟</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Province_for_alart__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Province_for_alart__c.field-meta.xml
new file mode 100644
index 0000000..6dc9c17
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Province_for_alart__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Province_for_alart__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF( Owner.Salesdepartment__c ="鐗圭害缁忛攢鍟嗙鐞嗘敮鎻存湰閮�","缁忛攢鍟嗙鐞嗘湰閮�",
+
+State_Text__c)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鐪�(鎻愰啋鐢�)</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/ProvisionPrice__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/ProvisionPrice__c.field-meta.xml
new file mode 100644
index 0000000..6cae9f8
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/ProvisionPrice__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ProvisionPrice__c</fullName>
+ <externalId>false</externalId>
+ <label>璁℃彁閲戦</label>
+ <summarizedField>OpportunityLineItem.GuranteePriceSum__c</summarizedField>
+ <summaryForeignKey>OpportunityLineItem.OpportunityId</summaryForeignKey>
+ <summaryOperation>sum</summaryOperation>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Summary</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Purchase_Reason__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Purchase_Reason__c.field-meta.xml
new file mode 100644
index 0000000..091e79d
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Purchase_Reason__c.field-meta.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Purchase_Reason__c</fullName>
+ <externalId>false</externalId>
+ <label>璐拱鍘熷洜</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+ <valueSet>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>鏂版湡</fullName>
+ <default>false</default>
+ <label>鏂拌</label>
+ </value>
+ <value>
+ <fullName>鏇存柊</fullName>
+ <default>false</default>
+ <label>鏇存柊</label>
+ </value>
+ <value>
+ <fullName>澧楄ō</fullName>
+ <default>false</default>
+ <label>澧炲姞</label>
+ </value>
+ <value>
+ <fullName>濂洖</fullName>
+ <default>false</default>
+ <label>澶哄洖</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Purchase_Type__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Purchase_Type__c.field-meta.xml
new file mode 100644
index 0000000..2015426
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Purchase_Type__c.field-meta.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Purchase_Type__c</fullName>
+ <externalId>false</externalId>
+ <label>璁㈣揣娴佺▼绫诲埆</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+ <valueSet>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>涓�鑸紩鍚�</fullName>
+ <default>false</default>
+ <label>涓�鑸紩鍚�</label>
+ </value>
+ <value>
+ <fullName>ET24鏅傞枔璨╁２</fullName>
+ <default>false</default>
+ <label>ET24鏅傞枔璨╁２</label>
+ </value>
+ <value>
+ <fullName>SI锛堟墜琛撳妗堜欢锛�</fullName>
+ <default>false</default>
+ <label>SI锛堟墜琛撳妗堜欢锛�</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Purchasing_Cost__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Purchasing_Cost__c.field-meta.xml
new file mode 100644
index 0000000..af270d7
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Purchasing_Cost__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Purchasing_Cost__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF( $User.Cost_Referable__c , Stocking_Price__c, null)</formula>
+ <label>鎴愭湰</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/QuotePrinted__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/QuotePrinted__c.field-meta.xml
new file mode 100644
index 0000000..cc729e2
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/QuotePrinted__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>QuotePrinted__c</fullName>
+ <externalId>false</externalId>
+ <formula>if(Isnull(Estimation_Proposal_Date__c), 0, 1)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>宸叉彁浜ゆ姤浠�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Quote_Update_Sum__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Quote_Update_Sum__c.field-meta.xml
new file mode 100644
index 0000000..3286df7
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Quote_Update_Sum__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Quote_Update_Sum__c</fullName>
+ <defaultValue>0</defaultValue>
+ <externalId>false</externalId>
+ <label>鎶ヤ环鏇存柊璁℃暟</label>
+ <precision>15</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/RANK_A__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/RANK_A__c.field-meta.xml
new file mode 100644
index 0000000..6014992
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/RANK_A__c.field-meta.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>RANK_A__c</fullName>
+ <description>IF(AND(Text(StageName) = "寮曞悎",
+Close_Forecasted_Date__c < IF(Month(Today()) < 4, Date(Year(Today()), 4, 1), Date(Year(Today())+1, 4, 1))
+),
+CASE(Competitor__c,"A",Amount_Without_Tax_F__c ,0),0)</description>
+ <externalId>false</externalId>
+ <formula>IF(Text(StageName) = "寮曞悎",
+
+CASE(Competitor__c,"A",Amount_Without_Tax_F__c ,0),0)</formula>
+ <label>涓嶄娇鐢細5.RANK_A(涓嶅惈绋�)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/RANK_A_inc_tax__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/RANK_A_inc_tax__c.field-meta.xml
new file mode 100644
index 0000000..1a56f4a
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/RANK_A_inc_tax__c.field-meta.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>RANK_A_inc_tax__c</fullName>
+ <description>IF(Text(StageName) = "寮曞悎",
+
+CASE(Competitor__c,"A",Wholesale_Price_F__c ,0),0)</description>
+ <externalId>false</externalId>
+ <formula>IF(Text(StageName) = "寮曞悎",
+
+CASE(Competitor__c,
+"A",Wholesale_Price_F__c ,
+"A1",Wholesale_Price_F__c ,
+0),0)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>涓嶇敤锛�5.RANK_A(鍚◣)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/RANK_B__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/RANK_B__c.field-meta.xml
new file mode 100644
index 0000000..c232e33
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/RANK_B__c.field-meta.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>RANK_B__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(Text(StageName) = "寮曞悎",
+
+CASE(Competitor__c,"B",Amount_Without_Tax_F__c ,0),0)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>涓嶄娇鐢細5.RANK_B(涓嶅惈绋�)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/RANK_B_inc_tax__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/RANK_B_inc_tax__c.field-meta.xml
new file mode 100644
index 0000000..f669c2a
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/RANK_B_inc_tax__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>RANK_B_inc_tax__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(Text(StageName) = "寮曞悎", CASE(Competitor__c,"B",Wholesale_Price_F__c ,0),0)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>涓嶇敤锛�5.RANK_B(鍚◣)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/RANK_C__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/RANK_C__c.field-meta.xml
new file mode 100644
index 0000000..fb5ad20
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/RANK_C__c.field-meta.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>RANK_C__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(Text(StageName) = "寮曞悎",
+
+CASE(Competitor__c,"C",Amount_Without_Tax_F__c ,0),0)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>涓嶇敤锛�5.RANK_C(涓嶅惈绋�)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/RANK_C_inc_tax__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/RANK_C_inc_tax__c.field-meta.xml
new file mode 100644
index 0000000..67c7012
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/RANK_C_inc_tax__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>RANK_C_inc_tax__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(Text(StageName) = "寮曞悎", CASE(Competitor__c,"C",Wholesale_Price_F__c ,0),0)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>涓嶇敤锛�5.RANK_C(鍚◣)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/RANK_D__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/RANK_D__c.field-meta.xml
new file mode 100644
index 0000000..acd0005
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/RANK_D__c.field-meta.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>RANK_D__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(Text(StageName) = "寮曞悎",
+
+CASE(Competitor__c,"D",Amount_Without_Tax_F__c ,0),0)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>涓嶄娇鐢細5.RANK_D(涓嶅惈绋�)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/RANK_D_inc_tax__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/RANK_D_inc_tax__c.field-meta.xml
new file mode 100644
index 0000000..d255a76
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/RANK_D_inc_tax__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>RANK_D_inc_tax__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(Text(StageName) = "寮曞悎", CASE(Competitor__c,"D",Wholesale_Price_F__c ,0),0)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>涓嶇敤锛�5.RANK_D(鍚◣)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/RANK_E_inc_Tax__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/RANK_E_inc_Tax__c.field-meta.xml
new file mode 100644
index 0000000..6c7bda9
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/RANK_E_inc_Tax__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>RANK_E_inc_Tax__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(Text(StageName) = "寮曞悎", CASE(Competitor__c,"E",Wholesale_Price_F__c ,0),0)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>涓嶇敤锛�5.RANK_E(鍚◣)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Rating01__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Rating01__c.field-meta.xml
new file mode 100644
index 0000000..14ce250
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Rating01__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Rating01__c</fullName>
+ <externalId>false</externalId>
+ <label>1鏈堟湯</label>
+ <length>10</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Rating02__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Rating02__c.field-meta.xml
new file mode 100644
index 0000000..03ee953
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Rating02__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Rating02__c</fullName>
+ <externalId>false</externalId>
+ <label>2鏈堟湯</label>
+ <length>10</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Rating03__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Rating03__c.field-meta.xml
new file mode 100644
index 0000000..d3967ea
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Rating03__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Rating03__c</fullName>
+ <externalId>false</externalId>
+ <label>3鏈堟湯</label>
+ <length>10</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Rating04__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Rating04__c.field-meta.xml
new file mode 100644
index 0000000..b75cc8c
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Rating04__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Rating04__c</fullName>
+ <externalId>false</externalId>
+ <label>4鏈堟湯</label>
+ <length>10</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Rating05__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Rating05__c.field-meta.xml
new file mode 100644
index 0000000..08c105b
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Rating05__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Rating05__c</fullName>
+ <externalId>false</externalId>
+ <label>5鏈堟湯</label>
+ <length>10</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Rating06__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Rating06__c.field-meta.xml
new file mode 100644
index 0000000..cee7d03
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Rating06__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Rating06__c</fullName>
+ <externalId>false</externalId>
+ <label>6鏈堟湯</label>
+ <length>10</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Rating07__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Rating07__c.field-meta.xml
new file mode 100644
index 0000000..2de2510
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Rating07__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Rating07__c</fullName>
+ <externalId>false</externalId>
+ <label>7鏈堟湯</label>
+ <length>10</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Rating08__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Rating08__c.field-meta.xml
new file mode 100644
index 0000000..a9b7709
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Rating08__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Rating08__c</fullName>
+ <externalId>false</externalId>
+ <label>8鏈堟湯</label>
+ <length>10</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Rating09__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Rating09__c.field-meta.xml
new file mode 100644
index 0000000..dd2bb43
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Rating09__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Rating09__c</fullName>
+ <externalId>false</externalId>
+ <label>9鏈堟湯</label>
+ <length>10</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Rating10__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Rating10__c.field-meta.xml
new file mode 100644
index 0000000..3d22bc3
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Rating10__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Rating10__c</fullName>
+ <externalId>false</externalId>
+ <label>10鏈堟湯</label>
+ <length>10</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Rating11__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Rating11__c.field-meta.xml
new file mode 100644
index 0000000..f06a801
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Rating11__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Rating11__c</fullName>
+ <externalId>false</externalId>
+ <label>11鏈堟湯</label>
+ <length>10</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Rating12__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Rating12__c.field-meta.xml
new file mode 100644
index 0000000..b424305
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Rating12__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Rating12__c</fullName>
+ <externalId>false</externalId>
+ <label>12鏈堟湯</label>
+ <length>10</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Rating__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Rating__c.field-meta.xml
new file mode 100644
index 0000000..1866894
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Rating__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Rating__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(Status_Formula__c="-","",mid(Status_Formula__c,1,2)& Text(Competitor__c))</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>Rating</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Reason_Cancel_WIN__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Reason_Cancel_WIN__c.field-meta.xml
new file mode 100644
index 0000000..53c98f4
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Reason_Cancel_WIN__c.field-meta.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Reason_Cancel_WIN__c</fullName>
+ <externalId>false</externalId>
+ <label>鍙栨秷WIN鐞嗙敱</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+ <valueSet>
+ <restricted>true</restricted>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>1.缁堟鍚堝悓</fullName>
+ <default>false</default>
+ <label>1.缁堟鍚堝悓</label>
+ </value>
+ <value>
+ <fullName>2.璁㈠崟绫诲瀷鏈夎</fullName>
+ <default>false</default>
+ <label>2.璁㈠崟绫诲瀷鏈夎</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Recommended_Confirmation_Time__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Recommended_Confirmation_Time__c.field-meta.xml
new file mode 100644
index 0000000..933276f
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Recommended_Confirmation_Time__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Recommended_Confirmation_Time__c</fullName>
+ <externalId>false</externalId>
+ <label>SI寤鸿纭鏃堕棿</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/RecordCount__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/RecordCount__c.field-meta.xml
new file mode 100644
index 0000000..e20f04d
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/RecordCount__c.field-meta.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>RecordCount__c</fullName>
+ <description>2/8銇儸銉濄兗銉堛儉銉冦偡銉ャ儨銉笺儔銉囥儮銇仧銈併伀杩藉姞銆�</description>
+ <externalId>false</externalId>
+ <formula>1</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>璇环鏁伴噺</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Recordtype_Name__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Recordtype_Name__c.field-meta.xml
new file mode 100644
index 0000000..b30dd92
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Recordtype_Name__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Recordtype_Name__c</fullName>
+ <externalId>false</externalId>
+ <formula>RecordType.DeveloperName</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>Recordtype_Name</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Referee__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Referee__c.field-meta.xml
new file mode 100644
index 0000000..f6ae577
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Referee__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Referee__c</fullName>
+ <externalId>false</externalId>
+ <label>鎺ㄨ崘浜�</label>
+ <length>50</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Report_title__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Report_title__c.field-meta.xml
new file mode 100644
index 0000000..ba18108
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Report_title__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Report_title__c</fullName>
+ <externalId>false</externalId>
+ <formula>Owner.Report_title__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>閿�鍞疄闄呭拰棰勬祴</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Request_quotation_update__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Request_quotation_update__c.field-meta.xml
new file mode 100644
index 0000000..61e875c
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Request_quotation_update__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Request_quotation_update__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>闇�瑕侀厤濂楁洿鏂�</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Request_update_quotation__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Request_update_quotation__c.field-meta.xml
new file mode 100644
index 0000000..c8af6b5
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Request_update_quotation__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Request_update_quotation__c</fullName>
+ <externalId>false</externalId>
+ <label>闇�瑕侀厤濂楁洿鏂版棩</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/RetentionCnt__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/RetentionCnt__c.field-meta.xml
new file mode 100644
index 0000000..d64d137
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/RetentionCnt__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>RetentionCnt__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF((Today() - NULLVALUE(Key_tipics_last_update_dayF__c, DATEVALUE(CreatedDate )) > 180) , 1, 0)</formula>
+ <label>婊炵暀鏁�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Risk__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Risk__c.field-meta.xml
new file mode 100644
index 0000000..80698a1
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Risk__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Risk__c</fullName>
+ <externalId>false</externalId>
+ <formula>Hospital__r.Risk__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>Risk</label>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/RivalHostsNumber__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/RivalHostsNumber__c.field-meta.xml
new file mode 100644
index 0000000..289283c
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/RivalHostsNumber__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>RivalHostsNumber__c</fullName>
+ <externalId>false</externalId>
+ <label>瀵规墜涓绘満鍙版暟</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/SAP_Province_CD__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/SAP_Province_CD__c.field-meta.xml
new file mode 100644
index 0000000..235a6d5
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/SAP_Province_CD__c.field-meta.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>SAP_Province_CD__c</fullName>
+ <description>寮曞悎鐣彿鐢熸垚鏅備娇銇�
+//20230414 澧炲姞娴峰崡
+//20230414 澧炲姞娴峰崡 //20230506 ljh DB202304613639 褰撶渷锛堝鎴凤級=娴峰崡鐪佹椂锛岃浠风紪鐮佷负SY
+//20230524 澧炲姞'OSH-瀹夊窘鐪�','AH'</description>
+ <externalId>false</externalId>
+ <formula>IF(AND(!ISBLANK(OCM_man_province_cus__c),OCM_man_province_cus__c='娴峰崡'),'SY',
+Case(SAP_Province__c,
+'鍖椾含甯�','BJ',
+'澶╂触甯�','TJ',
+'婀栧寳鐪�','HB',
+'鍐呰挋鍙�','NM',
+'榛戦緳姹熺渷','HJ',
+'鍚夋灄鐪�','JL',
+'杈藉畞鐪�','LN',
+'澶ц繛甯�','DL',
+'闄曡タ鐪�','XA',
+'闈掓捣鐪�','QH',
+'瀹佸鑷不鍖�','NX',
+'鐢樿們鐪�','GS',
+'鏂扮枂鑷不鍖�','XJ',
+'灞辫タ鐪�','SX',
+'娌冲崡鐪�','HN',
+'灞变笢鐪�','SD',
+'涓婃捣甯�','SH',
+'姹熻嫃鐪�','JS',
+'姹熻タ鐪�','JX',
+'娴欐睙鐪�','ZJ',
+'瀹夊窘鐪�','AH',
+'OSH-瀹夊窘鐪�','AH', /*20230327 lt add*/
+'绂忓缓鐪�','FJ',
+'骞夸笢鐪�','GD',
+'骞胯タ鑷不鍖�','GX',
+'婀栧崡鐪�','CS',
+'浜戝崡鐪�','YN',
+'璐靛窞鐪�','GZ',
+'鍥涘窛鐪�','SC',
+'閲嶅簡甯�','CQ',
+'娣卞湷甯�','SZ',
+'闈掑矝甯�','QD',
+'娌冲寳鐪�','ZB',
+'瑗胯棌鑷不鍖�','SC',
+'娴峰崡鐪�','GD',
+''
+)
+)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>SAP_Province_CD</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/SAP_Province__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/SAP_Province__c.field-meta.xml
new file mode 100644
index 0000000..93404e9
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/SAP_Province__c.field-meta.xml
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>SAP_Province__c</fullName>
+ <description>鍜岀敤鎴风殑Province__c淇濇寔涓�鑷�</description>
+ <externalId>false</externalId>
+ <inlineHelpText>璺ㄥ尯閿�鍞敤锛屼笂浼犺嚦鐪佸搴旂殑鍖椾笂骞夸粨搴撱�備笟缁╂墧鎸夌収瀹㈡埛鎵�鍦ㄧ渷璁＄畻</inlineHelpText>
+ <label>鐪�(涓婁紶SAP/SPO)</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+ <valueSet>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>瀹夊窘鐪�</fullName>
+ <default>false</default>
+ <label>瀹夊窘鐪�</label>
+ </value>
+ <value>
+ <fullName>鍖椾含甯�</fullName>
+ <default>false</default>
+ <label>鍖椾含甯�</label>
+ </value>
+ <value>
+ <fullName>绂忓缓鐪�</fullName>
+ <default>false</default>
+ <label>绂忓缓鐪�</label>
+ </value>
+ <value>
+ <fullName>鐢樿們鐪�</fullName>
+ <default>false</default>
+ <label>鐢樿們鐪�</label>
+ </value>
+ <value>
+ <fullName>骞夸笢鐪�</fullName>
+ <default>false</default>
+ <label>骞夸笢鐪�</label>
+ </value>
+ <value>
+ <fullName>娣卞湷甯�</fullName>
+ <default>false</default>
+ <label>娣卞湷甯�</label>
+ </value>
+ <value>
+ <fullName>骞胯タ鑷不鍖�</fullName>
+ <default>false</default>
+ <label>骞胯タ鑷不鍖�</label>
+ </value>
+ <value>
+ <fullName>璐靛窞鐪�</fullName>
+ <default>false</default>
+ <label>璐靛窞鐪�</label>
+ </value>
+ <value>
+ <fullName>娌冲寳鐪�</fullName>
+ <default>false</default>
+ <label>娌冲寳鐪�</label>
+ </value>
+ <value>
+ <fullName>娌冲崡鐪�</fullName>
+ <default>false</default>
+ <label>娌冲崡鐪�</label>
+ </value>
+ <value>
+ <fullName>榛戦緳姹熺渷</fullName>
+ <default>false</default>
+ <label>榛戦緳姹熺渷</label>
+ </value>
+ <value>
+ <fullName>婀栧寳鐪�</fullName>
+ <default>false</default>
+ <label>婀栧寳鐪�</label>
+ </value>
+ <value>
+ <fullName>婀栧崡鐪�</fullName>
+ <default>false</default>
+ <label>婀栧崡鐪�</label>
+ </value>
+ <value>
+ <fullName>鍚夋灄鐪�</fullName>
+ <default>false</default>
+ <label>鍚夋灄鐪�</label>
+ </value>
+ <value>
+ <fullName>姹熻嫃鐪�</fullName>
+ <default>false</default>
+ <label>姹熻嫃鐪�</label>
+ </value>
+ <value>
+ <fullName>姹熻タ鐪�</fullName>
+ <default>false</default>
+ <label>姹熻タ鐪�</label>
+ </value>
+ <value>
+ <fullName>杈藉畞鐪�</fullName>
+ <default>false</default>
+ <label>杈藉畞鐪�</label>
+ </value>
+ <value>
+ <fullName>澶ц繛甯�</fullName>
+ <default>false</default>
+ <label>澶ц繛甯�</label>
+ </value>
+ <value>
+ <fullName>鍐呰挋鍙�</fullName>
+ <default>false</default>
+ <label>鍐呰挋鍙�</label>
+ </value>
+ <value>
+ <fullName>瀹佸鑷不鍖�</fullName>
+ <default>false</default>
+ <label>瀹佸鑷不鍖�</label>
+ </value>
+ <value>
+ <fullName>闈掓捣鐪�</fullName>
+ <default>false</default>
+ <label>闈掓捣鐪�</label>
+ </value>
+ <value>
+ <fullName>灞变笢鐪�</fullName>
+ <default>false</default>
+ <label>灞变笢鐪�</label>
+ </value>
+ <value>
+ <fullName>闈掑矝甯�</fullName>
+ <default>false</default>
+ <label>闈掑矝甯�</label>
+ </value>
+ <value>
+ <fullName>灞辫タ鐪�</fullName>
+ <default>false</default>
+ <label>灞辫タ鐪�</label>
+ </value>
+ <value>
+ <fullName>闄曡タ鐪�</fullName>
+ <default>false</default>
+ <label>闄曡タ鐪�</label>
+ </value>
+ <value>
+ <fullName>涓婃捣甯�</fullName>
+ <default>false</default>
+ <label>涓婃捣甯�</label>
+ </value>
+ <value>
+ <fullName>鍥涘窛鐪�</fullName>
+ <default>false</default>
+ <label>鍥涘窛鐪�</label>
+ </value>
+ <value>
+ <fullName>澶╂触甯�</fullName>
+ <default>false</default>
+ <label>澶╂触甯�</label>
+ </value>
+ <value>
+ <fullName>鏂扮枂鑷不鍖�</fullName>
+ <default>false</default>
+ <label>鏂扮枂鑷不鍖�</label>
+ </value>
+ <value>
+ <fullName>浜戝崡鐪�</fullName>
+ <default>false</default>
+ <label>浜戝崡鐪�</label>
+ </value>
+ <value>
+ <fullName>娴欐睙鐪�</fullName>
+ <default>false</default>
+ <label>娴欐睙鐪�</label>
+ </value>
+ <value>
+ <fullName>閲嶅簡甯�</fullName>
+ <default>false</default>
+ <label>閲嶅簡甯�</label>
+ </value>
+ <value>
+ <fullName>娴峰崡鐪�</fullName>
+ <default>false</default>
+ <label>娴峰崡鐪�</label>
+ </value>
+ <value>
+ <fullName>瑗胯棌鑷不鍖�</fullName>
+ <default>false</default>
+ <label>瑗胯棌鑷不鍖�</label>
+ </value>
+ <value>
+ <fullName>OSH-瀹夊窘鐪�</fullName>
+ <default>false</default>
+ <label>OSH-瀹夊窘鐪�</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/SAP_Send_OK_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/SAP_Send_OK_Date__c.field-meta.xml
new file mode 100644
index 0000000..641e8fb
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/SAP_Send_OK_Date__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>SAP_Send_OK_Date__c</fullName>
+ <externalId>false</externalId>
+ <label>15.SAP涓婁紶鏃堕棿</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>DateTime</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/SAP_Send_OK_First_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/SAP_Send_OK_First_Date__c.field-meta.xml
new file mode 100644
index 0000000..ac11634
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/SAP_Send_OK_First_Date__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>SAP_Send_OK_First_Date__c</fullName>
+ <externalId>false</externalId>
+ <label>SAP鍒濇涓婁紶鏃堕棿</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>DateTime</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/SAP_Send_OK__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/SAP_Send_OK__c.field-meta.xml
new file mode 100644
index 0000000..b53bc68
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/SAP_Send_OK__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>SAP_Send_OK__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>SAP涓婁紶(WIN)</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>true</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/SAP_win_elapse_day__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/SAP_win_elapse_day__c.field-meta.xml
new file mode 100644
index 0000000..8ff3b35
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/SAP_win_elapse_day__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>SAP_win_elapse_day__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(ISBLANK(SAP_Send_OK_Date__c),0,today()- DATEVALUE(SAP_Send_OK_Date__c))</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>WIN杩囦簡澶╂暟</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/SFDCLast_Process_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/SFDCLast_Process_Date__c.field-meta.xml
new file mode 100644
index 0000000..2e7f9f5
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/SFDCLast_Process_Date__c.field-meta.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>SFDCLast_Process_Date__c</fullName>
+ <description>*****CHAN-AUE3TB*****Batch SSOpportunity鐨勬墽琛屾暟鎹瓫閫�
+SAP_Send_OK_Date__c => Contract_recognized_day_1__c</description>
+ <externalId>false</externalId>
+ <formula>IF(OR(ISPICKVAL(StageName, '娉ㄦ畫'), ISPICKVAL(StageName, '鍑鸿嵎'), ISPICKVAL(StageName, '瀹屼簡')),
+ IF(If_Account_Change__c,
+ Contract_DB_Finalcomplite_day__c,
+ Contract_recognized_day_1__c
+ ),
+ IF(OR(ISPICKVAL(StageName, '鍓婇櫎'), ISPICKVAL(StageName, '鏁楁垿')),
+ Final_Contract_Proceeded_Date__c,
+ null
+ )
+)</formula>
+ <label>16.SFDC鏈�缁堝鐞嗘棩</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/SI_Decide_ID__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/SI_Decide_ID__c.field-meta.xml
new file mode 100644
index 0000000..2732dce
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/SI_Decide_ID__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>SI_Decide_ID__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>鍐冲畾鐨凷I闇�姹傝〃</label>
+ <referenceTo>IS_Opportunity_Demand__c</referenceTo>
+ <relationshipLabel>涓氬姟鏈轰細</relationshipLabel>
+ <relationshipName>SIDDhXPq</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/SI_FinishedPorj_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/SI_FinishedPorj_Date__c.field-meta.xml
new file mode 100644
index 0000000..ae381c6
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/SI_FinishedPorj_Date__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>SI_FinishedPorj_Date__c</fullName>
+ <externalId>false</externalId>
+ <label>SI-绔ｅ伐鏃�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/SI_Flg__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/SI_Flg__c.field-meta.xml
new file mode 100644
index 0000000..26be311
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/SI_Flg__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>SI_Flg__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>SI璇环</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/SPOApprovedNo__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/SPOApprovedNo__c.field-meta.xml
new file mode 100644
index 0000000..64d9d67
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/SPOApprovedNo__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>SPOApprovedNo__c</fullName>
+ <externalId>false</externalId>
+ <formula>HYPERLINK("https://olympus.sharepoint.cn/sites/GSPWF/OCSM"+MID(NotesApprovedNo__c, 2, 2) +"/SitePages/ContractNew/ContractDisp.aspx?CApplyNum="+NotesApprovedNo__c,NotesApprovedNo__c)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>SPO鍚堝悓鐢宠鍗�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/SPOApprovedQuote__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/SPOApprovedQuote__c.field-meta.xml
new file mode 100644
index 0000000..562280f
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/SPOApprovedQuote__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>SPOApprovedQuote__c</fullName>
+ <externalId>false</externalId>
+ <label>鍚堝悓瀹℃壒瀹屾垚鐨勬姤浠�</label>
+ <length>255</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/SPO_URL__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/SPO_URL__c.field-meta.xml
new file mode 100644
index 0000000..d409210
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/SPO_URL__c.field-meta.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>SPO_URL__c</fullName>
+ <description>bj锛�
+https://olympus.sharepoint.cn/sites/GSPWF/OCSMBJ/Lists/ContractManagement/ContractAdd.aspx?Source=/SitePages/ContractAllTypeViewList.aspx?ListId={232F6078-90AF-4A15-8BA1-AAF0C32F67E5}&TopMenu=%E5%90%88%E5%90%8C%E7%94%B3%E8%AF%B7&LeftMenu=%E7%94%B3%E8%AF%B7%E4%B8%AD</description>
+ <externalId>false</externalId>
+ <formula>if( OR(BEGINS(Opportunity_No__c, 'BJ-'),BEGINS(Opportunity_No__c, 'DB-'),BEGINS(Opportunity_No__c, 'XB-'),BEGINS(Opportunity_No__c, 'HB-')),
+'https://olympus.sharepoint.cn/sites/GSPWF/OCSMBJ/SitePages/ContractNew/ContractAdd.aspx?Source=/SitePages/ContractAllTypeViewList.aspx?ListId={232F6078-90AF-4A15-8BA1-AAF0C32F67E5}&TopMenu=%E5%90%88%E5%90%8C%E7%94%B3%E8%AF%B7&LeftMenu=%E7%94%B3%E8%AF%B7%E4%B8%AD',
+if(OR(BEGINS(Opportunity_No__c, 'SH-'),BEGINS(Opportunity_No__c, 'HD-')),
+'https://olympus.sharepoint.cn/sites/GSPWF/OCSMSH/Lists/ContractManagement/ContractAdd.aspx?Source=/SitePages/ContractAllTypeViewList.aspx?ListId={6373a5f9-4ab0-4bb5-a553-17237a7d943f}&TopMenu=%E5%90%88%E5%90%8C%E7%94%B3%E8%AF%B7&LeftMenu=%E7%94%B3%E8%AF%B7%E4%B8%AD',
+if(OR(BEGINS(Opportunity_No__c, 'GZ-'),BEGINS(Opportunity_No__c, 'HN-'),BEGINS(Opportunity_No__c, 'XN-')),
+'https://olympus.sharepoint.cn/sites/GSPWF/OCSMGZ/Lists/ContractManagement/ContractAdd.aspx?Source=/SitePages/ContractAllTypeViewList.aspx?ListId={B31C9D53-31DA-48D4-83A7-2C77E0A6E603}&TopMenu=%E5%90%88%E5%90%8C%E7%94%B3%E8%AF%B7&LeftMenu=%E7%94%B3%E8%AF%B7%E4%B8%AD',
+'https://olympus.sharepoint.cn/sites/GSPWF/SitePages/HomePage.aspx')))</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>SPO璺宠浆URL</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/SP_Imaging_OPD_target__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/SP_Imaging_OPD_target__c.field-meta.xml
new file mode 100644
index 0000000..81cf614
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/SP_Imaging_OPD_target__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>SP_Imaging_OPD_target__c</fullName>
+ <externalId>false</externalId>
+ <formula>Account.Parent.Important_Product_opd2_number__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>銉籗P鏂颁富鏈� OPD鐩爣瀹㈡埛鏁�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/STMS_Package_Sale__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/STMS_Package_Sale__c.field-meta.xml
new file mode 100644
index 0000000..c921fae
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/STMS_Package_Sale__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>STMS_Package_Sale__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>鑳介噺鎵撳寘</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/S_Install_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/S_Install_Date__c.field-meta.xml
new file mode 100644
index 0000000..006a102
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/S_Install_Date__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>S_Install_Date__c</fullName>
+ <externalId>false</externalId>
+ <label>23.瀹夎鏃�(SI)</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/SaleProvince_SAP__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/SaleProvince_SAP__c.field-meta.xml
new file mode 100644
index 0000000..8cd8c77
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/SaleProvince_SAP__c.field-meta.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>SaleProvince_SAP__c</fullName>
+ <externalId>false</externalId>
+ <formula>CASE(TEXT( SAP_Province__c ),
+"鍖椾含甯�","鍖椾含甯�",
+"澶╂触甯�","澶╂触甯�",
+"娌冲崡鐪�","娌冲崡鐪�",
+"娌冲寳鐪�","娌冲寳鐪�",
+"灞辫タ鐪�","灞辫タ鐪�",
+"鍐呰挋鍙�","鍐呰挋鍙�",
+"灞变笢鐪�","灞变笢鐪�",
+"闄曡タ鐪�","闄曡タ鐪�",
+"闈掓捣鐪�","闈掓捣鐪�",
+"瀹佸鑷不鍖�","瀹佸鑷不鍖�",
+"鐢樿們鐪�","鐢樿們鐪�",
+"鏂扮枂鑷不鍖�","鏂扮枂鑷不鍖�",
+"杈藉畞鐪�","杈藉畞鐪�",
+"榛戦緳姹熺渷","榛戦緳姹熺渷",
+"鍚夋灄鐪�","鍚夋灄鐪�",
+"涓婃捣甯�","涓婃捣甯�",
+"姹熻嫃鐪�","姹熻嫃鐪�",
+"娴欐睙鐪�","娴欐睙鐪�",
+"绂忓缓鐪�","绂忓缓鐪�",
+"瀹夊窘鐪�","瀹夊窘鐪�",
+"OSH-瀹夊窘鐪�","瀹夊窘鐪�", /*20230524 lt add*/
+"姹熻タ鐪�","姹熻タ鐪�",
+"骞夸笢鐪�","骞夸笢鐪�",
+"骞胯タ鑷不鍖�","骞胯タ鑷不鍖�",
+"鍥涘窛鐪�","鍥涘窛鐪�",
+"閲嶅簡甯�","閲嶅簡甯�",
+"浜戝崡鐪�","浜戝崡鐪�",
+"璐靛窞鐪�","璐靛窞鐪�",
+"婀栧寳鐪�","婀栧寳鐪�",
+"婀栧崡鐪�","婀栧崡鐪�",
+"娣卞湷甯�","骞夸笢鐪�",
+"澶ц繛甯�","杈藉畞鐪�",
+"闈掑矝甯�","闈掑矝甯�", /*20230407 lt update 鍘�"闈掑矝甯�","灞变笢鐪�"*/
+"娴峰崡鐪�","娴峰崡鐪�",
+"鍏朵粬")</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鐪�(SAP涓氱哗)</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/SalesPoint_Code__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/SalesPoint_Code__c.field-meta.xml
new file mode 100644
index 0000000..32db465
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/SalesPoint_Code__c.field-meta.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>SalesPoint_Code__c</fullName>
+ <description>//lt 20230524
+IF(TEXT(Trade__c) = '鍐呰部',
+ 'OCM-',
+ 'OHC-'
+) + SalesPoint_Province_CD__c + 'SP'</description>
+ <externalId>false</externalId>
+ <formula>IF(TEXT(SAP_Province__c)='OSH-瀹夊窘鐪�', '', IF(TEXT(Trade__c) = '鍐呰部',
+'OCM-',
+'OHC-'
+)
+) + SalesPoint_Province_CD__c + 'SP'</formula>
+ <label>SalesPoint</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/SalesPoint_Province_CD__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/SalesPoint_Province_CD__c.field-meta.xml
new file mode 100644
index 0000000..f9a9463
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/SalesPoint_Province_CD__c.field-meta.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>SalesPoint_Province_CD__c</fullName>
+ <externalId>false</externalId>
+ <formula>Case(SAP_Province__c,
+'鍖椾含甯�','BJ',
+'澶╂触甯�','TJ',
+'婀栧寳鐪�','HB',
+'鍐呰挋鍙�','NM',
+'榛戦緳姹熺渷','HJ',
+'鍚夋灄鐪�','CC', /* SAP銇甋alespoint 銇� JL=>CC */
+'杈藉畞鐪�','LN',
+'澶ц繛甯�','DL',
+'闄曡タ鐪�','XA',
+'闈掓捣鐪�','QH',
+'瀹佸鑷不鍖�','NX',
+'鐢樿們鐪�','GS',
+'鏂扮枂鑷不鍖�','XJ',
+'灞辫タ鐪�','TY', /* SAP銇甋alespoint 銇� SX=>TY */
+'娌冲崡鐪�','ZZ', /* SAP銇甋alespoint 銇� HN=>ZZ */
+'灞变笢鐪�','SD',
+'涓婃捣甯�','SH',
+'姹熻嫃鐪�','JS',
+'姹熻タ鐪�','JX',
+'娴欐睙鐪�','ZJ',
+'瀹夊窘鐪�','AH',
+'绂忓缓鐪�','FJ',
+'骞夸笢鐪�','GH', /* SAP銇甋alespoint 銇� GD=>GH */
+'骞胯タ鑷不鍖�','GX',
+'婀栧崡鐪�','CS',
+'浜戝崡鐪�','YN',
+'璐靛窞鐪�','GY', /* SAP銇甋alespoint 銇� GZ=>GY */
+'鍥涘窛鐪�','SS', /* SAP銇甋alespoint 銇� SC=>SS */
+'閲嶅簡甯�','CQ',
+'娣卞湷甯�','SZ',
+'闈掑矝甯�','QD',
+'娌冲寳鐪�','ZB',
+'娴峰崡鐪�','HN',
+'瑗胯棌鑷不鍖�','XZ',
+'OSH-瀹夊窘鐪�','OSH-AH', /*20230313 lt add */
+''
+)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>SalesPoint_Province_CD</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Sales_Contract_No__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Sales_Contract_No__c.field-meta.xml
new file mode 100644
index 0000000..cdd7bc3
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Sales_Contract_No__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Sales_Contract_No__c</fullName>
+ <externalId>false</externalId>
+ <label>缁忛攢鍟嗗崗璁紪鐮�</label>
+ <length>50</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Sales_Method__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Sales_Method__c.field-meta.xml
new file mode 100644
index 0000000..e5f6467
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Sales_Method__c.field-meta.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Sales_Method__c</fullName>
+ <externalId>false</externalId>
+ <label>鎷涙爣鏂瑰紡</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+ <valueSet>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>鏀垮簻鎷涙爣</fullName>
+ <default>false</default>
+ <label>鏀垮簻鎷涙爣</label>
+ </value>
+ <value>
+ <fullName>闄㈠唴鎷涙爣</fullName>
+ <default>false</default>
+ <label>闄㈠唴鎷涙爣</label>
+ </value>
+ <value>
+ <fullName>绔熶簤鎬ц皥鍒�(闈炴嫑鏍�)</fullName>
+ <default>false</default>
+ <label>绔熶簤鎬ц皥鍒�</label>
+ </value>
+ <value>
+ <fullName>鍗曚竴鏉ユ簮閲囪喘</fullName>
+ <default>false</default>
+ <label>鍗曚竴鏉ユ簮閲囪喘</label>
+ </value>
+ <value>
+ <fullName>绉佺珛鍖婚櫌閲囪喘</fullName>
+ <default>false</default>
+ <label>绉佺珛鍖婚櫌閲囪喘</label>
+ </value>
+ <value>
+ <fullName>鑰楁潗閲囪喘</fullName>
+ <default>false</default>
+ <label>鑰楁潗閲囪喘</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Sales_Root__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Sales_Root__c.field-meta.xml
new file mode 100644
index 0000000..1de8178
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Sales_Root__c.field-meta.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Sales_Root__c</fullName>
+ <externalId>false</externalId>
+ <label>閿�鍞笭閬�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+ <valueSet>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>璨╁２搴�</fullName>
+ <default>false</default>
+ <label>缁忛攢鍟�</label>
+ </value>
+ <value>
+ <fullName>OCM鐩存帴璨╁２</fullName>
+ <default>false</default>
+ <label>OCSM鐩存帴閿�鍞�</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Sales_Shop_Class__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Sales_Shop_Class__c.field-meta.xml
new file mode 100644
index 0000000..a6a87d9
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Sales_Shop_Class__c.field-meta.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Sales_Shop_Class__c</fullName>
+ <externalId>false</externalId>
+ <formula>CASE (TEXT(Agency1__r.Sales_Shop_Class__c)
+ ,'鐗圭磩璨╁２搴楋紙鍖哄煙锛�','鐗圭害缁忛攢鍟�(鍖哄煙)'
+ ,'鐗圭磩璨╁２搴楋紙瑁藉搧锛�','鐗圭害缁忛攢鍟�(浜у搧)'
+ ,'涓�绱氳博澹插簵','涓�绾х粡閿�鍟�'
+ ,'浜岀礆璨╁２搴�','浜岀骇缁忛攢鍟�'
+ ,'鐗圭磩璨╁２搴楋紙瑁藉搧+鍖哄煙锛�','鐗圭害缁忛攢鍟�(浜у搧+鍖哄煙)'
+ ,'鍖荤枟淇悊缁忛攢鍟�','鍖荤枟淇悊缁忛攢鍟�'
+ ,'銇濄伄浠�','鍏朵粬'
+ ,'鍖哄煙','鍖哄煙'
+ ,'瑁藉搧','浜у搧'
+ ,'瑁藉搧+鍖哄煙','浜у搧+鍖哄煙'
+ ,'闆嗛噰缁忛攢鍟�','闆嗛噰缁忛攢鍟�'
+ ,''
+)</formula>
+ <label>缁忛攢鍟嗗垎绫�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Sales_Shop_Hospital_Contract__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Sales_Shop_Hospital_Contract__c.field-meta.xml
new file mode 100644
index 0000000..e57390e
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Sales_Shop_Hospital_Contract__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Sales_Shop_Hospital_Contract__c</fullName>
+ <externalId>false</externalId>
+ <label>15.缁忛攢鍟�-鍖婚櫌绛剧害鏃�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Sales_Speciality__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Sales_Speciality__c.field-meta.xml
new file mode 100644
index 0000000..7f31974
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Sales_Speciality__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Sales_Speciality__c</fullName>
+ <externalId>false</externalId>
+ <formula>text(Owner.Sales_Speciality__c)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>閿�鍞伐浣滃唴瀹�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Sales_assistantWIN_ID__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Sales_assistantWIN_ID__c.field-meta.xml
new file mode 100644
index 0000000..0e47e90
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Sales_assistantWIN_ID__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Sales_assistantWIN_ID__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <description>鏈�鍚庡仛WIN鐨勫姪鐞咺D</description>
+ <externalId>false</externalId>
+ <label>璇环鍔╃悊ID(WIN)</label>
+ <referenceTo>User</referenceTo>
+ <relationshipName>Sales_assistantIDWIN</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Sales_assistantWIN_Mail__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Sales_assistantWIN_Mail__c.field-meta.xml
new file mode 100644
index 0000000..fd34225
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Sales_assistantWIN_Mail__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Sales_assistantWIN_Mail__c</fullName>
+ <description>璇环鍔╃悊鐨勯偖浠跺湴鍧�</description>
+ <externalId>false</externalId>
+ <label>璇环鍔╃悊閭欢鍦板潃(WIN)</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Email</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Sales_assistant_ID__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Sales_assistant_ID__c.field-meta.xml
new file mode 100644
index 0000000..0c332b1
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Sales_assistant_ID__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Sales_assistant_ID__c</fullName>
+ <externalId>false</externalId>
+ <formula>Sales_assistant_name_text__r.Id</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>璇环鍔╃悊ID</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Sales_assistant_name__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Sales_assistant_name__c.field-meta.xml
new file mode 100644
index 0000000..c3faef3
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Sales_assistant_name__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Sales_assistant_name__c</fullName>
+ <externalId>false</externalId>
+ <formula>Sales_assistant_name_text__r.Alias__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>璇环鍔╃悊</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Sales_assistant_name_text__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Sales_assistant_name_text__c.field-meta.xml
new file mode 100644
index 0000000..f3857ef
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Sales_assistant_name_text__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Sales_assistant_name_text__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>璇环鍔╃悊锛堟枃鏈級</label>
+ <referenceTo>User</referenceTo>
+ <relationshipName>Sales_assistant_name</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Sales_forecast_YM_BA__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Sales_forecast_YM_BA__c.field-meta.xml
new file mode 100644
index 0000000..2a8de11
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Sales_forecast_YM_BA__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Sales_forecast_YM_BA__c</fullName>
+ <externalId>false</externalId>
+ <formula>SUBSTITUTE(Mid(Text(Sales_forecast_day_BA__c), 3, 5), "-", "骞�") + "鏈�"</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>棰勬祴OCSM绛剧害骞存湀</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Sales_forecast_day_BA__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Sales_forecast_day_BA__c.field-meta.xml
new file mode 100644
index 0000000..b387cfd
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Sales_forecast_day_BA__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Sales_forecast_day_BA__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(Close_Forecasted_Date__c < today(),today(),Close_Forecasted_Date__c)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>棰勬祴OCSM绛剧害鏃�(BA)</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Sales_incharge__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Sales_incharge__c.field-meta.xml
new file mode 100644
index 0000000..26a5411
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Sales_incharge__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Sales_incharge__c</fullName>
+ <externalId>false</externalId>
+ <formula>HYPERLINK
+("/00O10000002lsWI?pv0=" + OwnerId, Owner_System__r.Alias__c )</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>璇环鎷呭綋浜�(涓氱哗)</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Sales_manager_departmentID__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Sales_manager_departmentID__c.field-meta.xml
new file mode 100644
index 0000000..f932933
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Sales_manager_departmentID__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Sales_manager_departmentID__c</fullName>
+ <externalId>false</externalId>
+ <formula>Owner.SalesManager__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>璇环鎵�鏈変汉鐨勭粡鐞咺D</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Sales_owner_buchangID__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Sales_owner_buchangID__c.field-meta.xml
new file mode 100644
index 0000000..0d0a415
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Sales_owner_buchangID__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Sales_owner_buchangID__c</fullName>
+ <externalId>false</externalId>
+ <formula>Owner.BuchangApprovalManagerSales__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>璇环鎵�鏈変汉鐨勬�荤洃ID</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Sales_owner_buchang__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Sales_owner_buchang__c.field-meta.xml
new file mode 100644
index 0000000..6137926
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Sales_owner_buchang__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Sales_owner_buchang__c</fullName>
+ <externalId>false</externalId>
+ <formula>Owner.BuchangApprovalManagerSalesname__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>璇环鎵�鏈変汉鐨勬�荤洃</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Sales_window_text__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Sales_window_text__c.field-meta.xml
new file mode 100644
index 0000000..2842821
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Sales_window_text__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Sales_window_text__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>閿�鍞儴绐楀彛锛堟枃鏈級</label>
+ <referenceTo>User</referenceTo>
+ <relationshipName>Sales_window</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/SalesdepartmentForecastTxt__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/SalesdepartmentForecastTxt__c.field-meta.xml
new file mode 100644
index 0000000..506cb8a
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/SalesdepartmentForecastTxt__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>SalesdepartmentForecastTxt__c</fullName>
+ <externalId>false</externalId>
+ <label>鏈儴(棰勬祴鏂囨湰)</label>
+ <length>255</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/SalesdepartmentForecast_Snapshot__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/SalesdepartmentForecast_Snapshot__c.field-meta.xml
new file mode 100644
index 0000000..a81855d
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/SalesdepartmentForecast_Snapshot__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>SalesdepartmentForecast_Snapshot__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF( ISBLANK(SalesdepartmentForecast_lastmonth__c) ,SalesdepartmentForecast__c,SalesdepartmentForecast_lastmonth__c)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏈儴(棰勬祴蹇収鐢�)</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/SalesdepartmentForecast__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/SalesdepartmentForecast__c.field-meta.xml
new file mode 100644
index 0000000..0d43d2b
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/SalesdepartmentForecast__c.field-meta.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>SalesdepartmentForecast__c</fullName>
+ <externalId>false</externalId>
+ <formula>if(Equipment_Order_Flg__c = true,'鍏朵粬',
+if(OCM_man_province_txt__c='鑳介噺','7.鑳介噺',
+if(OCM_man_province_txt__c='澶栫鏈儴','澶栫',
+if(OCM_man_province_txt__c='甯傚満','甯傚満',
+if(OCM_man_province_txt__c='缁忛攢鍟嗙鐞嗘湰閮�','缁忛攢鍟�',
+ Case(OCM_man_province_cus_txt__c,
+ '灞辫タ','3.瑗垮寳',
+ '闄曡タ','3.瑗垮寳',
+ '娌冲崡','3.瑗垮寳',
+ '鏂扮枂','3.瑗垮寳',
+ '鐢樿們','3.瑗垮寳',
+ '瀹佸','3.瑗垮寳',
+ '闈掓捣','3.瑗垮寳',
+ '鍥涘窛/瑗胯棌','4.瑗垮崡',
+ '閲嶅簡','4.瑗垮崡',
+ '璐靛窞','4.瑗垮崡',
+ '浜戝崡','4.瑗垮崡',
+ '涓婃捣','5.鍗庝笢',
+ '姹熻嫃','5.鍗庝笢',
+ '绂忓缓','5.鍗庝笢',
+ '姹熻タ','5.鍗庝笢',
+ '娴欐睙','5.鍗庝笢',
+ '瀹夊窘','5.鍗庝笢',
+ '骞夸笢','6.鍗庡崡',
+ '娣卞湷','6.鍗庡崡',
+ '娴峰崡','6.鍗庡崡',
+ '婀栧寳','6.鍗庡崡',
+ '婀栧崡','6.鍗庡崡',
+ '骞胯タ','6.鍗庡崡',
+ '鍖椾含','1.鍗庡寳',
+ '鍐呰挋鍙�','1.鍗庡寳',
+ '娌冲寳','1.鍗庡寳',
+ '澶╂触','1.鍗庡寳',
+ '灞变笢','1.鍗庡寳',
+ '闈掑矝','1.鍗庡寳', /*20230407 lt add*/
+ '榛戦緳姹�','2.涓滃寳',
+ '鍚夋灄','2.涓滃寳',
+ '杈藉畞','2.涓滃寳',
+ '澶ц繛','2.涓滃寳',
+ '娌堥槼','2.涓滃寳',
+ ''
+))))))</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏈儴(棰勬祴)</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/SalesdepartmentForecast_lastmonth__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/SalesdepartmentForecast_lastmonth__c.field-meta.xml
new file mode 100644
index 0000000..c395add
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/SalesdepartmentForecast_lastmonth__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>SalesdepartmentForecast_lastmonth__c</fullName>
+ <externalId>false</externalId>
+ <label>鏈儴(棰勬祴涓婃湀)</label>
+ <length>255</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Salesdepartment_Owner_Snapshot__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Salesdepartment_Owner_Snapshot__c.field-meta.xml
new file mode 100644
index 0000000..d434a29
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Salesdepartment_Owner_Snapshot__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Salesdepartment_Owner_Snapshot__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF( ISBLANK(Salesdepartment_Owner_lastmonth__c) ,Salesdepartment_Owner__c,Salesdepartment_Owner_lastmonth__c)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏈儴(鎵�鏈変汉蹇収鐢級</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Salesdepartment_Owner__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Salesdepartment_Owner__c.field-meta.xml
new file mode 100644
index 0000000..c0e399c
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Salesdepartment_Owner__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Salesdepartment_Owner__c</fullName>
+ <description>Owner.Salesdepartment__c</description>
+ <externalId>false</externalId>
+ <formula>if(Equipment_Order_Flg__c = true,'鍏朵粬',if(Owner.Salesdepartment__c='甯傚満浼佸垝鏈儴','甯傚満',Owner.Salesdepartment__c))</formula>
+ <label>鏈儴(鎵�鏈変汉)</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Salesdepartment_Owner_lastmonth__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Salesdepartment_Owner_lastmonth__c.field-meta.xml
new file mode 100644
index 0000000..c322241
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Salesdepartment_Owner_lastmonth__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Salesdepartment_Owner_lastmonth__c</fullName>
+ <externalId>false</externalId>
+ <label>鏈儴(鎵�鏈変汉涓婃湀)</label>
+ <length>255</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Salesdepartment_Owner_txt__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Salesdepartment_Owner_txt__c.field-meta.xml
new file mode 100644
index 0000000..0c3fb38
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Salesdepartment_Owner_txt__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Salesdepartment_Owner_txt__c</fullName>
+ <externalId>false</externalId>
+ <label>鏈儴(鎵�鏈変汉鏂囨湰)</label>
+ <length>50</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Salesdepartment_SAP__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Salesdepartment_SAP__c.field-meta.xml
new file mode 100644
index 0000000..e479af4
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Salesdepartment_SAP__c.field-meta.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Salesdepartment_SAP__c</fullName>
+ <description>FY24淇敼 闆嗛噰璇捐浠蜂粠瀹㈡埛鐨勭渷鍒ゆ柇鏈儴锛屽叾浠栨部鐢⊿AP涓婁紶鐪�
+20230809 鐩爣璋冩暣锛岀洰鏍囪浠峰彇sap鐪侊紝涓�鑸浠峰彇瀹㈡埛鐪�
+if(Equipment_Order_Flg__c = true,'鍏朵粬',
+CASE(IF(Group_purchase_PCL__c, Account.OCM_man_province_txt__c, TEXT( SAP_Province__c )),
+"鍖椾含甯�","1.鍗庡寳",
+"澶╂触甯�","1.鍗庡寳",
+"娌冲崡鐪�","3.瑗垮寳",
+"娌冲寳鐪�","1.鍗庡寳",
+"灞辫タ鐪�","3.瑗垮寳",
+"鍐呰挋鍙�","1.鍗庡寳",
+"灞变笢鐪�","1.鍗庡寳",
+"闄曡タ鐪�","3.瑗垮寳",
+"闈掓捣鐪�","3.瑗垮寳",
+"瀹佸鑷不鍖�","3.瑗垮寳",
+"鐢樿們鐪�","3.瑗垮寳",
+"鏂扮枂鑷不鍖�","3.瑗垮寳",
+"杈藉畞鐪�","2.涓滃寳",
+"榛戦緳姹熺渷","2.涓滃寳",
+"鍚夋灄鐪�","2.涓滃寳",
+"涓婃捣甯�","5.鍗庝笢",
+"姹熻嫃鐪�","5.鍗庝笢",
+"娴欐睙鐪�","5.鍗庝笢",
+"绂忓缓鐪�","5.鍗庝笢",
+"瀹夊窘鐪�","5.鍗庝笢",
+"OSH-瀹夊窘鐪�","5.鍗庝笢", /*20230327 lt add*/
+"姹熻タ鐪�","5.鍗庝笢",
+"骞夸笢鐪�","6.鍗庡崡",
+"骞胯タ鑷不鍖�","6.鍗庡崡",
+"鍥涘窛鐪�","4.瑗垮崡",
+"閲嶅簡甯�","4.瑗垮崡",
+"浜戝崡鐪�","4.瑗垮崡",
+"璐靛窞鐪�","4.瑗垮崡",
+"婀栧寳鐪�","6.鍗庡崡",
+"婀栧崡鐪�","6.鍗庡崡",
+"娣卞湷甯�","6.鍗庡崡",
+"澶ц繛甯�","2.涓滃寳",
+"闈掑矝甯�","1.鍗庡寳",
+"娴峰崡鐪�","6.鍗庡崡",
+"鍏朵粬"))</description>
+ <externalId>false</externalId>
+ <formula>if( RecordType.Id ='01210000000QekP',
+ Case(Text(SAP_Province__c),
+'鍖椾含甯�','1.鍗庡寳',
+'澶╂触甯�','1.鍗庡寳',
+'灞变笢鐪�','1.鍗庡寳',
+'闈掑矝甯�','1.鍗庡寳',
+'鍐呰挋鍙�','1.鍗庡寳',
+'娌冲寳鐪�','1.鍗庡寳',
+'榛戦緳姹熺渷','2.涓滃寳',
+'榛戦緳姹�','2.涓滃寳',
+'鍚夋灄鐪�','2.涓滃寳',
+'杈藉畞鐪�','2.涓滃寳',
+'澶ц繛甯�','2.涓滃寳',
+'瀹佸鑷不鍖�','3.瑗垮寳',
+'闈掓捣鐪�','3.瑗垮寳',
+'灞辫タ鐪�','3.瑗垮寳',
+'闄曡タ鐪�','3.瑗垮寳',
+'鏂扮枂鑷不鍖�','3.瑗垮寳',
+'鐢樿們鐪�','3.瑗垮寳',
+'娌冲崡鐪�','3.瑗垮寳',
+'璐靛窞鐪�','4.瑗垮崡',
+'浜戝崡鐪�','4.瑗垮崡',
+'鍥涘窛鐪�','4.瑗垮崡',
+'閲嶅簡甯�','4.瑗垮崡',
+'瑗胯棌鑷不鍖�','4.瑗垮崡',
+'娴欐睙鐪�','5.鍗庝笢',
+'涓婃捣甯�','5.鍗庝笢',
+'绂忓缓鐪�','5.鍗庝笢',
+'姹熻嫃鐪�','5.鍗庝笢',
+'姹熻タ鐪�','5.鍗庝笢',
+'瀹夊窘鐪�','5.鍗庝笢',
+'骞胯タ鑷不鍖�','6.鍗庡崡',
+'娴峰崡鐪�','6.鍗庡崡',
+'骞夸笢鐪�','6.鍗庡崡',
+'婀栧崡鐪�','6.鍗庡崡',
+'婀栧寳鐪�','6.鍗庡崡',
+'娣卞湷甯�','6.鍗庡崡',
+ '鍏朵粬'),
+
+if(OR(Equipment_Order_Flg__c = true,!isBlank(Text(CelonOpportunity__c))),'鍏朵粬',
+if(Owner.Salesdepartment__c='甯傚満浼佸垝鏈儴', '甯傚満',
+CASE(IF( Account.RecordType.Id <> '01210000000QjCN',Hospital__r.OCM_man_province_txt__c,
+Account.OCM_man_province_txt__c ) ,
+"娌冲寳","1.鍗庡寳",
+"灞变笢","1.鍗庡寳",
+"闈掑矝","1.鍗庡寳",
+"澶╂触","1.鍗庡寳",
+"鍖椾含","1.鍗庡寳",
+"鍐呰挋鍙�","1.鍗庡寳",
+"榛戦緳姹�","2.涓滃寳",
+"鍚夋灄","2.涓滃寳",
+"澶ц繛","2.涓滃寳",
+"娌堥槼","2.涓滃寳",
+"鐢樿們","3.瑗垮寳",
+"娌冲崡","3.瑗垮寳",
+"闄曡タ","3.瑗垮寳",
+"瀹佸","3.瑗垮寳",
+"闈掓捣","3.瑗垮寳",
+"鏂扮枂","3.瑗垮寳",
+"灞辫タ","3.瑗垮寳",
+"閲嶅簡","4.瑗垮崡",
+"璐靛窞","4.瑗垮崡",
+"鍥涘窛/瑗胯棌","4.瑗垮崡",
+"浜戝崡","4.瑗垮崡",
+"姹熻嫃","5.鍗庝笢",
+"姹熻タ","5.鍗庝笢",
+"瀹夊窘","5.鍗庝笢",
+"绂忓缓","5.鍗庝笢",
+"娴欐睙","5.鍗庝笢",
+"涓婃捣","5.鍗庝笢",
+"骞夸笢","6.鍗庡崡",
+"骞胯タ","6.鍗庡崡",
+"婀栧寳","6.鍗庡崡",
+"婀栧崡","6.鍗庡崡",
+"娣卞湷","6.鍗庡崡",
+"娴峰崡","6.鍗庡崡",
+"鍏朵粬"))))</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏈儴(涓氱哗)</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Segment__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Segment__c.field-meta.xml
new file mode 100644
index 0000000..065f9f7
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Segment__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Segment__c</fullName>
+ <externalId>false</externalId>
+ <formula>Account.HP_OCM_Category_From_Dept__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>Segment</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/SeparateBillMark__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/SeparateBillMark__c.field-meta.xml
new file mode 100644
index 0000000..64e2e91
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/SeparateBillMark__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>SeparateBillMark__c</fullName>
+ <description>鎷嗗崟鏍囪 - 浣滀负涓棿鏍囪浣跨敤,鏃犲疄闄呮剰涔�,璇蜂繚鐣�</description>
+ <externalId>false</externalId>
+ <label>绯荤粺鐢–heck</label>
+ <length>255</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/SeparateBill__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/SeparateBill__c.field-meta.xml
new file mode 100644
index 0000000..bb89b47
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/SeparateBill__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>SeparateBill__c</fullName>
+ <defaultValue>false</defaultValue>
+ <description>璁板綍璇环鏄�氳繃鎷嗗崟鎸夐挳鍒涘缓</description>
+ <externalId>false</externalId>
+ <label>鎷嗗崟璁板綍</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Set_Target_DC_wave__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Set_Target_DC_wave__c.field-meta.xml
new file mode 100644
index 0000000..30f4dcc
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Set_Target_DC_wave__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Set_Target_DC_wave__c</fullName>
+ <externalId>false</externalId>
+ <formula>Account.Parent.Set_Target_DC_wave__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏄惁璁惧畾瀹㈡埛锛堟垬鐣ョ瀹わ級</label>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Sfdc_Bidding_No__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Sfdc_Bidding_No__c.field-meta.xml
new file mode 100644
index 0000000..b1a22ca
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Sfdc_Bidding_No__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Sfdc_Bidding_No__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF (!ISBLANK(Bidding_Project_Name_Bid__c),
+ HYPERLINK('/'+Bidding_Project_Name_Bid__c,Bidding_Project_Name_Bid__r.TenderManageCode__c ,'_blank'), '')</formula>
+ <label>椤圭洰:SFDC缂栫爜</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/ShippedAmount153P_DN__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/ShippedAmount153P_DN__c.field-meta.xml
new file mode 100644
index 0000000..e091075
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/ShippedAmount153P_DN__c.field-meta.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ShippedAmount153P_DN__c</fullName>
+ <description>2023-2-10 淇敼澧炲姞閫�璐�</description>
+ <externalId>false</externalId>
+ <label>153P鍙戣揣閲戦_鍏冿紙鍚◣锛�(DN)</label>
+ <summarizedField>Statu_Achievements__c.ShippedAmount153P_DN_A__c</summarizedField>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.Valid_Statu_Achievements1__c</field>
+ <operation>equals</operation>
+ <value>1</value>
+ </summaryFilterItems>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.FALSE_Order__c</field>
+ <operation>notEqual</operation>
+ <value>FALSE</value>
+ </summaryFilterItems>
+ <summaryForeignKey>Statu_Achievements__c.Opportunity__c</summaryForeignKey>
+ <summaryOperation>sum</summaryOperation>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Summary</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/ShippedAmount_All_Cost__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/ShippedAmount_All_Cost__c.field-meta.xml
new file mode 100644
index 0000000..3b5c612
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/ShippedAmount_All_Cost__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ShippedAmount_All_Cost__c</fullName>
+ <externalId>false</externalId>
+ <formula>ShippedAmount_DN__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>宸插彂璐ч噾棰�(鍚◣)_鍏僟Cost</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/ShippedAmount_All_Cost_notax__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/ShippedAmount_All_Cost_notax__c.field-meta.xml
new file mode 100644
index 0000000..0243a6e
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/ShippedAmount_All_Cost_notax__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ShippedAmount_All_Cost_notax__c</fullName>
+ <externalId>false</externalId>
+ <formula>NetWorthNoProviston_DN__c * IF(Text(Trade__c) == "澶栬部", Tax_Foreign_F_Copy__c, 1)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>宸插彂璐ч噾棰�(涓嶅惈绋�)_鍏僟Cost</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/ShippedAmount_All_backup__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/ShippedAmount_All_backup__c.field-meta.xml
new file mode 100644
index 0000000..4141ebc
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/ShippedAmount_All_backup__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ShippedAmount_All_backup__c</fullName>
+ <externalId>false</externalId>
+ <label>宸插彂璐ч噾棰�(鍚◣)_姣�3涓伐浣滄棩</label>
+ <precision>15</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/ShippedAmount_DN__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/ShippedAmount_DN__c.field-meta.xml
new file mode 100644
index 0000000..2a404aa
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/ShippedAmount_DN__c.field-meta.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ShippedAmount_DN__c</fullName>
+ <externalId>false</externalId>
+ <label>(鍚庡彴鐢�)/宸插彂璐ч噾棰�(鍚◣DN)</label>
+ <summarizedField>Statu_Achievements__c.ShippedAmount_DN_All__c</summarizedField>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.Valid_Statu_Achievements__c</field>
+ <operation>equals</operation>
+ <value>1</value>
+ </summaryFilterItems>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.FALSE_Order__c</field>
+ <operation>notEqual</operation>
+ <value>FALSE</value>
+ </summaryFilterItems>
+ <summaryForeignKey>Statu_Achievements__c.Opportunity__c</summaryForeignKey>
+ <summaryOperation>sum</summaryOperation>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Summary</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/ShippedAmount_Sum__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/ShippedAmount_Sum__c.field-meta.xml
new file mode 100644
index 0000000..d3f1b25
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/ShippedAmount_Sum__c.field-meta.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ShippedAmount_Sum__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(SAP_Send_OK__c && (Agency1__r.Special__c || Agency2__r.Special__c || Account.Parent.Special__c) && $User.ViewSpecialAgencyAmout__c == False, null,
+ShippedAmount_ThisYear_PA_SumTxt__c+ TxtShippedAmount_ThisYear_PB_Sum__c
+)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>宸插彂璐ч噾棰�(鍚◣)(148P)_Sum</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/ShippedAmount_ThisYear_PATxt__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/ShippedAmount_ThisYear_PATxt__c.field-meta.xml
new file mode 100644
index 0000000..9afb613
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/ShippedAmount_ThisYear_PATxt__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ShippedAmount_ThisYear_PATxt__c</fullName>
+ <externalId>false</externalId>
+ <label>宸插彂璐ч噾棰�(鍚◣)(148PA)_鍏僒xt</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/ShippedAmount_ThisYear_PA_SumTxt__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/ShippedAmount_ThisYear_PA_SumTxt__c.field-meta.xml
new file mode 100644
index 0000000..bb67310
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/ShippedAmount_ThisYear_PA_SumTxt__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ShippedAmount_ThisYear_PA_SumTxt__c</fullName>
+ <externalId>false</externalId>
+ <label>宸插彂璐ч噾棰�(鍚◣)(148PA)_SumTxt</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/ShippedAmount_ThisYear_PBTxt__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/ShippedAmount_ThisYear_PBTxt__c.field-meta.xml
new file mode 100644
index 0000000..03b24ad
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/ShippedAmount_ThisYear_PBTxt__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ShippedAmount_ThisYear_PBTxt__c</fullName>
+ <externalId>false</externalId>
+ <label>宸插彂璐ч噾棰�(鍚◣)(148PB)_鍏僒xt</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/ShippedAmount_ThisYear_withoutax_PACP__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/ShippedAmount_ThisYear_withoutax_PACP__c.field-meta.xml
new file mode 100644
index 0000000..1ab9ba4
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/ShippedAmount_ThisYear_withoutax_PACP__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ShippedAmount_ThisYear_withoutax_PACP__c</fullName>
+ <externalId>false</externalId>
+ <label>宸插彂璐ч噾棰�(涓嶅惈绋�)(148PA)_鍏�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/ShippedAmount_ThisYear_withoutax_PBCP__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/ShippedAmount_ThisYear_withoutax_PBCP__c.field-meta.xml
new file mode 100644
index 0000000..e1ea80d
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/ShippedAmount_ThisYear_withoutax_PBCP__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ShippedAmount_ThisYear_withoutax_PBCP__c</fullName>
+ <externalId>false</externalId>
+ <label>宸插彂璐ч噾棰�(涓嶅惈绋�)(148PB)_鍏�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/ShippedAmount__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/ShippedAmount__c.field-meta.xml
new file mode 100644
index 0000000..a484d2c
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/ShippedAmount__c.field-meta.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ShippedAmount__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(SAP_Send_OK__c && (Agency1__r.Special__c || Agency2__r.Special__c || Account.Parent.Special__c) && $User.ViewSpecialAgencyAmout__c == False, null,
+ShippedAmount_ThisYear_PATxt__c + ShippedAmount_ThisYear_PBTxt__c
+)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>宸插彂璐ч噾棰�(鍚◣)(148P)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/ShippedAmount_without_tax_ThousandY__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/ShippedAmount_without_tax_ThousandY__c.field-meta.xml
new file mode 100644
index 0000000..c5f24b1
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/ShippedAmount_without_tax_ThousandY__c.field-meta.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ShippedAmount_without_tax_ThousandY__c</fullName>
+ <description>//20230411 lt update
+ShippedAmount_without_tax_new__c/1000</description>
+ <externalId>false</externalId>
+ <formula>IF(SAP_Send_OK__c && (Agency1__r.Special__c || Agency2__r.Special__c || Account.Parent.Special__c) && $User.ViewSpecialAgencyAmout__c == False, null,
+ShippedAmount_All_Cost_notax__c
+)/1000</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>宸插彂璐ч噾棰�(KRMB)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/ShippingDate_For_Report__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/ShippingDate_For_Report__c.field-meta.xml
new file mode 100644
index 0000000..54a61f1
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/ShippingDate_For_Report__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ShippingDate_For_Report__c</fullName>
+ <externalId>false</externalId>
+ <label>鏃ユ湡(涓氱哗缁熻鐢�)</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Shipping_Date_For_Report__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Shipping_Date_For_Report__c.field-meta.xml
new file mode 100644
index 0000000..6e17d0e
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Shipping_Date_For_Report__c.field-meta.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Shipping_Date_For_Report__c</fullName>
+ <description>Shipping_Finished_Day_Func__c 銈掍娇銈忋仾銇勭悊鐢便伅銆佹暟寮忋伄銈炽兂銉戙偆銉暦銇曘倰绡�绱勩仚銈嬨仧銈�
+2022.1.11
+Case( StageName,
+"寮曞悎", CloseDate,
+"娉ㄦ畫", CloseDate,
+"鍑鸿嵎", Shipping_Finished_Day__c,
+"瀹屼簡", Shipping_Finished_Day__c,
+CloseDate)</description>
+ <externalId>false</externalId>
+ <formula>Case( StageName,
+"鍑鸿嵎", Shipping_Finished_Day__c,
+"瀹屼簡", Shipping_Finished_Day__c,
+CloseDate)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏃ユ湡(鍙戣揣鏃�)鈽�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Shipping_Finished_Day_Func__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Shipping_Finished_Day_Func__c.field-meta.xml
new file mode 100644
index 0000000..028c17b
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Shipping_Finished_Day_Func__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Shipping_Finished_Day_Func__c</fullName>
+ <externalId>false</externalId>
+ <formula>if ( or( text(StageName) = '鍑鸿嵎', text(StageName) = '瀹屼簡'), Last_Shipping_Date__c ,null)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>22.鏈�鏂板彂璐ф棩</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Shipping_Finished_Day__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Shipping_Finished_Day__c.field-meta.xml
new file mode 100644
index 0000000..06fe7e0
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Shipping_Finished_Day__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Shipping_Finished_Day__c</fullName>
+ <externalId>false</externalId>
+ <label>22.璁㈠崟鍙戣揣瀹屾瘯鏃�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Sight2SendEmail_flag__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Sight2SendEmail_flag__c.field-meta.xml
new file mode 100644
index 0000000..f965f5b
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Sight2SendEmail_flag__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Sight2SendEmail_flag__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>绛剧害2鍙戦�侀偖浠舵爣璇�</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/SightSendEmail_flag__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/SightSendEmail_flag__c.field-meta.xml
new file mode 100644
index 0000000..4245510
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/SightSendEmail_flag__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>SightSendEmail_flag__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>绛剧害鍙戦�侀偖浠舵爣璇�</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Sign_Contract_Electronically__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Sign_Contract_Electronically__c.field-meta.xml
new file mode 100644
index 0000000..ff41ed8
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Sign_Contract_Electronically__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Sign_Contract_Electronically__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>鏄惁鐢靛瓙绛�</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Sign_Time__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Sign_Time__c.field-meta.xml
new file mode 100644
index 0000000..d3fc123
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Sign_Time__c.field-meta.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Sign_Time__c</fullName>
+ <description>20230206ws淇敼鍓嶏細
+IF(text(ConfirmationofAward__c) == 'OLY涓爣',IF(Contract_recognized_day_1__c - Closing_Bid_Date__c <= 60, 1, 0),null)</description>
+ <externalId>false</externalId>
+ <formula>if(text(ConfirmationofAward__c) == 'OLY涓爣',IF( ISNULL(Contract_recognized_day_1__c) , IF(TODAY() - Closing_Bid_Date__c <=60, null, 0) , IF( Contract_recognized_day_1__c -
+Closing_Bid_Date__c <= 60 , 1, 0 ) ),null)</formula>
+ <label>鏄惁鎸夋椂绛剧害</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Situation_last_update_day__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Situation_last_update_day__c.field-meta.xml
new file mode 100644
index 0000000..496ef90
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Situation_last_update_day__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Situation_last_update_day__c</fullName>
+ <externalId>false</externalId>
+ <label>3.鏈�鍚庢洿鏂版棩-璇环璺熻繘鎯呭喌</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Spare_Application_Singular__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Spare_Application_Singular__c.field-meta.xml
new file mode 100644
index 0000000..9287c2f
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Spare_Application_Singular__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Spare_Application_Singular__c</fullName>
+ <externalId>false</externalId>
+ <label>澶囧搧鐢宠鍗曟暟</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/SpecialAgency_Text__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/SpecialAgency_Text__c.field-meta.xml
new file mode 100644
index 0000000..b35ab4e
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/SpecialAgency_Text__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>SpecialAgency_Text__c</fullName>
+ <externalId>false</externalId>
+ <label>鐗圭害缁忛攢鍟嗗悕绉�</label>
+ <length>255</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/SpecialAgency__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/SpecialAgency__c.field-meta.xml
new file mode 100644
index 0000000..fa57ccb
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/SpecialAgency__c.field-meta.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>SpecialAgency__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <description>DB202310310867 鐗圭害缁忛攢鍟嗗崗璁煡鎵惧瓧娈�</description>
+ <externalId>false</externalId>
+ <label>鐗圭害缁忛攢鍟嗗崗璁�</label>
+ <referenceTo>Account</referenceTo>
+ <relationshipLabel>涓氬姟鏈轰細 (鐗圭害缁忛攢鍟�)</relationshipLabel>
+ <relationshipName>OppSpecialAgency</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/SpecialApplyMemo__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/SpecialApplyMemo__c.field-meta.xml
new file mode 100644
index 0000000..1abefa8
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/SpecialApplyMemo__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>SpecialApplyMemo__c</fullName>
+ <externalId>false</externalId>
+ <label>鐗规畩瀵瑰簲鏍�</label>
+ <length>1000</length>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>LongTextArea</type>
+ <visibleLines>3</visibleLines>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/SpecialApply__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/SpecialApply__c.field-meta.xml
new file mode 100644
index 0000000..71b7c0c
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/SpecialApply__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>SpecialApply__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>鏈�鏂扮壒娈婂搴�</label>
+ <referenceTo>OpportunitySpecialApply__c</referenceTo>
+ <relationshipLabel>涓氬姟鏈轰細</relationshipLabel>
+ <relationshipName>SpecialApplyNew</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Special_Apply_Content__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Special_Apply_Content__c.field-meta.xml
new file mode 100644
index 0000000..2058bbd
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Special_Apply_Content__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Special_Apply_Content__c</fullName>
+ <externalId>false</externalId>
+ <label>鏈�鏂扮壒娈婂搴�-鏈湀鐢宠</label>
+ <length>50</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Special_Apply_Reason__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Special_Apply_Reason__c.field-meta.xml
new file mode 100644
index 0000000..11e0fef
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Special_Apply_Reason__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Special_Apply_Reason__c</fullName>
+ <externalId>false</externalId>
+ <label>鏈�鏂扮壒娈婂搴�-鐞嗙敱</label>
+ <length>255</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Special_Approval_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Special_Approval_Date__c.field-meta.xml
new file mode 100644
index 0000000..c53ec21
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Special_Approval_Date__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Special_Approval_Date__c</fullName>
+ <externalId>false</externalId>
+ <label>鏈�鏂扮壒娈婂搴�-鎵瑰噯鏃�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Special_Opp_lanhai__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Special_Opp_lanhai__c.field-meta.xml
new file mode 100644
index 0000000..2733e77
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Special_Opp_lanhai__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Special_Opp_lanhai__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>钃濇捣璇环</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Special_Stage__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Special_Stage__c.field-meta.xml
new file mode 100644
index 0000000..90e25a6
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Special_Stage__c.field-meta.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Special_Stage__c</fullName>
+ <externalId>false</externalId>
+ <label>璇环闃舵(钃濇捣) 涓嶇敤</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+ <valueSet>
+ <restricted>true</restricted>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>璇环涓�</fullName>
+ <default>true</default>
+ <label>0.璇环涓�</label>
+ </value>
+ <value>
+ <fullName>宸茬‘璁ら厤缃�</fullName>
+ <default>false</default>
+ <label>1.宸茬‘璁ら厤缃�</label>
+ </value>
+ <value>
+ <fullName>鍖婚櫌鍗忚绛剧讲瀹屾瘯</fullName>
+ <default>false</default>
+ <label>2.鍖婚櫌鍗忚绛剧讲瀹屾瘯</label>
+ </value>
+ <value>
+ <fullName>铻嶈祫鍏徃瀹℃牳瀹屾瘯</fullName>
+ <default>false</default>
+ <label>3.铻嶈祫鍏徃瀹℃牳瀹屾瘯</label>
+ </value>
+ <value>
+ <fullName>鍖婚櫌涓婄骇鍗曚綅瀹℃壒瀹屾瘯</fullName>
+ <default>false</default>
+ <label>4.鍖婚櫌涓婄骇鍗曚綅瀹℃壒瀹屾瘯</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Stage2_last_update_day__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Stage2_last_update_day__c.field-meta.xml
new file mode 100644
index 0000000..d111f49
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Stage2_last_update_day__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Stage2_last_update_day__c</fullName>
+ <externalId>false</externalId>
+ <label>1.鏈�鍚庢洿鏂版棩-鐘舵��2</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/StageName.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/StageName.field-meta.xml
new file mode 100644
index 0000000..81387bb
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/StageName.field-meta.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>StageName</fullName>
+ <trackFeedHistory>true</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/StageName_Forecast__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/StageName_Forecast__c.field-meta.xml
new file mode 100644
index 0000000..4b4fd82
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/StageName_Forecast__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>StageName_Forecast__c</fullName>
+ <externalId>false</externalId>
+ <label>鐘舵��(棰勬祴)</label>
+ <length>50</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/StageName__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/StageName__c.field-meta.xml
new file mode 100644
index 0000000..d4a1188
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/StageName__c.field-meta.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>StageName__c</fullName>
+ <externalId>false</externalId>
+ <formula>Case(StageName,
+"寮曞悎","璇环",
+"娉ㄦ畫","娉ㄦ畫",
+"鍑鸿嵎","鍙戣揣",
+"瀹屼簡","瀹屾瘯",
+"鏁楁垿","澶卞崟",
+"鍓婇櫎","鍙栨秷",
+"鐩","鐩爣",
+Text(StageName)
+)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鐘舵��1(鍏紡)</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/StageName_lastmonth__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/StageName_lastmonth__c.field-meta.xml
new file mode 100644
index 0000000..3ff026c
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/StageName_lastmonth__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>StageName_lastmonth__c</fullName>
+ <externalId>false</externalId>
+ <label>鐘舵�侊紙涓婃湀锛�</label>
+ <length>50</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Stage_prospect__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Stage_prospect__c.field-meta.xml
new file mode 100644
index 0000000..0955402
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Stage_prospect__c.field-meta.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Stage_prospect__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(Not(ISNULL(Min_FirstApproveDate__c)) ,9,
+(IF(OR(SAP_Send_OK__c, Text(StageName)="娉ㄦ畫", Text(StageName)="鍑鸿嵎", Text(StageName)="瀹屼簡") ,8,
+(IF(Not(ISNULL(Sales_Shop_Hospital_Contract__c )) ,7,
+(IF(Not(ISNULL(Agency_Contract_Date1__c )) ,6,
+(IF(Not(ISNULL(Assistant_Applied_Date__c )) ,5,
+(IF(Not(ISNULL(Closing_Bid_Date__c )) ,4,
+
+(IF(Not(ISNULL(Autholization_Activated_Date__c )) ,3,
+(IF(Not(ISNULL(Authorized_Date__c )) ,3,
+(IF(Not(ISNULL(Last_Follow_Up_Date__c )) ,2,
+(IF(DATEVALUE(LastModifiedDate) > DATEVALUE(CreatedDate) ,1,
+0
+))
+))
+))
+))
+))
+))
+))
+))
+))
+)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>Stage</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/State_Owner_Snapshot__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/State_Owner_Snapshot__c.field-meta.xml
new file mode 100644
index 0000000..4b33c04
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/State_Owner_Snapshot__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>State_Owner_Snapshot__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF( ISBLANK(State_Owner_lastmonth__c) ,State_Owner__c,State_Owner_lastmonth__c)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鐪�(鎵�鏈変汉蹇収鐢�)</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/State_Owner__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/State_Owner__c.field-meta.xml
new file mode 100644
index 0000000..68f2f65
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/State_Owner__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>State_Owner__c</fullName>
+ <description>IF(Distributor_InCharge_opp__c=True,"缁忛攢鍟嗙鐞嗙",
+IF(Group_purchase_PCL__c = True,"闆嗕腑閲囪喘绉�",
+Owner.OCM_man_province__c ))</description>
+ <externalId>false</externalId>
+ <formula>if(Equipment_Order_Flg__c = true,'鍏朵粬',if(Owner.OCM_man_province__c='甯傚満浼佸垝閮�','甯傚満',Owner.OCM_man_province__c))</formula>
+ <label>鐪�(鎵�鏈変汉)</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/State_Owner_lastmonth__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/State_Owner_lastmonth__c.field-meta.xml
new file mode 100644
index 0000000..1cd7569
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/State_Owner_lastmonth__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>State_Owner_lastmonth__c</fullName>
+ <externalId>false</externalId>
+ <label>鐪�(鎵�鏈変汉涓婃湀)</label>
+ <length>100</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/State_Text__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/State_Text__c.field-meta.xml
new file mode 100644
index 0000000..00d0a6c
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/State_Text__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>State_Text__c</fullName>
+ <externalId>false</externalId>
+ <label>琛屾斂鐪�(鏂囨湰)</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>TextArea</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/State__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/State__c.field-meta.xml
new file mode 100644
index 0000000..d73aada
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/State__c.field-meta.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>State__c</fullName>
+ <description>2014骞�9鏈�26鏃ヤ慨鏀瑰叕寮� = MB瀵瑰簲锛堟媴褰撲汉鐪侊級
+/* 01210000000QekP == 鐩爣鐨勮褰曠被鍨嬬殑Id */
+IF(RecordTypeId = "01210000000QekP",
+Text(SAP_Province__c),
+/* 01210000000QemG == 鍖婚櫌鐨勮褰曠被鍨嬬殑Id */
+IF(Account.Parent.Parent.RecordTypeId = "01210000000QemG",
+Account.State_Text__c,
+/* 01210000000Qem1 == 缁忛攢鍟嗙殑璁板綍绫诲瀷鐨処d */
+IF(Account.Parent.RecordTypeId = "01210000000Qem1",
+Account.State_Master__r.Name,
+""
+)))</description>
+ <externalId>false</externalId>
+ <formula>/* 01210000000QekP == 鐩爣鐨勮褰曠被鍨嬬殑Id */
+IF(RecordTypeId = "01210000000QekP",Owner.Province_address__c,
+
+
+/* 01210000000QemG == 鍖婚櫌鐨勮褰曠被鍨嬬殑Id */
+IF(Account.Parent.Parent.RecordTypeId = "01210000000QemG",
+ Account.State_Text__c,
+/* 01210000000Qem1 == 缁忛攢鍟嗙殑璁板綍绫诲瀷鐨処d */
+IF(Account.Parent.RecordTypeId = "01210000000Qem1",
+ Account.State_Master__r.Name,
+
+
+
+ ""
+)))</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>琛屾斂鐪�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Status0_Elapsed_Date_Function__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Status0_Elapsed_Date_Function__c.field-meta.xml
new file mode 100644
index 0000000..91dd81d
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Status0_Elapsed_Date_Function__c.field-meta.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Status0_Elapsed_Date_Function__c</fullName>
+ <externalId>false</externalId>
+ <formula>if (
+ isblank( Follow_Start_Date__c),
+ if (
+ isblank( Last_Follow_Up_Date__c),
+ if (
+ isblank( Authorized_Start_Date__c),
+ if (
+ isblank( Closing_Bid_Date__c),
+ if (
+ isblank( Assistant_Applied_Date__c),
+ if (
+ isblank( Agency_Contract_Date1__c),
+ if (
+ isblank( Sales_Shop_Hospital_Contract__c),
+ if (
+ isblank( SFDCLast_Process_Date__c),
+ today() - datevalue(CreatedDate),
+ SFDCLast_Process_Date__c - datevalue(CreatedDate)
+ ),
+ Sales_Shop_Hospital_Contract__c - datevalue(CreatedDate)
+ ),
+ Agency_Contract_Date1__c - datevalue(CreatedDate)
+ ),
+ Assistant_Applied_Date__c - datevalue(CreatedDate)
+ ),
+ Closing_Bid_Date__c - datevalue(CreatedDate)
+ ),
+ Authorized_Start_Date__c - datevalue(CreatedDate)
+ ),
+ Last_Follow_Up_Date__c - datevalue(CreatedDate)
+ ),
+ Follow_Start_Date__c - datevalue( CreatedDate)
+)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏈窡韪棩鏁�(鍏紡)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Status0_Elapsed_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Status0_Elapsed_Date__c.field-meta.xml
new file mode 100644
index 0000000..f736e7c
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Status0_Elapsed_Date__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Status0_Elapsed_Date__c</fullName>
+ <externalId>false</externalId>
+ <label>鏈窡韪棩鏁�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Status1_Elapsed_Date_Function__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Status1_Elapsed_Date_Function__c.field-meta.xml
new file mode 100644
index 0000000..08958d2
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Status1_Elapsed_Date_Function__c.field-meta.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Status1_Elapsed_Date_Function__c</fullName>
+ <externalId>false</externalId>
+ <formula>if (
+ isblank( Last_Follow_Up_Date__c),
+ if (
+ isblank( Authorized_Start_Date__c),
+ if (
+ isblank( Closing_Bid_Date__c),
+ if (
+ isblank( Assistant_Applied_Date__c),
+ if (
+ isblank( Agency_Contract_Date1__c),
+ if (
+ isblank( Sales_Shop_Hospital_Contract__c),
+ if (
+ isblank( SFDCLast_Process_Date__c),
+ today() - Follow_Start_Date__c,
+ SFDCLast_Process_Date__c - Follow_Start_Date__c
+ ),
+ Sales_Shop_Hospital_Contract__c - Follow_Start_Date__c
+ ),
+ Agency_Contract_Date1__c - Follow_Start_Date__c
+ ),
+ Assistant_Applied_Date__c - Follow_Start_Date__c
+ ),
+ Closing_Bid_Date__c - Follow_Start_Date__c
+ ),
+ Authorized_Start_Date__c - Follow_Start_Date__c
+ ),
+ Last_Follow_Up_Date__c - Follow_Start_Date__c
+)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏈嫓璁挎棩鏁�(鍏紡)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Status1_Elapsed_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Status1_Elapsed_Date__c.field-meta.xml
new file mode 100644
index 0000000..772caaf
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Status1_Elapsed_Date__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Status1_Elapsed_Date__c</fullName>
+ <externalId>false</externalId>
+ <label>鏈嫓璁挎棩鏁�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Status2_Elapsed_Date_Function__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Status2_Elapsed_Date_Function__c.field-meta.xml
new file mode 100644
index 0000000..4b2e2bc
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Status2_Elapsed_Date_Function__c.field-meta.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Status2_Elapsed_Date_Function__c</fullName>
+ <externalId>false</externalId>
+ <formula>if (
+ isblank( Authorized_Start_Date__c),
+ if (
+ isblank( Closing_Bid_Date__c),
+ if (
+ isblank( Assistant_Applied_Date__c),
+ if (
+ isblank( Agency_Contract_Date1__c),
+ if (
+ isblank( Sales_Shop_Hospital_Contract__c),
+ if (
+ isblank( SFDCLast_Process_Date__c),
+ today() - Last_Follow_Up_Date__c,
+ SFDCLast_Process_Date__c - Last_Follow_Up_Date__c
+ ),
+ Sales_Shop_Hospital_Contract__c - Last_Follow_Up_Date__c
+ ),
+ Agency_Contract_Date1__c - Last_Follow_Up_Date__c
+ ),
+ Assistant_Applied_Date__c - Last_Follow_Up_Date__c
+ ),
+ Closing_Bid_Date__c - Last_Follow_Up_Date__c
+ ),
+ Authorized_Start_Date__c - Last_Follow_Up_Date__c
+)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>銉曘偐銉兗涓粸鐣欐棩鏁�(鏁板紡)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Status2_Elapsed_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Status2_Elapsed_Date__c.field-meta.xml
new file mode 100644
index 0000000..9c11f19
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Status2_Elapsed_Date__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Status2_Elapsed_Date__c</fullName>
+ <externalId>false</externalId>
+ <label>鏈窡杩涙棩鏁�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Status4_Elapsed_Date_Function__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Status4_Elapsed_Date_Function__c.field-meta.xml
new file mode 100644
index 0000000..83f2d4d
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Status4_Elapsed_Date_Function__c.field-meta.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Status4_Elapsed_Date_Function__c</fullName>
+ <externalId>false</externalId>
+ <formula>if (
+ isblank( Assistant_Applied_Date__c),
+ if (
+ isblank( Agency_Contract_Date1__c),
+ if (
+ isblank( Sales_Shop_Hospital_Contract__c),
+ if (
+ isblank( SFDCLast_Process_Date__c),
+ today() - Closing_Bid_Date__c,
+ SFDCLast_Process_Date__c - Closing_Bid_Date__c
+ ),
+ Sales_Shop_Hospital_Contract__c - Closing_Bid_Date__c
+ ),
+ Agency_Contract_Date1__c - Closing_Bid_Date__c
+ ),
+ Assistant_Applied_Date__c - Closing_Bid_Date__c
+)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>涓爣->鏀跺埌鍚堝悓鏃ョ殑澶╂暟(鍏紡)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Status4_Elapsed_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Status4_Elapsed_Date__c.field-meta.xml
new file mode 100644
index 0000000..af0d955
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Status4_Elapsed_Date__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Status4_Elapsed_Date__c</fullName>
+ <externalId>false</externalId>
+ <label>涓爣->鏀跺埌鍚堝悓鏃ョ殑澶╂暟</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Status5_Elapsed_Date_Function__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Status5_Elapsed_Date_Function__c.field-meta.xml
new file mode 100644
index 0000000..baf9e60
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Status5_Elapsed_Date_Function__c.field-meta.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Status5_Elapsed_Date_Function__c</fullName>
+ <externalId>false</externalId>
+ <formula>if (
+ isblank( Agency_Contract_Date1__c),
+ if (
+ isblank( Sales_Shop_Hospital_Contract__c),
+ if (
+ isblank( SFDCLast_Process_Date__c),
+ today() - Assistant_Applied_Date__c,
+ SFDCLast_Process_Date__c - Assistant_Applied_Date__c
+ ),
+ Sales_Shop_Hospital_Contract__c - Assistant_Applied_Date__c
+ ),
+ Agency_Contract_Date1__c - Assistant_Applied_Date__c
+)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>浠锋牸鐢宠涓棩鏁�(鏁板紡)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Status5_Elapsed_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Status5_Elapsed_Date__c.field-meta.xml
new file mode 100644
index 0000000..7e6e4b6
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Status5_Elapsed_Date__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Status5_Elapsed_Date__c</fullName>
+ <externalId>false</externalId>
+ <label>浠锋牸鐢宠涓棩鏁�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Status6_Elapsed_Date_Function__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Status6_Elapsed_Date_Function__c.field-meta.xml
new file mode 100644
index 0000000..6917d7a
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Status6_Elapsed_Date_Function__c.field-meta.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Status6_Elapsed_Date_Function__c</fullName>
+ <externalId>false</externalId>
+ <formula>if (
+ isblank( Sales_Shop_Hospital_Contract__c),
+ if (
+ isblank( SFDCLast_Process_Date__c),
+ today() - Agency_Contract_Date1__c,
+ SFDCLast_Process_Date__c - Agency_Contract_Date1__c
+ ),
+ Sales_Shop_Hospital_Contract__c - Agency_Contract_Date1__c
+)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>缁忛攢鍟嗙绾︽粸鐣欐棩鏁�(鍏紡)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Status6_Elapsed_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Status6_Elapsed_Date__c.field-meta.xml
new file mode 100644
index 0000000..429374c
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Status6_Elapsed_Date__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Status6_Elapsed_Date__c</fullName>
+ <externalId>false</externalId>
+ <label>缁忛攢鍟嗙绾︽粸鐣欐棩鏁�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Status7_Elapsed_Date_Function__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Status7_Elapsed_Date_Function__c.field-meta.xml
new file mode 100644
index 0000000..d2cf533
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Status7_Elapsed_Date_Function__c.field-meta.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Status7_Elapsed_Date_Function__c</fullName>
+ <externalId>false</externalId>
+ <formula>if (
+ isblank( SFDCLast_Process_Date__c),
+ today() - Sales_Shop_Hospital_Contract__c,
+ SFDCLast_Process_Date__c - Sales_Shop_Hospital_Contract__c
+)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鍖婚櫌绛剧害婊炵暀鏃ユ暟(鍏紡)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Status7_Elapsed_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Status7_Elapsed_Date__c.field-meta.xml
new file mode 100644
index 0000000..8c1618e
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Status7_Elapsed_Date__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Status7_Elapsed_Date__c</fullName>
+ <externalId>false</externalId>
+ <label>鍖婚櫌绛剧害婊炵暀鏃ユ暟</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/StatusFormula2than__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/StatusFormula2than__c.field-meta.xml
new file mode 100644
index 0000000..cd36bdf
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/StatusFormula2than__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>StatusFormula2than__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(Status_Formula__c = Status_Formula_Text__c, 1, 0)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鐘舵��2姣斿</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Status_Formula_Option__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Status_Formula_Option__c.field-meta.xml
new file mode 100644
index 0000000..7a1de45
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Status_Formula_Option__c.field-meta.xml
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Status_Formula_Option__c</fullName>
+ <externalId>false</externalId>
+ <label>鐘舵��2锛堥�夐」鍒楄〃锛�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+ <valueSet>
+ <restricted>true</restricted>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>00 鏈窡杩�</fullName>
+ <default>false</default>
+ <label>00 鏈窡杩�</label>
+ </value>
+ <value>
+ <fullName>01 璺熻繘涓�</fullName>
+ <default>false</default>
+ <label>01 璺熻繘涓�</label>
+ </value>
+ <value>
+ <fullName>02 璐锋鎵瑰噯</fullName>
+ <default>false</default>
+ <label>02 璐锋鎵瑰噯</label>
+ </value>
+ <value>
+ <fullName>03 宸茬敵璇烽绠�</fullName>
+ <default>false</default>
+ <label>03 宸茬敵璇烽绠�</label>
+ </value>
+ <value>
+ <fullName>04 棰勭畻鏈壒鍑�</fullName>
+ <default>false</default>
+ <label>04 棰勭畻鏈壒鍑�</label>
+ </value>
+ <value>
+ <fullName>04 棰勭畻宸叉壒鍑�</fullName>
+ <default>false</default>
+ <label>04 棰勭畻宸叉壒鍑�</label>
+ </value>
+ <value>
+ <fullName>05 宸茬敵璇疯繘鍙ｈ璇�</fullName>
+ <default>false</default>
+ <label>05 宸茬敵璇疯繘鍙ｈ璇�</label>
+ </value>
+ <value>
+ <fullName>06 璁鸿瘉鏈�氳繃</fullName>
+ <default>false</default>
+ <label>06 璁鸿瘉鏈�氳繃</label>
+ </value>
+ <value>
+ <fullName>06 璁鸿瘉宸查�氳繃</fullName>
+ <default>false</default>
+ <label>06 璁鸿瘉宸查�氳繃</label>
+ </value>
+ <value>
+ <fullName>07 宸茬‘璁ゅ弬鏁�(涓珛)</fullName>
+ <default>false</default>
+ <label>07 宸茬‘璁ゅ弬鏁�(涓珛)</label>
+ </value>
+ <value>
+ <fullName>07 宸茬‘璁ゅ弬鏁�(瀵规墜)</fullName>
+ <default>false</default>
+ <label>07 宸茬‘璁ゅ弬鏁�(瀵规墜)</label>
+ </value>
+ <value>
+ <fullName>07 宸茬‘璁ゅ弬鏁�(OLY)</fullName>
+ <default>false</default>
+ <label>07 宸茬‘璁ゅ弬鏁�(OLY)</label>
+ </value>
+ <value>
+ <fullName>08 宸叉巿鏉�</fullName>
+ <default>false</default>
+ <label>08 宸叉巿鏉�</label>
+ </value>
+ <value>
+ <fullName>09 宸叉嫑鏍�</fullName>
+ <default>false</default>
+ <label>09 宸叉嫑鏍�</label>
+ </value>
+ <value>
+ <fullName>10 宸蹭腑鏍�</fullName>
+ <default>false</default>
+ <label>10 宸蹭腑鏍�</label>
+ </value>
+ <value>
+ <fullName>11 浠锋牸鐢宠涓�</fullName>
+ <default>false</default>
+ <label>11 浠锋牸鐢宠涓�</label>
+ </value>
+ <value>
+ <fullName>12 宸茬绾�</fullName>
+ <default>false</default>
+ <label>12 宸茬绾�</label>
+ </value>
+ <value>
+ <fullName>01 宸插綍鍏ヨ鍗�,鏈粯娆�</fullName>
+ <default>false</default>
+ <label>01 宸插綍鍏ヨ鍗�,鏈粯娆�</label>
+ </value>
+ <value>
+ <fullName>02 搴撳瓨宸查鐣�,鏈粯娆�</fullName>
+ <default>false</default>
+ <label>02 搴撳瓨宸查鐣�,鏈粯娆�</label>
+ </value>
+ <value>
+ <fullName>03 宸茶璐�,浠樿閲�</fullName>
+ <default>false</default>
+ <label>03 宸茶璐�,浠樿閲�</label>
+ </value>
+ <value>
+ <fullName>04 宸茶璐�,浠樺叏娆�</fullName>
+ <default>false</default>
+ <label>04 宸茶璐�,浠樺叏娆�</label>
+ </value>
+ <value>
+ <fullName>05 宸插垎閰�,寰呭彂璐�</fullName>
+ <default>false</default>
+ <label>05 宸插垎閰�,寰呭彂璐�</label>
+ </value>
+ <value>
+ <fullName>06 宸插彂璐�</fullName>
+ <default>false</default>
+ <label>06 宸插彂璐�</label>
+ </value>
+ <value>
+ <fullName>07 宸插畨瑁�</fullName>
+ <default>false</default>
+ <label>07 宸插畨瑁�</label>
+ </value>
+ <value>
+ <fullName>08 宸茬粨鏉�</fullName>
+ <default>false</default>
+ <label>08 宸茬粨鏉�</label>
+ </value>
+ <value>
+ <fullName>澶卞崟</fullName>
+ <default>false</default>
+ <label>澶卞崟</label>
+ </value>
+ <value>
+ <fullName>鍙栨秷</fullName>
+ <default>false</default>
+ <label>鍙栨秷</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Status_Formula_Retention_Days__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Status_Formula_Retention_Days__c.field-meta.xml
new file mode 100644
index 0000000..95731e8
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Status_Formula_Retention_Days__c.field-meta.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Status_Formula_Retention_Days__c</fullName>
+ <description>20230911 BK
+Key_tipics_last_update_day__c,鏇挎崲涓� Key_tipics_last_update_dayF__c,</description>
+ <externalId>false</externalId>
+ <formula>IF(Not(ISNULL(Min_FirstApproveDate__c)) ,0,
+(IF(OR(SAP_Send_OK__c, Text(StageName)="娉ㄦ畫", Text(StageName)="鍑鸿嵎", Text(StageName)="瀹屼簡") ,today()-SFDCLast_Process_Date__c,
+(IF(Not(ISNULL(Sales_Shop_Hospital_Contract__c )) ,today()-Agent_Hospital_Contract_day_last_update__c,
+(IF(Not(ISNULL(Agency_Contract_Date1__c )) ,today()-Agency_Contract_Date_last_update__c,
+(IF(Not(ISNULL(Assistant_Applied_Date__c )) ,IF(ISNULL(Contract_DB_complite_day__c),IF(ISNULL(Contract_DB_SalesDept_complite_day__c),today()-Assistant_Applied_Date__c,today()-Contract_DB_SalesDept_complite_day__c),today()-Contract_DB_complite_day__c),
+(IF(Not(ISNULL(Closing_Bid_Date__c )) ,today()-Closing_Bid_Date__c,
+(IF(Not(ISNULL(Autholization_Activated_Date__c )) ,IF(Not(ISNULL(Bid_Date__c)),today()-Bid_Date__c,today()-Authorized_Date__c),
+(IF(Not(ISNULL(Authorized_Date__c )) ,IF(Not(ISNULL(Bid_Date__c)),today()-Bid_Date__c,today()-Authorized_Date__c),
+(IF(Not(ISNULL(Last_Follow_Up_Date__c )) ,today()-Last_Follow_Up_Date__c,
+(IF(DATEVALUE(LastModifiedDate) > DATEVALUE(CreatedDate) ,today()-Key_tipics_last_update_dayF__c,
+today()-Created_Day__c
+))
+))
+))
+))
+))
+))
+))
+))
+))
+)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鐘舵��2鍚勯樁娈垫粸鐣欏ぉ鏁�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Status_Formula_Text__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Status_Formula_Text__c.field-meta.xml
new file mode 100644
index 0000000..942e6a6
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Status_Formula_Text__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Status_Formula_Text__c</fullName>
+ <externalId>false</externalId>
+ <inlineHelpText>00=杩樻病鏇存柊, 01=杩樻病鎷滆, 02=璺熻繘涓�, 03=宸叉巿鏉�, 04=宸蹭腑鏍�, 05=浠锋牸鐢宠涓�, 06=鐢ㄦ埛鏈绾�, 07=鐢ㄦ埛宸茬绾�, 08=宸茬绾�</inlineHelpText>
+ <label>鐘舵��2(鏂囨湰)</label>
+ <length>80</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Status_Formula__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Status_Formula__c.field-meta.xml
new file mode 100644
index 0000000..6429539
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Status_Formula__c.field-meta.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Status_Formula__c</fullName>
+ <description>if(Text(StageName) = '鍓婇櫎', '17 鍙栨秷',
+if(Text(StageName) = '鏁楁垿', '18 澶卞崟',
+IF(Not(ISNULL(Min_FirstApproveDate__c)) ,
+"-",
+IF(OR(SAP_Send_OK__c, Text(StageName)="娉ㄦ畫", Text(StageName)="鍑鸿嵎", Text(StageName)="瀹屼簡") ,
+"08 宸茬绾�",
+IF(Not(ISNULL(Sales_Shop_Hospital_Contract__c )) ,
+"07 鐢ㄦ埛宸茬绾�",
+IF(Not(ISNULL(Agency_Contract_Date1__c )) ,
+"06 鐢ㄦ埛鏈绾�",
+IF(Not(ISNULL(Assistant_Applied_Date__c )) ,
+"05 浠锋牸鐢宠涓�",
+IF(Not(ISNULL(Closing_Bid_Date__c )) ,
+"04 宸蹭腑鏍�",
+IF(Not(And(ISNULL(Autholization_Activated_Date__c ),
+ISNULL(Authorized_Date__c ))) ,
+"03 宸叉巿鏉�",
+IF(Not(ISNULL(Last_Follow_Up_Date__c )) ,
+"02 璺熻繘涓�",
+IF(DATEVALUE(LastModifiedDate) > DATEVALUE(CreatedDate) ,
+"01 杩樻病鎷滆",
+"00 杩樻病鏇存柊"
+)
+)
+)
+)
+)
+)
+)
+)
+)
+)
+)</description>
+ <externalId>false</externalId>
+ <formula>if(Text(StageName)='鏁楁垿' && NOT(ISBLANK(Final_Contract_Proceeded_Date__c)),'澶卞崟',
+if(Text(StageName)='鍓婇櫎' && NOT(ISBLANK(Final_Contract_Proceeded_Date__c)),'鍙栨秷',
+if(Text(StageName)='瀹屼簡','08 宸茬粨鏉�',
+if(Text(StageName)='鍑鸿嵎',if(NOT(ISBLANK(Last_Install_Date__c)),'07 宸插畨瑁�',if(NOT(ISBLANK(Shipping_Finished_Day_Func__c)),'06 宸插彂璐�','')),
+if(Text(StageName)='娉ㄦ畫',if(NOT(ISBLANK(Last_Delivery_Date__c)),'05 宸插垎閰�,寰呭彂璐�',if(NOT(ISBLANK(Deposit_In_Full_Day__c)),'04 宸茶璐�,浠樺叏娆�',if(NOT(ISBLANK(X30_Deposit_Day_New__c)),'03 宸茶璐�,浠樿閲�',if(NOT(ISBLANK(Max_LastApproveDate__c)),'02 搴撳瓨宸查鐣�,鏈粯娆�',if(OR(NOT(ISBLANK(Contract_recognized_day_1__c)),NOT(ISBLANK(Contract_Recieve_Date__c))),'01 宸插綍鍏ヨ鍗�,鏈粯娆�',''))))),
+if(Text(StageName)='寮曞悎',if(NOT(ISBLANK(SAP_Send_OK_Date__c)),'12 宸茬绾�',
+if(NOT(ISBLANK(Assistant_Applied_Date__c)),'11 浠锋牸鐢宠涓�',
+if(NOT(ISBLANK(Closing_Bid_Date__c)),'10 宸蹭腑鏍�',
+if(AND(NOT(ISBLANK(Bid_Date__c)),Bid_Date__c<=Today()),'09 宸叉嫑鏍�',
+if(OR(NOT(ISBLANK(Autholization_Activated_Date__c)),NOT(ISBLANK(Authorized_Date__c))),'08 宸叉巿鏉�',
+if(AND(NOT(ISBLANK(Determine_oly_parameter_day__c)), TEXT(Opportunity_stage__c) = '纭畾浜哋LY鍙傛暟'),'07 宸茬‘璁ゅ弬鏁�(OLY)',
+if(AND(NOT(ISBLANK(Determine_competitor_parameter_date__c)), TEXT(Opportunity_stage__c) = '纭畾浜嗗鎵嬪弬鏁�'),'07 宸茬‘璁ゅ弬鏁�(瀵规墜)',
+if(AND(NOT(ISBLANK(No_Parameter_date__c)), TEXT(Opportunity_stage__c) = '娌℃湁纭畾鍙傛暟'),'07 宸茬‘璁ゅ弬鏁�(涓珛)',
+if(NOT(ISBLANK(ImportDemonstration_Rejection_date__c)),'06 璁鸿瘉鏈�氳繃',
+if(NOT(ISBLANK(ImportDemonstration_Approval_date__c)),'06 璁鸿瘉宸查�氳繃',
+if(NOT(ISBLANK(ImportDemonstration_Filing_date__c)),'05 宸茬敵璇疯繘鍙ｈ璇�',
+if(NOT(ISBLANK(Budget_unapproved_date__c)),'04 棰勭畻鏈壒鍑�',
+if(NOT(ISBLANK(Budget_approval_date__c)),'04 棰勭畻宸叉壒鍑�',
+if(NOT(ISBLANK(Budget_application_date__c)),'03 宸茬敵璇烽绠�',if(NOT(ISBLANK(LoanApprovedDate__c)),'02 璐锋鎵瑰噯',if(NOT(ISBLANK(Last_Follow_Up_Date__c)),'01 璺熻繘涓�',if(NOT(ISBLANK(CreatedDate)),'00 鏈窡杩�',''))))))))))))))))),
+''))))))</formula>
+ <label>鐘舵��2</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Status_List_SI__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Status_List_SI__c.field-meta.xml
new file mode 100644
index 0000000..abdbc3f
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Status_List_SI__c.field-meta.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Status_List_SI__c</fullName>
+ <externalId>false</externalId>
+ <label>SI_璇环鐘舵��2</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+ <valueSet>
+ <restricted>true</restricted>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>16 宸茬粨鏉�</fullName>
+ <default>false</default>
+ <label>16 宸茬粨鏉�</label>
+ </value>
+ <value>
+ <fullName>15 宸插畨瑁�</fullName>
+ <default>false</default>
+ <label>15 宸插畨瑁�</label>
+ </value>
+ <value>
+ <fullName>14 宸插彂璐�</fullName>
+ <default>false</default>
+ <label>14 宸插彂璐�</label>
+ </value>
+ <value>
+ <fullName>13 宸插垎閰嶏紝寰呭彂璐�</fullName>
+ <default>false</default>
+ <label>13 宸插垎閰嶏紝寰呭彂璐�</label>
+ </value>
+ <value>
+ <fullName>12 宸茶璐э紝浠樺叏娆�</fullName>
+ <default>false</default>
+ <label>12 宸茶璐э紝浠樺叏娆�</label>
+ </value>
+ <value>
+ <fullName>11 宸茶璐э紝浠樿閲�</fullName>
+ <default>false</default>
+ <label>11 宸茶璐э紝浠樿閲�</label>
+ </value>
+ <value>
+ <fullName>10 搴撳瓨宸查鐣欙紝鏈粯娆�</fullName>
+ <default>false</default>
+ <label>10 搴撳瓨宸查鐣欙紝鏈粯娆�</label>
+ </value>
+ <value>
+ <fullName>9 宸插綍鍏ヨ鍗曪紝鏈粯娆�</fullName>
+ <default>false</default>
+ <label>9 宸插綍鍏ヨ鍗曪紝鏈粯娆�</label>
+ </value>
+ <value>
+ <fullName>8 宸茬绾�</fullName>
+ <default>false</default>
+ <label>8 宸茬绾�</label>
+ </value>
+ <value>
+ <fullName>7 鐢ㄦ埛宸茬绾�</fullName>
+ <default>false</default>
+ <label>7 鐢ㄦ埛宸茬绾�</label>
+ </value>
+ <value>
+ <fullName>6 鐢ㄦ埛鏈绾�</fullName>
+ <default>false</default>
+ <label>6 鐢ㄦ埛鏈绾�</label>
+ </value>
+ <value>
+ <fullName>5 浠锋牸鐢宠涓�</fullName>
+ <default>false</default>
+ <label>5 浠锋牸鐢宠涓�</label>
+ </value>
+ <value>
+ <fullName>4 宸蹭腑鏍�</fullName>
+ <default>false</default>
+ <label>4 宸蹭腑鏍�</label>
+ </value>
+ <value>
+ <fullName>3 宸叉巿鏉�</fullName>
+ <default>false</default>
+ <label>3 宸叉巿鏉�</label>
+ </value>
+ <value>
+ <fullName>2 璺熻繘涓�</fullName>
+ <default>false</default>
+ <label>2 璺熻繘涓�</label>
+ </value>
+ <value>
+ <fullName>1 杩樻病鎷滆</fullName>
+ <default>false</default>
+ <label>1 杩樻病鎷滆</label>
+ </value>
+ <value>
+ <fullName>0 杩樻病璺熻繘</fullName>
+ <default>false</default>
+ <label>0 杩樻病璺熻繘</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Status_and_follow__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Status_and_follow__c.field-meta.xml
new file mode 100644
index 0000000..7192d2a
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Status_and_follow__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Status_and_follow__c</fullName>
+ <externalId>false</externalId>
+ <formula>HYPERLINK
+("/00O10000002lqdC?pv0=" + Id, Status_Formula__c & " : " & TEXT(Xin_Gross_Follow_Num__c) & "娆�")</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鐘舵��+鎷滆娆℃暟</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Stock_Check_Leader__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Stock_Check_Leader__c.field-meta.xml
new file mode 100644
index 0000000..e3c14c9
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Stock_Check_Leader__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Stock_Check_Leader__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>澶囪揣纭瀹℃壒浜�</label>
+ <referenceTo>User</referenceTo>
+ <relationshipName>opporWlTx</relationshipName>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Stock_Confrim_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Stock_Confrim_Date__c.field-meta.xml
new file mode 100644
index 0000000..20c12d6
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Stock_Confrim_Date__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Stock_Confrim_Date__c</fullName>
+ <externalId>false</externalId>
+ <label>澶囪揣纭鏃�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Stock_Submit_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Stock_Submit_Date__c.field-meta.xml
new file mode 100644
index 0000000..d5edb71
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Stock_Submit_Date__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Stock_Submit_Date__c</fullName>
+ <externalId>false</externalId>
+ <label>澶囪揣纭鐢宠鏃�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Stock_apply_passtime__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Stock_apply_passtime__c.field-meta.xml
new file mode 100644
index 0000000..c3c85fd
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Stock_apply_passtime__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Stock_apply_passtime__c</fullName>
+ <externalId>false</externalId>
+ <label>澶囪揣瀹℃壒閫氳繃鏃堕棿</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>DateTime</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Stock_apply_status__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Stock_apply_status__c.field-meta.xml
new file mode 100644
index 0000000..775ffea
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Stock_apply_status__c.field-meta.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Stock_apply_status__c</fullName>
+ <externalId>false</externalId>
+ <label>澶囪揣鐢宠鐘舵��</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+ <valueSet>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>鑽夋涓�</fullName>
+ <default>true</default>
+ <label>鑽夋涓�</label>
+ </value>
+ <value>
+ <fullName>濉啓瀹屾瘯</fullName>
+ <default>false</default>
+ <label>濉啓瀹屾瘯</label>
+ </value>
+ <value>
+ <fullName>鐢宠涓�</fullName>
+ <default>false</default>
+ <label>鐢宠涓�</label>
+ </value>
+ <value>
+ <fullName>鎵瑰噯</fullName>
+ <default>false</default>
+ <label>鎵瑰噯</label>
+ </value>
+ <value>
+ <fullName>涓嶆壒鍑�</fullName>
+ <default>false</default>
+ <label>椹冲洖</label>
+ </value>
+ <value>
+ <fullName>鎾ら攢濉啓瀹屾瘯</fullName>
+ <default>false</default>
+ <label>鎾ら攢濉啓瀹屾瘯</label>
+ </value>
+ <value>
+ <fullName>鎾ら攢鐢宠涓�</fullName>
+ <default>false</default>
+ <label>鎾ら攢鐢宠涓�</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Stock_apply_time__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Stock_apply_time__c.field-meta.xml
new file mode 100644
index 0000000..f229b23
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Stock_apply_time__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Stock_apply_time__c</fullName>
+ <externalId>false</externalId>
+ <label>澶囪揣鐢宠鏃堕棿</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>DateTime</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Stock_cancel_reason__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Stock_cancel_reason__c.field-meta.xml
new file mode 100644
index 0000000..485f1ae
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Stock_cancel_reason__c.field-meta.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Stock_cancel_reason__c</fullName>
+ <externalId>false</externalId>
+ <label>鎾ら攢鍘熷洜</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+ <valueSet>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>寤惰繜绛剧害</fullName>
+ <default>false</default>
+ <label>寤惰繜绛剧害</label>
+ </value>
+ <value>
+ <fullName>閲嶆柊鎷涙爣</fullName>
+ <default>false</default>
+ <label>閲嶆柊鎷涙爣</label>
+ </value>
+ <value>
+ <fullName>鍏朵粬</fullName>
+ <default>false</default>
+ <label>鍏朵粬</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Stock_cancel_reason_text__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Stock_cancel_reason_text__c.field-meta.xml
new file mode 100644
index 0000000..bc53acf
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Stock_cancel_reason_text__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Stock_cancel_reason_text__c</fullName>
+ <externalId>false</externalId>
+ <label>鎾ら攢鍘熷洜(鍏朵粬)</label>
+ <length>255</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Stocking_Price__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Stocking_Price__c.field-meta.xml
new file mode 100644
index 0000000..a65afe9
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Stocking_Price__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Stocking_Price__c</fullName>
+ <externalId>false</externalId>
+ <label>鎴愭湰_System</label>
+ <precision>15</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Strategic_Department_Class_Id__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Strategic_Department_Class_Id__c.field-meta.xml
new file mode 100644
index 0000000..e41a25a
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Strategic_Department_Class_Id__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Strategic_Department_Class_Id__c</fullName>
+ <externalId>false</externalId>
+ <formula>Account.Parent.Id</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鎴樼暐绉戝鍒嗙被ID</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Strategic_department_Class_Name__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Strategic_department_Class_Name__c.field-meta.xml
new file mode 100644
index 0000000..2322524
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Strategic_department_Class_Name__c.field-meta.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Strategic_department_Class_Name__c</fullName>
+ <description>IF(OR(RecordTypeId = "01210000000QekK",RecordTypeId = "012100000006KMe"),
+IF(Account.RecordType.Id ="01210000000QjCN",IF(Account.ET_SP_Dealer__c,"ET",IF(Account.ENG_Dealer__c,"3.鏅绉�","8.涓嶆槑")),
+Case(Account.Parent.Department_Class_Label__c,
+"娑堝寲绉�", "1.娑堝寲绉�",
+"鍛煎惛绉�", "2.鍛煎惛绉�",
+"鏅绉�", "3.鏅绉�",
+"娉屽翱绉�", "4.娉屽翱绉�",
+"濡囩", "5.濡囩",
+"鑰抽蓟鍠夌", "6.鑰抽蓟鍠夌",
+"鍏朵粬", "7.鍏朵粬",
+"ET", "ET",
+"8.涓嶆槑")),"9.鐩爣")</description>
+ <externalId>false</externalId>
+ <formula>Case(Opportunity_Category__c,
+ "GI", "1.娑堝寲绉�",
+ "BF", "2.鍛煎惛绉�",
+ "GS", "3.鏅绉�",
+ "URO", "4.娉屽翱绉�",
+ "GYN", "5.濡囩",
+ "ENT", "6.鑰抽蓟鍠夌",
+ "OTH", "3.鏅绉�",
+ "ET", "ET",
+ "鍏朵粬", "7.鍏朵粬","8.涓嶆槑")</formula>
+ <label>鎴樼暐绉戝鍒嗙被鍚�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Strategic_department_new__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Strategic_department_new__c.field-meta.xml
new file mode 100644
index 0000000..0a60b24
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Strategic_department_new__c.field-meta.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Strategic_department_new__c</fullName>
+ <externalId>false</externalId>
+ <label>鎴樼暐绉戝鍒嗙被(鏂�-閫夐」)</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+ <valueSet>
+ <controllingField>Opportunity_Category__c</controllingField>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>娑堝寲绉�</fullName>
+ <default>false</default>
+ <label>娑堝寲绉�</label>
+ </value>
+ <value>
+ <fullName>鍛煎惛绉�</fullName>
+ <default>false</default>
+ <label>鍛煎惛绉�</label>
+ </value>
+ <value>
+ <fullName>鏅绉�</fullName>
+ <default>false</default>
+ <label>鏅绉�</label>
+ </value>
+ <value>
+ <fullName>娉屽翱绉�</fullName>
+ <default>false</default>
+ <label>娉屽翱绉�</label>
+ </value>
+ <value>
+ <fullName>濡囩</fullName>
+ <default>false</default>
+ <label>濡囩</label>
+ </value>
+ <value>
+ <fullName>鑰抽蓟鍠夌</fullName>
+ <default>false</default>
+ <label>鑰抽蓟鍠夌</label>
+ </value>
+ <value>
+ <fullName>鍏朵粬</fullName>
+ <default>false</default>
+ <label>鍏朵粬</label>
+ </value>
+ </valueSetDefinition>
+ <valueSettings>
+ <controllingFieldValue>GI</controllingFieldValue>
+ <controllingFieldValue>ET</controllingFieldValue>
+ <valueName>娑堝寲绉�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>BF</controllingFieldValue>
+ <controllingFieldValue>ET</controllingFieldValue>
+ <valueName>鍛煎惛绉�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>GS</controllingFieldValue>
+ <controllingFieldValue>ET</controllingFieldValue>
+ <valueName>鏅绉�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>URO</controllingFieldValue>
+ <controllingFieldValue>ET</controllingFieldValue>
+ <valueName>娉屽翱绉�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>GYN</controllingFieldValue>
+ <controllingFieldValue>ET</controllingFieldValue>
+ <valueName>濡囩</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>ENT</controllingFieldValue>
+ <controllingFieldValue>ET</controllingFieldValue>
+ <valueName>鑰抽蓟鍠夌</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>OTH</controllingFieldValue>
+ <controllingFieldValue>ET</controllingFieldValue>
+ <valueName>鍏朵粬</valueName>
+ </valueSettings>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/StrategyProductNumber__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/StrategyProductNumber__c.field-meta.xml
new file mode 100644
index 0000000..22a912b
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/StrategyProductNumber__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>StrategyProductNumber__c</fullName>
+ <description>SWAG-BGCCB9</description>
+ <externalId>false</externalId>
+ <label>鎴樼暐浜у搧鏁伴噺</label>
+ <summarizedField>OpportunityLineItem.strategyProductText__c</summarizedField>
+ <summaryForeignKey>OpportunityLineItem.OpportunityId</summaryForeignKey>
+ <summaryOperation>sum</summaryOperation>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Summary</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Sum_ContractAmount_F__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Sum_ContractAmount_F__c.field-meta.xml
new file mode 100644
index 0000000..59a30a4
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Sum_ContractAmount_F__c.field-meta.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Sum_ContractAmount_F__c</fullName>
+ <description>娉ㄦ畫鐨勫悎鍚岄噾棰濈疮璁�</description>
+ <externalId>false</externalId>
+ <formula>IF(SAP_Send_OK__c && (Agency1__r.Special__c || Agency2__r.Special__c || Account.Parent.Special__c) && $User.ViewSpecialAgencyAmout__c == False, null,
+ Sum_ContractAmount__c
+)</formula>
+ <label>鍖婚櫌鍚堝悓閲戦(鍚◣)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Sum_ContractAmount__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Sum_ContractAmount__c.field-meta.xml
new file mode 100644
index 0000000..34ab564
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Sum_ContractAmount__c.field-meta.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Sum_ContractAmount__c</fullName>
+ <description>娉ㄦ畫鐨勫悎鍚岄噾棰濈疮璁�(鍏�)</description>
+ <externalId>false</externalId>
+ <label>鍖婚櫌鍚堝悓閲戦(鍚◣)_鍏�</label>
+ <summarizedField>Statu_Achievements__c.ContractAmount__c</summarizedField>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.DeliveryStatus__c</field>
+ <operation>equals</operation>
+ <value>宸插畬鍏ㄤ氦浠�</value>
+ </summaryFilterItems>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.Valid_Statu_Achievements__c</field>
+ <operation>equals</operation>
+ <value>1</value>
+ </summaryFilterItems>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.FALSE_Order__c</field>
+ <operation>notEqual</operation>
+ <value>FALSE</value>
+ </summaryFilterItems>
+ <summaryForeignKey>Statu_Achievements__c.Opportunity__c</summaryForeignKey>
+ <summaryOperation>sum</summaryOperation>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Summary</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Sum_SAIsCompleted__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Sum_SAIsCompleted__c.field-meta.xml
new file mode 100644
index 0000000..d03a943
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Sum_SAIsCompleted__c.field-meta.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Sum_SAIsCompleted__c</fullName>
+ <externalId>false</externalId>
+ <label>绱娉ㄦ畫鍙戣揣瀹屾瘯鏁伴噺</label>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.Status_1_text__c</field>
+ <operation>equals</operation>
+ <value>鍙戣揣,瀹屾瘯</value>
+ </summaryFilterItems>
+ <summaryForeignKey>Statu_Achievements__c.Opportunity__c</summaryForeignKey>
+ <summaryOperation>count</summaryOperation>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Summary</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Summary_Status_Total__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Summary_Status_Total__c.field-meta.xml
new file mode 100644
index 0000000..61fdfd3
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Summary_Status_Total__c.field-meta.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Summary_Status_Total__c</fullName>
+ <externalId>false</externalId>
+ <label>娉ㄦ畫(璁㈠崟瀹屾瘯)_鍚堣鏁�(绯荤粺鐢�)</label>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.OverviewStatus__c</field>
+ <operation>equals</operation>
+ <value>璁㈠崟瀹屾垚</value>
+ </summaryFilterItems>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.Valid_Statu_Achievements__c</field>
+ <operation>equals</operation>
+ <value>1</value>
+ </summaryFilterItems>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.FALSE_Order__c</field>
+ <operation>notEqual</operation>
+ <value>FALSE</value>
+ </summaryFilterItems>
+ <summaryForeignKey>Statu_Achievements__c.Opportunity__c</summaryForeignKey>
+ <summaryOperation>count</summaryOperation>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Summary</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/SyncedQuoteId.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/SyncedQuoteId.field-meta.xml
new file mode 100644
index 0000000..e8e8498
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/SyncedQuoteId.field-meta.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>SyncedQuoteId</fullName>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/TAT_Augthorization_Bid__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/TAT_Augthorization_Bid__c.field-meta.xml
new file mode 100644
index 0000000..177c33d
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/TAT_Augthorization_Bid__c.field-meta.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>TAT_Augthorization_Bid__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF ( NOT(ISBLANK(Bid_Date__c)),
+IF ((Bid_Date__c - Authorized_Date__c) < 1, null, Bid_Date__c - Authorized_Date__c),
+IF ((TenderBeginDate__c - Authorized_Date__c) < 1, null, TenderBeginDate__c - Authorized_Date__c))</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>TAT锛氭巿鏉�-鎷涙爣鏃ユ暟</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/TAT_ContractApprove_Win__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/TAT_ContractApprove_Win__c.field-meta.xml
new file mode 100644
index 0000000..fedeba4
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/TAT_ContractApprove_Win__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>TAT_ContractApprove_Win__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF ((SFDCLast_Process_Date__c - Contract_DB_SalesDept_complite_day__c) < 1, null, SFDCLast_Process_Date__c - Contract_DB_SalesDept_complite_day__c)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>TAT锛氬悎鍚屽鎵�-WIN鏃ユ暟</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/TAT_Contract_approved__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/TAT_Contract_approved__c.field-meta.xml
new file mode 100644
index 0000000..5c0ce63
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/TAT_Contract_approved__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>TAT_Contract_approved__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF ((Contract_DB_SalesDept_complite_day__c - Assistant_Applied_Date__c) < 1, null, Contract_DB_SalesDept_complite_day__c - Assistant_Applied_Date__c)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>TAT锛氶攢鍞儴瀹℃壒鏃ユ暟</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/TAT_WIN__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/TAT_WIN__c.field-meta.xml
new file mode 100644
index 0000000..a8bb130
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/TAT_WIN__c.field-meta.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>TAT_WIN__c</fullName>
+ <description>20171009涔嬪墠
+SFDCLast_Process_Date__c - Created_Day__c</description>
+ <externalId>false</externalId>
+ <formula>IF ((Contract_recognized_day_1__c - Created_Day__c) < 1, null, Contract_recognized_day_1__c - Created_Day__c)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>TAT锛氬垱寤�-璁㈣揣鏃ユ暟</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/TAT_last_close_bid__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/TAT_last_close_bid__c.field-meta.xml
new file mode 100644
index 0000000..23892e9
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/TAT_last_close_bid__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>TAT_last_close_bid__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF ((SFDCLast_Process_Date__c - Closing_Bid_Date__c) < 1, null, SFDCLast_Process_Date__c - Closing_Bid_Date__c)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>TAT锛� 涓爣-绛剧害鏃ユ暟</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/TURis_TCRis_OPD__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/TURis_TCRis_OPD__c.field-meta.xml
new file mode 100644
index 0000000..5166d96
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/TURis_TCRis_OPD__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>TURis_TCRis_OPD__c</fullName>
+ <externalId>false</externalId>
+ <formula>Account.Parent.Important_Product_opd13_number__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>銉籘URis/TCRis : OPD鐩爣瀹㈡埛鏁�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/TargetType__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/TargetType__c.field-meta.xml
new file mode 100644
index 0000000..a65e37a
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/TargetType__c.field-meta.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>TargetType__c</fullName>
+ <externalId>false</externalId>
+ <label>鐩爣绫诲瀷</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+ <valueSet>
+ <restricted>true</restricted>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>涓汉</fullName>
+ <default>false</default>
+ <label>涓汉</label>
+ </value>
+ <value>
+ <fullName>缁�</fullName>
+ <default>false</default>
+ <label>缁�</label>
+ </value>
+ <value>
+ <fullName>璇�</fullName>
+ <default>false</default>
+ <label>璇�</label>
+ </value>
+ <value>
+ <fullName>鐪�</fullName>
+ <default>false</default>
+ <label>鐪�</label>
+ </value>
+ <value>
+ <fullName>閮�</fullName>
+ <default>false</default>
+ <label>閮�</label>
+ </value>
+ <value>
+ <fullName>鏈儴</fullName>
+ <default>false</default>
+ <label>鏈儴</label>
+ </value>
+ <value>
+ <fullName>缁熸嫭鏈儴</fullName>
+ <default>false</default>
+ <label>缁熸嫭鏈儴</label>
+ </value>
+ <value>
+ <fullName>鍏ㄥ浗</fullName>
+ <default>false</default>
+ <label>鍏ㄥ浗</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Target_Opportunity_c__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Target_Opportunity_c__c.field-meta.xml
new file mode 100644
index 0000000..335ecb6
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Target_Opportunity_c__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Target_Opportunity_c__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>鏈熷垵鐩爣璇环</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Target_Source__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Target_Source__c.field-meta.xml
new file mode 100644
index 0000000..004ea03
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Target_Source__c.field-meta.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Target_Source__c</fullName>
+ <externalId>false</externalId>
+ <label>鐩爣鏉ユ簮</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+ <valueSet>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>SetProvinceTarget</fullName>
+ <default>false</default>
+ <label>SetProvinceTarget</label>
+ </value>
+ <value>
+ <fullName>SetProvinceTargetEng</fullName>
+ <default>false</default>
+ <label>SetProvinceTargetEng</label>
+ </value>
+ <value>
+ <fullName>SalesTarget</fullName>
+ <default>false</default>
+ <label>SalesTarget</label>
+ </value>
+ <value>
+ <fullName>EngTarget</fullName>
+ <default>false</default>
+ <label>EngTarget</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Target_category__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Target_category__c.field-meta.xml
new file mode 100644
index 0000000..c9dcd95
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Target_category__c.field-meta.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Target_category__c</fullName>
+ <externalId>false</externalId>
+ <label>鐩爣鍖哄垎</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+ <valueSet>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>鐪佺洰鏍�</fullName>
+ <default>false</default>
+ <label>鐪佺洰鏍�</label>
+ </value>
+ <value>
+ <fullName>鐪佺洰鏍�(淇敼鐩爣)</fullName>
+ <default>false</default>
+ <label>鐪佺洰鏍�(淇敼鐩爣)</label>
+ </value>
+ <value>
+ <fullName>鎷呭綋鐩爣</fullName>
+ <default>false</default>
+ <label>鎷呭綋鐩爣</label>
+ </value>
+ <value>
+ <fullName>閲嶇偣浜у搧鐩爣(鏁伴噺)</fullName>
+ <default>false</default>
+ <label>閲嶇偣浜у搧鐩爣(鏁伴噺)</label>
+ </value>
+ <value>
+ <fullName>閲嶇偣浜у搧鐩爣(閲戦)</fullName>
+ <default>false</default>
+ <label>閲嶇偣浜у搧鐩爣(閲戦)</label>
+ </value>
+ <value>
+ <fullName>灏忕粍鐩爣</fullName>
+ <default>false</default>
+ <label>灏忕粍鐩爣</label>
+ </value>
+ <value>
+ <fullName>鎷呭綋閲嶇偣浜у搧鐩爣</fullName>
+ <default>false</default>
+ <label>鎷呭綋閲嶇偣浜у搧鐩爣</label>
+ </value>
+ <value>
+ <fullName>鐪侀噸鐐逛骇鍝佺洰鏍�</fullName>
+ <default>false</default>
+ <label>鐪侀噸鐐逛骇鍝佺洰鏍�</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Task_createTime__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Task_createTime__c.field-meta.xml
new file mode 100644
index 0000000..7f73416
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Task_createTime__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Task_createTime__c</fullName>
+ <externalId>false</externalId>
+ <label>涓爣浠诲姟鍒涘缓鏃�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Tax_Foreign_F_Copy__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Tax_Foreign_F_Copy__c.field-meta.xml
new file mode 100644
index 0000000..af0e497
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Tax_Foreign_F_Copy__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Tax_Foreign_F_Copy__c</fullName>
+ <externalId>false</externalId>
+ <label>娑堣垂绋�(澶栬锤)Copy</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Tax_Foreign_F__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Tax_Foreign_F__c.field-meta.xml
new file mode 100644
index 0000000..37a7eb9
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Tax_Foreign_F__c.field-meta.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Tax_Foreign_F__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(ShippingDate_For_Report__c < Datevalue("2012-10-01") ,
+6.6,
+IF(ShippingDate_For_Report__c < Datevalue("2016-07-01") ,
+6.3,
+IF(ShippingDate_For_Report__c < Datevalue("2016-12-01") ,
+6.5,
+IF(ShippingDate_For_Report__c < Datevalue("2018-05-01") ,
+6.8,
+IF(ShippingDate_For_Report__c < Datevalue("2018-11-01") ,
+6.3,
+IF(ShippingDate_For_Report__c < Datevalue( $Label.Tax_Foreign_Date) ,
+6.8,6.43
+)
+)
+)
+)
+)
+)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>娑堣垂绋�(澶栬锤)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Tax_Intra_Changed__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Tax_Intra_Changed__c.field-meta.xml
new file mode 100644
index 0000000..c55437b
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Tax_Intra_Changed__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Tax_Intra_Changed__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(OR( Tax_Foreign_F__c <> Tax_Foreign_F_Copy__c, Tax_Intra_F__c <> Tax_Intra_F_Copy__c ) , true, false)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>娑堣垂绋庢槸鍚﹀彉鍖�</label>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Tax_Intra_F_Copy__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Tax_Intra_F_Copy__c.field-meta.xml
new file mode 100644
index 0000000..f24b995
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Tax_Intra_F_Copy__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Tax_Intra_F_Copy__c</fullName>
+ <externalId>false</externalId>
+ <label>娑堣垂绋�(鍐呰锤)Copy</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Tax_Intra_F__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Tax_Intra_F__c.field-meta.xml
new file mode 100644
index 0000000..bba0608
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Tax_Intra_F__c.field-meta.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Tax_Intra_F__c</fullName>
+ <description>20190326鍓�
+IF( AND(OR(TEXT(StageName) = '鍑鸿嵎',TEXT(StageName) = '瀹屼簡'),SFDCLast_Process_Date__c < Datevalue( $Label.Tax_Date )), 1.17,
+IF(TODAY() < Datevalue( $Label.Tax_Date ),1.17, 1.16))</description>
+ <externalId>false</externalId>
+ <formula>if(
+OR(TEXT(StageName) = '鍑鸿嵎',TEXT(StageName) = '瀹屼簡'),
+if(
+SFDCLast_Process_Date__c < Datevalue($Label.Tax_Date),
+1.17,
+if(
+And(SFDCLast_Process_Date__c >= Datevalue($Label.Tax_Date),SFDCLast_Process_Date__c < Datevalue($Label.Tax_Date_13)),
+1.16,
+1.13
+)
+),
+IF(
+TODAY() < Datevalue( $Label.Tax_Date_13 ),
+1.16,
+1.13
+)
+)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>娑堣垂绋�(鍐呰锤)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Team__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Team__c.field-meta.xml
new file mode 100644
index 0000000..c0f69f1
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Team__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Team__c</fullName>
+ <externalId>false</externalId>
+ <formula>Owner.Group__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>缁�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/TenderBeginDate_New__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/TenderBeginDate_New__c.field-meta.xml
new file mode 100644
index 0000000..9c3c484
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/TenderBeginDate_New__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>TenderBeginDate_New__c</fullName>
+ <externalId>false</externalId>
+ <label>椤圭洰:鎷涙爣鏃�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/TenderBeginDate__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/TenderBeginDate__c.field-meta.xml
new file mode 100644
index 0000000..a946ea0
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/TenderBeginDate__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>TenderBeginDate__c</fullName>
+ <description>XYOU-CBU8TZ锛欴ATEVALUE(Bidding_Project_Name_Bid__r.TenderBeginTime__c)20220720 XLIU-CGGDMS 澶囦唤if(NOT(ISBLANK(Bidding_Project_Name_Bid__r.TenderBeginTime__c)),DATEVALUE(Bidding_Project_Name_Bid__r.TenderBeginTime__c),if(NOT(ISBLANK(Bidding_Project_Name_Bid__r.TenderEndTime__c)), DATEVALUE(Bidding_Project_Name_Bid__r.TenderEndTime__c),
+if(NOT(ISBLANK(Bidding_Project_Name_Bid__r.publicDate__c)),Bidding_Project_Name_Bid__r.publicDate__c,null)))</description>
+ <externalId>false</externalId>
+ <formula>IF(OR(TEXT(Bidding_Project_Name_Bid__r.InfoType__c) = '1锛氶鍛�', TEXT(Bidding_Project_Name_Bid__r.TerminateApprovalStatus__c) = '鎵瑰噯'),NULL,Bidding_Project_Name_Bid__r.TenderDate__c)</formula>
+ <inlineHelpText>1锛庨」鐩樁娈�=1锛氶鍛婏紝鎴栬�呴」鐩殑缁堟瀹℃壒鐘舵��=鎵瑰噯鐨勬椂鍊欙紝鏄剧ず绌猴紝
+2.鍏朵粬闃舵锛屽鏋滄湁鎶曟爣寮�濮嬫棩鍙栧紑濮嬫棩锛屾湁鎶曟爣鎴嚦鏃ュ彇鎴嚦锛屾渶鍚庢墠鍙栧叕鍛婅褰曟棩</inlineHelpText>
+ <label>椤圭洰:鎷涙爣鏃�(鍏紡)</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Tender_Number_Flag__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Tender_Number_Flag__c.field-meta.xml
new file mode 100644
index 0000000..b09c158
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Tender_Number_Flag__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Tender_Number_Flag__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(NOT(ISBLANK(Authorized_DB_No__c)),1,if(Tender_Number__c >0 , 1, 0))</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鎷涙爣鏁�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Tender_Number__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Tender_Number__c.field-meta.xml
new file mode 100644
index 0000000..b7e9c01
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Tender_Number__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Tender_Number__c</fullName>
+ <externalId>false</externalId>
+ <label>鎷涙爣鏁�(绱)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Territory2Id.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Territory2Id.field-meta.xml
new file mode 100644
index 0000000..ccfca64
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Territory2Id.field-meta.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Territory2Id</fullName>
+ <trackTrending>false</trackTrending>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Test_staff__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Test_staff__c.field-meta.xml
new file mode 100644
index 0000000..416eb31
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Test_staff__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Test_staff__c</fullName>
+ <externalId>false</externalId>
+ <formula>Owner.Test_staff__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>寮�鍙�/娴嬭瘯鍛樺伐</label>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/ThisPhase_Ship_Forecast__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/ThisPhase_Ship_Forecast__c.field-meta.xml
new file mode 100644
index 0000000..96ceffb
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/ThisPhase_Ship_Forecast__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ThisPhase_Ship_Forecast__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>鐗规畩璇环</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/ThisYear_Opp__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/ThisYear_Opp__c.field-meta.xml
new file mode 100644
index 0000000..9b3bd29
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/ThisYear_Opp__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ThisYear_Opp__c</fullName>
+ <externalId>false</externalId>
+ <formula>if(month(TODAY()) <= 3 ,
+Close_Forecasted_Date__c >= DATE(YEAR(TODAY()) - 1 ,4,1) ,
+Close_Forecasted_Date__c >= DATE(YEAR(TODAY()),4,1)
+)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏈储骞磋浠�</label>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/ToDo__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/ToDo__c.field-meta.xml
new file mode 100644
index 0000000..a2024e6
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/ToDo__c.field-meta.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ToDo__c</fullName>
+ <description>"/00T/e?&what_id="
+Id
+"&retURL=%2F&"
+Id</description>
+ <externalId>false</externalId>
+ <formula>HYPERLINK
+("/00T/e?&what_id="
+& Id
+& "&retURL=%2F&"
+& Id, "鈻�")</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鍒涘缓ToDo</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Today_Rate__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Today_Rate__c.field-meta.xml
new file mode 100644
index 0000000..f3a7013
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Today_Rate__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Today_Rate__c</fullName>
+ <description>/* 6.43 * Saleforce Conversion Rate */</description>
+ <externalId>false</externalId>
+ <formula>0.86891805</formula>
+ <label>鏈�鏂版崲甯�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>13</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/TotalOpportunityQuantity.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/TotalOpportunityQuantity.field-meta.xml
new file mode 100644
index 0000000..2c0d4db
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/TotalOpportunityQuantity.field-meta.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>TotalOpportunityQuantity</fullName>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Town__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Town__c.field-meta.xml
new file mode 100644
index 0000000..7efcb47
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Town__c.field-meta.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Town__c</fullName>
+ <externalId>false</externalId>
+ <formula>/* 01210000000QemG == 鍖婚櫌鐨勮褰曠被鍨嬬殑Id */
+IF(Account.Parent.Parent.RecordTypeId = "01210000000QemG",
+ Account.Parent.Parent.Town__c,
+/* 01210000000Qem1 == 缁忛攢鍟嗙殑璁板綍绫诲瀷鐨処d */
+IF(Account.Parent.RecordTypeId = "01210000000Qem1",
+ Account.Town__c,
+ ""
+))</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鍘�/鍖�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Trade__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Trade__c.field-meta.xml
new file mode 100644
index 0000000..2249c88
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Trade__c.field-meta.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Trade__c</fullName>
+ <externalId>false</externalId>
+ <label>鍐呰锤/澶栬锤</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+ <valueSet>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>鍐呰部</fullName>
+ <default>false</default>
+ <label>鍐呰部</label>
+ </value>
+ <value>
+ <fullName>澶栬部</fullName>
+ <default>false</default>
+ <label>澶栬部</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/TxtShippedAmount_ThisYear_PB_Sum__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/TxtShippedAmount_ThisYear_PB_Sum__c.field-meta.xml
new file mode 100644
index 0000000..b2124f6
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/TxtShippedAmount_ThisYear_PB_Sum__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>TxtShippedAmount_ThisYear_PB_Sum__c</fullName>
+ <externalId>false</externalId>
+ <label>宸插彂璐ч噾棰�(鍚◣)(148PB)_SumTxt</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Type.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Type.field-meta.xml
new file mode 100644
index 0000000..6861e78
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Type.field-meta.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Type</fullName>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/UnshippedAmount_DN__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/UnshippedAmount_DN__c.field-meta.xml
new file mode 100644
index 0000000..02a046f
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/UnshippedAmount_DN__c.field-meta.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>UnshippedAmount_DN__c</fullName>
+ <externalId>false</externalId>
+ <label>(鍚庡彴鐢�)/鏈彂璐ч噾棰�(鍚◣DN)</label>
+ <summarizedField>Statu_Achievements__c.DNUnshippedAmount_DN_A__c</summarizedField>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.Valid_Statu_Achievements__c</field>
+ <operation>equals</operation>
+ <value>1</value>
+ </summaryFilterItems>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.FALSE_Order__c</field>
+ <operation>notEqual</operation>
+ <value>FALSE</value>
+ </summaryFilterItems>
+ <summaryForeignKey>Statu_Achievements__c.Opportunity__c</summaryForeignKey>
+ <summaryOperation>sum</summaryOperation>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Summary</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/UnshippedAmount_without_tax__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/UnshippedAmount_without_tax__c.field-meta.xml
new file mode 100644
index 0000000..30feea8
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/UnshippedAmount_without_tax__c.field-meta.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>UnshippedAmount_without_tax__c</fullName>
+ <externalId>false</externalId>
+ <label>(鍚庡彴鐢�)/鏈彂璐ч噾棰�(涓嶅惈绋庨櫎璁℃彁DN)</label>
+ <summarizedField>Statu_Achievements__c.UnshippedAmount_without_tax_A__c</summarizedField>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.Valid_Statu_Achievements__c</field>
+ <operation>equals</operation>
+ <value>1</value>
+ </summaryFilterItems>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.FALSE_Order__c</field>
+ <operation>notEqual</operation>
+ <value>FALSE</value>
+ </summaryFilterItems>
+ <summaryForeignKey>Statu_Achievements__c.Opportunity__c</summaryForeignKey>
+ <summaryOperation>sum</summaryOperation>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Summary</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Update_follow_category__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Update_follow_category__c.field-meta.xml
new file mode 100644
index 0000000..ce661aa
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Update_follow_category__c.field-meta.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Update_follow_category__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(Datevalue(LastModifiedDate) < Today() && Today() <=
+Datevalue(LastModifiedDate + 1),"鏄ㄥぉ鏇存柊",
+IF(Last_Follow_Up_Date__c < Today() && Today() <=
+Last_Follow_Up_Date__c+ 1,"鏄ㄥぉ璺熻繘",""))</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏄ㄥぉ鏇存柊/璺熻繘鐨勮浠�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Update_situation__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Update_situation__c.field-meta.xml
new file mode 100644
index 0000000..0fc3df1
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Update_situation__c.field-meta.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Update_situation__c</fullName>
+ <description>--20230911BK
+IF(
+text(Year(Created_Day__c)) & text(Month(Created_Day__c)) =
+text(Year(today())) & text(Month(today())),"鏈湀鍒涘缓",
+
+IF(ISBLANK(Key_tipics_last_update_day__c),"杩樻病鏇存柊",
+
+IF(
+text(Year(Key_tipics_last_update_day__c)) & text(Month(Key_tipics_last_update_day__c)) =
+text(Year(today())) & text(Month(today())),"鏈湀鏇存柊",
+
+IF(
+text(Year(Key_tipics_last_update_day__c)) & text(Month(Key_tipics_last_update_day__c)) =
+text(Year(today())) & text(Month(today())-1),"涓婁釜鏈堟洿鏂�",
+
+"鏈�杩�2涓湀娌℃洿鏂�")
+
+)
+)
+)</description>
+ <externalId>false</externalId>
+ <formula>IF(
+text(Year(Created_Day__c)) & text(Month(Created_Day__c)) =
+text(Year(today())) & text(Month(today())),"鏈湀鍒涘缓",
+
+IF(ISBLANK(Key_tipics_last_update_dayF__c),"杩樻病鏇存柊",
+
+IF(
+text(Year(Key_tipics_last_update_dayF__c)) & text(Month(Key_tipics_last_update_dayF__c)) =
+text(Year(today())) & text(Month(today())),"鏈湀鏇存柊",
+
+IF(
+text(Year(Key_tipics_last_update_dayF__c)) & text(Month(Key_tipics_last_update_dayF__c)) =
+text(Year(today())) & text(Month(today())-1),"涓婁釜鏈堟洿鏂�",
+
+"鏈�杩�2涓湀娌℃洿鏂�")
+
+)
+)
+)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏇存柊鎯呭喌</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Visit_Head_Doctor_Count__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Visit_Head_Doctor_Count__c.field-meta.xml
new file mode 100644
index 0000000..7439011
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Visit_Head_Doctor_Count__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Visit_Head_Doctor_Count__c</fullName>
+ <externalId>false</externalId>
+ <label>鎷滆涓讳换娆℃暟</label>
+ <precision>8</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Visit_Head_Doctor_Flag__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Visit_Head_Doctor_Flag__c.field-meta.xml
new file mode 100644
index 0000000..a364936
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Visit_Head_Doctor_Flag__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Visit_Head_Doctor_Flag__c</fullName>
+ <externalId>false</externalId>
+ <formula>if(Visit_Head_Doctor_Count__c > 0, 1, 0)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏄惁鎷滆涓讳换</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Visit_President_Count__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Visit_President_Count__c.field-meta.xml
new file mode 100644
index 0000000..59bc876
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Visit_President_Count__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Visit_President_Count__c</fullName>
+ <externalId>false</externalId>
+ <label>鎷滆闄㈤暱娆℃暟</label>
+ <precision>8</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Visit_President_Flag__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Visit_President_Flag__c.field-meta.xml
new file mode 100644
index 0000000..e0de513
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Visit_President_Flag__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Visit_President_Flag__c</fullName>
+ <externalId>false</externalId>
+ <formula>if(Visit_President_Count__c > 0, 1, 0)</formula>
+ <label>鏄惁鎷滆闄㈤暱</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Weekly__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Weekly__c.field-meta.xml
new file mode 100644
index 0000000..ed9b29a
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Weekly__c.field-meta.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Weekly__c</fullName>
+ <externalId>false</externalId>
+ <formula>"绗�"&
+text(
+IF(
+ CEILING( ( today()- DATE( YEAR( today()), 1, 1) + 1) / 7) > 52,
+ 52,
+ CEILING( ( today() - DATE( YEAR( today() ), 1, 1) + 1) / 7)
+))&"鍛�"</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>绗嚑鍛�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/WhetherTrySpareParts_1y__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/WhetherTrySpareParts_1y__c.field-meta.xml
new file mode 100644
index 0000000..af06b1c
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/WhetherTrySpareParts_1y__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>WhetherTrySpareParts_1y__c</fullName>
+ <defaultValue>false</defaultValue>
+ <description>CHAN-BEN5UC</description>
+ <externalId>false</externalId>
+ <label>鏄惁璇曠敤澶囧搧锛堜竴骞村唴锛�</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/WhetherTrySpareParts_3m__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/WhetherTrySpareParts_3m__c.field-meta.xml
new file mode 100644
index 0000000..e8c25c5
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/WhetherTrySpareParts_3m__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>WhetherTrySpareParts_3m__c</fullName>
+ <defaultValue>false</defaultValue>
+ <description>CHAN-BEN5UC</description>
+ <externalId>false</externalId>
+ <label>鏄惁璇曠敤澶囧搧锛�3涓湀鍐咃級</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/WhetherTrySpareParts_6m__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/WhetherTrySpareParts_6m__c.field-meta.xml
new file mode 100644
index 0000000..81bf3e9
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/WhetherTrySpareParts_6m__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>WhetherTrySpareParts_6m__c</fullName>
+ <defaultValue>false</defaultValue>
+ <description>CHAN-BEN5UC</description>
+ <externalId>false</externalId>
+ <label>鏄惁璇曠敤澶囧搧锛堝崐骞村唴锛�</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Whether_Bidding__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Whether_Bidding__c.field-meta.xml
new file mode 100644
index 0000000..46f3339
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Whether_Bidding__c.field-meta.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Whether_Bidding__c</fullName>
+ <description>璇环鐨勬嫑鏍囬」鐩笉搴旀爣瀹℃壒,濡傛灉瀹℃壒閫氳繃锛屽垯灏嗗叾璧嬪�间负鈥樺惁鈥�</description>
+ <externalId>false</externalId>
+ <label>鏄惁搴旀爣</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+ <valueSet>
+ <restricted>true</restricted>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>鏄�</fullName>
+ <default>false</default>
+ <label>鏄�</label>
+ </value>
+ <value>
+ <fullName>鍚�</fullName>
+ <default>false</default>
+ <label>鍚�</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Whether_FALSE_order__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Whether_FALSE_order__c.field-meta.xml
new file mode 100644
index 0000000..7586933
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Whether_FALSE_order__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Whether_FALSE_order__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>FALSE璁㈠崟鐢宠</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Whether_Upload_Bidding_Document__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Whether_Upload_Bidding_Document__c.field-meta.xml
new file mode 100644
index 0000000..4fc8dc7
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Whether_Upload_Bidding_Document__c.field-meta.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Whether_Upload_Bidding_Document__c</fullName>
+ <externalId>false</externalId>
+ <formula>CASE(TEXT(Last_opportunity_file__r.Oppor_File_Stage__c),
+'A', 1,
+'B', 1,
+'C', 1,
+'D', 1,
+'E', 1,
+ 0
+)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏄惁涓婁紶涓爣鏂囦欢</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Whether_Upload_Question_Document__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Whether_Upload_Question_Document__c.field-meta.xml
new file mode 100644
index 0000000..62424ac
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Whether_Upload_Question_Document__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Whether_Upload_Question_Document__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(TEXT(Last_opportunity_file__r.Oppor_File_Stage__c) == 'F', 1, 0)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏄惁涓婁紶璐ㄧ枒鍑�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Whether_update_PCL_this_month__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Whether_update_PCL_this_month__c.field-meta.xml
new file mode 100644
index 0000000..74bbeb0
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Whether_update_PCL_this_month__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Whether_update_PCL_this_month__c</fullName>
+ <externalId>false</externalId>
+ <formula>If(Update_situation__c="鏈湀鏇存柊",1,0)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏄惁鏈湀鏇存柊璇环</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Wholesale_Price_F_RMB__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Wholesale_Price_F_RMB__c.field-meta.xml
new file mode 100644
index 0000000..5f0fd5c
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Wholesale_Price_F_RMB__c.field-meta.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Wholesale_Price_F_RMB__c</fullName>
+ <description>杞崲鍚庣殑RMB閲戦/1000</description>
+ <externalId>false</externalId>
+ <formula>Wholesale_Price_F__c/1000</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>棰勬祴鍚堝悓閲戦(KRMB鍚◣)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Wholesale_Price_F_SAP_WIN__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Wholesale_Price_F_SAP_WIN__c.field-meta.xml
new file mode 100644
index 0000000..8fc70bf
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Wholesale_Price_F_SAP_WIN__c.field-meta.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Wholesale_Price_F_SAP_WIN__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(SAP_Send_OK__c = True,
+IF(SAP_Send_OK__c && (Agency1__r.Special__c || Agency2__r.Special__c || Account.Parent.Special__c) && $User.ViewSpecialAgencyAmout__c == False, null,
+Wholesale_Price__c
+),0)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>宸睸AP-WIN鐨凮CSM棰勬祴鎴愪氦閲戦(鍚◣)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Wholesale_Price_F__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Wholesale_Price_F__c.field-meta.xml
new file mode 100644
index 0000000..4e5d571
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Wholesale_Price_F__c.field-meta.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Wholesale_Price_F__c</fullName>
+ <description>OCSM棰勬祴鎴愪氦閲戦(鍚◣)</description>
+ <externalId>false</externalId>
+ <formula>IF(SAP_Send_OK__c && (Agency1__r.Special__c || Agency2__r.Special__c || Account.Parent.Special__c) && $User.ViewSpecialAgencyAmout__c == False, null,
+ Wholesale_Price__c
+)</formula>
+ <inlineHelpText>涓庣粡閿�鍟嗙璁㈢殑鍚堝悓閲戦</inlineHelpText>
+ <label>棰勬祴鍚堝悓閲戦锛堝惈绋庯級</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Wholesale_Price_F_backup__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Wholesale_Price_F_backup__c.field-meta.xml
new file mode 100644
index 0000000..fabc928
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Wholesale_Price_F_backup__c.field-meta.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Wholesale_Price_F_backup__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(SAP_Send_OK__c && (Agency1__r.Special__c || Agency2__r.Special__c || Account.Parent.Special__c) && $User.ViewSpecialAgencyAmout__c == False, null,
+Wholesale_Price_backup__c
+)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>OCSM棰勬祴鎴愪氦閲戦(鍚◣) 姣�3涓伐浣滄棩</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Wholesale_Price__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Wholesale_Price__c.field-meta.xml
new file mode 100644
index 0000000..0d8e900
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Wholesale_Price__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Wholesale_Price__c</fullName>
+ <externalId>false</externalId>
+ <label>(鏂囨湰)/棰勬祴鍚堝悓閲戦锛堝惈绋庯級</label>
+ <precision>13</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>true</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Wholesale_Price_backup__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Wholesale_Price_backup__c.field-meta.xml
new file mode 100644
index 0000000..c3b9406
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Wholesale_Price_backup__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Wholesale_Price_backup__c</fullName>
+ <externalId>false</externalId>
+ <inlineHelpText>Wholesale_Price__c鐨勫鍝�</inlineHelpText>
+ <label>OCSM棰勬祴鎴愪氦閲戦(鍚◣) 鍏� 姣�3涓伐浣滄棩</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/WinCnt__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/WinCnt__c.field-meta.xml
new file mode 100644
index 0000000..df029e9
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/WinCnt__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>WinCnt__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF( OR( TEXT(StageName) = '娉ㄦ畫',TEXT(StageName) = '鍑鸿嵎',TEXT(StageName) = '瀹屼簡') , 1, 0)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>璧㈠崟鏁�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/X153PNetWorthNoProviston__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/X153PNetWorthNoProviston__c.field-meta.xml
new file mode 100644
index 0000000..705ae77
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/X153PNetWorthNoProviston__c.field-meta.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>X153PNetWorthNoProviston__c</fullName>
+ <externalId>false</externalId>
+ <label>褰撴湡鍙戣揣閲戦_鍏冿紙涓嶅惈绋庝笉鍚鎻愶級(DN)</label>
+ <summarizedField>Statu_Achievements__c.X153PNetWorthNoProviston_AA__c</summarizedField>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.FALSE_Order__c</field>
+ <operation>notEqual</operation>
+ <value>FALSE</value>
+ </summaryFilterItems>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.Valid_Statu_Achievements1__c</field>
+ <operation>equals</operation>
+ <value>1</value>
+ </summaryFilterItems>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.DeliveryDate__c</field>
+ <operation>notEqual</operation>
+ <value></value>
+ </summaryFilterItems>
+ <summaryForeignKey>Statu_Achievements__c.Opportunity__c</summaryForeignKey>
+ <summaryOperation>sum</summaryOperation>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Summary</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/X30_Deposit_Day_New__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/X30_Deposit_Day_New__c.field-meta.xml
new file mode 100644
index 0000000..b5d153f
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/X30_Deposit_Day_New__c.field-meta.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>X30_Deposit_Day_New__c</fullName>
+ <externalId>false</externalId>
+ <label>20.30%棰勪粯娆炬棩鏈�(IF)</label>
+ <summarizedField>Statu_Achievements__c.X30_Deposit_Day__c</summarizedField>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.Status_1_text__c</field>
+ <operation>notEqual</operation>
+ <value>鏃犳晥,閫�璐�</value>
+ </summaryFilterItems>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.Valid_Statu_Achievements__c</field>
+ <operation>equals</operation>
+ <value>1</value>
+ </summaryFilterItems>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.FALSE_Order__c</field>
+ <operation>notEqual</operation>
+ <value>FALSE</value>
+ </summaryFilterItems>
+ <summaryFilterItems>
+ <field>Statu_Achievements__c.Expire__c</field>
+ <operation>notEqual</operation>
+ <value>True</value>
+ </summaryFilterItems>
+ <summaryForeignKey>Statu_Achievements__c.Opportunity__c</summaryForeignKey>
+ <summaryOperation>max</summaryOperation>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Summary</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/X30_Deposit_Day__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/X30_Deposit_Day__c.field-meta.xml
new file mode 100644
index 0000000..314c70f
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/X30_Deposit_Day__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>X30_Deposit_Day__c</fullName>
+ <externalId>false</externalId>
+ <label>20.30%棰勪粯娆炬棩鏈�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/X500_2015_1_27__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/X500_2015_1_27__c.field-meta.xml
new file mode 100644
index 0000000..5312468
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/X500_2015_1_27__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>X500_2015_1_27__c</fullName>
+ <externalId>false</externalId>
+ <label>鍗敓閮�500瀹堕噸鐐规壎妞嶅尰闄㈠璞�(2015骞�1鏈�27鏃�)</label>
+ <length>250</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Xin_Gross_Follow_Num__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Xin_Gross_Follow_Num__c.field-meta.xml
new file mode 100644
index 0000000..126ec63
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Xin_Gross_Follow_Num__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Xin_Gross_Follow_Num__c</fullName>
+ <externalId>false</externalId>
+ <label>绱璺熻繘娆℃暟</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/Xin_Last_Follow_Up_Date_For_Report__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/Xin_Last_Follow_Up_Date_For_Report__c.field-meta.xml
new file mode 100644
index 0000000..791b618
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/Xin_Last_Follow_Up_Date_For_Report__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Xin_Last_Follow_Up_Date_For_Report__c</fullName>
+ <externalId>false</externalId>
+ <label>2.鏈�鍚庢嫓璁挎椂闂达紙涓嶈锛�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>DateTime</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/bid_Confrim_Date__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/bid_Confrim_Date__c.field-meta.xml
new file mode 100644
index 0000000..ff0d6cb
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/bid_Confrim_Date__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>bid_Confrim_Date__c</fullName>
+ <externalId>false</externalId>
+ <label>鏍囦功纭鏃�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/ifOpenBid__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/ifOpenBid__c.field-meta.xml
new file mode 100644
index 0000000..da7d81a
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/ifOpenBid__c.field-meta.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ifOpenBid__c</fullName>
+ <externalId>false</externalId>
+ <label>鏄惁鍏紑鎷涙爣</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+ <valueSet>
+ <restricted>true</restricted>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>鍏紑鎷涙爣</fullName>
+ <default>false</default>
+ <label>鍏紑鎷涙爣</label>
+ </value>
+ <value>
+ <fullName>闈炲叕寮�鎷涙爣</fullName>
+ <default>false</default>
+ <label>闈炲叕寮�鎷涙爣</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/if_Interface_Lock__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/if_Interface_Lock__c.field-meta.xml
new file mode 100644
index 0000000..bec6b9c
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/if_Interface_Lock__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>if_Interface_Lock__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>璇环缂栫爜閿佸畾鏍囧織(鍚庡彴鐢�)</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/if_NeedImportDemonstration__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/if_NeedImportDemonstration__c.field-meta.xml
new file mode 100644
index 0000000..f2bab75
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/if_NeedImportDemonstration__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>if_NeedImportDemonstration__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>闇�瑕佽繘鍙ｈ璇�</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/isContainsStrategyProduct__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/isContainsStrategyProduct__c.field-meta.xml
new file mode 100644
index 0000000..78eb704
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/isContainsStrategyProduct__c.field-meta.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>isContainsStrategyProduct__c</fullName>
+ <description>SWAG-BGCCB9</description>
+ <externalId>false</externalId>
+ <formula>if(not(Estimation_Decision__c) ||StrategyProductNumber__c =0, 0, 1)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏄惁鍖呭惈鎴樼暐浜у搧</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/isOwnerDiffWithAccount__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/isOwnerDiffWithAccount__c.field-meta.xml
new file mode 100644
index 0000000..8d986fb
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/isOwnerDiffWithAccount__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>isOwnerDiffWithAccount__c</fullName>
+ <externalId>false</externalId>
+ <formula>AccountId != null && OwnerId != Custmor_pic_ID__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏄惁涓绘媴褰撳拰鎴樼暐绉戝涓绘媴褰� 涓嶄竴鑷�</label>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/is_CheckTargetFormula_TF__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/is_CheckTargetFormula_TF__c.field-meta.xml
new file mode 100644
index 0000000..64fea24
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/is_CheckTargetFormula_TF__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>is_CheckTargetFormula_TF__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(If_Need_Authorize__c == true && !ISBLANK(Authorized_Finish_Sales__c) , IF(Authorized_Finish_Sales__c == IF(Agency2__c == null,Agency1__r.Name, Agency2__r.Name), True, False), False)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鎺堟潈缁忛攢鍟嗕竴鑷存�ф鏌�</label>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/is_CheckTarget_TF__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/is_CheckTarget_TF__c.field-meta.xml
new file mode 100644
index 0000000..c9741ef
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/is_CheckTarget_TF__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>is_CheckTarget_TF__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>鎷涙爣淇℃伅涓�鑷存�ф鏌�</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/leaveTime__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/leaveTime__c.field-meta.xml
new file mode 100644
index 0000000..2b9ed5e
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/leaveTime__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>leaveTime__c</fullName>
+ <externalId>false</externalId>
+ <formula>TODAY() - datevalue(LastModifiedDate)</formula>
+ <label>鏈洿鏂板ぉ鏁�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/multiYearWarranty__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/multiYearWarranty__c.field-meta.xml
new file mode 100644
index 0000000..d451413
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/multiYearWarranty__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>multiYearWarranty__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>鍙栨秷甯傚満澶氬勾淇濅慨</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/oldData_flg__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/oldData_flg__c.field-meta.xml
new file mode 100644
index 0000000..e7a935d
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/oldData_flg__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>oldData_flg__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>涓嶄娇鐢� 鏃ф暟鎹�</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/old_Oppo_No__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/old_Oppo_No__c.field-meta.xml
new file mode 100644
index 0000000..690ad9c
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/old_Oppo_No__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>old_Oppo_No__c</fullName>
+ <externalId>false</externalId>
+ <label>鍘熻浠风紪鐮�</label>
+ <length>32</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/opp_quotes_num__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/opp_quotes_num__c.field-meta.xml
new file mode 100644
index 0000000..876d8d5
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/opp_quotes_num__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>opp_quotes_num__c</fullName>
+ <externalId>false</externalId>
+ <label>鎶ヤ环鏁伴噺</label>
+ <summaryForeignKey>Quote.OpportunityId</summaryForeignKey>
+ <summaryOperation>count</summaryOperation>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Summary</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/opp_updated_history__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/opp_updated_history__c.field-meta.xml
new file mode 100644
index 0000000..e406d2c
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/opp_updated_history__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>opp_updated_history__c</fullName>
+ <externalId>false</externalId>
+ <formula>HYPERLINK
+("/00O10000002lqdb?pv0=" + Id, "璇环鏇存柊鍘嗗彶")</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>璇环鏇存柊鍘嗗彶</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/order_Date_For_Report__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/order_Date_For_Report__c.field-meta.xml
new file mode 100644
index 0000000..ec88985
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/order_Date_For_Report__c.field-meta.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>order_Date_For_Report__c</fullName>
+ <description>IF(ISNULL(SAP_Send_OK_Date__c) || SAP_Send_OK__c = False, Close_Forecasted_Date__c ,DATEVALUE(SAP_Send_OK_Date__c))
+
+锛燂紵Contract_recognized_day_1__c锛燂紵
+
+--20151030 back--
+IF(text(StageName)="鐩",CloseDate,
+IF(AND( SAP_Send_OK__c = False,ISBLANK(Contract_recognized_day_1__c)),Close_Forecasted_Date__c ,Contract_recognized_day_1__c))</description>
+ <externalId>false</externalId>
+ <formula>IF(text(StageName)="鐩",CloseDate,
+ IF(AND(SAP_Send_OK__c = true,NOT(ISNULL(Contract_recognized_day_1__c))),Contract_recognized_day_1__c,
+ Close_Forecasted_Date__c
+ )
+)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鏃ユ湡(璁㈣揣鏃�)鈽�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/ossibility_mark_link__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/ossibility_mark_link__c.field-meta.xml
new file mode 100644
index 0000000..7e3f9f3
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/ossibility_mark_link__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ossibility_mark_link__c</fullName>
+ <externalId>false</externalId>
+ <formula>HYPERLINK
+("/00O10000002lqdb?pv0=" + Id, Possibility_mark__c)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鍙兘鎬ч娴�(閾炬帴)</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/owner_not_automatically_update__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/owner_not_automatically_update__c.field-meta.xml
new file mode 100644
index 0000000..c368e62
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/owner_not_automatically_update__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>owner_not_automatically_update__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>鍗曠嫭缁存姢鎵�鏈変汉</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/quoteSavedDate__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/quoteSavedDate__c.field-meta.xml
new file mode 100644
index 0000000..3eaa177
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/quoteSavedDate__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>quoteSavedDate__c</fullName>
+ <description>澶氬勾淇濅慨</description>
+ <externalId>false</externalId>
+ <label>3.1 鎶ヤ环鏃�</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/remarks__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/remarks__c.field-meta.xml
new file mode 100644
index 0000000..1b1c1c2
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/remarks__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>remarks__c</fullName>
+ <externalId>false</externalId>
+ <label>澶囨敞</label>
+ <length>15</length>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/response__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/response__c.field-meta.xml
new file mode 100644
index 0000000..e887cd2
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/response__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>response__c</fullName>
+ <externalId>false</externalId>
+ <label>搴旂瓟娌熼�氳褰�</label>
+ <length>128000</length>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>LongTextArea</type>
+ <visibleLines>8</visibleLines>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/subInfoType__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/subInfoType__c.field-meta.xml
new file mode 100644
index 0000000..3c4c666
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/subInfoType__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>subInfoType__c</fullName>
+ <externalId>false</externalId>
+ <formula>TEXT( Bidding_Project_Name_Bid__r.subInfoType__c)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>椤圭洰:闃舵琛ュ厖</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/fields/testUpdateQ__c.field-meta.xml b/force-app/main/default/objects/Opportunity/fields/testUpdateQ__c.field-meta.xml
new file mode 100644
index 0000000..ed5012c
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/fields/testUpdateQ__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>testUpdateQ__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>娴嬭瘯batch鏇存柊(鍙敤涓�娆�)</label>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Opportunity/listViews/AllForcastFollowThisMONTH.listView-meta.xml b/force-app/main/default/objects/Opportunity/listViews/AllForcastFollowThisMONTH.listView-meta.xml
new file mode 100644
index 0000000..7fc8da6
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/listViews/AllForcastFollowThisMONTH.listView-meta.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ListView xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>AllForcastFollowThisMONTH</fullName>
+ <columns>Sales_assistant_name__c</columns>
+ <columns>Opportunity_No__c</columns>
+ <columns>ACCOUNT.NAME</columns>
+ <columns>OPPORTUNITY.NAME</columns>
+ <columns>Bid_Date__c</columns>
+ <columns>Closing_Bid_Date__c</columns>
+ <columns>Opportunity_stage__c</columns>
+ <columns>Competitor__c</columns>
+ <columns>Close_Forecasted_Date__c</columns>
+ <columns>OPPORTUNITY.CLOSE_DATE</columns>
+ <columns>Follow_up_comment__c</columns>
+ <columns>CORE.USERS.ALIAS</columns>
+ <filterScope>Everything</filterScope>
+ <filters>
+ <field>OPPORTUNITY.RECORDTYPE</field>
+ <operation>equals</operation>
+ <value>Opportunity.Opportunity</value>
+ </filters>
+ <filters>
+ <field>OPPORTUNITY.STAGE_NAME</field>
+ <operation>equals</operation>
+ <value>寮曞悎,璇环</value>
+ </filters>
+ <filters>
+ <field>order_Date_For_Report__c</field>
+ <operation>lessOrEqual</operation>
+ <value>THIS_MONTH</value>
+ </filters>
+ <filters>
+ <field>SAP_Send_OK__c</field>
+ <operation>equals</operation>
+ <value>0</value>
+ </filters>
+ <label>02-1锛氭湰鏈堥娴嬫垚浜ょ殑璇环</label>
+ <language>ja</language>
+</ListView>
diff --git a/force-app/main/default/objects/Opportunity/listViews/AllForcastFollowThisMONTHtoship.listView-meta.xml b/force-app/main/default/objects/Opportunity/listViews/AllForcastFollowThisMONTHtoship.listView-meta.xml
new file mode 100644
index 0000000..6958b48
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/listViews/AllForcastFollowThisMONTHtoship.listView-meta.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ListView xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>AllForcastFollowThisMONTHtoship</fullName>
+ <columns>Sales_assistant_name__c</columns>
+ <columns>Opportunity_No__c</columns>
+ <columns>ACCOUNT.NAME</columns>
+ <columns>OPPORTUNITY.NAME</columns>
+ <columns>Bid_Date__c</columns>
+ <columns>Closing_Bid_Date__c</columns>
+ <columns>Opportunity_stage__c</columns>
+ <columns>Competitor__c</columns>
+ <columns>Close_Forecasted_Date__c</columns>
+ <columns>OPPORTUNITY.CLOSE_DATE</columns>
+ <columns>Follow_up_comment__c</columns>
+ <columns>CORE.USERS.ALIAS</columns>
+ <filterScope>Everything</filterScope>
+ <filters>
+ <field>OPPORTUNITY.RECORDTYPE</field>
+ <operation>equals</operation>
+ <value>Opportunity.Opportunity</value>
+ </filters>
+ <filters>
+ <field>OPPORTUNITY.STAGE_NAME</field>
+ <operation>equals</operation>
+ <value>寮曞悎,璇环</value>
+ </filters>
+ <filters>
+ <field>Shipping_Date_For_Report__c</field>
+ <operation>lessOrEqual</operation>
+ <value>THIS_MONTH</value>
+ </filters>
+ <filters>
+ <field>SAP_Send_OK__c</field>
+ <operation>equals</operation>
+ <value>0</value>
+ </filters>
+ <label>02-2锛氭湰鏈堥娴嬪彂璐х殑璇环</label>
+ <language>ja</language>
+</ListView>
diff --git a/force-app/main/default/objects/Opportunity/listViews/AllOpportunitiesFollowA.listView-meta.xml b/force-app/main/default/objects/Opportunity/listViews/AllOpportunitiesFollowA.listView-meta.xml
new file mode 100644
index 0000000..3f1a22b
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/listViews/AllOpportunitiesFollowA.listView-meta.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ListView xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>AllOpportunitiesFollowA</fullName>
+ <booleanFilter>1 AND 2 AND 3 AND 4 AND 5</booleanFilter>
+ <columns>Opportunity_No__c</columns>
+ <columns>ACCOUNT.NAME</columns>
+ <columns>OPPORTUNITY.NAME</columns>
+ <columns>Status_Formula__c</columns>
+ <columns>Closing_Bid_Date__c</columns>
+ <columns>Bid60Date__c</columns>
+ <columns>Close_Forecasted_Date__c</columns>
+ <filterScope>Everything</filterScope>
+ <filters>
+ <field>OPPORTUNITY.RECORDTYPE</field>
+ <operation>equals</operation>
+ <value>Opportunity.Opportunity,Opportunity.SI_Oppor</value>
+ </filters>
+ <filters>
+ <field>ForecastAccuracyObject__c</field>
+ <operation>equals</operation>
+ <value>1</value>
+ </filters>
+ <filters>
+ <field>OPPORTUNITY.STAGE_NAME</field>
+ <operation>equals</operation>
+ <value>寮曞悎,璇环</value>
+ </filters>
+ <filters>
+ <field>Bid60NextMonth__c</field>
+ <operation>equals</operation>
+ <value>鏄�</value>
+ </filters>
+ <filters>
+ <field>order_Date_For_Report__c</field>
+ <operation>greaterThan</operation>
+ <value>NEXT_MONTH</value>
+ </filters>
+ <label>03-2 鍔╃悊纭锛氬凡涓爣涓嶅湪娆℃湀棰勬祴</label>
+ <language>ja</language>
+</ListView>
diff --git a/force-app/main/default/objects/Opportunity/listViews/AllOpportunitiesFollowAB.listView-meta.xml b/force-app/main/default/objects/Opportunity/listViews/AllOpportunitiesFollowAB.listView-meta.xml
new file mode 100644
index 0000000..b3bf377
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/listViews/AllOpportunitiesFollowAB.listView-meta.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ListView xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>AllOpportunitiesFollowAB</fullName>
+ <columns>Opportunity_No__c</columns>
+ <columns>ACCOUNT.NAME</columns>
+ <columns>OPPORTUNITY.NAME</columns>
+ <columns>Status_Formula_Option__c</columns>
+ <columns>Closing_Bid_Date__c</columns>
+ <columns>Bid60Date__c</columns>
+ <columns>Close_Forecasted_Date__c</columns>
+ <filterScope>Everything</filterScope>
+ <filters>
+ <field>OPPORTUNITY.RECORDTYPE</field>
+ <operation>equals</operation>
+ <value>Opportunity.Opportunity,Opportunity.SI_Oppor</value>
+ </filters>
+ <filters>
+ <field>ForecastAccuracyObject__c</field>
+ <operation>equals</operation>
+ <value>1</value>
+ </filters>
+ <filters>
+ <field>OPPORTUNITY.STAGE_NAME</field>
+ <operation>equals</operation>
+ <value>寮曞悎,璇环</value>
+ </filters>
+ <filters>
+ <field>Bid60ThisMonth__c</field>
+ <operation>equals</operation>
+ <value>鏄�</value>
+ </filters>
+ <filters>
+ <field>order_Date_For_Report__c</field>
+ <operation>greaterThan</operation>
+ <value>THIS_MONTH</value>
+ </filters>
+ <label>03-1 鍔╃悊纭锛氬凡涓爣涓嶅湪鏈湀棰勬祴</label>
+</ListView>
diff --git a/force-app/main/default/objects/Opportunity/listViews/AllOpportunitiesFollowAll.listView-meta.xml b/force-app/main/default/objects/Opportunity/listViews/AllOpportunitiesFollowAll.listView-meta.xml
new file mode 100644
index 0000000..2c6e17b
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/listViews/AllOpportunitiesFollowAll.listView-meta.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ListView xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>AllOpportunitiesFollowAll</fullName>
+ <columns>Opportunity_No__c</columns>
+ <columns>CORE.USERS.ALIAS</columns>
+ <columns>ACCOUNT.NAME</columns>
+ <columns>OPPORTUNITY.NAME</columns>
+ <columns>Opportunity_stage__c</columns>
+ <columns>Competitor__c</columns>
+ <columns>if_NeedImportDemonstration__c</columns>
+ <columns>ImportDemonstration_Filing_date__c</columns>
+ <columns>ImportDemonstration_Approval_date__c</columns>
+ <columns>ImportDemonstration_Rejection_date__c</columns>
+ <columns>Closing_Bid_Date__c</columns>
+ <columns>Close_Forecasted_Date__c</columns>
+ <columns>OPPORTUNITY.CLOSE_DATE</columns>
+ <columns>Wholesale_Price_F__c</columns>
+ <filterScope>Everything</filterScope>
+ <filters>
+ <field>OPPORTUNITY.RECORDTYPE</field>
+ <operation>equals</operation>
+ <value>Opportunity.Opportunity</value>
+ </filters>
+ <filters>
+ <field>OPPORTUNITY.STAGE_NAME</field>
+ <operation>equals</operation>
+ <value>寮曞悎,璇环</value>
+ </filters>
+ <filters>
+ <field>SAP_Send_OK__c</field>
+ <operation>equals</operation>
+ <value>0</value>
+ </filters>
+ <label>01锛氳繘琛屼腑鎵�鏈夎浠�</label>
+</ListView>
diff --git a/force-app/main/default/objects/Opportunity/listViews/AllOpportunitiesFollowGI_RCN.listView-meta.xml b/force-app/main/default/objects/Opportunity/listViews/AllOpportunitiesFollowGI_RCN.listView-meta.xml
new file mode 100644
index 0000000..a213cf6
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/listViews/AllOpportunitiesFollowGI_RCN.listView-meta.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ListView xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>AllOpportunitiesFollowGI_RCN</fullName>
+ <columns>Opportunity_No__c</columns>
+ <columns>CORE.USERS.ALIAS</columns>
+ <columns>ACCOUNT.NAME</columns>
+ <columns>OPPORTUNITY.NAME</columns>
+ <columns>Bid_Date__c</columns>
+ <columns>Closing_Bid_Date__c</columns>
+ <columns>Next_action__c</columns>
+ <columns>Close_Forecasted_Date__c</columns>
+ <columns>Opportunity_stage__c</columns>
+ <columns>OPPORTUNITY.CLOSE_DATE</columns>
+ <columns>Competitor__c</columns>
+ <columns>Wholesale_Price_F__c</columns>
+ <filterScope>Everything</filterScope>
+ <filters>
+ <field>OPPORTUNITY.RECORDTYPE</field>
+ <operation>equals</operation>
+ <value>Opportunity.Opportunity</value>
+ </filters>
+ <filters>
+ <field>OPPORTUNITY.STAGE_NAME</field>
+ <operation>equals</operation>
+ <value>寮曞悎,璇环</value>
+ </filters>
+ <filters>
+ <field>Opportunity_Category__c</field>
+ <operation>equals</operation>
+ <value>GI,BF</value>
+ </filters>
+ <filters>
+ <field>SAP_Send_OK__c</field>
+ <operation>equals</operation>
+ <value>0</value>
+ </filters>
+ <label>01-2锛氳繘琛屼腑GI璇环</label>
+ <language>ja</language>
+</ListView>
diff --git a/force-app/main/default/objects/Opportunity/listViews/AllOpportunitiesFollowRANK_ACNFORJIALI.listView-meta.xml b/force-app/main/default/objects/Opportunity/listViews/AllOpportunitiesFollowRANK_ACNFORJIALI.listView-meta.xml
new file mode 100644
index 0000000..06578a2
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/listViews/AllOpportunitiesFollowRANK_ACNFORJIALI.listView-meta.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ListView xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>AllOpportunitiesFollowRANK_ACNFORJIALI</fullName>
+ <columns>Opportunity_No__c</columns>
+ <columns>Equipment_Order_Flg__c</columns>
+ <columns>OPPORTUNITY.STAGE_NAME</columns>
+ <columns>ACCOUNT.NAME</columns>
+ <columns>OPPORTUNITY.NAME</columns>
+ <columns>owner_not_automatically_update__c</columns>
+ <columns>Opportunity_stage__c</columns>
+ <columns>Competitor__c</columns>
+ <columns>Close_Forecasted_Date__c</columns>
+ <columns>OPPORTUNITY.CLOSE_DATE</columns>
+ <columns>Wholesale_Price_F__c</columns>
+ <filterScope>Everything</filterScope>
+ <filters>
+ <field>OPPORTUNITY.RECORDTYPE</field>
+ <operation>equals</operation>
+ <value>Opportunity.Opportunity</value>
+ </filters>
+ <filters>
+ <field>Equipment_Order_Flg__c</field>
+ <operation>equals</operation>
+ <value>1</value>
+ </filters>
+ <filters>
+ <field>OPPORTUNITY.STAGE_NAME</field>
+ <operation>equals</operation>
+ <value>娉ㄦ畫,鍑鸿嵎,鍙戣揣,瀹屼簡,瀹屾瘯</value>
+ </filters>
+ <filters>
+ <field>CelonOpportunity__c</field>
+ <operation>notEqual</operation>
+ <value>Celon涓绘満,Celon鑰楁潗</value>
+ </filters>
+ <label>71. 鍏ㄥ浗涓氱哗璇环</label>
+ <language>ja</language>
+ <sharedTo>
+ <group>Te2am_member</group>
+ </sharedTo>
+</ListView>
diff --git a/force-app/main/default/objects/Opportunity/listViews/AllOpportunitiesFollowRANK_DATE1.listView-meta.xml b/force-app/main/default/objects/Opportunity/listViews/AllOpportunitiesFollowRANK_DATE1.listView-meta.xml
new file mode 100644
index 0000000..9dfa331
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/listViews/AllOpportunitiesFollowRANK_DATE1.listView-meta.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ListView xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>AllOpportunitiesFollowRANK_DATE1</fullName>
+ <columns>Opportunity_No__c</columns>
+ <columns>ACCOUNT.NAME</columns>
+ <columns>OPPORTUNITY.NAME</columns>
+ <columns>Bid_Date__c</columns>
+ <columns>Closing_Bid_Date__c</columns>
+ <columns>Close_Forecasted_Date__c</columns>
+ <columns>CORE.USERS.ALIAS</columns>
+ <filterScope>Everything</filterScope>
+ <filters>
+ <field>OPPORTUNITY.RECORDTYPE</field>
+ <operation>equals</operation>
+ <value>Opportunity.Opportunity</value>
+ </filters>
+ <filters>
+ <field>OPPORTUNITY.STAGE_NAME</field>
+ <operation>equals</operation>
+ <value>寮曞悎,璇环</value>
+ </filters>
+ <filters>
+ <field>SAP_Send_OK__c</field>
+ <operation>equals</operation>
+ <value>0</value>
+ </filters>
+ <filters>
+ <field>Close_Forecasted_Date__c</field>
+ <operation>lessOrEqual</operation>
+ <value>THIS_MONTH</value>
+ </filters>
+ <label>03-0. 鍔╃悊纭锛氶娴嬬绾︽棩鍦ㄦ湰鏈堝墠</label>
+ <language>ja</language>
+</ListView>
diff --git a/force-app/main/default/objects/Opportunity/listViews/AllOpportunitiesFollowRANK_ORDER.listView-meta.xml b/force-app/main/default/objects/Opportunity/listViews/AllOpportunitiesFollowRANK_ORDER.listView-meta.xml
new file mode 100644
index 0000000..da47c0a
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/listViews/AllOpportunitiesFollowRANK_ORDER.listView-meta.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ListView xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>AllOpportunitiesFollowRANK_ORDER</fullName>
+ <columns>Opportunity_No__c</columns>
+ <columns>OPPORTUNITY.NAME</columns>
+ <columns>ACCOUNT.NAME</columns>
+ <columns>Opportunity_stage__c</columns>
+ <columns>Competitor__c</columns>
+ <columns>Bid_Date__c</columns>
+ <columns>Closing_Bid_Date__c</columns>
+ <columns>Close_Forecasted_Date__c</columns>
+ <columns>OPPORTUNITY.CLOSE_DATE</columns>
+ <filterScope>Everything</filterScope>
+ <filters>
+ <field>OPPORTUNITY.RECORDTYPE</field>
+ <operation>equals</operation>
+ <value>Opportunity.Opportunity</value>
+ </filters>
+ <filters>
+ <field>order_Date_For_Report__c</field>
+ <operation>lessOrEqual</operation>
+ <value>NEXT_MONTH</value>
+ </filters>
+ <filters>
+ <field>OPPORTUNITY.STAGE_NAME</field>
+ <operation>equals</operation>
+ <value>寮曞悎,璇环</value>
+ </filters>
+ <label>02-3锛氫笅鏈堝唴棰勬祴鎴愪氦鐨勮浠�</label>
+ <language>ja</language>
+</ListView>
diff --git a/force-app/main/default/objects/Opportunity/listViews/AllOpportunitiesFollowRANK_SHIP.listView-meta.xml b/force-app/main/default/objects/Opportunity/listViews/AllOpportunitiesFollowRANK_SHIP.listView-meta.xml
new file mode 100644
index 0000000..f5bb533
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/listViews/AllOpportunitiesFollowRANK_SHIP.listView-meta.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ListView xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>AllOpportunitiesFollowRANK_SHIP</fullName>
+ <columns>Opportunity_No__c</columns>
+ <columns>OPPORTUNITY.NAME</columns>
+ <columns>Opportunity_stage__c</columns>
+ <columns>ACCOUNT.NAME</columns>
+ <columns>Competitor__c</columns>
+ <columns>Bid_Date__c</columns>
+ <columns>Closing_Bid_Date__c</columns>
+ <columns>Close_Forecasted_Date__c</columns>
+ <columns>OPPORTUNITY.CLOSE_DATE</columns>
+ <filterScope>Everything</filterScope>
+ <filters>
+ <field>OPPORTUNITY.RECORDTYPE</field>
+ <operation>equals</operation>
+ <value>Opportunity.Opportunity</value>
+ </filters>
+ <filters>
+ <field>Shipping_Date_For_Report__c</field>
+ <operation>lessOrEqual</operation>
+ <value>NEXT_MONTH</value>
+ </filters>
+ <filters>
+ <field>OPPORTUNITY.STAGE_NAME</field>
+ <operation>equals</operation>
+ <value>寮曞悎,璇环</value>
+ </filters>
+ <label>02-4锛氫笅鏈堝唴棰勬祴鍙戣揣鐨勮浠�</label>
+ <language>ja</language>
+</ListView>
diff --git a/force-app/main/default/objects/Opportunity/listViews/AllOpportunitiesFollowbiding.listView-meta.xml b/force-app/main/default/objects/Opportunity/listViews/AllOpportunitiesFollowbiding.listView-meta.xml
new file mode 100644
index 0000000..a275a64
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/listViews/AllOpportunitiesFollowbiding.listView-meta.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ListView xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>AllOpportunitiesFollowbiding</fullName>
+ <booleanFilter>1 AND 2 AND 3 AND 4 AND 5 AND 6 AND 7</booleanFilter>
+ <columns>Opportunity_No__c</columns>
+ <columns>CORE.USERS.ALIAS</columns>
+ <columns>ACCOUNT.NAME</columns>
+ <columns>OPPORTUNITY.NAME</columns>
+ <columns>Closing_Bid_Date__c</columns>
+ <columns>OPPORTUNITY.CLOSE_DATE</columns>
+ <columns>Next_action__c</columns>
+ <columns>ProjectDescription__c</columns>
+ <columns>Opportunity_stage__c</columns>
+ <columns>Competitor__c</columns>
+ <columns>Wholesale_Price_F__c</columns>
+ <columns>OPPORTUNITY.CREATED_DATE</columns>
+ <columns>OPPORTUNITY.STAGE_NAME</columns>
+ <columns>If_Account_Change__c</columns>
+ <filterScope>Everything</filterScope>
+ <filters>
+ <field>OPPORTUNITY.STAGE_NAME</field>
+ <operation>equals</operation>
+ <value>寮曞悎,璇环</value>
+ </filters>
+ <filters>
+ <field>Closing_Bid_Date__c</field>
+ <operation>notEqual</operation>
+ </filters>
+ <filters>
+ <field>Assistant_Applied__c</field>
+ <operation>notEqual</operation>
+ <value>0</value>
+ </filters>
+ <filters>
+ <field>Next_action__c</field>
+ <operation>equals</operation>
+ </filters>
+ <filters>
+ <field>ProjectDescription__c</field>
+ <operation>equals</operation>
+ </filters>
+ <filters>
+ <field>Status_Formula__c</field>
+ <operation>notContain</operation>
+ <value>11,12</value>
+ </filters>
+ <filters>
+ <field>ForecastAccuracyObject__c</field>
+ <operation>equals</operation>
+ <value>1</value>
+ </filters>
+ <label>A閲嶈锛氫腑鏍�30澶╂湭鐢宠浠锋牸鐨勮浠疯ˉ鍏呭師鍥�</label>
+ <language>ja</language>
+</ListView>
diff --git a/force-app/main/default/objects/Opportunity/listViews/AllOpportunitiesFollowbidingcppy.listView-meta.xml b/force-app/main/default/objects/Opportunity/listViews/AllOpportunitiesFollowbidingcppy.listView-meta.xml
new file mode 100644
index 0000000..88236c8
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/listViews/AllOpportunitiesFollowbidingcppy.listView-meta.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ListView xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>AllOpportunitiesFollowbidingcppy</fullName>
+ <booleanFilter>1 AND 2 AND 3 AND 4 AND 5 AND 6 AND 7</booleanFilter>
+ <columns>Opportunity_No__c</columns>
+ <columns>CORE.USERS.ALIAS</columns>
+ <columns>ACCOUNT.NAME</columns>
+ <columns>OPPORTUNITY.NAME</columns>
+ <columns>Closing_Bid_Date__c</columns>
+ <columns>OPPORTUNITY.CLOSE_DATE</columns>
+ <columns>Next_action__c</columns>
+ <columns>ProjectDescription__c</columns>
+ <columns>Opportunity_stage__c</columns>
+ <columns>Competitor__c</columns>
+ <columns>Wholesale_Price_F__c</columns>
+ <columns>OPPORTUNITY.CREATED_DATE</columns>
+ <columns>OPPORTUNITY.STAGE_NAME</columns>
+ <columns>If_Account_Change__c</columns>
+ <filterScope>Everything</filterScope>
+ <filters>
+ <field>OPPORTUNITY.STAGE_NAME</field>
+ <operation>equals</operation>
+ <value>寮曞悎,璇环</value>
+ </filters>
+ <filters>
+ <field>Closing_Bid_Date__c</field>
+ <operation>notEqual</operation>
+ </filters>
+ <filters>
+ <field>Assistant_Applied__c</field>
+ <operation>notEqual</operation>
+ <value>0</value>
+ </filters>
+ <filters>
+ <field>Next_action__c</field>
+ <operation>equals</operation>
+ </filters>
+ <filters>
+ <field>ProjectDescription__c</field>
+ <operation>equals</operation>
+ </filters>
+ <filters>
+ <field>Status_Formula__c</field>
+ <operation>notContain</operation>
+ <value>11,12</value>
+ </filters>
+ <filters>
+ <field>ForecastAccuracyObject__c</field>
+ <operation>equals</operation>
+ <value>1</value>
+ </filters>
+ <label>A閲嶈锛氫腑鏍�30澶╂湭鐢宠浠锋牸鐨勮浠疯ˉ鍏呭師鍥燾ppy</label>
+ <language>ja</language>
+</ListView>
diff --git a/force-app/main/default/objects/Opportunity/listViews/Opptunity_onbidblack.listView-meta.xml b/force-app/main/default/objects/Opportunity/listViews/Opptunity_onbidblack.listView-meta.xml
new file mode 100644
index 0000000..ffe46be
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/listViews/Opptunity_onbidblack.listView-meta.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ListView xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Opptunity_onbidblack</fullName>
+ <columns>ACCOUNT.NAME</columns>
+ <columns>OPPORTUNITY.NAME</columns>
+ <columns>Status_Formula__c</columns>
+ <columns>InfoTypeBid__c</columns>
+ <columns>TenderBeginDate__c</columns>
+ <columns>Bid_Date__c</columns>
+ <columns>Bidding_Project_Name_Bid__c</columns>
+ <columns>Sfdc_Bidding_No__c</columns>
+ <filterScope>Everything</filterScope>
+ <filters>
+ <field>OPPORTUNITY.STAGE_NAME</field>
+ <operation>contains</operation>
+ <value>璇环</value>
+ </filters>
+ <filters>
+ <field>TenderBeginDate__c</field>
+ <operation>notEqual</operation>
+ </filters>
+ <filters>
+ <field>Bid_Date__c</field>
+ <operation>equals</operation>
+ </filters>
+ <filters>
+ <field>OPPORTUNITY.RECORDTYPE</field>
+ <operation>equals</operation>
+ <value>Opportunity.Opportunity</value>
+ </filters>
+ <filters>
+ <field>Status_Formula__c</field>
+ <operation>notContain</operation>
+ <value>10,11,12,13,14,15,16</value>
+ </filters>
+ <label>04-1锛氭嫑鏍囨棩绌虹殑璇环</label>
+ <language>zh_CN</language>
+</ListView>
diff --git a/force-app/main/default/objects/Opportunity/listViews/PERSON.listView-meta.xml b/force-app/main/default/objects/Opportunity/listViews/PERSON.listView-meta.xml
new file mode 100644
index 0000000..102a597
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/listViews/PERSON.listView-meta.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ListView xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>PERSON</fullName>
+ <columns>OPPORTUNITY.NAME</columns>
+ <columns>ACCOUNT.NAME</columns>
+ <columns>OPPORTUNITY.STAGE_NAME</columns>
+ <columns>Custmor_pic__c</columns>
+ <columns>CORE.USERS.ALIAS</columns>
+ <columns>owner_not_automatically_update__c</columns>
+ <columns>OCM_man_province_no_dealer__c</columns>
+ <columns>Shipping_Date_For_Report__c</columns>
+ <filterScope>Everything</filterScope>
+ <filters>
+ <field>OPPORTUNITY.RECORDTYPE</field>
+ <operation>equals</operation>
+ <value>Opportunity.Opportunity</value>
+ </filters>
+ <filters>
+ <field>OPPORTUNITY.STAGE_NAME</field>
+ <operation>equals</operation>
+ <value>寮曞悎,璇环,娉ㄦ畫,鍑鸿嵎,鍙戣揣,瀹屼簡,瀹屾瘯</value>
+ </filters>
+ <filters>
+ <field>owner_not_automatically_update__c</field>
+ <operation>equals</operation>
+ <value>1</value>
+ </filters>
+ <label>00:鍗曠嫭缁存姢璐熻矗浜虹殑璇环</label>
+ <language>ja</language>
+</ListView>
diff --git a/force-app/main/default/objects/Opportunity/listViews/SI_InquirySI.listView-meta.xml b/force-app/main/default/objects/Opportunity/listViews/SI_InquirySI.listView-meta.xml
new file mode 100644
index 0000000..984ca25
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/listViews/SI_InquirySI.listView-meta.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ListView xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>SI_InquirySI</fullName>
+ <columns>OPPORTUNITY.NAME</columns>
+ <columns>Opportunity_No__c</columns>
+ <columns>ACCOUNT.NAME</columns>
+ <columns>OPPORTUNITY.STAGE_NAME</columns>
+ <columns>Status_List_SI__c</columns>
+ <columns>Competitor__c</columns>
+ <columns>Amount_Without_Tax_Thousand_F__c</columns>
+ <columns>OPPORTUNITY.CLOSE_DATE</columns>
+ <columns>CORE.USERS.ALIAS</columns>
+ <columns>old_Oppo_No__c</columns>
+ <filterScope>Everything</filterScope>
+ <filters>
+ <field>OPPORTUNITY.RECORDTYPE</field>
+ <operation>equals</operation>
+ <value>Opportunity.SI_Oppor</value>
+ </filters>
+ <filters>
+ <field>OPPORTUNITY.STAGE_NAME</field>
+ <operation>contains</operation>
+ <value>璇环</value>
+ </filters>
+ <label>01-3锛氳繘琛屼腑鐨凷I璇环</label>
+ <language>zh_CN</language>
+</ListView>
diff --git a/force-app/main/default/objects/Opportunity/listViews/taget_PROVINCE.listView-meta.xml b/force-app/main/default/objects/Opportunity/listViews/taget_PROVINCE.listView-meta.xml
new file mode 100644
index 0000000..3cc8f7d
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/listViews/taget_PROVINCE.listView-meta.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ListView xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>taget_PROVINCE</fullName>
+ <columns>Opportunity_Category__c</columns>
+ <columns>OPPORTUNITY.NAME</columns>
+ <columns>ACCOUNT.NAME</columns>
+ <columns>OPPORTUNITY.AMOUNT</columns>
+ <columns>OPPORTUNITY.CLOSE_DATE</columns>
+ <columns>OPPORTUNITY.STAGE_NAME</columns>
+ <columns>CORE.USERS.ALIAS</columns>
+ <columns>Department_Name__c</columns>
+ <filterScope>Everything</filterScope>
+ <filters>
+ <field>OPPORTUNITY.RECORDTYPE</field>
+ <operation>equals</operation>
+ <value>Opportunity.Target</value>
+ </filters>
+ <filters>
+ <field>OCM_Target_period__c</field>
+ <operation>contains</operation>
+ <value>155</value>
+ </filters>
+ <filters>
+ <field>Opportunity_Category__c</field>
+ <operation>contains</operation>
+ <value>GI,BF,GS,URO,GYN,ENT,OTH</value>
+ </filters>
+ <filters>
+ <field>Target_category__c</field>
+ <operation>equals</operation>
+ <value>鎷呭綋鐩爣</value>
+ </filters>
+ <label>鐩爣_鎷呭綋浜�</label>
+ <language>zh_CN</language>
+</ListView>
diff --git a/force-app/main/default/objects/Opportunity/listViews/taget_PROVINCE1.listView-meta.xml b/force-app/main/default/objects/Opportunity/listViews/taget_PROVINCE1.listView-meta.xml
new file mode 100644
index 0000000..b753142
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/listViews/taget_PROVINCE1.listView-meta.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ListView xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>taget_PROVINCE1</fullName>
+ <columns>Opportunity_Category__c</columns>
+ <columns>OPPORTUNITY.NAME</columns>
+ <columns>ACCOUNT.NAME</columns>
+ <columns>OPPORTUNITY.AMOUNT</columns>
+ <columns>OPPORTUNITY.CLOSE_DATE</columns>
+ <columns>OPPORTUNITY.STAGE_NAME</columns>
+ <columns>CORE.USERS.ALIAS</columns>
+ <columns>Department_Name__c</columns>
+ <filterScope>Everything</filterScope>
+ <filters>
+ <field>OPPORTUNITY.RECORDTYPE</field>
+ <operation>equals</operation>
+ <value>Opportunity.Target</value>
+ </filters>
+ <filters>
+ <field>OCM_Target_period__c</field>
+ <operation>contains</operation>
+ <value>156</value>
+ </filters>
+ <filters>
+ <field>Opportunity_Category__c</field>
+ <operation>contains</operation>
+ <value>GS</value>
+ </filters>
+ <filters>
+ <field>Target_category__c</field>
+ <operation>equals</operation>
+ <value>鐪佺洰鏍�</value>
+ </filters>
+ <label>鐩爣_鐪�</label>
+</ListView>
diff --git a/force-app/main/default/objects/Opportunity/recordTypes/Opportunity.recordType-meta.xml b/force-app/main/default/objects/Opportunity/recordTypes/Opportunity.recordType-meta.xml
new file mode 100644
index 0000000..dc316ed
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/recordTypes/Opportunity.recordType-meta.xml
@@ -0,0 +1,1246 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<RecordType xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Opportunity</fullName>
+ <active>true</active>
+ <businessProcess>寮曞悎</businessProcess>
+ <compactLayoutAssignment>SI_lightning</compactLayoutAssignment>
+ <description>鐢ㄤ簬绠＄悊璇环</description>
+ <label>寮曞悎</label>
+ <picklistValues>
+ <picklist>AdvanceTarget__c</picklist>
+ <values>
+ <fullName>浜夊彇</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>蹇呰揪</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>CLBIC_Category__c</picklist>
+ <values>
+ <fullName>BF</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>CLBIC-00800%3AENERGY</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>CLBIC-00900%3AOTH</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>ENT</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>ET</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>GI</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>GS</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>GYN</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>URO</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>CelonOpportunity__c</picklist>
+ <values>
+ <fullName>Celon涓绘満</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>Celon鑰楁潗</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Competitor__c</picklist>
+ <values>
+ <fullName>A</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>A1</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>B</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>C</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>D</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Competitor_copy__c</picklist>
+ <values>
+ <fullName>A</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>A1</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>B</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>C</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>D</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>E</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>F</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>銇濄伄浠�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Configuration_Suggestion_Feedback__c</picklist>
+ <values>
+ <fullName>涓嶉噰绾冲缓璁�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲囩撼寤鸿</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Configuration_Suggestion__c</picklist>
+ <values>
+ <fullName>鏃犲缓璁�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏈夊缓璁�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>ConfirmationofAward__c</picklist>
+ <values>
+ <fullName>OLY涓爣</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>绔炰簤瀵规墜涓爣</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Deleted_Reason__c</picklist>
+ <values>
+ <fullName>鍖婚櫌浜轰簨鍙樺姩</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍖婚櫌璧勯噾绱у紶</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>璁″垝鏈幏瀹℃壒</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>璇环閲嶅</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>璐拱璁″垝鏆傜紦</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲囪喘浜у搧鍋滀骇</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>ForecastCategoryName</picklist>
+ <values>
+ <fullName>Best Case</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>Closed</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>Commit</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>Omitted</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>Pipeline</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Forecast_3month__c</picklist>
+ <values>
+ <fullName>3涓湀鍐呰鍙戣揣棰勬祴</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>3涓湀鍐呰鍙戣揣棰勬祴%28鍙璐�%29</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>3涓湀鍐呰璐ч娴�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Forecast_last_month__c</picklist>
+ <values>
+ <fullName>鏈湀鍙戣揣棰勬祴</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏈湀璁㈠彂璐ч娴�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏈湀璁㈣揣%28鍙璐�%29</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏈湀璁㈣揣棰勬祴</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Forecast_ship_monthly_mannual__c</picklist>
+ <values>
+ <fullName>绗竴鍛�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>绗笁鍛�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>绗簩鍛�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>绗簲鍛�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>绗洓鍛�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Forecast_this_month__c</picklist>
+ <values>
+ <fullName>鏈湀鍙戣揣棰勬祴</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏈湀璁㈠彂璐ч娴�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏈湀璁㈣揣%28鍙璐�%29</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏈湀璁㈣揣棰勬祴</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Fund_Basis__c</picklist>
+ <values>
+ <fullName>浼氱ぞ%2F鍊嬩汉璩囬噾</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍥介殯璩囬噾</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏀垮簻璩囬噾</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鐥呴櫌璩囬噾</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>铻嶈祫绉熻祦%EF%BC%88銉兗銈�%EF%BC%89</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>璐存伅璐锋</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閵�琛岃硣閲�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Goverment_Important_Department__c</picklist>
+ <values>
+ <fullName>鍚�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏄�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Group_purchased_order__c</picklist>
+ <values>
+ <fullName>涓�鑸噰璐�</fullName>
+ <default>true</default>
+ </values>
+ <values>
+ <fullName>鍖哄煙鍐呴泦涓噰璐�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>璺ㄥ尯闆嗕腑閲囪喘</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Gurantee_Period__c</picklist>
+ <values>
+ <fullName>1</fullName>
+ <default>true</default>
+ </values>
+ <values>
+ <fullName>2</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>3</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>4</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>5</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>IS_Price_Apply__c</picklist>
+ <values>
+ <fullName>鍚�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏄�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Important_Key_product_category__c</picklist>
+ <values>
+ <fullName>閲嶇偣浜у搧01</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧02</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧03</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧04</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧05</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧06</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧07</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧08</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧09</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧10</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧11</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧12</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧13</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧14</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧15</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧16</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧17</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧18</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧19</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧20</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧21</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧22</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧23</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧24</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧25</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧26</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧27</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧28</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧29</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧30</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧31</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧32</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧33</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Install_Status__c</picklist>
+ <values>
+ <fullName>銈ゃ兂銈广儓銉笺儷娓堛伩</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>涓�閮ㄣ偆銉炽偣銉堛兗銉�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏈偆銉炽偣銉堛兗銉�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>LeadSource</picklist>
+ <values>
+ <fullName>浜岀骇</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍩哄缓椤圭洰</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>瀛︿細浼氳</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鎷涙爣缃�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏅烘収鍖荤枟</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鐩存帴鎷滆</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>缁忛攢鍟�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>NM_Forecast__c</picklist>
+ <values>
+ <fullName>娆℃湀鍙戣揣棰勬祴</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>娆℃湀璁㈠彂璐ч娴�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>娆℃湀璁㈣揣棰勬祴</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Opp_order_Type__c</picklist>
+ <values>
+ <fullName>ENG</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>ET</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>SP</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Opp_situation__c</picklist>
+ <values>
+ <fullName>姝ｅ父</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>闂</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>OpportunitySource__c</picklist>
+ <values>
+ <fullName>鍏紑鎷涙爣</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>娑堣�楀搧绯荤粺</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Opportunity_Category__c</picklist>
+ <values>
+ <fullName>BF</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>ENT</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>ET</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>GI</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>GS</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>GYN</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>OTH</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>URO</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Opportunity_stage__c</picklist>
+ <values>
+ <fullName>鎻愪氦浜嗛绠楃敵璇�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>娌℃湁纭畾鍙傛暟</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>纭畾浜哋LY鍙傛暟</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>纭畾浜嗗鎵嬪弬鏁�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>杩樻病鐢宠棰勭畻</fullName>
+ <default>true</default>
+ </values>
+ <values>
+ <fullName>棰勭畻宸茬粡鎵瑰噯</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>棰勭畻娌℃湁鎵瑰噯</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>ProjectDescription__c</picklist>
+ <values>
+ <fullName>浜у搧鍑哄簱姝�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鎵╂敼寤�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏂板尰闄�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏂板ぇ妤�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏂伴櫌鍖�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>绛夊緟EUS</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>璧勯噾闂</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Promise_Class__c</picklist>
+ <values>
+ <fullName>鍏嶇◣澶栬部</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍐呰部</fullName>
+ <default>true</default>
+ </values>
+ <values>
+ <fullName>闈炲厤绋庡璨�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Proposal_Competitors__c</picklist>
+ <values>
+ <fullName>鍊熺敤鏍锋満</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>寰�鍔炰簨澶勮�冨療</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>寰�鍖婚櫌鑰冨療</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鎻愪緵鍏朵粬鏉′欢</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鎻愪緵鍩硅鍚嶉</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Purchase_Reason__c</picklist>
+ <values>
+ <fullName>澧楄ō</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>濂洖</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏂版湡</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏇存柊</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Purchase_Type__c</picklist>
+ <values>
+ <fullName>ET24鏅傞枔璨╁２</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>SI%EF%BC%88鎵嬭瀹ゆ浠�%EF%BC%89</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>涓�鑸紩鍚�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Reason_Cancel_WIN__c</picklist>
+ <values>
+ <fullName>1%2E缁堟鍚堝悓</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>2%2E璁㈠崟绫诲瀷鏈夎</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>SAP_Province__c</picklist>
+ <values>
+ <fullName>OSH-瀹夊窘鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>涓婃捣甯�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>浜戝崡鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍐呰挋鍙�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍖椾含甯�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍚夋灄鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍥涘窛鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>澶ц繛甯�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>澶╂触甯�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>瀹佸鑷不鍖�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>瀹夊窘鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>灞变笢鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>灞辫タ鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>骞夸笢鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>骞胯タ鑷不鍖�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏂扮枂鑷不鍖�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>姹熻嫃鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>姹熻タ鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>娌冲寳鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>娌冲崡鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>娴欐睙鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>娴峰崡鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>娣卞湷甯�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>婀栧寳鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>婀栧崡鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鐢樿們鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>绂忓缓鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>瑗胯棌鑷不鍖�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>璐靛窞鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>杈藉畞鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶅簡甯�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>闄曡タ鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>闈掑矝甯�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>闈掓捣鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>榛戦緳姹熺渷</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Sales_Method__c</picklist>
+ <values>
+ <fullName>鍗曚竴鏉ユ簮閲囪喘</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏀垮簻鎷涙爣</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>绉佺珛鍖婚櫌閲囪喘</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>绔熶簤鎬ц皥鍒�%28闈炴嫑鏍�%29</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鑰楁潗閲囪喘</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>闄㈠唴鎷涙爣</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Sales_Root__c</picklist>
+ <values>
+ <fullName>OCM鐩存帴璨╁２</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>璨╁２搴�</fullName>
+ <default>true</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Special_Stage__c</picklist>
+ <values>
+ <fullName>鍖婚櫌涓婄骇鍗曚綅瀹℃壒瀹屾瘯</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍖婚櫌鍗忚绛剧讲瀹屾瘯</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>宸茬‘璁ら厤缃�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>铻嶈祫鍏徃瀹℃牳瀹屾瘯</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>璇环涓�</fullName>
+ <default>true</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Status_Formula_Option__c</picklist>
+ <values>
+ <fullName>00 鏈窡杩�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>01 宸插綍鍏ヨ鍗�%2C鏈粯娆�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>01 璺熻繘涓�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>02 搴撳瓨宸查鐣�%2C鏈粯娆�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>02 璐锋鎵瑰噯</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>03 宸茬敵璇烽绠�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>03 宸茶璐�%2C浠樿閲�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>04 宸茶璐�%2C浠樺叏娆�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>04 棰勭畻宸叉壒鍑�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>04 棰勭畻鏈壒鍑�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>05 宸插垎閰�%2C寰呭彂璐�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>05 宸茬敵璇疯繘鍙ｈ璇�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>06 宸插彂璐�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>06 璁鸿瘉宸查�氳繃</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>06 璁鸿瘉鏈�氳繃</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>07 宸插畨瑁�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>07 宸茬‘璁ゅ弬鏁�%28OLY%29</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>07 宸茬‘璁ゅ弬鏁�%28涓珛%29</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>07 宸茬‘璁ゅ弬鏁�%28瀵规墜%29</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>08 宸叉巿鏉�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>08 宸茬粨鏉�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>09 宸叉嫑鏍�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>10 宸蹭腑鏍�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>11 浠锋牸鐢宠涓�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>12 宸茬绾�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍙栨秷</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>澶卞崟</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Stock_cancel_reason__c</picklist>
+ <values>
+ <fullName>鍏朵粬</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>寤惰繜绛剧害</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶆柊鎷涙爣</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Strategic_department_new__c</picklist>
+ <values>
+ <fullName>鍏朵粬</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍛煎惛绉�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>濡囩</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏅绉�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>娉屽翱绉�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>娑堝寲绉�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鑰抽蓟鍠夌</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>TargetType__c</picklist>
+ <values>
+ <fullName>涓汉</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍏ㄥ浗</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏈儴</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>缁�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>缁熸嫭鏈儴</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>璇�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閮�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Target_category__c</picklist>
+ <values>
+ <fullName>鎷呭綋鐩爣</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鐪佺洰鏍�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧鐩爣%28鏁伴噺%29</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Trade__c</picklist>
+ <values>
+ <fullName>鍐呰部</fullName>
+ <default>true</default>
+ </values>
+ <values>
+ <fullName>澶栬部</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Type</picklist>
+ <values>
+ <fullName>鏂拌銉撱偢銉嶃偣</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏃㈠瓨銉撱偢銉嶃偣</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Whether_Bidding__c</picklist>
+ <values>
+ <fullName>鍚�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏄�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>ifOpenBid__c</picklist>
+ <values>
+ <fullName>鍏紑鎷涙爣</fullName>
+ <default>true</default>
+ </values>
+ <values>
+ <fullName>闈炲叕寮�鎷涙爣</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+</RecordType>
diff --git a/force-app/main/default/objects/Opportunity/recordTypes/SI_Oppor.recordType-meta.xml b/force-app/main/default/objects/Opportunity/recordTypes/SI_Oppor.recordType-meta.xml
new file mode 100644
index 0000000..2f682d4
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/recordTypes/SI_Oppor.recordType-meta.xml
@@ -0,0 +1,1370 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<RecordType xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>SI_Oppor</fullName>
+ <active>true</active>
+ <businessProcess>寮曞悎</businessProcess>
+ <compactLayoutAssignment>SI_lightning</compactLayoutAssignment>
+ <label>SI璇环</label>
+ <picklistValues>
+ <picklist>AdvanceTarget__c</picklist>
+ <values>
+ <fullName>浜夊彇</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>蹇呰揪</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>CLBIC_Category__c</picklist>
+ <values>
+ <fullName>BF</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>CLBIC-00800%3AENERGY</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>CLBIC-00900%3AOTH</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>ENT</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>ET</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>GI</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>GS</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>GYN</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>URO</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>CelonOpportunity__c</picklist>
+ <values>
+ <fullName>Celon涓绘満</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>Celon鑰楁潗</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Competitor__c</picklist>
+ <values>
+ <fullName>A</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>A1</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>B</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>C</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>D</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>E</fullName>
+ <default>true</default>
+ </values>
+ <values>
+ <fullName>F</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>銇濄伄浠�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Competitor_copy__c</picklist>
+ <values>
+ <fullName>A</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>A1</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>B</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>C</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>D</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>E</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>F</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>銇濄伄浠�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Configuration_Suggestion_Feedback__c</picklist>
+ <values>
+ <fullName>涓嶉噰绾冲缓璁�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲囩撼寤鸿</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Configuration_Suggestion__c</picklist>
+ <values>
+ <fullName>鏃犲缓璁�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏈夊缓璁�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>ConfirmationofAward__c</picklist>
+ <values>
+ <fullName>OLY涓爣</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>绔炰簤瀵规墜涓爣</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Deleted_Reason__c</picklist>
+ <values>
+ <fullName>鍖婚櫌浜轰簨鍙樺姩</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍖婚櫌璧勯噾绱у紶</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>璁″垝鏈幏瀹℃壒</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>璇环閲嶅</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>璐拱璁″垝鏆傜紦</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲囪喘浜у搧鍋滀骇</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>ForecastCategoryName</picklist>
+ <values>
+ <fullName>Best Case</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>Closed</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>Commit</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>Omitted</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>Pipeline</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Forecast_3month__c</picklist>
+ <values>
+ <fullName>3涓湀鍐呰鍙戣揣棰勬祴</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>3涓湀鍐呰鍙戣揣棰勬祴%28鍙璐�%29</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>3涓湀鍐呰璐ч娴�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Forecast_last_month__c</picklist>
+ <values>
+ <fullName>鏈湀鍙戣揣棰勬祴</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏈湀璁㈠彂璐ч娴�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏈湀璁㈣揣%28鍙璐�%29</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏈湀璁㈣揣棰勬祴</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Forecast_ship_monthly_mannual__c</picklist>
+ <values>
+ <fullName>绗竴鍛�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>绗笁鍛�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>绗簩鍛�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>绗簲鍛�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>绗洓鍛�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Forecast_this_month__c</picklist>
+ <values>
+ <fullName>鏈湀鍙戣揣棰勬祴</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏈湀璁㈠彂璐ч娴�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏈湀璁㈣揣%28鍙璐�%29</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏈湀璁㈣揣棰勬祴</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Fund_Basis__c</picklist>
+ <values>
+ <fullName>浼氱ぞ%2F鍊嬩汉璩囬噾</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍥介殯璩囬噾</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏀垮簻璩囬噾</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鐥呴櫌璩囬噾</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>铻嶈祫绉熻祦%EF%BC%88銉兗銈�%EF%BC%89</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>璐存伅璐锋</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閵�琛岃硣閲�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Goverment_Important_Department__c</picklist>
+ <values>
+ <fullName>鍚�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏄�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Group_purchased_order__c</picklist>
+ <values>
+ <fullName>涓�鑸噰璐�</fullName>
+ <default>true</default>
+ </values>
+ <values>
+ <fullName>鍖哄煙鍐呴泦涓噰璐�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>璺ㄥ尯闆嗕腑閲囪喘</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Gurantee_Period__c</picklist>
+ <values>
+ <fullName>1</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>2</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>3</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>4</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>5</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>IS_Price_Apply__c</picklist>
+ <values>
+ <fullName>鍚�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏄�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Important_Key_product_category__c</picklist>
+ <values>
+ <fullName>閲嶇偣浜у搧01</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧02</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧03</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧04</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧05</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧06</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧07</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧08</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧09</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧10</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧11</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧12</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧13</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧14</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧15</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧16</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧17</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧18</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧19</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧20</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧21</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧22</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧23</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧24</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧25</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧26</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧27</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧28</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧29</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧30</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧31</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧32</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧33</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Informationcheck__c</picklist>
+ <values>
+ <fullName>鍙傛暟鏂囦欢涓庢嫑鏍囦俊鎭竴鑷�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍙傛暟鏂囦欢涓庢嫑鏍囦俊鎭笉涓�鑷�%EF%BC%8C璇峰仛澶卞崟鎿嶄綔</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍙傛暟鏂囦欢涓庢嫑鏍囦俊鎭笉涓�鑷�%EF%BC%8C璇锋洿鏂伴渶姹�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Install_Status__c</picklist>
+ <values>
+ <fullName>銈ゃ兂銈广儓銉笺儷娓堛伩</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>涓�閮ㄣ偆銉炽偣銉堛兗銉�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏈偆銉炽偣銉堛兗銉�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>LeadSource</picklist>
+ <values>
+ <fullName>浜岀骇</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍩哄缓椤圭洰</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>瀛︿細浼氳</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鎷涙爣缃�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏅烘収鍖荤枟</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鐩存帴鎷滆</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>缁忛攢鍟�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>NM_Forecast__c</picklist>
+ <values>
+ <fullName>娆℃湀鍙戣揣棰勬祴</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>娆℃湀璁㈠彂璐ч娴�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>娆℃湀璁㈣揣棰勬祴</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Opp_order_Type__c</picklist>
+ <values>
+ <fullName>ENG</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>ET</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>SP</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Opp_situation__c</picklist>
+ <values>
+ <fullName>姝ｅ父</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>闂</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>OpportunitySource__c</picklist>
+ <values>
+ <fullName>娑堣�楀搧绯荤粺</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Opportunity_Category__c</picklist>
+ <values>
+ <fullName>BF</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>ENT</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>ET</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>GI</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>GS</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>GYN</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>OTH</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>URO</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Opportunity_stage__c</picklist>
+ <values>
+ <fullName>鎻愪氦浜嗛绠楃敵璇�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>娌℃湁纭畾鍙傛暟</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>纭畾浜哋LY鍙傛暟</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>纭畾浜嗗鎵嬪弬鏁�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>杩樻病鐢宠棰勭畻</fullName>
+ <default>true</default>
+ </values>
+ <values>
+ <fullName>棰勭畻宸茬粡鎵瑰噯</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>棰勭畻娌℃湁鎵瑰噯</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>ProjectDescription__c</picklist>
+ <values>
+ <fullName>浜у搧鍑哄簱姝�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鎵╂敼寤�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏂板尰闄�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏂板ぇ妤�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏂伴櫌鍖�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>绛夊緟EUS</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>璧勯噾闂</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Promise_Class__c</picklist>
+ <values>
+ <fullName>鍏嶇◣澶栬部</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍐呰部</fullName>
+ <default>true</default>
+ </values>
+ <values>
+ <fullName>闈炲厤绋庡璨�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Proposal_Competitors__c</picklist>
+ <values>
+ <fullName>鍊熺敤鏍锋満</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>寰�鍔炰簨澶勮�冨療</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>寰�鍖婚櫌鑰冨療</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鎻愪緵鍏朵粬鏉′欢</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鎻愪緵鍩硅鍚嶉</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Purchase_Reason__c</picklist>
+ <values>
+ <fullName>澧楄ō</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>濂洖</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏂版湡</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏇存柊</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Purchase_Type__c</picklist>
+ <values>
+ <fullName>ET24鏅傞枔璨╁２</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>SI%EF%BC%88鎵嬭瀹ゆ浠�%EF%BC%89</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>涓�鑸紩鍚�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Reason_Cancel_WIN__c</picklist>
+ <values>
+ <fullName>1%2E缁堟鍚堝悓</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>2%2E璁㈠崟绫诲瀷鏈夎</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>SAP_Province__c</picklist>
+ <values>
+ <fullName>OSH-瀹夊窘鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>涓婃捣甯�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>浜戝崡鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍐呰挋鍙�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍖椾含甯�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍚夋灄鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍥涘窛鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>澶ц繛甯�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>澶╂触甯�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>瀹佸鑷不鍖�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>瀹夊窘鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>灞变笢鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>灞辫タ鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>骞夸笢鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>骞胯タ鑷不鍖�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏂扮枂鑷不鍖�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>姹熻嫃鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>姹熻タ鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>娌冲寳鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>娌冲崡鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>娴欐睙鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>娴峰崡鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>娣卞湷甯�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>婀栧寳鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>婀栧崡鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鐢樿們鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>绂忓缓鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>瑗胯棌鑷不鍖�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>璐靛窞鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>杈藉畞鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶅簡甯�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>闄曡タ鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>闈掑矝甯�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>闈掓捣鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>榛戦緳姹熺渷</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Sales_Method__c</picklist>
+ <values>
+ <fullName>鍗曚竴鏉ユ簮閲囪喘</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏀垮簻鎷涙爣</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>绉佺珛鍖婚櫌閲囪喘</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>绔熶簤鎬ц皥鍒�%28闈炴嫑鏍�%29</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鑰楁潗閲囪喘</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>闄㈠唴鎷涙爣</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Sales_Root__c</picklist>
+ <values>
+ <fullName>OCM鐩存帴璨╁２</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>璨╁２搴�</fullName>
+ <default>true</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Special_Stage__c</picklist>
+ <values>
+ <fullName>鍖婚櫌涓婄骇鍗曚綅瀹℃壒瀹屾瘯</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍖婚櫌鍗忚绛剧讲瀹屾瘯</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>宸茬‘璁ら厤缃�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>铻嶈祫鍏徃瀹℃牳瀹屾瘯</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>璇环涓�</fullName>
+ <default>true</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Status_Formula_Option__c</picklist>
+ <values>
+ <fullName>00 鏈窡杩�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>01 宸插綍鍏ヨ鍗�%2C鏈粯娆�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>01 璺熻繘涓�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>02 搴撳瓨宸查鐣�%2C鏈粯娆�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>02 璐锋鎵瑰噯</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>03 宸茬敵璇烽绠�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>03 宸茶璐�%2C浠樿閲�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>04 宸茶璐�%2C浠樺叏娆�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>04 棰勭畻宸叉壒鍑�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>04 棰勭畻鏈壒鍑�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>05 宸插垎閰�%2C寰呭彂璐�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>05 宸茬敵璇疯繘鍙ｈ璇�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>06 宸插彂璐�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>06 璁鸿瘉宸查�氳繃</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>06 璁鸿瘉鏈�氳繃</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>07 宸插畨瑁�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>07 宸茬‘璁ゅ弬鏁�%28OLY%29</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>07 宸茬‘璁ゅ弬鏁�%28涓珛%29</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>07 宸茬‘璁ゅ弬鏁�%28瀵规墜%29</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>08 宸叉巿鏉�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>08 宸茬粨鏉�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>09 宸叉嫑鏍�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>10 宸蹭腑鏍�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>11 浠锋牸鐢宠涓�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>12 宸茬绾�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍙栨秷</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>澶卞崟</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Status_List_SI__c</picklist>
+ <values>
+ <fullName>0 杩樻病璺熻繘</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>1 杩樻病鎷滆</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>10 搴撳瓨宸查鐣�%EF%BC%8C鏈粯娆�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>11 宸茶璐�%EF%BC%8C浠樿閲�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>12 宸茶璐�%EF%BC%8C浠樺叏娆�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>13 宸插垎閰�%EF%BC%8C寰呭彂璐�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>14 宸插彂璐�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>15 宸插畨瑁�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>16 宸茬粨鏉�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>2 璺熻繘涓�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>3 宸叉巿鏉�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>4 宸蹭腑鏍�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>5 浠锋牸鐢宠涓�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>6 鐢ㄦ埛鏈绾�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>7 鐢ㄦ埛宸茬绾�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>8 宸茬绾�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>9 宸插綍鍏ヨ鍗�%EF%BC%8C鏈粯娆�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Stock_cancel_reason__c</picklist>
+ <values>
+ <fullName>鍏朵粬</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>寤惰繜绛剧害</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶆柊鎷涙爣</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Strategic_department_new__c</picklist>
+ <values>
+ <fullName>鍏朵粬</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍛煎惛绉�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>濡囩</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏅绉�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>娉屽翱绉�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>娑堝寲绉�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鑰抽蓟鍠夌</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>TargetType__c</picklist>
+ <values>
+ <fullName>涓汉</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍏ㄥ浗</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏈儴</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>缁�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>缁熸嫭鏈儴</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>璇�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閮�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Target_Source__c</picklist>
+ <values>
+ <fullName>SetProvinceTarget</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>SetProvinceTargetEng</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Target_category__c</picklist>
+ <values>
+ <fullName>灏忕粍鐩爣</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鎷呭綋鐩爣</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鎷呭綋閲嶇偣浜у搧鐩爣</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鐪佺洰鏍�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鐪佺洰鏍�%28淇敼鐩爣%29</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鐪侀噸鐐逛骇鍝佺洰鏍�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧鐩爣%28鏁伴噺%29</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧鐩爣%28閲戦%29</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Trade__c</picklist>
+ <values>
+ <fullName>鍐呰部</fullName>
+ <default>true</default>
+ </values>
+ <values>
+ <fullName>澶栬部</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Type</picklist>
+ <values>
+ <fullName>鏂拌銉撱偢銉嶃偣</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏃㈠瓨銉撱偢銉嶃偣</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Whether_Bidding__c</picklist>
+ <values>
+ <fullName>鍚�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏄�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>ifOpenBid__c</picklist>
+ <values>
+ <fullName>鍏紑鎷涙爣</fullName>
+ <default>true</default>
+ </values>
+ <values>
+ <fullName>闈炲叕寮�鎷涙爣</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+</RecordType>
diff --git a/force-app/main/default/objects/Opportunity/recordTypes/Target.recordType-meta.xml b/force-app/main/default/objects/Opportunity/recordTypes/Target.recordType-meta.xml
new file mode 100644
index 0000000..80fcec6
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/recordTypes/Target.recordType-meta.xml
@@ -0,0 +1,1197 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<RecordType xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Target</fullName>
+ <active>true</active>
+ <businessProcess>鐩</businessProcess>
+ <compactLayoutAssignment>lightning_target</compactLayoutAssignment>
+ <description>鐢ㄤ簬绠＄悊鐩爣</description>
+ <label>鐩</label>
+ <picklistValues>
+ <picklist>AdvanceTarget__c</picklist>
+ <values>
+ <fullName>浜夊彇</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>蹇呰揪</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>CLBIC_Category__c</picklist>
+ <values>
+ <fullName>BF</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>CLBIC-00800%3AENERGY</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>CLBIC-00900%3AOTH</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>ENT</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>ET</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>GI</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>GS</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>GYN</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>URO</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>CelonOpportunity__c</picklist>
+ <values>
+ <fullName>Celon涓绘満</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>Celon鑰楁潗</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Competitor__c</picklist>
+ <values>
+ <fullName>銇濄伄浠�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Competitor_copy__c</picklist>
+ <values>
+ <fullName>A</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>B</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>C</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>D</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>E</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>F</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>銇濄伄浠�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Configuration_Suggestion_Feedback__c</picklist>
+ <values>
+ <fullName>涓嶉噰绾冲缓璁�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲囩撼寤鸿</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Configuration_Suggestion__c</picklist>
+ <values>
+ <fullName>鏃犲缓璁�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏈夊缓璁�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>ConfirmationofAward__c</picklist>
+ <values>
+ <fullName>OLY涓爣</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>绔炰簤瀵规墜涓爣</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Deleted_Reason__c</picklist>
+ <values>
+ <fullName>鍖婚櫌浜轰簨鍙樺姩</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>璇环閲嶅</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>璐拱璁″垝鏆傜紦</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>ForecastCategoryName</picklist>
+ <values>
+ <fullName>Best Case</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>Closed</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>Commit</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>Omitted</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>Pipeline</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Forecast_3month__c</picklist>
+ <values>
+ <fullName>3涓湀鍐呰鍙戣揣棰勬祴</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>3涓湀鍐呰鍙戣揣棰勬祴%28鍙璐�%29</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>3涓湀鍐呰璐ч娴�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Forecast_last_month__c</picklist>
+ <values>
+ <fullName>鏈湀鍙戣揣棰勬祴</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏈湀璁㈠彂璐ч娴�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏈湀璁㈣揣%28鍙璐�%29</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏈湀璁㈣揣棰勬祴</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Forecast_ship_monthly_mannual__c</picklist>
+ <values>
+ <fullName>绗竴鍛�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>绗笁鍛�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>绗簩鍛�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>绗簲鍛�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>绗洓鍛�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Forecast_this_month__c</picklist>
+ <values>
+ <fullName>鏈湀鍙戣揣棰勬祴</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏈湀璁㈠彂璐ч娴�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏈湀璁㈣揣棰勬祴</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Fund_Basis__c</picklist>
+ <values>
+ <fullName>浼氱ぞ%2F鍊嬩汉璩囬噾</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍥介殯璩囬噾</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏀垮簻璩囬噾</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鐥呴櫌璩囬噾</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閵�琛岃硣閲�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Goverment_Important_Department__c</picklist>
+ <values>
+ <fullName>鍚�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏄�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Group_purchased_order__c</picklist>
+ <values>
+ <fullName>涓�鑸噰璐�</fullName>
+ <default>true</default>
+ </values>
+ <values>
+ <fullName>鍖哄煙鍐呴泦涓噰璐�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>璺ㄥ尯闆嗕腑閲囪喘</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Gurantee_Period__c</picklist>
+ <values>
+ <fullName>1</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>2</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>3</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>4</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>5</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>IS_Price_Apply__c</picklist>
+ <values>
+ <fullName>鍚�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏄�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Important_Key_product_category__c</picklist>
+ <values>
+ <fullName>閲嶇偣浜у搧01</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧02</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧03</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧04</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧05</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧06</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧07</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧08</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧09</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧10</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧11</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧12</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧13</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧14</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧15</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧16</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧17</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧18</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧19</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧20</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧21</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧22</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧23</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧24</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧25</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧26</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧27</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧28</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧29</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧30</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧31</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧32</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧33</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Install_Status__c</picklist>
+ <values>
+ <fullName>銈ゃ兂銈广儓銉笺儷娓堛伩</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>涓�閮ㄣ偆銉炽偣銉堛兗銉�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏈偆銉炽偣銉堛兗銉�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>LeadSource</picklist>
+ <values>
+ <fullName>浜岀骇</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍩哄缓椤圭洰</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>瀛︿細浼氳</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鎷涙爣缃�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏅烘収鍖荤枟</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鐩存帴鎷滆</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>缁忛攢鍟�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>NM_Forecast__c</picklist>
+ <values>
+ <fullName>娆℃湀鍙戣揣棰勬祴</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>娆℃湀璁㈠彂璐ч娴�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>娆℃湀璁㈣揣棰勬祴</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Opp_order_Type__c</picklist>
+ <values>
+ <fullName>ENG</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>ET</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>SP</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Opp_situation__c</picklist>
+ <values>
+ <fullName>姝ｅ父</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>闂</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>OpportunitySource__c</picklist>
+ <values>
+ <fullName>娑堣�楀搧绯荤粺</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Opportunity_Category__c</picklist>
+ <values>
+ <fullName>BF</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>ENT</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>ET</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>GI</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>GS</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>GYN</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>OTH</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>URO</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Opportunity_stage__c</picklist>
+ <values>
+ <fullName>鎻愪氦浜嗛绠楃敵璇�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>娌℃湁纭畾鍙傛暟</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>纭畾浜哋LY鍙傛暟</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>纭畾浜嗗鎵嬪弬鏁�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>杩樻病鐢宠棰勭畻</fullName>
+ <default>true</default>
+ </values>
+ <values>
+ <fullName>棰勭畻宸茬粡鎵瑰噯</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>棰勭畻娌℃湁鎵瑰噯</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>ProjectDescription__c</picklist>
+ <values>
+ <fullName>鎵╂敼寤�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏂板尰闄�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏂板ぇ妤�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏂伴櫌鍖�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Promise_Class__c</picklist>
+ <values>
+ <fullName>鍏嶇◣澶栬部</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍐呰部</fullName>
+ <default>true</default>
+ </values>
+ <values>
+ <fullName>闈炲厤绋庡璨�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Proposal_Competitors__c</picklist>
+ <values>
+ <fullName>鍊熺敤鏍锋満</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>寰�鍔炰簨澶勮�冨療</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>寰�鍖婚櫌鑰冨療</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鎻愪緵鍏朵粬鏉′欢</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鎻愪緵鍩硅鍚嶉</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Purchase_Reason__c</picklist>
+ <values>
+ <fullName>澧楄ō</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏂版湡</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏇存柊</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Purchase_Type__c</picklist>
+ <values>
+ <fullName>ET24鏅傞枔璨╁２</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>SI%EF%BC%88鎵嬭瀹ゆ浠�%EF%BC%89</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>涓�鑸紩鍚�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Reason_Cancel_WIN__c</picklist>
+ <values>
+ <fullName>1%2E缁堟鍚堝悓</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>2%2E璁㈠崟绫诲瀷鏈夎</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>SAP_Province__c</picklist>
+ <values>
+ <fullName>涓婃捣甯�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>浜戝崡鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍐呰挋鍙�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍖椾含甯�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍚夋灄鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍥涘窛鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>澶ц繛甯�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>澶╂触甯�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>瀹佸鑷不鍖�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>瀹夊窘鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>灞变笢鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>灞辫タ鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>骞夸笢鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>骞胯タ鑷不鍖�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏂扮枂鑷不鍖�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>姹熻嫃鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>姹熻タ鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>娌冲寳鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>娌冲崡鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>娴欐睙鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>娴峰崡鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>娣卞湷甯�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>婀栧寳鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>婀栧崡鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鐢樿們鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>绂忓缓鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>瑗胯棌鑷不鍖�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>璐靛窞鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>杈藉畞鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶅簡甯�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>闄曡タ鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>闈掑矝甯�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>闈掓捣鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>榛戦緳姹熺渷</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Sales_Method__c</picklist>
+ <values>
+ <fullName>绔熶簤鎬ц皥鍒�%28闈炴嫑鏍�%29</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Sales_Root__c</picklist>
+ <values>
+ <fullName>OCM鐩存帴璨╁２</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>璨╁２搴�</fullName>
+ <default>true</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Special_Stage__c</picklist>
+ <values>
+ <fullName>鍖婚櫌涓婄骇鍗曚綅瀹℃壒瀹屾瘯</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍖婚櫌鍗忚绛剧讲瀹屾瘯</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>宸茬‘璁ら厤缃�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>铻嶈祫鍏徃瀹℃牳瀹屾瘯</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>璇环涓�</fullName>
+ <default>true</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Status_Formula_Option__c</picklist>
+ <values>
+ <fullName>00 鏈窡杩�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>01 宸插綍鍏ヨ鍗�%2C鏈粯娆�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>01 璺熻繘涓�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>02 搴撳瓨宸查鐣�%2C鏈粯娆�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>02 璐锋鎵瑰噯</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>03 宸茬敵璇烽绠�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>03 宸茶璐�%2C浠樿閲�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>04 宸茶璐�%2C浠樺叏娆�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>04 棰勭畻宸叉壒鍑�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>04 棰勭畻鏈壒鍑�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>05 宸插垎閰�%2C寰呭彂璐�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>05 宸茬敵璇疯繘鍙ｈ璇�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>06 宸插彂璐�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>06 璁鸿瘉宸查�氳繃</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>06 璁鸿瘉鏈�氳繃</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>07 宸插畨瑁�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>07 宸茬‘璁ゅ弬鏁�%28OLY%29</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>07 宸茬‘璁ゅ弬鏁�%28涓珛%29</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>07 宸茬‘璁ゅ弬鏁�%28瀵规墜%29</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>08 宸叉巿鏉�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>08 宸茬粨鏉�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>09 宸叉嫑鏍�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>10 宸蹭腑鏍�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>11 浠锋牸鐢宠涓�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>12 宸茬绾�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍙栨秷</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>澶卞崟</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Stock_cancel_reason__c</picklist>
+ <values>
+ <fullName>鍏朵粬</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>寤惰繜绛剧害</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶆柊鎷涙爣</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Strategic_department_new__c</picklist>
+ <values>
+ <fullName>鍏朵粬</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍛煎惛绉�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>濡囩</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏅绉�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>娉屽翱绉�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>娑堝寲绉�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鑰抽蓟鍠夌</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>TargetType__c</picklist>
+ <values>
+ <fullName>涓汉</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鍏ㄥ浗</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏈儴</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鐪�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>缁�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>缁熸嫭鏈儴</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>璇�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閮�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Target_Source__c</picklist>
+ <values>
+ <fullName>EngTarget</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>SalesTarget</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>SetProvinceTarget</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>SetProvinceTargetEng</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Target_category__c</picklist>
+ <values>
+ <fullName>灏忕粍鐩爣</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鎷呭綋鐩爣</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鎷呭綋閲嶇偣浜у搧鐩爣</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鐪佺洰鏍�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鐪佺洰鏍�%28淇敼鐩爣%29</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鐪侀噸鐐逛骇鍝佺洰鏍�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧鐩爣%28鏁伴噺%29</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>閲嶇偣浜у搧鐩爣%28閲戦%29</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Trade__c</picklist>
+ <values>
+ <fullName>鍐呰部</fullName>
+ <default>true</default>
+ </values>
+ <values>
+ <fullName>澶栬部</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Type</picklist>
+ <values>
+ <fullName>鏂拌銉撱偢銉嶃偣</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏃㈠瓨銉撱偢銉嶃偣</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>Whether_Bidding__c</picklist>
+ <values>
+ <fullName>鍚�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>鏄�</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+ <picklistValues>
+ <picklist>ifOpenBid__c</picklist>
+ <values>
+ <fullName>鍏紑鎷涙爣</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>闈炲叕寮�鎷涙爣</fullName>
+ <default>false</default>
+ </values>
+ </picklistValues>
+</RecordType>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/Account_Inactive.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/Account_Inactive.validationRule-meta.xml
new file mode 100644
index 0000000..d4e83e2
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/Account_Inactive.validationRule-meta.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Account_Inactive</fullName>
+ <active>true</active>
+ <description>2018/8/8 CHAN-B394YH 淇敼鍚庯細
+涓嶄粎鍦ㄦ姤浠凤紝decide鍜寃in 杩涜楠岃瘉锛屽湪鏂板垱寤轰笟鍔℃満浼氭椂涔熻繘琛岄獙璇�
+2018/4/24 閿欒娑堟伅淇敼鍓嶏細
+璇烽�夋嫨鏈夋晥鐨勫鎴凤紙绉戝鎴栧悎鍚岋級
+
+2016/6/03 Win銇墠銇父銇儊銈с儍銈仚銈嬨倛銇嗐伀鏉′欢寮忋倰澶夋洿銆�
+2016/4/17 甯搞伀銉併偋銉冦偗銇欍倠銈堛亞銇潯浠跺紡銈掑鏇淬��
+澶夋洿鍓�
+(Isnew() || Ischanged(AccountId)) && Not(Isblank(AccountId)) && OR</description>
+ <errorConditionFormula>/*
+鐢ㄦ埛涓嶆槸 batch 鐢ㄦ埛
+骞朵笖鐢ㄦ埛涓嶉渶瑕佸仛澶卞崟/鍙栨秷
+骞朵笖 SAP_Send_OK__c 涓� true 鎴栬�協alse锛堟��鐤戞槸SAP_Send_OK__c 涓嶄负null鏃讹級
+骞朵笖StageName娌℃湁鏇存敼涓哄彇娑堝拰澶卞崟
+骞朵笖瀹㈡埛涓嶄负绌�
+骞朵笖鍦ㄦ姤浠枫�丼AP涓婁紶锛圵IN)鍜屽垱寤鸿浠锋椂锛�
+鏈変互涓嬫儏鍐典細瑙﹀彂璇ラ獙璇佽鍒欙細
+1. 瀹㈡埛闈炵粡閿�鍟嗗崗璁笖鏃犳晥
+2.瀹㈡埛涓虹粡閿�鍟嗗崗璁笖鏃犳晥
+3.瀹㈡埛涓虹粡閿�鍟嗗崗璁笖鏈夋晥锛屼絾涓嶆弧瓒筹紙鍙互鍋氭姤浠蜂负鐪�&&((ET/SP鑰楁潗缁忛攢鍟嗕负鐪�&&澶囧搧璁㈠崟涓哄亣锛墊|澶囧搧璁㈠崟涓虹湡锛�
+4.涓嶆弧瓒筹紙瀹㈡埛鐨勪笂绾у崟浣嶇殑涓婄骇鍗曚綅涓虹梾闄㈡垨瀹㈡埛鐨勪笂绾у崟浣嶄负缁忛攢鍟嗭級
+*/
+
+
+($User.Batch_User__c = false && $User.InquiryLostCancel__c = false) && OR(SAP_Send_OK__c == false, PRIORVALUE(SAP_Send_OK__c) == false)
+&& NOT(ISCHANGED(StageName) && TEXT(StageName) = '鍓婇櫎')
+&& NOT(ISCHANGED(StageName) && TEXT(StageName) = '鏁楁垿')
+&&
+Not(Isblank(AccountId)) && AND(OR (
+/* 鏃犳晥(闈炲彲浠ユ姤浠风殑鍗忚) ==> 鎶ラ敊 */
+Account.Is_Active_Formula__c == "鏃犳晥" &&
+Account.RecordTypeId <> "01210000000QjCN",
+Account.Is_Active_Formula__c == "鏃犳晥" &&
+Account.RecordTypeId = "01210000000QjCN" ,Account.RecordTypeId = "01210000000QjCN" && AND(NOT(AND(Equipment_Order_Flg__c=true, Account.Contract_Quote_Decide_Flag_checkbox__c = true)), NOT(AND(Equipment_Order_Flg__c=false, Account.Contract_Quote_Decide_Flag_checkbox__c = true, Account.ET_SP_Dealer__c = true)),NOT(AND(Equipment_Order_Flg__c=false, Account.Contract_Quote_Decide_Flag_checkbox__c = true, Account.ENG_Dealer__c = true)),NOT(AND(Equipment_Order_Flg__c=false, Account.Contract_Quote_Decide_Flag_checkbox__c = true, Account.SP_DealerContact__c = true))),
+/* 鐪嬬埗璁板綍锛屼笉鏄尰闄紝涓嶆槸缁忛攢鍟� ==> 鎶ラ敊 */
+Not(
+OR(Account.Parent.Parent.RecordTypeId = "01210000000QemG",
+Account.Parent.RecordTypeId = "01210000000Qem1")
+)
+), OR(ISCHANGED(Quote_Update_Sum__c) , SAP_Send_OK__c ,ISNEW())
+)</errorConditionFormula>
+ <errorDisplayField>AccountId</errorDisplayField>
+ <errorMessage>杩欎釜缁忛攢鍟嗗崗璁笉鍙互浣滀负鏈�缁堢敤鎴�</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/After_win_cannot_change_forecast_order_d.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/After_win_cannot_change_forecast_order_d.validationRule-meta.xml
new file mode 100644
index 0000000..280da4f
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/After_win_cannot_change_forecast_order_d.validationRule-meta.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>After_win_cannot_change_forecast_order_d</fullName>
+ <active>true</active>
+ <errorConditionFormula>AND(SAP_Send_OK__c = true,
+$User.Batch_User__c = False,
+ISCHANGED(Close_Forecasted_Date__c))</errorConditionFormula>
+ <errorDisplayField>Close_Forecasted_Date__c</errorDisplayField>
+ <errorMessage>SAP涓婁紶鍚庯紝涓嶅厑璁镐慨鏀广�岄娴婳CSM绛剧害鏃ャ��</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/After_win_cannotchange_ForcastingDel.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/After_win_cannotchange_ForcastingDel.validationRule-meta.xml
new file mode 100644
index 0000000..93fd03c
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/After_win_cannotchange_ForcastingDel.validationRule-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>After_win_cannotchange_ForcastingDel</fullName>
+ <active>true</active>
+ <errorConditionFormula>AND(SAP_Send_OK__c = true,
+$User.Batch_User__c = False,
+Note_Shipped_Residual_Total__c > 0,
+ISCHANGED(CloseDate))</errorConditionFormula>
+ <errorDisplayField>CloseDate</errorDisplayField>
+ <errorMessage>SAP涓婁紶鍚庯紝涓嶅厑璁镐慨鏀广�岄娴嬪彂璐ф棩銆�</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/Agency1_Change_Check.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/Agency1_Change_Check.validationRule-meta.xml
new file mode 100644
index 0000000..72970b1
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/Agency1_Change_Check.validationRule-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Agency1_Change_Check</fullName>
+ <active>true</active>
+ <description>CHAN-AYTCE6 褰撹浠稺IN鐨勭姸鎬佷负鍋囩殑鏃跺�欙紝鍙互浠庤浠烽〉闈慨鏀规姤浠蜂腑鐨勭粡閿�鍟�</description>
+ <errorConditionFormula>And(Estimation_Decision__c, ISCHANGED(Agency1__c) , $Profile.Name!='绯荤粺绠＄悊鍛�')</errorConditionFormula>
+ <errorDisplayField>Agency1__c</errorDisplayField>
+ <errorMessage>鍐冲畾鎶ヤ环鍚庝笉鑳芥洿鏀圭涓�缁忛攢鍟�</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/AgencyContract_Hospital_Equals_Account.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/AgencyContract_Hospital_Equals_Account.validationRule-meta.xml
new file mode 100644
index 0000000..43b302d
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/AgencyContract_Hospital_Equals_Account.validationRule-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>AgencyContract_Hospital_Equals_Account</fullName>
+ <active>true</active>
+ <description>缁忛攢鍟嗗悎鍚岀殑璇环锛屽尰闄篃瑕佸～鍚堝悓</description>
+ <errorConditionFormula>Account.Parent.RecordTypeId = '01210000000Qem1' && NOT(ISBLANK(Hospital__c)) && Hospital__c <> AccountId</errorConditionFormula>
+ <errorDisplayField>Hospital__c</errorDisplayField>
+ <errorMessage>缁忛攢鍟嗗悎鍚岀殑璇环锛屽尰闄篃瑕佽緭鍏ュ悎鍚�</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/Ass_can_not_update_authorizationNo.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/Ass_can_not_update_authorizationNo.validationRule-meta.xml
new file mode 100644
index 0000000..b17fa1f
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/Ass_can_not_update_authorizationNo.validationRule-meta.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Ass_can_not_update_authorizationNo</fullName>
+ <active>true</active>
+ <errorConditionFormula>NOT(ISNEW()) && (ISCHANGED(Authorized_DB_No__c) ||
+ISCHANGED(NotesApprovedNo__c)) && ($User.ProfileId = '00e10000000xnpR'||$User.ProfileId = '00e10000000xyK6')</errorConditionFormula>
+ <errorMessage>涓嶈兘淇敼'鍚堝悓鐢宠鍐宠缂栫爜'鍜�'鎺堟潈鐢宠缂栫爜'</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/Authorizing_ChangeBidDate.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/Authorizing_ChangeBidDate.validationRule-meta.xml
new file mode 100644
index 0000000..44f0755
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/Authorizing_ChangeBidDate.validationRule-meta.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Authorizing_ChangeBidDate</fullName>
+ <active>true</active>
+ <description>璇环姝ｅ湪鎺堟潈鐢宠涓紝涓嶈兘鏇存敼鎷涙爣鏃ャ��</description>
+ <errorConditionFormula>$Profile.Id!='00e10000000Y3o5' && $Profile.Id!='00e10000000dzzG' &&
+$Profile.Id!='00e10000000dEQx' && isChanged(Bid_Date__c) && If_Authorizing_Lock__c</errorConditionFormula>
+ <errorDisplayField>Bid_Date__c</errorDisplayField>
+ <errorMessage>璇环姝ｅ湪鎺堟潈鐢宠涓紝涓嶈兘鏇存敼12.鎷涙爣鏃ャ��</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/Authorizing_ChangeCloseBid.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/Authorizing_ChangeCloseBid.validationRule-meta.xml
new file mode 100644
index 0000000..84ef86d
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/Authorizing_ChangeCloseBid.validationRule-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Authorizing_ChangeCloseBid</fullName>
+ <active>true</active>
+ <description>璇环姝ｅ湪鍚堝悓鐢宠涓紝涓嶈兘鏇存敼涓爣鏃ャ��</description>
+ <errorConditionFormula>$Profile.Id!='00e10000000Y3o5' && $Profile.Id!='00e10000000dzzG' &&
+$Profile.Id!='00e10000000dEQx' &&
+ !$User.Batch_User__c && ISCHANGED(Closing_Bid_Date__c) && NOT(ISBLANK(Assistant_Applied_Date__c))&& ISBLANK(Contract_DB_SalesDept_complite_day__c)</errorConditionFormula>
+ <errorDisplayField>Closing_Bid_Date__c</errorDisplayField>
+ <errorMessage>璇环姝ｅ湪鍚堝悓鐢宠涓紝涓嶈兘鏇存敼13.涓爣鏃ャ��</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/Authorizing_ChangeOppNo.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/Authorizing_ChangeOppNo.validationRule-meta.xml
new file mode 100644
index 0000000..803b68e
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/Authorizing_ChangeOppNo.validationRule-meta.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Authorizing_ChangeOppNo</fullName>
+ <active>true</active>
+ <errorConditionFormula>isChanged(Opportunity_No__c) && (if_Interface_Lock__c)</errorConditionFormula>
+ <errorMessage>璇环姝ｅ湪SPO绯荤粺杩涜鎺堟潈/鍚堝悓鐢宠锛岃涓嶈淇敼璇环缂栫爜銆�</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/BidDateCanNotEarlyThanBidRequestWhenWin.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/BidDateCanNotEarlyThanBidRequestWhenWin.validationRule-meta.xml
new file mode 100644
index 0000000..3f46453
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/BidDateCanNotEarlyThanBidRequestWhenWin.validationRule-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>BidDateCanNotEarlyThanBidRequestWhenWin</fullName>
+ <active>false</active>
+ <description>鍋歐IN鐨勬椂鍊欙紝涓爣鏃ヤ笉鑳芥棭浜庢嫑鏍囨棩;20221009 ljh SWAG-CK29AJ 鍋滅敤;</description>
+ <errorConditionFormula>ISCHANGED(SAP_Send_OK__c) && SAP_Send_OK__c = true &&
+(Closing_Bid_Date__c < Bid_Date__c)</errorConditionFormula>
+ <errorMessage>鍋歐IN鏃讹紝13.涓爣鏃ヤ笉鑳芥棭浜�12.鎷涙爣鏃�</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/CampaignSource.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/CampaignSource.validationRule-meta.xml
new file mode 100644
index 0000000..2756b0d
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/CampaignSource.validationRule-meta.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>CampaignSource</fullName>
+ <active>true</active>
+ <description>褰撹浠蜂腑鐨勫垱寤烘潵婧愭槸鈥滃浼氫細璁椂,涓昏浼氳鈥濆繀椤诲～鍐�"
+20220428 涓轰簡璺宠繃鎰忓悜杞浠锋椂鏍囧噯API鍒涘缓璇环锛岄�夋嫨椤甸潰蹇呭～浣嗗悗鍙颁笉蹇呭～鐨�"璁㈣揣娴佺▼绫诲埆"浣滀负鍒ゆ柇渚濇嵁锛屼繚璇侀〉闈㈡柊寤恒�佺紪杈戠殑淇濆瓨鏃跺彲浠ラ檺鍒朵綇</description>
+ <errorConditionFormula>TEXT(LeadSource ) == '瀛︿細浼氳' && ISBLANK(CampaignId) && DATEVALUE(CreatedDate) > DATEVALUE('2022-07-14') && !(!ISBLANK(Lead_Num__c) && ISNEW())</errorConditionFormula>
+ <errorDisplayField>CampaignId</errorDisplayField>
+ <errorMessage>褰撳垱寤烘潵婧愭槸鈥滃浼氫細璁�"鏃�,"涓昏浼氳鈥濆繀椤诲～鍐�</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/CanNotWinIfFinalUserChanged.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/CanNotWinIfFinalUserChanged.validationRule-meta.xml
new file mode 100644
index 0000000..a3ecf65
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/CanNotWinIfFinalUserChanged.validationRule-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>CanNotWinIfFinalUserChanged</fullName>
+ <active>true</active>
+ <description>鐢ㄦ埛鍙樻洿璇环涓嶅彲浠ュ仛WIN
+
+CHAN-BEN5UC
+If_Account_Change__c = true &&
+SAP_Send_OK__c = true
+
+0708璺宠繃绠＄悊鍛橀獙璇�</description>
+ <errorConditionFormula>$User.Batch_User__c ==FALSE && If_Account_Change__c = true &&
+SAP_Send_OK__c = true && $User.Id <> '00510000005sEEM' && $User.Id <> '00510000000fSYI'</errorConditionFormula>
+ <errorMessage>鍙樻洿鐢ㄦ埛鐨勮浠蜂笉鍙互WIN</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/CannotBackToOpportunity.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/CannotBackToOpportunity.validationRule-meta.xml
new file mode 100644
index 0000000..17821ac
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/CannotBackToOpportunity.validationRule-meta.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>CannotBackToOpportunity</fullName>
+ <active>true</active>
+ <description>20220509XYOU-CE68L5鎺掗櫎绯荤粺绠＄悊鍛�</description>
+ <errorConditionFormula>Cnt_Lost_cancel_report__c > 0 && ISCHANGED(StageName) && Text(StageName) == '寮曞悎' && $User.ProfileId <>'00e10000000Y3o5'</errorConditionFormula>
+ <errorMessage>鍙栨秷澶卞崟鐨勮浠蜂笉鑳芥洿鏀圭姸鎬�</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/CannotBackToOpportunity_Deleted_Reason.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/CannotBackToOpportunity_Deleted_Reason.validationRule-meta.xml
new file mode 100644
index 0000000..19ac594
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/CannotBackToOpportunity_Deleted_Reason.validationRule-meta.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>CannotBackToOpportunity_Deleted_Reason</fullName>
+ <active>true</active>
+ <description>20220509XYOU-CE68L5鎺掗櫎绯荤粺绠＄悊鍛�</description>
+ <errorConditionFormula>Not(Isblank(Text(Deleted_Reason__c))) && ISCHANGED(StageName) && Text(StageName) == '寮曞悎' && $User.ProfileId <>'00e10000000Y3o5'</errorConditionFormula>
+ <errorMessage>鍙栨秷鐨勮浠蜂笉鑳芥洿鏀圭姸鎬�</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/Cannot_Change_Stage2_When_A1.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/Cannot_Change_Stage2_When_A1.validationRule-meta.xml
new file mode 100644
index 0000000..4168c63
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/Cannot_Change_Stage2_When_A1.validationRule-meta.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Cannot_Change_Stage2_When_A1</fullName>
+ <active>true</active>
+ <description>A1绛夌骇鏃朵笉鍏佽淇敼璇环杩涘睍闃舵</description>
+ <errorConditionFormula>Special_Opp_lanhai__c = true && TEXT(Competitor__c) = 'A1' && ISCHANGED(Special_Stage__c) &&
+TEXT(Special_Stage__c) <> '鍖婚櫌涓婄骇鍗曚綅瀹℃壒瀹屾瘯'</errorConditionFormula>
+ <errorDisplayField>Special_Stage__c</errorDisplayField>
+ <errorMessage>A1绛夌骇鏃朵笉鍏佽淇敼璇环杩涘睍闃舵</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/Cannot_Change_Stage_When_A1.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/Cannot_Change_Stage_When_A1.validationRule-meta.xml
new file mode 100644
index 0000000..fcfd5a9
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/Cannot_Change_Stage_When_A1.validationRule-meta.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Cannot_Change_Stage_When_A1</fullName>
+ <active>true</active>
+ <description>A1绛夌骇鏃朵笉鍏佽淇敼璇环杩涘睍闃舵</description>
+ <errorConditionFormula>Special_Opp_lanhai__c = false && TEXT(Competitor__c) = 'A1' && ISCHANGED(Opportunity_stage__c) &&
+TEXT(Opportunity_stage__c) <> '涓爣绛剧害'</errorConditionFormula>
+ <errorDisplayField>Opportunity_stage__c</errorDisplayField>
+ <errorMessage>A1绛夌骇鏃朵笉鍏佽淇敼璇环杩涘睍闃舵</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/CelonCheck.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/CelonCheck.validationRule-meta.xml
new file mode 100644
index 0000000..d90004c
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/CelonCheck.validationRule-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>CelonCheck</fullName>
+ <active>true</active>
+ <description>褰撹浠锋槸Celon璇环鏃讹紝銆愮渷锛堜笂浼燬AP鐢�-鍔炰簨澶勶級銆戝彧鑳藉寳浜競锛�</description>
+ <errorConditionFormula>AND(OR(!ISBLANK(TEXT(CelonOpportunity__c)),Group_purchase_PCL__c) , !ISPICKVAL(SAP_Province__c, '鍖椾含甯�'), $User.ProfileId <> LEFT($Label.ProfileId_SystemAdmin, 15)
+,$User.Batch_User__c = false
+)</errorConditionFormula>
+ <errorDisplayField>SAP_Province__c</errorDisplayField>
+ <errorMessage>鐪�(涓婁紶SAP/SPO) 榛樿鍖椾含</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/Change_Close_Forecasted_Date_Warning.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/Change_Close_Forecasted_Date_Warning.validationRule-meta.xml
new file mode 100644
index 0000000..2f1deca
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/Change_Close_Forecasted_Date_Warning.validationRule-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Change_Close_Forecasted_Date_Warning</fullName>
+ <active>true</active>
+ <description>褰撳湪椤甸潰涓婄洿鎺ヤ慨鏀归娴嬬绾︽棩鏃舵彁绀洪敊璇�</description>
+ <errorConditionFormula>AND($Profile.Id != '00e10000000Y3o5', $Profile.Id != '00e10000000dEQx', ISCHANGED(Close_Forecasted_Date__c), NOT(OR(ISCHANGED(Close_Forecasted_Assume_Date__c), ISCHANGED(Date_InAdvance_Delay__c), ISCHANGED(Predicted_date_ChangeReason__c),ISCHANGED( ForecastApprovalTime__c ))))</errorConditionFormula>
+ <errorDisplayField>Close_Forecasted_Date__c</errorDisplayField>
+ <errorMessage>璇蜂娇鐢�"淇敼棰勬祴鏃�"鎸夐挳淇敼绛剧害鏃�</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/Change_Warning.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/Change_Warning.validationRule-meta.xml
new file mode 100644
index 0000000..76131fd
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/Change_Warning.validationRule-meta.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Change_Warning</fullName>
+ <active>false</active>
+ <errorConditionFormula>AND($User.Batch_User__c = False,DirectLossFLG__c,DATEVALUE(CreatedDate)> DATE(2022,12,03),OR(ISCHANGED(CloseDate),
+ISCHANGED(Close_Forecasted_Date__c)))</errorConditionFormula>
+ <errorMessage>浠庢嫑鏍囬」鐩偣鍑诲け鍗曟柊寤虹殑璇环锛岄娴婳CSM绛剧害鏃�(KPI)鍜岄娴嬪彂璐ф棩涓嶅厑璁镐慨鏀�</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/Check_AgencyContract_Quote_Decide_Flag.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/Check_AgencyContract_Quote_Decide_Flag.validationRule-meta.xml
new file mode 100644
index 0000000..2a0fdee
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/Check_AgencyContract_Quote_Decide_Flag.validationRule-meta.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Check_AgencyContract_Quote_Decide_Flag</fullName>
+ <active>true</active>
+ <description>璨╁２搴椼伄濂戠磩銇岃绌嶃倞姹哄畾涓嶅彲銇仾銇ｃ仸銇勩伨銇欍��</description>
+ <errorConditionFormula>And(
+ PRIORVALUE(Estimation_Decision__c) = False,
+ Estimation_Decision__c = True,
+ AND(
+ /* 濂戠磩銇牬鍚� AgencyContract */
+ Account.RecordTypeId = '01210000000QjCN',
+ OR(Today() < Account.Contract_Decide_Start_Date__c,
+ Account.Contract_Decide_End_Date__c < Today())
+ )
+)</errorConditionFormula>
+ <errorMessage>缁忛攢鍟嗙殑鍚堝悓杩囨湡锛屼笉鑳藉喅瀹氭姤浠枫��</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/Check_Cancel_WIN.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/Check_Cancel_WIN.validationRule-meta.xml
new file mode 100644
index 0000000..c3d64f2
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/Check_Cancel_WIN.validationRule-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Check_Cancel_WIN</fullName>
+ <active>true</active>
+ <description>璇环win鍙栨秷鏃讹紝鍙栨秷鍘熷洜蹇呴��</description>
+ <errorConditionFormula>ISCHANGED( SAP_Send_OK__c ) && SAP_Send_OK__c == false && ISBLANK(TEXT(Reason_Cancel_WIN__c))</errorConditionFormula>
+ <errorDisplayField>Reason_Cancel_WIN__c</errorDisplayField>
+ <errorMessage>璇烽�夋嫨鍙栨秷WIN鐨勭悊鐢�</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/Check_SAP_WIN.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/Check_SAP_WIN.validationRule-meta.xml
new file mode 100644
index 0000000..adf41c7
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/Check_SAP_WIN.validationRule-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Check_SAP_WIN</fullName>
+ <active>true</active>
+ <description>閫夋嫨鍙栨秷WIN鐞嗙敱鐨勬椂鍊欐病鏈夊嬀鎺塖AP涓婁紶(WIN)</description>
+ <errorConditionFormula>ISCHANGED(Reason_Cancel_WIN__c) == true && TEXT(Reason_Cancel_WIN__c) != null && SAP_Send_OK__c == true</errorConditionFormula>
+ <errorDisplayField>SAP_Send_OK__c</errorDisplayField>
+ <errorMessage>宸查�夋嫨鍙栨秷WIN鐨勭悊鐢憋紝璇风‘璁ゆ槸鍚﹀彇娑圵IN</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/Clear_on_BidDate.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/Clear_on_BidDate.validationRule-meta.xml
new file mode 100644
index 0000000..9894f0b
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/Clear_on_BidDate.validationRule-meta.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Clear_on_BidDate</fullName>
+ <active>true</active>
+ <description>oly涓爣锛屼笖13.涓爣鏃ユ湁鏀瑰彉锛屼笖浠庢湁鍊煎彉鎴愭棤鍊硷紝璺宠繃Batch鍜屾帴鍙ｇ敤鎴�</description>
+ <errorConditionFormula>AND( TEXT( ConfirmationofAward__c ) = 'OLY涓爣' , ISCHANGED( Closing_Bid_Date__c ) , ISBLANK(Closing_Bid_Date__c), $User.Id != '00510000000fSYI', $User.Id != '00510000000gmxH')</errorConditionFormula>
+ <errorMessage>宸茬粡纭畾oly涓爣锛�13.涓爣鏃ヤ笉鑳戒负绌恒��</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/CloseDate_gt_Close_Forecasted_Date.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/CloseDate_gt_Close_Forecasted_Date.validationRule-meta.xml
new file mode 100644
index 0000000..4106c36
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/CloseDate_gt_Close_Forecasted_Date.validationRule-meta.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>CloseDate_gt_Close_Forecasted_Date</fullName>
+ <active>true</active>
+ <description>2016/5/13 浠ヤ笅銇銈掑鏇�
+/* 00e10000000dEQx GPI_绯荤粺绠＄悊鍛樼殑鏃跺�欎笉鎶ラ敊 */
+$User.ProfileId <> "00e10000000dEQx" &&</description>
+ <errorConditionFormula>/* 00e10000000dEQx GPI_绯荤粺绠＄悊鍛樼殑鏃跺�欎笉鎶ラ敊 */
+$User.ProfileId <> "00e10000000dEQx" &&
+$User.ProfileId <> "00e10000000dE0K" &&
+$User.Batch_User__c = False &&
+Not(ISNEW()) && OR(Text(StageName) = '寮曞悎', Text(StageName) = '娉ㄦ畫')
+&&
+/*Not(OR(
+ISCHANGED(Cnt_Lost_cancel_report__c)
+, ISCHANGED(False_order_total_number__c)
+, ISCHANGED(Sum_ContractAmount__c)
+, ISCHANGED(Last_Shipping_Date__c)
+, ISCHANGED(Last_Shipping_Scheduled_Date__c)
+, ISCHANGED(Important_Rroduct_Count__c)
+, ISCHANGED(Min_FirstApproveDate__c)
+, ISCHANGED(Forecast_Amount_All__c)
+, ISCHANGED(Judge_Lost_or_Cancel__c)
+, ISCHANGED(Summary_Status_Total__c)
+, ISCHANGED(Contract_Number_Input_Total__c)
+, ISCHANGED(Note_shipped_residual__c)
+, ISCHANGED(Note_Shipped_Residual_Total__c)
+, ISCHANGED(ShippedAmount_All__c)
+, ISCHANGED(ShippedAmount_ThisYear_PA__c)
+, ISCHANGED(ShippedAmount_ThisYear_PB__c)
+, ISCHANGED(ShippedAmount_without_tax__c)
+, ISCHANGED(ShippedAmount_ThisYear_withoutax_PA__c)
+, ISCHANGED(ShippedAmount_ThisYear_withoutax_PB__c)
+, ISCHANGED(Contract_Invalid_Total__c)
+, ISCHANGED(Backup_order_number__c)
+, ISCHANGED(DetailNum__c)
+, ISCHANGED(Amount__c)
+, ISCHANGED(Max_LastApproveDate__c)
+, ISCHANGED(Xin_Last_Follow_Up_Date_For_Report__c)
+, ISCHANGED(Xin_Gross_Follow_Num__c)
+, ISCHANGED(Visit_President_Count__c)
+, ISCHANGED(Visit_Head_Doctor_Count__c)
+, ISCHANGED(Num_Of_NTC__c)
+, ISCHANGED(Num_Of_OPD__c)
+, ISCHANGED(Last_Visit_Scheduled_Date__c)
+, ISCHANGED(Rating01__c)
+, ISCHANGED(Rating02__c)
+, ISCHANGED(Rating03__c)
+, ISCHANGED(Rating04__c)
+, ISCHANGED(Rating05__c)
+, ISCHANGED(Rating06__c)
+, ISCHANGED(Rating07__c)
+, ISCHANGED(Rating08__c)
+, ISCHANGED(Rating09__c)
+, ISCHANGED(Rating10__c)
+, ISCHANGED(Rating11__c)
+, ISCHANGED(Rating12__c)
+))
+&& */
+OR (
+SAP_Send_OK__c = False && CloseDate < Close_Forecasted_Date__c,
+SAP_Send_OK__c = True && Ischanged(SAP_Send_OK__c) && CloseDate < Today(),
+SAP_Send_OK__c = True && Ischanged(SAP_Send_OK__c) = false && CloseDate < Datevalue(SAP_Send_OK_Date__c)
+)</errorConditionFormula>
+ <errorDisplayField>CloseDate</errorDisplayField>
+ <errorMessage>棰勬祴鍙戣揣鏃ュ繀椤绘櫄浜庨娴婳CSM绛剧害鏃�</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/Close_Date_Check.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/Close_Date_Check.validationRule-meta.xml
new file mode 100644
index 0000000..bcf82a2
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/Close_Date_Check.validationRule-meta.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Close_Date_Check</fullName>
+ <active>true</active>
+ <errorConditionFormula>AND(RecordTypeId = "01210000000QekK", CloseDate < TODAY() , Len(TEXT(CreatedDate))=0 )</errorConditionFormula>
+ <errorMessage>宸茬粡瓒呰繃棰勬祴鍙戣揣鏃ユ湡</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/Close_Forecasted_Date_Is_Must.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/Close_Forecasted_Date_Is_Must.validationRule-meta.xml
new file mode 100644
index 0000000..0cf23ed
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/Close_Forecasted_Date_Is_Must.validationRule-meta.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Close_Forecasted_Date_Is_Must</fullName>
+ <active>true</active>
+ <errorConditionFormula>Isblank(Close_Forecasted_Date__c) && ISCHANGED(Close_Forecasted_Date__c) && $Profile.Id!='00e10000000Y3o5' &&
+$Profile.Id!='00e10000000dEQx' && NOT($User.Batch_User__c)</errorConditionFormula>
+ <errorMessage>棰勬祴OCSM绛剧害鏃�(KPI)蹇呭～ 銆�</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/Cnt_Lost_cancel_Must_LTE_1.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/Cnt_Lost_cancel_Must_LTE_1.validationRule-meta.xml
new file mode 100644
index 0000000..7e0c76d
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/Cnt_Lost_cancel_Must_LTE_1.validationRule-meta.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Cnt_Lost_cancel_Must_LTE_1</fullName>
+ <active>true</active>
+ <description>璐ユ垬锛屽彇娑堬紝涓嶉渶灏忎簬绛変簬 1</description>
+ <errorConditionFormula>/* 00e10000000dEQx GPI_绯荤粺绠＄悊鍛樼殑鏃跺�欎笉鎶ラ敊 */
+$User.ProfileId <> "00e10000000dEQx" && $User.ProfileId <> "00e10000000Y3o5" &&
+(Cnt_Lost_cancel_report__c - Cnt_Lost_cancel_Draft__c > 1)</errorConditionFormula>
+ <errorMessage>璇环宸茬粡鏈� 鍙栨秷锛忓け鍗曟姤鍛� 浜嗭紒</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/Corrosion_Account.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/Corrosion_Account.validationRule-meta.xml
new file mode 100644
index 0000000..2c4603a
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/Corrosion_Account.validationRule-meta.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Corrosion_Account</fullName>
+ <active>true</active>
+ <errorConditionFormula>Is_Corrosion__c && Account.RecordTypeId=='01210000000QjCN'</errorConditionFormula>
+ <errorDisplayField>AccountId</errorDisplayField>
+ <errorMessage>闃胯タ璧涘璇环鍙兘閫夋嫨鍖婚櫌</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/Corrosion_Check.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/Corrosion_Check.validationRule-meta.xml
new file mode 100644
index 0000000..38a174e
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/Corrosion_Check.validationRule-meta.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Corrosion_Check</fullName>
+ <active>true</active>
+ <errorConditionFormula>Is_Corrosion__c && !AcecideCntCheck__c && (Contract_Authorize__c || If_Authorizing__c || SAP_Send_OK__c)</errorConditionFormula>
+ <errorMessage>闃胯タ璧涘鐨勮浠凤紝涓嶈兘鍖呭惈涓�鑸骇鍝�</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/Corrosion_Check_Not.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/Corrosion_Check_Not.validationRule-meta.xml
new file mode 100644
index 0000000..f122398
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/Corrosion_Check_Not.validationRule-meta.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Corrosion_Check_Not</fullName>
+ <active>true</active>
+ <errorConditionFormula>!Is_Corrosion__c && !AcecideCntCheck__c && (Contract_Authorize__c || If_Authorizing__c || SAP_Send_OK__c)</errorConditionFormula>
+ <errorMessage>涓嶆槸闃胯タ璧涘鐨勮浠凤紝涓嶈兘閫夋嫨鍗卞寲鍝佷骇鍝併��</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/Corrosion_Province.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/Corrosion_Province.validationRule-meta.xml
new file mode 100644
index 0000000..f3f6142
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/Corrosion_Province.validationRule-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Corrosion_Province</fullName>
+ <active>true</active>
+ <description>闃胯タ璧涘璇环鐨勩�愮渷锛堜笂浼燬AP鐢�-鍔炰簨澶勶級銆戝彧鑳介�夋嫨涓婃捣锛�</description>
+ <errorConditionFormula>Is_Corrosion__c && TEXT(SAP_Province__c)!='涓婃捣甯�'</errorConditionFormula>
+ <errorDisplayField>SAP_Province__c</errorDisplayField>
+ <errorMessage>褰撹浠锋槸闃胯タ璧涘鏃讹紝銆愮渷锛堜笂浼燬AP鐢�-鍔炰簨澶勶級銆戝彧鑳戒笂娴峰競锛�</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/Corrosion_PurchaseType.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/Corrosion_PurchaseType.validationRule-meta.xml
new file mode 100644
index 0000000..cdd70e4
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/Corrosion_PurchaseType.validationRule-meta.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Corrosion_PurchaseType</fullName>
+ <active>true</active>
+ <errorConditionFormula>Is_Corrosion__c && TEXT(Purchase_Type__c)!='ET24鏅傞枔璨╁２'</errorConditionFormula>
+ <errorDisplayField>Purchase_Type__c</errorDisplayField>
+ <errorMessage>闃胯タ璧涘璇环鍙兘閫夋嫨ET24H璁㈠崟</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/Corrosion_Root.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/Corrosion_Root.validationRule-meta.xml
new file mode 100644
index 0000000..e069e42
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/Corrosion_Root.validationRule-meta.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Corrosion_Root</fullName>
+ <active>true</active>
+ <errorConditionFormula>Is_Corrosion__c && TEXT(Sales_Root__c)=='OCM鐩存帴璨╁２'</errorConditionFormula>
+ <errorDisplayField>Sales_Root__c</errorDisplayField>
+ <errorMessage>闃胯タ璧涘璇环涓嶅彲浠ュ仛鐩撮攢</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/Corrosion_Trade.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/Corrosion_Trade.validationRule-meta.xml
new file mode 100644
index 0000000..cfcd34f
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/Corrosion_Trade.validationRule-meta.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Corrosion_Trade</fullName>
+ <active>true</active>
+ <errorConditionFormula>Is_Corrosion__c && TEXT(Trade__c)=='澶栬部'</errorConditionFormula>
+ <errorDisplayField>Trade__c</errorDisplayField>
+ <errorMessage>闃胯タ璧涘璇环鍙兘閫夋嫨鍐呰锤</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/Delete_Reason_Check.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/Delete_Reason_Check.validationRule-meta.xml
new file mode 100644
index 0000000..4a8d9cc
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/Delete_Reason_Check.validationRule-meta.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Delete_Reason_Check</fullName>
+ <active>false</active>
+ <errorConditionFormula>And(
+ISPICKVAL( StageName , "鍓婇櫎") ,
+ ISPICKVAL(Deleted_Reason__c , ""),
+$User.Batch_User__c = False)</errorConditionFormula>
+ <errorMessage>蹇呴』濉啓澶卞崟鐨勭悊鐢�</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/Forecast_SP_day_bigger_than_order_day.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/Forecast_SP_day_bigger_than_order_day.validationRule-meta.xml
new file mode 100644
index 0000000..4c1e12b
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/Forecast_SP_day_bigger_than_order_day.validationRule-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Forecast_SP_day_bigger_than_order_day</fullName>
+ <active>false</active>
+ <errorConditionFormula>AND(
+text(StageName)="寮曞悎",
+Close_Forecasted_Date__c > CloseDate,
+$User.Batch_User__c = False
+)</errorConditionFormula>
+ <errorMessage>棰勬祴绛剧害鏃ヤ笉鍏佽鏅氫簬棰勬祴鍙戣揣鏃�</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/ImportDemonstrationApprovalda_sametime.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/ImportDemonstrationApprovalda_sametime.validationRule-meta.xml
new file mode 100644
index 0000000..3d0f305
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/ImportDemonstrationApprovalda_sametime.validationRule-meta.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ImportDemonstrationApprovalda_sametime</fullName>
+ <active>true</active>
+ <errorConditionFormula>IF( AND(NOT(ISBLANK( ImportDemonstration_Rejection_date__c )), NOT(ISBLANK(ImportDemonstration_Approval_date__c )), ISCHANGED(ImportDemonstration_Approval_date__c)) , true, false)</errorConditionFormula>
+ <errorDisplayField>ImportDemonstration_Approval_date__c</errorDisplayField>
+ <errorMessage>鎵瑰噯鏃ュ拰椹冲洖鏃ヤ笉鑳藉悓鏃舵湁鍊�,璇峰垹闄�9.杩涘彛璁鸿瘉椹冲洖鏃�</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/ImportDemonstrationRejectiondate_sametim.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/ImportDemonstrationRejectiondate_sametim.validationRule-meta.xml
new file mode 100644
index 0000000..2b15a09
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/ImportDemonstrationRejectiondate_sametim.validationRule-meta.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ImportDemonstrationRejectiondate_sametim</fullName>
+ <active>true</active>
+ <errorConditionFormula>IF( AND(NOT(ISBLANK( ImportDemonstration_Rejection_date__c )), NOT(ISBLANK(ImportDemonstration_Approval_date__c )), ISCHANGED(ImportDemonstration_Rejection_date__c)) , true, false)</errorConditionFormula>
+ <errorDisplayField>ImportDemonstration_Rejection_date__c</errorDisplayField>
+ <errorMessage>鎵瑰噯鏃ュ拰椹冲洖鏃ヤ笉鑳藉悓鏃舵湁鍊�,璇峰垹闄�8.杩涘彛璁鸿瘉鎵瑰噯鏃�</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/ImportDemonstration_Approval_date_limit.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/ImportDemonstration_Approval_date_limit.validationRule-meta.xml
new file mode 100644
index 0000000..00e8db9
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/ImportDemonstration_Approval_date_limit.validationRule-meta.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ImportDemonstration_Approval_date_limit</fullName>
+ <active>true</active>
+ <errorConditionFormula>ImportDemonstration_Approval_date__c > TODAY()</errorConditionFormula>
+ <errorDisplayField>ImportDemonstration_Approval_date__c</errorDisplayField>
+ <errorMessage>8.杩涘彛璁鸿瘉鎵瑰噯鏃ヤ笉鑳藉ぇ浜庝粖澶�</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/ImportDemonstration_Filing_date_limit.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/ImportDemonstration_Filing_date_limit.validationRule-meta.xml
new file mode 100644
index 0000000..fa83e4d
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/ImportDemonstration_Filing_date_limit.validationRule-meta.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ImportDemonstration_Filing_date_limit</fullName>
+ <active>true</active>
+ <errorConditionFormula>ImportDemonstration_Filing_date__c > TODAY()</errorConditionFormula>
+ <errorDisplayField>ImportDemonstration_Filing_date__c</errorDisplayField>
+ <errorMessage>7.杩涘彛璁鸿瘉鐢宠鏃ヤ笉鑳藉ぇ浜庝粖澶�</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/ImportDemonstration_Rejection_date_limit.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/ImportDemonstration_Rejection_date_limit.validationRule-meta.xml
new file mode 100644
index 0000000..1d33d3e
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/ImportDemonstration_Rejection_date_limit.validationRule-meta.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ImportDemonstration_Rejection_date_limit</fullName>
+ <active>true</active>
+ <errorConditionFormula>ImportDemonstration_Rejection_date__c > TODAY()</errorConditionFormula>
+ <errorDisplayField>ImportDemonstration_Rejection_date__c</errorDisplayField>
+ <errorMessage>9.杩涘彛璁鸿瘉椹冲洖鏃ヤ笉鑳藉ぇ浜庝粖澶�</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/Invalid_department.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/Invalid_department.validationRule-meta.xml
new file mode 100644
index 0000000..4f565a4
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/Invalid_department.validationRule-meta.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Invalid_department</fullName>
+ <active>true</active>
+ <description>鏃犳晥鐨勭瀹や笉鍏佽杩涜璇环</description>
+ <errorConditionFormula>Account.Account_Is_Active2__c && ISNEW()</errorConditionFormula>
+ <errorMessage>鏃犳晥鐨勭瀹や笉鍏佽杩涜璇环</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/Limit_ForecastDay.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/Limit_ForecastDay.validationRule-meta.xml
new file mode 100644
index 0000000..9170f49
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/Limit_ForecastDay.validationRule-meta.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Limit_ForecastDay</fullName>
+ <active>true</active>
+ <description>棰勬祴鏃ラ檺鍒�</description>
+ <errorConditionFormula>AND(ISNEW(),OR(IF( Close_Forecasted_Date__c > (DATE(IF( MONTH( TODAY() ) > 3 , YEAR( TODAY() )+4, YEAR( TODAY() )+3),3,31)), true, false),IF( CloseDate > (DATE(IF( MONTH( TODAY() ) > 3 , YEAR( TODAY() )+5, YEAR( TODAY() )+4),3,31)), true, false)))</errorConditionFormula>
+ <errorMessage>璇锋鏌ラ娴嬫棩锛岃璐ч娴嬫棩璇峰湪鏈潵涓夎储骞村唴锛屽彂璐ч娴嬫棩璇峰湪鏈潵鍥涜储骞村唴銆�</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/Limitation_Of_Num_Of_Opportunity_Name.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/Limitation_Of_Num_Of_Opportunity_Name.validationRule-meta.xml
new file mode 100644
index 0000000..1e5e820
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/Limitation_Of_Num_Of_Opportunity_Name.validationRule-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Limitation_Of_Num_Of_Opportunity_Name</fullName>
+ <active>false</active>
+ <description>寮曞悎鍚嶃伅15鏂囧瓧浠ュ唴銇ㄣ仚銈�
+2013/01/10
+寮曞悎鍚嶃伅20鏂囧瓧浠ュ唴銇鏇�
+
+2013/02/17 銉囥兗銈跨Щ琛屻亴銇嗐伨銇忋亜銇嬨仾銇勩伄銇с�佺劇鍔广仺銇欍倠
+銆�銆�銆�銆�銆�銆�銆�銆�銆�涓�鏅傜殑銇鍑︺仹銇仾銇忋�佹亽涔呭绛栥仺銇欍倠</description>
+ <errorConditionFormula>And(Len(Name) > 20,
+$User.Batch_User__c = False)</errorConditionFormula>
+ <errorMessage>寮曞悎鍚嶃亴闀枫仚銇庛伨銇欍��20鏂囧瓧浠ヤ笅銇仐銇︺亸銇犮仌銇勩��</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/Lost_or_Cancel_PCL_cannot_Check_WIN.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/Lost_or_Cancel_PCL_cannot_Check_WIN.validationRule-meta.xml
new file mode 100644
index 0000000..6a4d906
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/Lost_or_Cancel_PCL_cannot_Check_WIN.validationRule-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Lost_or_Cancel_PCL_cannot_Check_WIN</fullName>
+ <active>true</active>
+ <errorConditionFormula>AND(
+$User.Batch_User__c = False,
+OR(ISPICKVAL(StageName, "鏁楁垿"),ISPICKVAL(StageName, "鍓婇櫎")),SAP_Send_OK__c=TRUE)</errorConditionFormula>
+ <errorMessage>濡傛灉鐘舵��1鏄彇娑�/澶卞崟锛屼笉鍏佽鍋歐IN</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/Must_input_cancel_reason_text.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/Must_input_cancel_reason_text.validationRule-meta.xml
new file mode 100644
index 0000000..cc65bfd
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/Must_input_cancel_reason_text.validationRule-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Must_input_cancel_reason_text</fullName>
+ <active>true</active>
+ <description>鎾ら攢鍘熷洜锛屽欢杩熺绾�/閲嶆柊鎷涙爣/鍏朵粬锛� 閫夋嫨鍏朵粬鏃讹紝蹇呴』杈撳叆鍏朵粬鍘熷洜鑷虫枃鏈</description>
+ <errorConditionFormula>TEXT(Stock_cancel_reason__c) = '鍏朵粬' && ISBLANK(Stock_cancel_reason_text__c)</errorConditionFormula>
+ <errorDisplayField>Stock_cancel_reason_text__c</errorDisplayField>
+ <errorMessage>蹇呴』濉啓鎾ら攢鍘熷洜(鍏朵粬)</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/NeedImportDemonstration_verification.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/NeedImportDemonstration_verification.validationRule-meta.xml
new file mode 100644
index 0000000..1bd46f7
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/NeedImportDemonstration_verification.validationRule-meta.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>NeedImportDemonstration_verification</fullName>
+ <active>true</active>
+ <errorConditionFormula>IF( AND(OR(NOT(ISBLANK( ImportDemonstration_Rejection_date__c )),NOT(ISBLANK(ImportDemonstration_Approval_date__c )),NOT(ISBLANK(ImportDemonstration_Filing_date__c ))), NOT(if_NeedImportDemonstration__c )) , true, false)</errorConditionFormula>
+ <errorDisplayField>if_NeedImportDemonstration__c</errorDisplayField>
+ <errorMessage>杩涘彛璁鸿瘉鐩稿叧鏃ユ湡涓嶄负绌猴紝涓嶈兘鍙栨秷閫夋嫨</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/Not_Change_Chuzan_Status.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/Not_Change_Chuzan_Status.validationRule-meta.xml
new file mode 100644
index 0000000..d718233
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/Not_Change_Chuzan_Status.validationRule-meta.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Not_Change_Chuzan_Status</fullName>
+ <active>true</active>
+ <errorConditionFormula>AND(TEXT(StageName) = '娉ㄦ畫',
+NOT(Fixed_Check__c ),
+$User.Batch_User__c = False
+)</errorConditionFormula>
+ <errorMessage>鐘舵厠1銇ф敞娈嬨倰瑷畾銇欍倠銇撱仺銇仹銇嶃伨銇涖倱銆�</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/Not_Change_HP_after_past_30days.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/Not_Change_HP_after_past_30days.validationRule-meta.xml
new file mode 100644
index 0000000..0e2e810
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/Not_Change_HP_after_past_30days.validationRule-meta.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Not_Change_HP_after_past_30days</fullName>
+ <active>true</active>
+ <description>鏂板缓璇环鍚庯紝瓒呰繃30澶╁悗锛屼笉鑳戒慨鏀瑰尰闄㈠悕绉�</description>
+ <errorConditionFormula>ISCHANGED( Hospital__c) && datevalue(CreatedDate) + 30 < today()
+&& $User.Batch_User__c = false</errorConditionFormula>
+ <errorDisplayField>Hospital__c</errorDisplayField>
+ <errorMessage>鏂板缓璇环鍚庯紝宸茶秴杩�30澶┿�備笉鑳戒慨鏀瑰尰闄㈠悕绉般��</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/Not_Off_Estimation_Decision.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/Not_Off_Estimation_Decision.validationRule-meta.xml
new file mode 100644
index 0000000..20216ec
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/Not_Off_Estimation_Decision.validationRule-meta.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Not_Off_Estimation_Decision</fullName>
+ <active>true</active>
+ <description>瑕嬬淇妯╅檺銇孫N銇儲銉笺偠浠ュ銇�佽绌嶆焙瀹氥儠銉┿偘銇甇FF銇屻仹銇嶃仾銇勩��</description>
+ <errorConditionFormula>And(PRIORVALUE(Estimation_Decision__c) = True, Estimation_Decision__c = False, OR(SAP_Send_OK__c = True, $User.Quote_Correct__c = False))</errorConditionFormula>
+ <errorMessage>鎶ヤ环鍐冲畾鍚�,涓嶈兘鍙栨秷鎶ヤ环FLG鐨勫嬀閫�</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/Not_On_Estimation_Decision.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/Not_On_Estimation_Decision.validationRule-meta.xml
new file mode 100644
index 0000000..ac86ab1
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/Not_On_Estimation_Decision.validationRule-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Not_On_Estimation_Decision</fullName>
+ <active>true</active>
+ <description>瑕嬬淇妯╅檺銇孫N銇儲銉笺偠浠ュ銇�佽绌嶆焙瀹氥儠銉┿偘銇甇N銇屻仹銇嶃仾銇勩��</description>
+ <errorConditionFormula>And(PRIORVALUE(Estimation_Decision__c) = False, Estimation_Decision__c = True, OR($User.Quote_Correct__c = False, ISBLANK(Estimation_Id__c)))</errorConditionFormula>
+ <errorDisplayField>OCM_Agent1_Price__c</errorDisplayField>
+ <errorMessage>娌℃湁鍐冲畾鎶ヤ环鐨勬潈闄愶紝鎴栬�呮病鏈夊彲琚喅瀹氱殑鎶ヤ环銆�</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/Not_Update_Objective.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/Not_Update_Objective.validationRule-meta.xml
new file mode 100644
index 0000000..28ea802
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/Not_Update_Objective.validationRule-meta.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Not_Update_Objective</fullName>
+ <active>true</active>
+ <description>浠ヤ笅銇儣銉儠銈°偆銉伄鍫村悎銇伩鐩銇鏇淬亴鍙兘
+103_閿�鍞湰閮ㄧ郴缁熺獥鍙�
+104_閿�鍞湰閮ㄨ浠锋媴褰撳姪鐞�
+104_閿�鍞湰閮ㄨ浠锋媴褰撳姪鐞嗭紙鏃犱笅杞芥潈闄愶級
+104_閿�鍞湰閮ㄥ悎鍚屽姪鐞嗭紙鏃犱笅杞芥潈闄愶級
+123_Te2am灏忕粍
+2S1_閿�鍞尰闄㈡媴褰�
+2S4_閿�鍞鐞嗚��
+2S6_閿�鍞湰閮ㄧ獥鍙�&钀ヤ笟鍔╃悊
+2S6_閿�鍞湰閮ㄧ獥鍙�&钀ヤ笟鍔╃悊(璁″垝浠〃鏉�)
+2S6_閿�鍞湰閮ㄧ獥鍙�&钀ヤ笟鍔╃悊(鑳介噺)
+000_绯荤粺绠＄悊鑰�
+绯荤粺绠＄悊鍛�
+ )</description>
+ <errorConditionFormula>And(
+ RecordTypeId ="01210000000QekP",
+ $User.Batch_User__c = False,
+ Not(
+ Or(
+ ($User.ProfileId = "00e10000000dCs0"),
+ ($User.ProfileId = "00e10000000dCs1"),
+ ($User.ProfileId = "00e10000000dCsQ"),
+ ($User.ProfileId = "00e10000000xnp2"),
+ ($User.ProfileId = "00e10000000xnpH"),
+ ($User.ProfileId = "00e10000000xyK6"),
+ ($User.ProfileId = "00e10000000xnpR"),
+ ($User.ProfileId = "00e10000000NbCE"),
+ ($User.ProfileId = "00e10000000dGTI"),
+ ($User.ProfileId = "00e10000000Y3o5")
+ )
+ )
+ )</errorConditionFormula>
+ <errorMessage>娌℃湁鐩爣鏇存柊鏉冮檺锛岃鑱旂郴绯荤粺绠＄悊鍛�</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/Not_Update_Wholesale_Price.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/Not_Update_Wholesale_Price.validationRule-meta.xml
new file mode 100644
index 0000000..1b20634
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/Not_Update_Wholesale_Price.validationRule-meta.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Not_Update_Wholesale_Price</fullName>
+ <active>true</active>
+ <errorConditionFormula>And( Estimation_Decision__c = True,
+ ISCHANGED( Wholesale_Price__c ),
+$User.Quote_Correct__c = False,
+$User.Batch_User__c = False)</errorConditionFormula>
+ <errorMessage>DECIDE浠ュ悗锛孫CSM棰勬祴鎴愪氦閲戦锛堝惈绋庯級涓嶅彲浠ュ彉鏇淬��</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/OBA4_CannotmodifyName.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/OBA4_CannotmodifyName.validationRule-meta.xml
new file mode 100644
index 0000000..fa7c8b5
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/OBA4_CannotmodifyName.validationRule-meta.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OBA4_CannotmodifyName</fullName>
+ <active>true</active>
+ <description>OBA4绠�妗ｄ笉鑳戒慨鏀硅浠峰悕绉般�侀娴嬪彂璐ф棩</description>
+ <errorConditionFormula>AND($Profile.Id = '00e10000000s2cp', OR(ISCHANGED(Name), ISCHANGED(CloseDate)))</errorConditionFormula>
+ <errorMessage>涓嶈兘淇敼璇环鍚嶇О鍜岄娴嬪彂璐ф棩</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/OCM_expected_data_check.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/OCM_expected_data_check.validationRule-meta.xml
new file mode 100644
index 0000000..e6aee03
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/OCM_expected_data_check.validationRule-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OCM_expected_data_check</fullName>
+ <active>true</active>
+ <description>OCM棰勬祴绛剧害鏃モ�濆拰鈥滈娴嬪彂璐ф棩鈥濆鍔犲垽鏂紝褰撴洿鏂拌繖涓や釜鏃ユ湡鏃惰姹傛洿鏂扮殑鏃ユ湡涓嶅皬浜� 浠婂ぉ銆傚鏋滀笉婊¤冻鏉′欢鎻愰啋銆�</description>
+ <errorConditionFormula>(ISCHANGED(Close_Forecasted_Date__c) &&
+NOT(ISBLANK(Close_Forecasted_Date__c)) &&
+Close_Forecasted_Date__c < TODAY()) ||
+(ISCHANGED(CloseDate) &&
+NOT(ISBLANK(CloseDate)) &&
+CloseDate < TODAY())</errorConditionFormula>
+ <errorMessage>OCSM棰勬祴绛剧害鏃ユ垨鑰呴娴嬪彂璐ф棩涓嶈兘灏忎簬浠婂ぉ</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/OpportunityStageLimited.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/OpportunityStageLimited.validationRule-meta.xml
new file mode 100644
index 0000000..941e6d1
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/OpportunityStageLimited.validationRule-meta.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OpportunityStageLimited</fullName>
+ <active>false</active>
+ <errorConditionFormula>Special_Opp_lanhai__c = false && (PRIORVALUE(ET_SP_Consumption__c) || TEXT(PRIORVALUE(Opportunity_stage__c))='涓爣绛剧害' || TEXT(PRIORVALUE(Opportunity_stage__c))='纭畾浜哋LY鍙傛暟' || TEXT(PRIORVALUE(Opportunity_stage__c))='娌℃湁纭畾鍙傛暟' || TEXT(PRIORVALUE(Opportunity_stage__c))='纭畾浜嗗鎵嬪弬鏁�' || TEXT(PRIORVALUE(Opportunity_stage__c))='棰勭畻宸茬粡鎵瑰噯') && NOT(ET_SP_Consumption__c) && (TEXT(Opportunity_stage__c)='棰勭畻娌℃湁鎵瑰噯' || TEXT(Opportunity_stage__c)='鎻愪氦浜嗛绠楃敵璇�' || TEXT(Opportunity_stage__c)='杩樻病鐢宠棰勭畻')</errorConditionFormula>
+ <errorMessage>璇环C绛夌骇浠ュ悗锛屼笉鍙互淇敼鍒癉鎴朎</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/OpportunityStageLimited2.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/OpportunityStageLimited2.validationRule-meta.xml
new file mode 100644
index 0000000..ad8bbc7
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/OpportunityStageLimited2.validationRule-meta.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OpportunityStageLimited2</fullName>
+ <active>false</active>
+ <errorConditionFormula>Special_Opp_lanhai__c = true && (TEXT(PRIORVALUE(Special_Stage__c))='鍖婚櫌涓婄骇鍗曚綅瀹℃壒瀹屾瘯' || TEXT(PRIORVALUE(Special_Stage__c))='铻嶈祫鍏徃瀹℃牳瀹屾瘯' || TEXT(PRIORVALUE(Special_Stage__c))='鍖婚櫌鍗忚绛剧讲瀹屾瘯' || TEXT(PRIORVALUE(Special_Stage__c))='宸茬‘璁ら厤缃�') && (TEXT(Special_Stage__c)='璇环涓�')</errorConditionFormula>
+ <errorMessage>璇环C绛夌骇浠ュ悗锛屼笉鍙互淇敼鍒癉鎴朎</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/Opportunity_File_Closing_Bid_Date_Check.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/Opportunity_File_Closing_Bid_Date_Check.validationRule-meta.xml
new file mode 100644
index 0000000..dc430ab
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/Opportunity_File_Closing_Bid_Date_Check.validationRule-meta.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Opportunity_File_Closing_Bid_Date_Check</fullName>
+ <active>true</active>
+ <description>A,B,C,D,E闄勪欢涓�鑸彧浼氫笂浼犲叾涓竴绉嶏紝濡傛灉涓婁紶A || B鏃讹紝濉啓鐨勪腑鏍囨棩涓嶈兘鏅氫簬涓婁紶闄勪欢鏃ユ湡</description>
+ <errorConditionFormula>NOT(ISNULL(Last_opportunity_file__c)) &&
+(Last_opportunity_file_stage__c = 'A' || Last_opportunity_file_stage__c = 'B') && NOT(ISNULL(Closing_Bid_Date__c)) && Closing_Bid_Date__c > DATEVALUE(Last_opportunity_file_time__c)</errorConditionFormula>
+ <errorDisplayField>Closing_Bid_Date__c</errorDisplayField>
+ <errorMessage>13.涓爣鏃ヤ笉鑳芥櫄浜庝笂浼犻檮浠舵棩鏈�</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/QuolifiedCustomerCanDirectSale.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/QuolifiedCustomerCanDirectSale.validationRule-meta.xml
new file mode 100644
index 0000000..d2dd9d7
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/QuolifiedCustomerCanDirectSale.validationRule-meta.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>QuolifiedCustomerCanDirectSale</fullName>
+ <active>true</active>
+ <description>鍙彲浠ョ洿鎺ュ崠缁欒祫璐ㄥ鎵归�氳繃鐨勫鎴�</description>
+ <errorConditionFormula>$User.Batch_User__c = false &&
+$User.ProfileId != '00e10000000Y3o5' &&
+(TEXT(Hospital__r.Quolified_Approve_Status__c) <> 'Pass' || Hospital__r.IsQuolifiedInvalid_c__c = true) && TEXT(Sales_Root__c) = 'OCM鐩存帴璨╁２' && (
+NOT(ISCHANGED(Status_Formula__c)) &&
+NOT(ISCHANGED(Xin_Gross_Follow_Num__c)) &&
+NOT(ISCHANGED(Lapsed_Days__c)) &&
+NOT(ISCHANGED(DoOPD__c)) &&
+NOT(ISCHANGED(OwnerId)) &&
+NOT(ISCHANGED(Num_Of_OPD__c)) &&
+NOT(ISCHANGED(OPD_SIS_collect_evaluation_sight__c )) && NOT(ISCHANGED(Visit_Head_Doctor_Flag__c)) &&
+NOT(ISCHANGED(Visit_President_Flag__c)) &&
+NOT(ISCHANGED(DoNTC__c)) &&
+NOT(ISCHANGED(Num_Of_NTC__c)) &&
+NOT(ISCHANGED(Last_Visit_Scheduled_Date__c))
+) &&
+NOT(Estimation_Decision__c = false && ISCHANGED(Estimation_Decision__c))</errorConditionFormula>
+ <errorDisplayField>Sales_Root__c</errorDisplayField>
+ <errorMessage>鏈�氳繃璧勮川瀹℃牳鎴栬�呰祫璐ㄨ繃鏈熺殑瀹㈡埛涓嶅彲浠ラ�夋嫨OCSM鐩存帴閿�鍞�</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/Rejectiondate_Filingdate.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/Rejectiondate_Filingdate.validationRule-meta.xml
new file mode 100644
index 0000000..1146f3d
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/Rejectiondate_Filingdate.validationRule-meta.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Rejectiondate_Filingdate</fullName>
+ <active>true</active>
+ <errorConditionFormula>IF( AND(NOT(ISBLANK( ImportDemonstration_Rejection_date__c )), IF( ImportDemonstration_Filing_date__c >ImportDemonstration_Rejection_date__c, true, false) , ISCHANGED(ImportDemonstration_Filing_date__c)) , true, false)</errorConditionFormula>
+ <errorDisplayField>ImportDemonstration_Filing_date__c</errorDisplayField>
+ <errorMessage>璇峰垹闄�9.杩涘彛璁鸿瘉椹冲洖鏃�</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/Request_Contract_DB_SalesDept_complite_d.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/Request_Contract_DB_SalesDept_complite_d.validationRule-meta.xml
new file mode 100644
index 0000000..04cf8fa
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/Request_Contract_DB_SalesDept_complite_d.validationRule-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Request_Contract_DB_SalesDept_complite_d</fullName>
+ <active>true</active>
+ <errorConditionFormula>/* 00e10000000dEQx 鏄� GPI_绯荤粺绠＄悊鍛� */
+/* 01210000000QjCN 鏄� 缁忛攢鍟嗗悎鍚岀殑璇环 */
+
+AND($User.ProfileId <> "00e10000000dEQx",
+SAP_Send_OK__c = True , PRIORVALUE(SAP_Send_OK__c) = False,
+If_Need_PriceApply__c = True,
+Whether_FALSE_order__c = False,
+Isblank(Contract_DB_SalesDept_complite_day__c))</errorConditionFormula>
+ <errorDisplayField>Contract_DB_SalesDept_complite_day__c</errorDisplayField>
+ <errorMessage>闄や簡ET24灏忔椂璁㈠崟锛�14.钀ヤ笟閮ㄥ悎鍚屽鎵圭粨鏉熸棩鏄繀濉」鐨勫瓧娈�</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/Request_NotesApprovedNo.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/Request_NotesApprovedNo.validationRule-meta.xml
new file mode 100644
index 0000000..e98dc70
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/Request_NotesApprovedNo.validationRule-meta.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Request_NotesApprovedNo</fullName>
+ <active>true</active>
+ <description>SAP涓婁紶鐨勬椂鍊欙紝闄や簡ET24灏忔椂璁㈠崟鍚堝悓鐢宠鍐宠缂栫爜鏄繀濉」鐨�</description>
+ <errorConditionFormula>/* 00e10000000dEQx 鏄� GPI_绯荤粺绠＄悊鍛� */
+/* 01210000000QjCN 鏄� 缁忛攢鍟嗗悎鍚岀殑璇环 */
+
+AND($User.ProfileId <> "00e10000000dEQx",
+SAP_Send_OK__c = True , PRIORVALUE(SAP_Send_OK__c) = False,
+If_Need_PriceApply__c = True,
+Whether_FALSE_order__c = False,
+Isblank(NotesApprovedNo__c))</errorConditionFormula>
+ <errorDisplayField>NotesApprovedNo__c</errorDisplayField>
+ <errorMessage>闄や簡ET24灏忔椂璁㈠崟锛屽悎鍚岀敵璇峰喅瑁佺紪鐮佹槸蹇呭～椤圭殑瀛楁</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/Request_authorized_DB_number.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/Request_authorized_DB_number.validationRule-meta.xml
new file mode 100644
index 0000000..0e6181a
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/Request_authorized_DB_number.validationRule-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Request_authorized_DB_number</fullName>
+ <active>true</active>
+ <description>SAP涓婁紶鐨勬椂鍊欙紝闄や簡ET24灏忔椂璁㈠崟鍜孫CM鐩撮攢锛屾巿鏉冪紪鐮佹槸蹇呭～椤圭殑</description>
+ <errorConditionFormula>/* 00e10000000dEQx 鏄� GPI_绯荤粺绠＄悊鍛� */
+/* 01210000000QjCN 鏄� 缁忛攢鍟嗗悎鍚岀殑璇环 */
+
+AND($User.ProfileId <> "00e10000000dEQx",
+SAP_Send_OK__c = True , PRIORVALUE(SAP_Send_OK__c) = False,
+If_Need_Authorize__c = True,
+Isblank(Authorized_DB_No__c))</errorConditionFormula>
+ <errorDisplayField>Authorized_DB_No__c</errorDisplayField>
+ <errorMessage>闄や簡ET24灏忔椂璁㈠崟鍜孫CSM鐩撮攢锛屾巿鏉冪紪鐮佹槸蹇呭～椤圭殑瀛楁</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/SAP_Change_After_Sent.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/SAP_Change_After_Sent.validationRule-meta.xml
new file mode 100644
index 0000000..8ee4541
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/SAP_Change_After_Sent.validationRule-meta.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>SAP_Change_After_Sent</fullName>
+ <active>true</active>
+ <errorConditionFormula>AND(
+ $User.Batch_User__c = false,
+ SAP_Send_OK__c,
+ OR(
+ ISCHANGED( Sales_Root__c ),
+ ISCHANGED( Opportunity_Category__c ),
+ ISCHANGED( Purchase_Type__c ),
+ ISCHANGED( Promise_Class__c ),
+ ISCHANGED( Fund_Basis__c ),
+ ISCHANGED( SAP_Province__c )
+ )
+)</errorConditionFormula>
+ <errorMessage>SAP(WIN)鍚庯紝涓嶈兘鏇存敼銆岃浠风瀹ゅ垎绫汇�嶃�屽悎鍚屽垎绫汇�嶃�岃祫閲戞潵婧愩�嶃�岄攢鍞笭閬撱�嶃�岃璐ф祦绋嬬被鍒�嶃�岀渷锛堜笂浼燬AP鐢級銆�</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/SAP_Send_Check.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/SAP_Send_Check.validationRule-meta.xml
new file mode 100644
index 0000000..8cfb9bb
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/SAP_Send_Check.validationRule-meta.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>SAP_Send_Check</fullName>
+ <active>true</active>
+ <description>銉讳汉鍛樹俊鎭湁鐗规畩鎿嶄綔鏉冮檺,鍦ㄦ姤浠稢HECK ON浠ュ悗鎿嶄綔
+銉绘姤浠峰喅瀹氫互鍚庢墠鍙互鍋歐IN
+銉籗AP涓婁紶椤圭洰鏄惁鐧诲綍瀹屾垚鍚庯紝鎵嶅彲浠ュ仛WIN</description>
+ <errorConditionFormula>AND(ISCHANGED(SAP_Send_OK__c), SAP_Send_OK__c,
+ OR(NOT($User.Quote_Special_Operation__c),
+ NOT(Estimation_Decision__c),
+ ISBLANK( TEXT(Sales_Root__c)),
+ ISBLANK( TEXT(Purchase_Type__c)),
+ ISBLANK( TEXT(Promise_Class__c)),
+ ISBLANK( TEXT(Fund_Basis__c)),
+ ISBLANK( TEXT(SAP_Province__c))
+ ),$User.ProfileId <>'00e10000000Y3o5'
+)</errorConditionFormula>
+ <errorMessage>涓嶆弧瓒充笂浼燬AP鐨勬潯浠�</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/SAP_Send_Check_IsChanged_After_Decided.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/SAP_Send_Check_IsChanged_After_Decided.validationRule-meta.xml
new file mode 100644
index 0000000..144a0a3
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/SAP_Send_Check_IsChanged_After_Decided.validationRule-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>SAP_Send_Check_IsChanged_After_Decided</fullName>
+ <active>true</active>
+ <description>鍒ゆ柇鏄惁鍦ㄥ喅瀹氬悗鍙堟湁淇敼</description>
+ <errorConditionFormula>$User.Batch_User__c = false && Estimation_Decision__c = True &&
+(IsChanged(AccountId) || IsChanged(Hospital__c) || IsChanged(Sales_Root__c))</errorConditionFormula>
+ <errorMessage>璇环琚喅瀹氬悗涓嶈兘淇敼 瀹㈡埛锛屽尰闄紝閿�鍞笭閬�</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/SAP_Send_Check_Off.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/SAP_Send_Check_Off.validationRule-meta.xml
new file mode 100644
index 0000000..2e9aeaf
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/SAP_Send_Check_Off.validationRule-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>SAP_Send_Check_Off</fullName>
+ <active>true</active>
+ <description>SAP閫佷俊銉溿偪銉炽儊銈с儍銈偑銉曘伄鏉′欢銉併偋銉冦偗
+銉讳汉浜嬨優銈广偪銇甋AP閫佷俊瑙ｉ櫎銇屻儊銈с儍銈偑銉炽伄鍫村悎銇亾銇儨銈裤兂銇屾娂涓嬪嚭鏉ャ倠</description>
+ <errorConditionFormula>AND( ISCHANGED(SAP_Send_OK__c ) ,
+PRIORVALUE (SAP_Send_OK__c ) = True,
+NOT($User.SAP_Send_OFF__c)
+)</errorConditionFormula>
+ <errorMessage>娌℃湁瑙ｉ櫎SAP涓婁紶鐨勬潈闄愩��</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/Sales_Root_ChangeRule.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/Sales_Root_ChangeRule.validationRule-meta.xml
new file mode 100644
index 0000000..47f3992
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/Sales_Root_ChangeRule.validationRule-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Sales_Root_ChangeRule</fullName>
+ <active>true</active>
+ <description>鐘舵厠銇屾晽鎴︺�佸墛闄ゃ伄鏅傘亰銈堛伋瑕嬬姹哄畾寰屻伅 鍐呰部/澶栬部銆佽博澹层儷銉笺儓 銈掑鏇淬仚銈嬨亾銇ㄣ伅銇с亶銇俱仜銈撱��</description>
+ <errorConditionFormula>AND(
+ OR(Estimation_Decision__c,
+ ISPICKVAL( StageName , '鏁楁垿'),
+ ISPICKVAL( StageName , '鍓婇櫎')
+ ),
+ ISCHANGED( Sales_Root__c ))</errorConditionFormula>
+ <errorMessage>鐘舵�佷负澶卞崟/鍙栨秷鏃�,鎴栨姤浠峰喅瀹氬悗,涓嶅彲浠ヤ慨鏀归攢鍞笭閬撱��</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/Stage_check.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/Stage_check.validationRule-meta.xml
new file mode 100644
index 0000000..39fbd15
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/Stage_check.validationRule-meta.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Stage_check</fullName>
+ <active>true</active>
+ <errorConditionFormula>$User.Batch_User__c = false && RecordTypeId <> '01210000000QekP' && Special_Opp_lanhai__c = false && ISBLANK(TEXT(Opportunity_stage__c)) && (ISNEW() || ISCHANGED(Opportunity_stage__c))</errorConditionFormula>
+ <errorDisplayField>Opportunity_stage__c</errorDisplayField>
+ <errorMessage>蹇呴』濉啓璇环闃舵銆�</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/Stage_check2.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/Stage_check2.validationRule-meta.xml
new file mode 100644
index 0000000..9a76b45
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/Stage_check2.validationRule-meta.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Stage_check2</fullName>
+ <active>true</active>
+ <errorConditionFormula>$User.Batch_User__c = false && RecordTypeId <> '01210000000QekP' && Special_Opp_lanhai__c = true && ISBLANK(TEXT(Special_Stage__c)) && (ISNEW() || ISCHANGED(Special_Stage__c))</errorConditionFormula>
+ <errorDisplayField>Special_Stage__c</errorDisplayField>
+ <errorMessage>蹇呴』濉啓璇环闃舵(钃濇捣)</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/Status_Phase_Change_Fixed_To_Opp.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/Status_Phase_Change_Fixed_To_Opp.validationRule-meta.xml
new file mode 100644
index 0000000..9b0ec24
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/Status_Phase_Change_Fixed_To_Opp.validationRule-meta.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Status_Phase_Change_Fixed_To_Opp</fullName>
+ <active>true</active>
+ <description>And(
+ Note_Residual_Result__c <> "0",
+ Note_Residual_Result__c <> "4",
+ Fixed_Check__c ,
+ ISPICKVAL( StageName , "寮曞悎") ,
+ ISCHANGED(StageName),
+ $User.Batch_User__c = False
+)</description>
+ <errorConditionFormula>And(
+Note_Residual_Result__c <> "0",
+Note_Residual_Result__c <> "4",
+Fixed_Check__c ,
+ISPICKVAL( StageName , "寮曞悎") ,
+ISCHANGED(StageName),
+$User.Batch_User__c = False
+)</errorConditionFormula>
+ <errorMessage>鍦ㄧ姸鎬�1涓婁笉鑳芥敼涓鸿浠�</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/System_Stop_Win.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/System_Stop_Win.validationRule-meta.xml
new file mode 100644
index 0000000..c668e1e
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/System_Stop_Win.validationRule-meta.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>System_Stop_Win</fullName>
+ <active>true</active>
+ <errorConditionFormula>($Label.System_Stop == '2') && (SAP_Send_OK__c = true) && ischanged(SAP_Send_OK__c )&& ($Profile.Id != '00e10000000Y3o5')</errorConditionFormula>
+ <errorMessage>绯荤粺缁存姢鏈熼棿锛岀姝IN銆�</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/Tender_Closed_Day_should_be_past_day.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/Tender_Closed_Day_should_be_past_day.validationRule-meta.xml
new file mode 100644
index 0000000..192d23c
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/Tender_Closed_Day_should_be_past_day.validationRule-meta.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Tender_Closed_Day_should_be_past_day</fullName>
+ <active>true</active>
+ <errorConditionFormula>Closing_Bid_Date__c > today()</errorConditionFormula>
+ <errorDisplayField>Closing_Bid_Date__c</errorDisplayField>
+ <errorMessage>13.涓爣鏃ヤ笉鍏佽鐧诲綍鏈潵鏃ユ湡</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/Trade_ChangeRule.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/Trade_ChangeRule.validationRule-meta.xml
new file mode 100644
index 0000000..b88e07e
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/Trade_ChangeRule.validationRule-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Trade_ChangeRule</fullName>
+ <active>true</active>
+ <errorConditionFormula>AND(
+OR(Estimation_Decision__c,
+ NOT(ISPICKVAL( StageName , '寮曞悎')),
+ opp_quotes_num__c > 0,
+ SAP_Send_OK__c
+),
+ISCHANGED( Trade__c),
+NOT(ISPICKVAL( StageName , '鐩')))</errorConditionFormula>
+ <errorMessage>鐘舵��1涓嶆槸璇环锛屾垨鑰厀in涓烘锛屾垨鑰呭凡鍐冲畾鎶ヤ环,鎴栬�呮湁鎶ヤ环鏃�,涓嶅彲浠ヤ慨鏀瑰唴璐�/澶栬锤</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/canEditCelon.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/canEditCelon.validationRule-meta.xml
new file mode 100644
index 0000000..9faf4c0
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/canEditCelon.validationRule-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>canEditCelon</fullName>
+ <active>true</active>
+ <errorConditionFormula>(NOT(OR(LEFT($Profile.Id, 15) == LEFT($Label.ProfileId_2M4, 15) ,
+LEFT($Profile.Id, 15) == LEFT($Label.ProfileId_2M5, 15) )
+))&&
+/* !ISNULL(Text(CelonOpportunity__c))*/
+OR(ISCHANGED(CelonOpportunity__c),AND(ISNEW(),!ISBLANK(TEXT(CelonOpportunity__c))))
+&& $Profile.Id!='00e10000000Y3o5' && $Profile.Id!='00e10000000dzzG'</errorConditionFormula>
+ <errorDisplayField>CelonOpportunity__c</errorDisplayField>
+ <errorMessage>浠呭競鍦轰紒鍒掗儴闂ㄥ彲浠ラ�夋嫨</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/cannotchange_agencyopp.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/cannotchange_agencyopp.validationRule-meta.xml
new file mode 100644
index 0000000..1d426e5
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/cannotchange_agencyopp.validationRule-meta.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>cannotchange_agencyopp</fullName>
+ <active>true</active>
+ <description>缁忛攢鍟嗚浠蜂笉鑳戒慨鏀�</description>
+ <errorConditionFormula>AND( NOT(PRIORVALUE(AgencyOpp_StageName__c)='鍙栨秷'), NOT(ISBLANK(PRIORVALUE(Agency_Opportunity__c))),
+ISCHANGED(Agency_Opportunity__c),$User.ProfileId <> LEFT($Label.ProfileId_SystemAdmin, 15))</errorConditionFormula>
+ <errorDisplayField>Agency_Opportunity__c</errorDisplayField>
+ <errorMessage>涓嶈兘淇敼缁忛攢鍟嗚浠�</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/lastAccount.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/lastAccount.validationRule-meta.xml
new file mode 100644
index 0000000..801a8ec
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/lastAccount.validationRule-meta.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>lastAccount</fullName>
+ <active>true</active>
+ <errorConditionFormula>AND(Account.RecordTypeId == "01210000000QjCN",ISPICKVAL(CelonOpportunity__c, 'Celon涓绘満'))</errorConditionFormula>
+ <errorMessage>Celon涓绘満蹇呴』鍖婚櫌鍋氭渶缁堢敤鎴�</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/notRemoveBid.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/notRemoveBid.validationRule-meta.xml
new file mode 100644
index 0000000..ed7d397
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/notRemoveBid.validationRule-meta.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>notRemoveBid</fullName>
+ <active>false</active>
+ <description>鍙湁绯荤粺绠＄悊鍛樺彲浠ュ幓鎺夋嫑鎶曟爣椤圭洰
+20220425 鏆傚仠 閫昏緫鍒犻櫎鏃朵細閲嶆柊淇敼缁戝畾鐨勬嫑鏍囬」鐩紝鏃犳硶璺宠繃杩欎釜楠岃瘉瑙勫垯銆�</description>
+ <errorConditionFormula>ischanged(Bidding_Project_Name_Bid__c) && (isblank(Bidding_Project_Name_Bid__c )) && $Profile.Id <> "00e1m000000MSci" && $Profile.Id <> "00e10000000Y3o5" && !ISNEW()</errorConditionFormula>
+ <errorDisplayField>Bidding_Project_Name_Bid__c</errorDisplayField>
+ <errorMessage>璇疯仈绯昏惀涓氭敮鎻撮儴鍘婚櫎璇�夌殑鎷涙姇鏍囬」鐩�</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/validationRules/notcanEditCelon.validationRule-meta.xml b/force-app/main/default/objects/Opportunity/validationRules/notcanEditCelon.validationRule-meta.xml
new file mode 100644
index 0000000..75039f9
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/validationRules/notcanEditCelon.validationRule-meta.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>notcanEditCelon</fullName>
+ <active>true</active>
+ <errorConditionFormula>!ISBLANK( PRIORVALUE(CelonOpportunity__c) )
+&& ISCHANGED(CelonOpportunity__c)
+&& $Profile.Id!='00e10000000Y3o5' && $Profile.Id!='00e10000000dzzG'</errorConditionFormula>
+ <errorDisplayField>CelonOpportunity__c</errorDisplayField>
+ <errorMessage>Celon璇环閫夊畾鍚庝笉鍙互淇敼</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity/webLinks/Agency_Authorize.webLink-meta.xml b/force-app/main/default/objects/Opportunity/webLinks/Agency_Authorize.webLink-meta.xml
new file mode 100644
index 0000000..3cfd064
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/webLinks/Agency_Authorize.webLink-meta.xml
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Agency_Authorize</fullName>
+ <availability>online</availability>
+ <description>{!RequireScript("/soap/ajax/30.0/connection.js")}
+{!RequireScript("/soap/ajax/30.0/apex.js")}
+{!RequireScript("/resource/CommonUtilJs")}</description>
+ <displayType>button</displayType>
+ <linkType>javascript</linkType>
+ <masterLabel>鎺堟潈鐢宠</masterLabel>
+ <openType>onClickJavaScript</openType>
+ <protected>false</protected>
+ <url>var btns = document.getElementsByName("agency_authorize");
+for (var i=0; i<btns.length; i++) {
+ btns[i].disabled = true;
+ btns[i].className = 'btnDisabled';
+}
+{!RequireScript("/soap/ajax/51.0/connection.js")}
+{!RequireScript("/soap/ajax/51.0/apex.js")}
+{!RequireScript("/resource/CommonUtilJs")}
+//2021-10-21 gwy 鐗堟湰鏇存敼涓�51.0
+var foo = function() {
+ var oppid = '{!Opportunity.Id}';
+ var angency = '{!Opportunity.Agency1Id__c}';
+ var profileId = '{!$User.ProfileId}';
+ var estId = '{!Opportunity.Estimation_Id__c}';
+
+ if (profileId != '00e10000000Y3o5' && profileId != '00e10000000Nab7' && profileId != '00e10000000xnpR' && profileId != '00e10000000xyK6' && profileId != '00e10000000NbCE'
+&& profileId != '00e10000000xyK6' && profileId != '00e10000000Nb7i') {
+ alert("鎮ㄦ病鏈夋巿鏉冪敵璇风殑鏉冮檺銆傝鑱旂郴绯荤粺绠＄悊鍛樸��");
+ return;
+ }
+
+//chenjingwu 2023.8.25
+var record1 = sforce.connection.query("select Have_Virtual__c from Quote where Id = \'" + estId + "\'");
+ var records1 = record1.getArray("records");
+ if(records1[0].Have_Virtual__c == 'true'){
+ alert("鍖呭惈铏氭嫙浜у搧锛屼笉鑳芥巿鏉冿紝璇锋洿鏂版姤浠峰崟鍚庣敵璇�");
+ return;
+ }
+
+
+
+
+
+//璐告槗鍚堣 you
+var AccDealerBlacklist = '{!Opportunity.AccDealerBlacklist__c}';//鍒ゆ柇瀹㈡埛/缁忛攢鍟嗘槸鍚︿负榛戝悕鍗�
+var angency1 = '{!Opportunity.Agency1__c}';
+var angency2 = '{!Opportunity.Agency2__c}';
+var accname = '{!Opportunity.Hospital__c}';
+var ownerids = '{!Opportunity.OwnerId}';
+var ddid = '{!Opportunity.Sales_assistant_name_textId__c}';
+var TradeComplianceStatusFlag = "{!$Label.TradeComplianceStatusFlag}";//璐告槗鍚堣寮�鍏�
+var IFTradeComplianceAlert = "{!$Label.IFTradeComplianceAlert}";//璐告槗鍚堣寮�鍏�
+if(TradeComplianceStatusFlag=='true'){
+//鎷︽埅+閭欢鎻愰啋
+var oppflag=false;
+if (AccDealerBlacklist=='123') {
+alert('瀹㈡埛,缁忛攢鍟�1锛岀粡閿�鍟�2閮戒负榛戝悕鍗曪紝涓嶈兘鍋氭巿鏉冪敵璇凤紝'+IFTradeComplianceAlert);
+oppflag=true;
+
+}else if(AccDealerBlacklist=='12'){
+alert('瀹㈡埛,缁忛攢鍟�1閮戒负榛戝悕鍗曪紝涓嶈兘鍋氭巿鏉冪敵璇凤紝'+IFTradeComplianceAlert);
+oppflag=true;
+}else if(AccDealerBlacklist=='23'){
+alert('缁忛攢鍟�1锛岀粡閿�鍟�2閮戒负榛戝悕鍗曪紝涓嶈兘鍋氭巿鏉冪敵璇凤紝'+IFTradeComplianceAlert);
+oppflag=true;
+}else if(AccDealerBlacklist=='13'){
+alert('瀹㈡埛,缁忛攢鍟�2閮戒负榛戝悕鍗曪紝涓嶈兘鍋氭巿鏉冪敵璇凤紝'+IFTradeComplianceAlert);
+oppflag=true;
+}else if(AccDealerBlacklist=='1'){
+alert('瀹㈡埛涓洪粦鍚嶅崟锛屼笉鑳藉仛鎺堟潈鐢宠锛�'+IFTradeComplianceAlert);
+oppflag=true;
+}else if(AccDealerBlacklist=='2'){
+alert('缁忛攢鍟�1涓洪粦鍚嶅崟锛屼笉鑳藉仛鎺堟潈鐢宠锛�'+IFTradeComplianceAlert);
+oppflag=true;
+}else if(AccDealerBlacklist=='3'){
+alert('缁忛攢鍟�2涓洪粦鍚嶅崟锛屼笉鑳藉仛鎺堟潈鐢宠锛�'+IFTradeComplianceAlert);
+oppflag=true;
+}
+if(oppflag){
+var opprtn = sforce.apex.execute("OpportunityWebService", "accSendEmail",{"AccDealerBlacklist":AccDealerBlacklist,"accname":accname,"angency1":angency1,"angency2":angency2,"ownerids":ownerids,"ddid":ddid,"oppid":oppid});
+if (opprtn = true) {
+return;
+}
+}
+
+//璀︾ず鎻愰啋
+if (AccDealerBlacklist=='567') {
+if(!confirm('鎮ㄦ墍閫夋嫨鐨勫鎴�,缁忛攢鍟�1锛岀粡閿�鍟�2瀛樺湪璐告槗鍚堣璀︾ず椋庨櫓锛屼笉寤鸿鍋氭巿鏉冪敵璇凤紝璇锋偍纭鏄惁缁х画鐢宠锛�'+IFTradeComplianceAlert)){
+return;
+}
+}else if(AccDealerBlacklist=='56'){
+if(!confirm('鎮ㄦ墍閫夋嫨鐨勫鎴�,缁忛攢鍟�1瀛樺湪璐告槗鍚堣璀︾ず椋庨櫓锛屼笉寤鸿鍋氭巿鏉冪敵璇凤紝璇锋偍纭鏄惁缁х画鐢宠锛�'+IFTradeComplianceAlert)){
+return;
+}
+}else if(AccDealerBlacklist=='67'){
+if(!confirm('鎮ㄦ墍閫夋嫨鐨勭粡閿�鍟�1锛岀粡閿�鍟�2瀛樺湪璐告槗鍚堣璀︾ず椋庨櫓锛屼笉寤鸿鍋氭巿鏉冪敵璇凤紝璇锋偍纭鏄惁缁х画鐢宠锛�'+IFTradeComplianceAlert)){
+return;
+}
+}else if(AccDealerBlacklist=='57'){
+if(!confirm('鎮ㄦ墍閫夋嫨鐨勫鎴�,缁忛攢鍟�2瀛樺湪璐告槗鍚堣璀︾ず椋庨櫓锛屼笉寤鸿鍋氭巿鏉冪敵璇凤紝璇锋偍纭鏄惁缁х画鐢宠锛�'+IFTradeComplianceAlert)){
+return;
+}
+}else if(AccDealerBlacklist=='5'){
+if(!confirm('鎮ㄦ墍閫夋嫨鐨勫鎴峰瓨鍦ㄨ锤鏄撳悎瑙勮绀洪闄╋紝涓嶅缓璁仛鎺堟潈鐢宠锛岃鎮ㄧ‘璁ゆ槸鍚︾户缁敵璇凤紝'+IFTradeComplianceAlert)){
+return;
+}
+}else if(AccDealerBlacklist=='6'){
+if(!confirm('鎮ㄦ墍閫夋嫨鐨勭粡閿�鍟�1瀛樺湪璐告槗鍚堣璀︾ず椋庨櫓锛屼笉寤鸿鍋氭巿鏉冪敵璇凤紝璇锋偍纭鏄惁缁х画鐢宠锛�'+IFTradeComplianceAlert)){
+return;
+}
+}else if(AccDealerBlacklist=='7'){
+if(!confirm('鎮ㄦ墍閫夋嫨鐨勭粡閿�鍟�2瀛樺湪璐告槗鍚堣璀︾ず椋庨櫓锛屼笉寤鸿鍋氭巿鏉冪敵璇凤紝璇锋偍纭鏄惁缁х画鐢宠锛�'+IFTradeComplianceAlert)){
+return;
+}
+}
+}
+//璐告槗鍚堣 you
+
+ if ('{!Opportunity.StageName}' != '寮曞悎' && '{!Opportunity.StageName}' != '璇环' ) {
+ alert("鐘舵��1:" + '{!Opportunity.StageName}' + "銆佷笉鑳藉仛鎺堟潈鐢宠锛�");
+ return;
+
+ } else if ('{!Opportunity.SAP_Send_OK__c}' == '1') {
+ alert("宸茬粡涓婁紶SAP銆佷笉鑳藉仛鎺堟潈鐢宠浜嗭紒");
+ return;
+
+ } else if ('{!Opportunity.Opp_order_Type__c}' != '' && '{!Opportunity.If_Have_170__c}' == true) {
+ alert("鑰楁潗涓嶅彲涓�170浜у搧鍚屾椂瀛樺湪锛�");
+ return;
+ } else if ('{!Opportunity.Opp_order_Type__c}' != '' && '{!Opportunity.If_Have_AH__c}' == true) {
+ alert("鑰楁潗涓嶅彲涓庡ゥ杈変骇鍝佸悓鏃跺瓨鍦紒");
+ return;
+ } else if ('{!Opportunity.Cnt_Lost_cancel_Draft__c}' > 0) {
+ if(!confirm('璇环鏈夎崏妗堜腑鐨勫彇娑�/澶卞崟鎶ュ憡锛屾槸鍚︾户缁紵')){
+ return ;
+ }
+ } else if ('{!Opportunity.Cnt_Lost_cancel_report__c}' - '{!Opportunity.Cnt_Lost_cancel_Draft__c}' > 0) {
+ alert('璇环鏈夊凡鎻愪氦鐨勫彇娑�/澶卞崟鎶ュ憡銆�');
+ return;
+ } else if ('{!Opportunity.Estimation_Id__c}' == '' || '{!Opportunity.DetailNum__c}' == 0) {
+ alert('鎶ヤ环鏈畬鎴愶紝璇峰厛鎶ヤ环銆�');
+ return;
+
+ } else if ('{!Opportunity.Estimation_Decision__c}' == '1') {
+ alert('鎶ヤ环宸插喅瀹氾紝涓嶈兘杩涜鎺堟潈鐢宠銆�');
+ return;
+
+ } else if ('{!Opportunity.Sales_Root__c}' != '璨╁２搴�') {
+ alert('鍖婚櫌鐩撮攢涓嶉渶瑕佹巿鏉冪敵璇枫��');
+ return;
+
+ }
+ // else if ('{!Opportunity.AcecideCntCheck__c}' != '1') {
+ // alert('闃胯タ璧涘璇环鍙兘鍖呭惈鍗卞寲鍝侊紝鎴栬�咃紝鏅�氳浠蜂笉鑳藉寘鍚嵄鍖栧搧銆�');
+ // return;
+
+ // }
+ else if ('{!Opportunity.IF_Submit__c }' == '1') {
+ alert('涓婁紶澶辫触锛岃鑱旂郴绯荤粺绠＄悊鍛�!');
+ return;
+ }
+
+ var sql = "select Id,If_Authorizing_Lock__c from Opportunity where Id ='" + oppid + "'";
+ var sqlResult = sforce.connection.query(sql);
+ var records = sqlResult.getArray("records");
+ if (records[0].If_Authorizing_Lock__c == 'true') {
+ alert('璇环姝ｅ湪鎺堟潈涓紝璇蜂笉瑕侀噸澶嶆彁浜ゃ��');
+ return;
+ }
+ if ('{!Opportunity.Trade__c}' == '鍐呰部') {
+ if('{!Opportunity.Is_Corrosion__c}' == '1'){
+
+ var rtn1 = sforce.apex.execute("OpportunityWebService", "checkDangerItem",{agency1:angency });
+ if (rtn1 != 'OK') {
+ alert(rtn1);
+ return;
+ }
+ }else{
+ var rtn = sforce.apex.execute("OpportunityWebService", "oppCheck",{oppid:oppid,saveFlg:'1'});
+ if (rtn != 'OK') {
+ alert(rtn);
+ return;
+ }
+ }
+
+ } else {
+ var rtn = sforce.apex.execute("OpportunityWebService", "updReg",{oppid:oppid});
+ }
+
+
+ var opp = new sforce.SObject('Opportunity');
+ opp.Id = '{!Opportunity.Id}';
+ opp.If_Authorizing__c = '1';
+ opp.if_Interface_Lock__c = '1';
+ opp.IF_Submit__c = '1';
+ var result = sforce.connection.update([opp]);
+ var messages = getConnectDMLErrorMessages(result);
+ if (messages.length > 0) {
+ alert(messages.join("\n"));
+ return;
+ }
+ alert('鎻愪氦鎴愬姛銆傝鍦⊿PO绯荤粺涓畬鎴愭巿鏉冪敵璇枫��');
+ //window.location.reload();
+
+window.open("https://olympus.sharepoint.cn/sites/GSPWF/SitePages/HomePage.aspx");
+
+};
+foo();</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Opportunity/webLinks/AssignTaskButton.webLink-meta.xml b/force-app/main/default/objects/Opportunity/webLinks/AssignTaskButton.webLink-meta.xml
new file mode 100644
index 0000000..02fdb1c
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/webLinks/AssignTaskButton.webLink-meta.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>AssignTaskButton</fullName>
+ <availability>online</availability>
+ <description>// 2021-10-28 mzy 浠诲姟绠＄悊鏀瑰杽</description>
+ <displayType>button</displayType>
+ <linkType>javascript</linkType>
+ <masterLabel>鍒嗛厤浠诲姟</masterLabel>
+ <openType>onClickJavaScript</openType>
+ <protected>false</protected>
+ <url>{!RequireScript("/soap/ajax/51.0/connection.js")}
+{!RequireScript("/soap/ajax/51.0/apex.js")}
+{!RequireScript("/resource/CommonUtilJs")}
+var foo = function() {
+ //鍩虹璺緞
+ var url = '/setup/ui/recordtypeselect.jsp?ent=01I100000016llf';
+ //璁板綍绫诲瀷
+ url += '&p3=01210000000cWfw';
+ url += '&retURL=%2F';
+ url += '&save_new_url=%2Fa3V%2Fe%3FretURL%3D%252Fa3V%252Fo';
+ //瀹㈡埛
+ url += '&CF00N100000095tn6={!HTMLENCODE(Account.Name)}';
+ url += '&CF00N100000095tn6_lkid={!Account.Id}';
+ //璇环
+ url += '&CF00N100000095zcA={!HTMLENCODE(Opportunity.Name)}';
+ url += '&CF00N100000095zcA_lkid={! Opportunity.Id }';
+ //浠诲姟鐘舵��
+ url += '&00N100000095tnR=01 鍒嗛厤';
+ //浠诲姟鍖哄垎
+ url += '&00N100000095tnP=涓婄骇鍒嗛厤浠诲姟';
+ //浠诲姟鍚嶇О
+ url += '&Name=*';
+ window.open(url);
+}
+foo();</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Opportunity/webLinks/BeforeOPDPDFBtn.webLink-meta.xml b/force-app/main/default/objects/Opportunity/webLinks/BeforeOPDPDFBtn.webLink-meta.xml
new file mode 100644
index 0000000..6788844
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/webLinks/BeforeOPDPDFBtn.webLink-meta.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>BeforeOPDPDFBtn</fullName>
+ <availability>online</availability>
+ <displayType>button</displayType>
+ <linkType>javascript</linkType>
+ <masterLabel>浜у搧璇曠敤璇勪环OPD</masterLabel>
+ <openType>onClickJavaScript</openType>
+ <protected>false</protected>
+ <url>{!REQUIRESCRIPT("/soap/ajax/51.0/connection.js")};
+{!REQUIRESCRIPT("/soap/ajax/51.0/apex.js")};
+{!RequireScript("/resource/CommonUtilJs")};
+
+if (window.confirm('鏄惁鏂板缓OPD鎶ュ憡涔︼紵\n[纭畾] => 鏂板缓OPD\n[鍙栨秷] => 鍙敓鎴� 锛讳骇鍝佽瘯鐢ㄨ瘎浠凤冀')) {
+ try {
+ sforce.connection.sessionId = "{!GETSESSIONID()}";
+ var accid = '{!Opportunity.AccountId}';
+ var recordType = 'OPD';
+ var repOwnerId = '{!$User.Id}';
+
+ var pdfno = sforce.apex.execute("ControllerUtil", "selectCommonSequence", {valueField: 'EvaluationPDF_NextValue__c', formatField: 'EvaluationPDF_Format__c'});
+
+ //鏂板缓OPD鎶ュ憡涔�
+ // 20220913 ljh WLIG-CHMATN update start
+ /*var rtn = sforce.apex.execute("Add_Report", "addReportOPWithEvaluationPDF",
+ {repOwnerId: repOwnerId,
+ reportId: null,
+ dailyReportId: null,
+ eventId: null,
+ recordType: recordType,
+ aId: accid,
+ visitor1: null,
+ visitor2: null,
+ visitor3: null,
+ visitor4: null,
+ visitor5: null,
+ opp1: '{!Opportunity.Id}',
+ opp2: null,
+ opp3: null,
+ opp4: null,
+ opp5: null,
+ reportDate: null,
+ evaluationPDFNumber: pdfno
+ }
+ );*/
+ var rtn = sforce.apex.execute("Add_Report", "addReportOPWithEvaluationPDF",
+ {"repOwnerId": "{!$User.Id}",
+ "reportId": "",
+ "dailyReportId": "",
+ "eventId": "",
+ "recordType": "OPD",
+ "aId": accid,
+ "visitor1": "",
+ "visitor2": "",
+ "visitor3": "",
+ "visitor4": "",
+ "visitor5": "",
+ "opp1": "{!Opportunity.Id}",
+ "opp2": "",
+ "opp3": "",
+ "opp4": "",
+ "opp5": "",
+ "reportDate": "",
+ "evaluationPDFNumber": pdfno
+ }
+ );
+ // 20220913 ljh WLIG-CHMATN update end
+ window.open('/apex/BeforeOPDPDF?oid=' + '{!Opportunity.Id}' + '&pdfNo=' + pdfno, 'BeforeOPDPDF');
+ } catch(e) {
+ alert(e);
+ }
+} else {
+ window.open('/apex/BeforeOPDPDF?oid=' + '{!Opportunity.Id}', 'BeforeOPDPDF');
+}</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Opportunity/webLinks/BeforeOPDPDFBtn_SIS.webLink-meta.xml b/force-app/main/default/objects/Opportunity/webLinks/BeforeOPDPDFBtn_SIS.webLink-meta.xml
new file mode 100644
index 0000000..7cdecf1
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/webLinks/BeforeOPDPDFBtn_SIS.webLink-meta.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>BeforeOPDPDFBtn_SIS</fullName>
+ <availability>online</availability>
+ <displayType>button</displayType>
+ <linkType>javascript</linkType>
+ <masterLabel>浜у搧璇曠敤璇勪环SIS</masterLabel>
+ <openType>onClickJavaScript</openType>
+ <protected>false</protected>
+ <url>if (window.confirm('鏄惁鏂板缓SIS鎶ュ憡涔︼紵')) {
+ try {
+ sforce.connection.sessionId = "{!GETSESSIONID()}";
+ var accid = '{!Opportunity.AccountId}';
+ var recordType = 'SIS';
+ var repOwnerId = '{!$User.Id}';
+
+ var pdfno = sforce.apex.execute("ControllerUtil", "selectCommonSequence", {valueField: 'EvaluationPDF_NextValue__c', formatField: 'EvaluationPDF_Format__c'});
+
+ //鏂板缓SIS鎶ュ憡涔�
+ var rtn = sforce.apex.execute("Add_Report", "addReportOPWithEvaluationPDF",
+ {repOwnerId: repOwnerId,
+ reportId: null,
+ dailyReportId: null,
+ eventId: null,
+ recordType: recordType,
+ aId: accid,
+ visitor1: null,
+ visitor2: null,
+ visitor3: null,
+ visitor4: null,
+ visitor5: null,
+ opp1: '{!Opportunity.Id}',
+ opp2: null,
+ opp3: null,
+ opp4: null,
+ opp5: null,
+ reportDate: null,
+ evaluationPDFNumber: pdfno,
+ pro1: null
+ }
+ );
+ window.open('/apex/BeforeOPDPDF?oid=' + '{!Opportunity.Id}' + '&pdfNo=' + pdfno, 'BeforeOPDPDF');
+ } catch(e) {
+ alert(e);
+ }
+ } else {
+ window.open('/apex/BeforeOPDPDF?oid=' + '{!Opportunity.Id}', 'BeforeOPDPDF');
+ }</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Opportunity/webLinks/BidProduct.webLink-meta.xml b/force-app/main/default/objects/Opportunity/webLinks/BidProduct.webLink-meta.xml
new file mode 100644
index 0000000..2136ade
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/webLinks/BidProduct.webLink-meta.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>BidProduct</fullName>
+ <availability>online</availability>
+ <displayType>button</displayType>
+ <encodingKey>UTF-8</encodingKey>
+ <hasMenubar>false</hasMenubar>
+ <hasScrollbars>true</hasScrollbars>
+ <hasToolbar>false</hasToolbar>
+ <height>600</height>
+ <isResizable>true</isResizable>
+ <linkType>url</linkType>
+ <masterLabel>鎷涙姇鏍囬」鐩殑鏍囩殑鐗�</masterLabel>
+ <openType>newWindow</openType>
+ <position>none</position>
+ <protected>false</protected>
+ <showsLocation>false</showsLocation>
+ <showsStatus>false</showsStatus>
+ <url>/00O10000006tI4F?pv0={!Opportunity.Bidding_Project_Name_BidId__c}</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Opportunity/webLinks/Cancel_Report.webLink-meta.xml b/force-app/main/default/objects/Opportunity/webLinks/Cancel_Report.webLink-meta.xml
new file mode 100644
index 0000000..6fd78e1
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/webLinks/Cancel_Report.webLink-meta.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Cancel_Report</fullName>
+ <availability>online</availability>
+ <description>Sales_owner_job_type</description>
+ <displayType>button</displayType>
+ <linkType>javascript</linkType>
+ <masterLabel>鍙栨秷</masterLabel>
+ <openType>onClickJavaScript</openType>
+ <protected>false</protected>
+ <url>//XLIU-CG98L5 銆愬鎵樸�戙�愯瘎浼般�戞柊闇�姹�-鎷涙爣椤圭洰/璇环瀵瑰簲娴佹爣銆佸簾鏍囨敼鍠� start
+{!REQUIRESCRIPT("/soap/ajax/51.0/connection.js")};
+{!REQUIRESCRIPT("/soap/ajax/51.0/apex.js")};
+{!RequireScript("/resource/CommonUtilJs")};
+var sql = "select id,Tender_information__r.subInfoType__c from Tender_Opportunity_Link__c where (Tender_information__r.subInfoType__c = '3-1锛氬簾鏍囧叕鍛�' OR Tender_information__r.subInfoType__c ='3-2锛氭祦鏍囧叕鍛�' OR Tender_information__r.TerminateApprovalStatus__c= '鎵瑰噯') and Opportunity__c ='" + '{!Opportunity.Id}'+ "'";
+//20230427 lt 椤圭洰缁堟娴佺▼寮�鍙� add OR Tender_information__r.TerminateApprovalStatus__c= '鎵瑰噯'
+var sqlResult = sforce.connection.query(sql);
+// alert('娴嬭瘯+锛�'+sqlResult.size);
+//XLIU-CG98L5 銆愬鎵樸�戙�愯瘎浼般�戞柊闇�姹�-鎷涙爣椤圭洰/璇环瀵瑰簲娴佹爣銆佸簾鏍囨敼鍠� end
+// js銇牬鍚堛�佺炕瑷炽仌銈屻仧鍊ゃ亴銇с倠銇仹銆佽娉ㄦ剰
+if ('{!Opportunity.StageName}' != '寮曞悎'
+&& '{!Opportunity.StageName}' != '璇环'
+) {
+alert("鐘舵��1:" + '{!Opportunity.StageName}' + "銆佷笉鑳藉仛 鍙栨秷 浜嗭紒");
+}
+else if ('{!Opportunity.SAP_Send_OK__c}' == '1') {
+alert("宸茬粡涓婁紶SAP銆佷笉鑳藉仛 鍙栨秷 浜嗭紒");
+}
+else if ({!Opportunity.Cnt_Lost_cancel_report__c} - {!Opportunity.Cnt_Lost_cancel_Draft__c} > 0) {
+alert("璇环宸茬粡鏈� 鍙栨秷锛忓け鍗曟姤鍛� 浜嗭紒");
+}
+else if ('{!Opportunity.Job_category__c}' == '鏀彺') {
+alert("璇环鎵�鏈変汉鏄姪鐞嗙殑锛屽厛璇蜂慨鏀瑰埌閿�鍞媴褰擄紒");
+}
+//XLIU-CG98L5 銆愬鎵樸�戙�愯瘎浼般�戞柊闇�姹�-鎷涙爣椤圭洰/璇环瀵瑰簲娴佹爣銆佸簾鏍囨敼鍠� start
+//else if({!NOT(ISBLANK(Opportunity.Bidding_Project_Name_Bid__c))}&& '{!Opportunity.subInfoType__c}' != '3-1锛氬簾鏍囧叕鍛�' &&'{!Opportunity.subInfoType__c}' != '3-2锛氭祦鏍囧叕鍛�'){
+else if({!NOT(ISBLANK(Opportunity.Bidding_Project_Name_Bid__c))}&& sqlResult.size == 0){
+alert("鏈夋嫑鎶曟爣椤圭洰鏃跺彧鑳藉仛澶卞崟鎴栭儴鍒嗗け鍗曟姤鍛婏紒");
+}
+//XLIU-CG98L5 銆愬鎵樸�戙�愯瘎浼般�戞柊闇�姹�-鎷涙爣椤圭洰/璇环瀵瑰簲娴佹爣銆佸簾鏍囨敼鍠� end
+else {
+location.href = '/a1U/e?retURL=%2F{!URLENCODE(Opportunity.Id)}' +
+'&RecordType=01210000000R4hH' +
+'&CF00N10000004lbGT={!URLENCODE(Opportunity.Name)}' +
+'&CF00N10000004lbGT_lkid={!URLENCODE(Opportunity.Id)}' +
+'&CF00N10000006QShg={!URLENCODE(Opportunity.Sales_assistant_name__c)}' +
+'&CF00N10000006QShg_lkid={!URLENCODE(Opportunity.Sales_assistant_ID__c)}' +
+'&CF00N10000006QShq={!URLENCODE(Opportunity.Manager_name__c)}' +
+'&CF00N10000006QShq_lkid={!URLENCODE(Opportunity.Sales_manager_departmentID__c)}' +
+
+'&CF00N10000006QShb={!URLENCODE(Opportunity.Sales_owner_buchang__c)}' +
+'&CF00N10000006QShb_lkid={!URLENCODE(Opportunity.Sales_owner_buchangID__c)}' +
+
+
+
+
+
+
+
+
+
+'';
+}</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Opportunity/webLinks/ChangeContractType.webLink-meta.xml b/force-app/main/default/objects/Opportunity/webLinks/ChangeContractType.webLink-meta.xml
new file mode 100644
index 0000000..cc3ad5d
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/webLinks/ChangeContractType.webLink-meta.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ChangeContractType</fullName>
+ <availability>online</availability>
+ <displayType>button</displayType>
+ <linkType>javascript</linkType>
+ <masterLabel>鍙樻洿鍚堝悓绫诲瀷</masterLabel>
+ <openType>onClickJavaScript</openType>
+ <protected>false</protected>
+ <url>{!RequireScript("/soap/ajax/51.0/connection.js")}
+{!RequireScript("/soap/ajax/51.0/apex.js")}
+sforce.connection.sessionId = '{!$Api.Session_ID}';
+
+var foo = function() {
+var oppId = '{!Opportunity.Id}';
+var str ;
+var status = '{!Opportunity.StageName}';
+var quostatus = '{!Opportunity.Estimation_Decision__c}';
+var win = '{!Opportunity.SAP_Send_OK__c}';
+var Auth = '{!Opportunity.If_Authorizing_Lock__c}';
+
+if(status != '寮曞悎'){
+alert('鍙湁鐘舵��1鏄浠风殑鍙互鏇存敼鍚堝悓绫诲瀷');
+return null;
+}
+if(Auth == '1'){
+alert('璇环姝ｅ湪鎺堟潈鐢宠涓紝璇峰湪SPO涓┏鍥炲悗鍐嶅仛杞崲銆�');
+return null;
+}
+if(quostatus == 'true' || quostatus == true){
+alert('宸插喅瀹氭姤浠凤紝涓嶈兘淇敼鍐呰锤/澶栬锤');
+return null;
+}
+if(win == 'true' || win == true){
+alert('璇峰厛鍙栨秷WIN锛� 鍐嶈浆鎹㈠唴澶栬锤');
+return null;
+}
+if(confirm('鍙樻洿鍚堝悓绫诲瀷浼氬垹闄ゅ叏閮ㄦ姤浠凤紝鏄惁缁х画锛�')){
+str = sforce.apex.execute("OpportunityWebService", "changeTrade",{oppId:oppId });
+}else{
+return null;
+}
+
+if(str != '1'){
+alert(str);
+}
+window.location.reload();
+};
+foo();</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Opportunity/webLinks/Contract_Authorize.webLink-meta.xml b/force-app/main/default/objects/Opportunity/webLinks/Contract_Authorize.webLink-meta.xml
new file mode 100644
index 0000000..a30e08d
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/webLinks/Contract_Authorize.webLink-meta.xml
@@ -0,0 +1,234 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Contract_Authorize</fullName>
+ <availability>online</availability>
+ <displayType>button</displayType>
+ <linkType>javascript</linkType>
+ <masterLabel>鍚堝悓鐢宠</masterLabel>
+ <openType>onClickJavaScript</openType>
+ <protected>false</protected>
+ <url>var btns = document.getElementsByName("contract_authorize");
+for (var i=0; i<btns.length; i++) {
+ btns[i].disabled = true;
+ btns[i].className = 'btnDisabled';
+}
+
+{!REQUIRESCRIPT("/soap/ajax/51.0/connection.js")};
+{!REQUIRESCRIPT("/soap/ajax/51.0/apex.js")};
+{!RequireScript("/resource/CommonUtilJs")};
+//2021-10-21 gwy 鐗堟湰鏇存敼涓�51.0
+
+
+var foo = function() {
+ var oppid = '{!Opportunity.Id}';
+ var decide_quote = '{!Opportunity.Estimation_Decision__c}';
+ var complete_day = '{!Opportunity.Contract_DB_complite_day__c}';
+ var if_contract_auth = '{!Opportunity.Contract_Authorize__c}';
+ var if_contract_lock = '{!Opportunity.Contract_Authorize_Lock__c}';
+ var If_Need_Authorize = '{!Opportunity.If_Need_Authorize__c}';
+ var Authorized_DB_No = '{!Opportunity.Authorized_DB_No__c}';
+ var profileId = '{!$User.ProfileId}';
+ var spoURL = '{!Opportunity.SPO_URL__c}';
+//SWAG-CG88AG銆愬鎵樸�戞彁鍑轰环鏍肩敵璇锋槸鍦ㄥ崗璁湁鏁堟湡鍐咃紝鍏佽WIN fy start
+ var DecidedQuoteNo = '{!Opportunity.Estimation_No__c}';
+//SWAG-CG88AG銆愬鎵樸�戞彁鍑轰环鏍肩敵璇锋槸鍦ㄥ崗璁湁鏁堟湡鍐咃紝鍏佽WIN fy end
+//2022-03-22 yjk SWAG-CCL6R7
+ var Closing_Bid_Date = '{!Opportunity.Closing_Bid_Date__c}';//13.涓爣鏃�
+ var Closing_Bid_Date_Bid = '{!Opportunity.Closing_Bid_Date_Bid__c}';
+
+ var AccDealerBlacklist = '{!Opportunity.AccDealerBlacklist__c}';//鍒ゆ柇瀹㈡埛/缁忛攢鍟嗘槸鍚︿负榛戝悕鍗�
+var angency1 = '{!Opportunity.Agency1__c}';
+var angency2 = '{!Opportunity.Agency2__c}';
+var accname = '{!Opportunity.Hospital__c}';
+var ownerids = '{!Opportunity.OwnerId}';
+var ddid = '{!Opportunity.Sales_assistant_name_textId__c}';
+
+ if (profileId != '00e10000000Y3o5' && profileId != '00e10000000Nab7' &&
+profileId != '00e10000000xnpR' && profileId != '00e10000000xyK6' && profileId != '00e10000000xnpW' && profileId != '00e10000000NbCE' && profileId != '00e10000000Nb7i'
+&& profileId != '00e10000000xyK6') {
+ alert("鎮ㄦ病鏈夊悎鍚岀敵璇风殑鏉冮檺銆傝鑱旂郴绯荤粺绠＄悊鍛樸��");
+ return;
+}
+//璐告槗鍚堣 you
+var TradeComplianceStatusFlag = "{!$Label.TradeComplianceStatusFlag}";//璐告槗鍚堣寮�鍏�
+var IFTradeComplianceAlert = "{!$Label.IFTradeComplianceAlert}";//璐告槗鍚堣鎻愰啋
+if(TradeComplianceStatusFlag=='true'){
+//鎷︽埅+閭欢鎻愰啋
+var oppflag=false;
+if (AccDealerBlacklist=='123') {
+alert('瀹㈡埛,缁忛攢鍟�1锛岀粡閿�鍟�2閮戒负榛戝悕鍗曪紝涓嶈兘鍋氬悎鍚岀敵璇凤紝'+IFTradeComplianceAlert);
+oppflag=true;
+
+}else if(AccDealerBlacklist=='12'){
+alert('瀹㈡埛,缁忛攢鍟�1閮戒负榛戝悕鍗曪紝涓嶈兘鍋氬悎鍚岀敵璇凤紝'+IFTradeComplianceAlert);
+oppflag=true;
+}else if(AccDealerBlacklist=='23'){
+alert('缁忛攢鍟�1锛岀粡閿�鍟�2閮戒负榛戝悕鍗曪紝涓嶈兘鍋氬悎鍚岀敵璇凤紝'+IFTradeComplianceAlert);
+oppflag=true;
+}else if(AccDealerBlacklist=='13'){
+alert('瀹㈡埛,缁忛攢鍟�2閮戒负榛戝悕鍗曪紝涓嶈兘鍋氬悎鍚岀敵璇凤紝'+IFTradeComplianceAlert);
+oppflag=true;
+}else if(AccDealerBlacklist=='1'){
+alert('瀹㈡埛涓洪粦鍚嶅崟锛屼笉鑳藉仛鍚堝悓鐢宠锛�'+IFTradeComplianceAlert);
+oppflag=true;
+}else if(AccDealerBlacklist=='2'){
+alert('缁忛攢鍟�1涓洪粦鍚嶅崟锛屼笉鑳藉仛鍚堝悓鐢宠锛�'+IFTradeComplianceAlert);
+oppflag=true;
+}else if(AccDealerBlacklist=='3'){
+alert('缁忛攢鍟�2涓洪粦鍚嶅崟锛屼笉鑳藉仛鍚堝悓鐢宠锛�'+IFTradeComplianceAlert);
+oppflag=true;
+}
+if(oppflag){
+var opprtn = sforce.apex.execute("OpportunityWebService", "accSendEmail",{"AccDealerBlacklist":AccDealerBlacklist,"accname":accname,"angency1":angency1,"angency2":angency2,"ownerids":ownerids,"ddid":ddid,"oppid":oppid});
+if (opprtn = true) {
+return;
+}
+}
+//璀︾ず鎻愰啋
+if (AccDealerBlacklist=='567') {
+if(!confirm('鎮ㄦ墍閫夋嫨鐨勫鎴�,缁忛攢鍟�1锛岀粡閿�鍟�2瀛樺湪璐告槗鍚堣璀︾ず椋庨櫓锛屼笉寤鸿鍋氬悎鍚岀敵璇凤紝璇锋偍纭鏄惁缁х画鐢宠锛�'+IFTradeComplianceAlert)){
+return;
+}
+}else if(AccDealerBlacklist=='56'){
+if(!confirm('鎮ㄦ墍閫夋嫨鐨勫鎴�,缁忛攢鍟�1瀛樺湪璐告槗鍚堣璀︾ず椋庨櫓锛屼笉寤鸿鍋氬悎鍚岀敵璇凤紝璇锋偍纭鏄惁缁х画鐢宠锛�'+IFTradeComplianceAlert)){
+return;
+}
+}else if(AccDealerBlacklist=='67'){
+if(!confirm('鎮ㄦ墍閫夋嫨鐨勭粡閿�鍟�1锛岀粡閿�鍟�2瀛樺湪璐告槗鍚堣璀︾ず椋庨櫓锛屼笉寤鸿鍋氬悎鍚岀敵璇凤紝璇锋偍纭鏄惁缁х画鐢宠锛�'+IFTradeComplianceAlert)){
+return;
+}
+}else if(AccDealerBlacklist=='57'){
+if(!confirm('鎮ㄦ墍閫夋嫨鐨勫鎴�,缁忛攢鍟�2瀛樺湪璐告槗鍚堣璀︾ず椋庨櫓锛屼笉寤鸿鍋氬悎鍚岀敵璇凤紝璇锋偍纭鏄惁缁х画鐢宠锛�'+IFTradeComplianceAlert)){
+return;
+}
+}else if(AccDealerBlacklist=='5'){
+if(!confirm('鎮ㄦ墍閫夋嫨鐨勫鎴峰瓨鍦ㄨ锤鏄撳悎瑙勮绀洪闄╋紝涓嶅缓璁仛鍚堝悓鐢宠锛岃鎮ㄧ‘璁ゆ槸鍚︾户缁敵璇凤紝'+IFTradeComplianceAlert)){
+return;
+}
+}else if(AccDealerBlacklist=='6'){
+if(!confirm('鎮ㄦ墍閫夋嫨鐨勭粡閿�鍟�1瀛樺湪璐告槗鍚堣璀︾ず椋庨櫓锛屼笉寤鸿鍋氬悎鍚岀敵璇凤紝璇锋偍纭鏄惁缁х画鐢宠锛�'+IFTradeComplianceAlert)){
+return;
+}
+}else if(AccDealerBlacklist=='7'){
+if(!confirm('鎮ㄦ墍閫夋嫨鐨勭粡閿�鍟�2瀛樺湪璐告槗鍚堣璀︾ず椋庨櫓锛屼笉寤鸿鍋氬悎鍚岀敵璇凤紝璇锋偍纭鏄惁缁х画鐢宠锛�'+IFTradeComplianceAlert)){
+return;
+}
+}
+}
+//璐告槗鍚堣 you
+
+ if(!Closing_Bid_Date){
+ alert("璇峰～鍐�13.涓爣鏃ャ��");
+ return;
+ }
+
+ if (decide_quote != '1') {
+ alert('璇峰厛鍐冲畾鎶ヤ环銆�');
+ return;
+ }
+//SWAG-CG88AG銆愬鎵樸�戞彁鍑轰环鏍肩敵璇锋槸鍦ㄥ崗璁湁鏁堟湡鍐咃紝鍏佽WIN fy start
+ if (DecidedQuoteNo !="") {
+ var judg=sforce.apex.execute("OpportunityWebService","judgeIsAssistantAppliedOutTime",{Quoteid:DecidedQuoteNo});
+ // alert('judg寰楀�硷細'+judg);
+ // return;
+ if(judg == 'false'){
+ alert('缁忛攢鍟嗗崗璁凡杩囨湡锛岃閲嶆柊鍋氭姤浠疯绠椼��');
+ return;
+ }
+ }
+//SWAG-CG88AG銆愬鎵樸�戞彁鍑轰环鏍肩敵璇锋槸鍦ㄥ崗璁湁鏁堟湡鍐咃紝鍏佽WIN fy end
+ // 20221009 ljh SWAG-CK29AJ start
+ var ClosingBidDate = '{!Opportunity.Closing_Bid_Date__c}';
+ var BidDate = '{!Opportunity.Bid_Date__c}';
+ if( ClosingBidDate < BidDate){
+ alert('13.涓爣鏃ヤ笉鑳芥棭浜�12.鎷涙爣鏃�');
+ return;
+ }
+ // 20221009 ljh SWAG-CK29AJ end
+
+ if(If_Need_Authorize == '1' && (Authorized_DB_No == null || Authorized_DB_No == '')){
+ alert('璇峰厛鍋氭巿鏉冪敵璇枫��');
+ return;
+ }
+
+ if ('{!Opportunity.Cnt_Lost_cancel_Draft__c}' > 0) {
+ if(!confirm('璇环鏈夎崏妗堜腑鐨勫彇娑�/澶卞崟鎶ュ憡锛屾槸鍚︾户缁紵')){
+ return ;
+ }
+ } else if ('{!Opportunity.Cnt_Lost_cancel_report__c}' - '{!Opportunity.Cnt_Lost_cancel_Draft__c}' > 0) {
+ alert('璇环鏈夊凡鎻愪氦鐨勫彇娑�/澶卞崟鎶ュ憡銆�');
+ return;
+ }
+
+
+
+// 2022-03-31 鏂拌储骞翠环鏍艰皟鏁� start
+ var decide_date = '{!Opportunity.DecideQuoteDate__c}';
+ if (decide_date != null && decide_date < {!DATE(2022,4,1)}) {
+ alert('鎶ヤ环鍙樻洿锛岃閲嶆柊鍋欴ecide銆�');
+ return;
+ }
+
+// 2022-03-31 鏂拌储骞翠环鏍艰皟鏁� end
+ var sql = "select Id,Contract_Authorize_Lock__c from Opportunity where Id ='" + oppid + "'";
+ var sqlResult = sforce.connection.query(sql);
+ var records = sqlResult.getArray("records");
+
+ if ((complete_day != null && complete_day != '') && records[0].Contract_Authorize_Lock__c== 'true') {
+ alert('鍚堝悓鐢宠宸茬粡瀹屾垚锛岃涓嶈閲嶅鎻愪氦銆�');
+ return;
+ }
+ // if ('{!Opportunity.AcecideCntCheck__c}' != '1') {
+ // alert('闃胯タ璧涘璇环鍙兘鍖呭惈鍗卞寲鍝侊紝鎴栬�咃紝鏅�氳浠蜂笉鑳藉寘鍚嵄鍖栧搧銆�');
+ // return;
+ // }
+ if ((complete_day == null || complete_day == '') && records[0].Contract_Authorize_Lock__c== 'true') {
+ alert('鍚堝悓姝ｅ湪鐢宠涓紝璇蜂笉瑕侀噸澶嶆彁浜ゃ��');
+ return;
+ }
+
+ if ('{!Opportunity.IF_Submit__c }' == '1') {
+ alert('涓婁紶澶辫触锛岃鑱旂郴绯荤粺绠＄悊鍛�!');
+ return;
+ }
+
+var angency = '{!Opportunity.Agency1Id__c}';
+if('{!Opportunity.Trade__c}' == '澶栬部' || '{!Opportunity.Sales_Root__c}' == 'OCM鐩存帴璨╁２'){
+ var rtn = sforce.apex.execute("OpportunityWebService", "updReg",{oppid:oppid});
+} else {
+ if('{!Opportunity.Is_Corrosion__c}' == '1'){
+ var rtn1 = sforce.apex.execute("OpportunityWebService", "checkDangerItem",{agency1:angency });
+ if (rtn1 != 'OK') {
+ alert(rtn1);
+ return;
+ }
+ }else{
+ var rtn = sforce.apex.execute("OpportunityWebService", "oppCheck",{oppid:oppid, saveFlg:'1'});
+
+ if (rtn != 'OK') {
+ alert(rtn);
+ return;
+ }
+ }
+
+
+}
+
+ var opp = new sforce.SObject('Opportunity');
+ opp.Id = '{!Opportunity.Id}';
+ opp.Contract_Authorize__c = '1';
+ opp.if_Interface_Lock__c = '1';
+ opp.IF_Submit__c = '1';
+ var result = sforce.connection.update([opp]);
+ var messages = getConnectDMLErrorMessages(result);
+ if (messages.length > 0) {
+ alert(messages.join("\n"));
+ return;
+ }
+ alert('鎻愪氦鎴愬姛锛佽鍦⊿PO绯荤粺涓畬鎴愬悎鍚岀敵璇枫��');
+
+ //window.location.reload();
+ window.open(spoURL);
+};
+foo();</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Opportunity/webLinks/Copy_with_Asset.webLink-meta.xml b/force-app/main/default/objects/Opportunity/webLinks/Copy_with_Asset.webLink-meta.xml
new file mode 100644
index 0000000..2914e04
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/webLinks/Copy_with_Asset.webLink-meta.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Copy_with_Asset</fullName>
+ <availability>online</availability>
+ <description>/* CHAN-BVYAFW
+&00N10000006qHav={!HTMLENCODE(Opportunity.Opportunity_No__c)}
+*/</description>
+ <displayType>button</displayType>
+ <linkType>javascript</linkType>
+ <masterLabel>鏀垮簻鎷涙爣鎷嗗崟</masterLabel>
+ <openType>onClickJavaScript</openType>
+ <protected>false</protected>
+ <url>if({!Opportunity.SAP_Send_OK__c}){
+ alert('璇环宸茬粡WIN锛屼笉鑳借繘琛屾媶鍗�');
+} else {
+ window.open("/{!Opportunity.Id}/e?clone=1&retURL=%2F006p0000004bsox&_CONFIRMATIONTOKEN=VmpFPSxNakF4Tnkwd05DMHdPVlF3TmpvME16bzFPUzR5TWpsYSxuc010bXY2U1MxYWgzTHcwNzdUX0VpLE5HUmlaR013&common.udd.actions.ActionsUtilORIG_URI=%2F006p0000004bsox%2Fe&cloneli=1&CF00N10000006qHai={!HTMLENCODE(Opportunity.Name)}&CF00N10000006qHai_lkid={!HTMLENCODE(Opportunity.Id)}&00N10000009Glvn={!Opportunity.IsAuthorized__c}&00N10000008pnmd=1&00N10000002Cb9P=&00N10000002DItz=&00N10000003O9oO=&00N10000003O9o4=&00N10000002CYHy=&00Np00000030gzb=&00Np0000002ajGe=&00Np00000034Qlb");
+}</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Opportunity/webLinks/Copy_without_Asset.webLink-meta.xml b/force-app/main/default/objects/Opportunity/webLinks/Copy_without_Asset.webLink-meta.xml
new file mode 100644
index 0000000..524bddd
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/webLinks/Copy_without_Asset.webLink-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Copy_without_Asset</fullName>
+ <availability>online</availability>
+ <displayType>button</displayType>
+ <encodingKey>UTF-8</encodingKey>
+ <linkType>url</linkType>
+ <masterLabel>澶嶅埗锛堝彧甯﹁浠风紪鐮侊級锛堜笉鐢級</masterLabel>
+ <openType>replace</openType>
+ <protected>false</protected>
+ <url>/{!Opportunity.Id}/e?clone=1&retURL=%2F006p0000004bsox&_CONFIRMATIONTOKEN=VmpFPSxNakF4Tnkwd05DMHdPVlF3TmpvME16bzFPUzR5TWpsYSxuc010bXY2U1MxYWgzTHcwNzdUX0VpLE5HUmlaR013&common.udd.actions.ActionsUtilORIG_URI=%2F006p0000004bsox%2Fe&CF00N10000006qHai={!HTMLENCODE(Opportunity.Name)}&CF00N10000006qHai_lkid={!HTMLENCODE(Opportunity.Id)}&00N10000006qHav={!HTMLENCODE(Opportunity.Opportunity_No__c)}&00N10000006qGJL_chkbox={0}</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Opportunity/webLinks/Create_Activity.webLink-meta.xml b/force-app/main/default/objects/Opportunity/webLinks/Create_Activity.webLink-meta.xml
new file mode 100644
index 0000000..c9a1426
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/webLinks/Create_Activity.webLink-meta.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Create_Activity</fullName>
+ <availability>online</availability>
+ <displayType>button</displayType>
+ <linkType>javascript</linkType>
+ <masterLabel>鏂板缓璁″垝</masterLabel>
+ <openType>onClickJavaScript</openType>
+ <protected>false</protected>
+ <url>{!RequireScript("/soap/ajax/51.0/connection.js")}
+{!RequireScript("/soap/ajax/51.0/apex.js")}
+
+var From= function(){
+ window.open( "/apex/SimpleEventRegister?retURL=%2Fapex%2FVFClosePage&accid={!Opportunity.AccountId}&oid={!Opportunity.Id}&source=AccountPCL&save_new=1&sfdc.override=1");
+}
+From();</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Opportunity/webLinks/Create_Competitor_Asset.webLink-meta.xml b/force-app/main/default/objects/Opportunity/webLinks/Create_Competitor_Asset.webLink-meta.xml
new file mode 100644
index 0000000..c4b8ee7
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/webLinks/Create_Competitor_Asset.webLink-meta.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Create_Competitor_Asset</fullName>
+ <availability>online</availability>
+ <displayType>button</displayType>
+ <encodingKey>UTF-8</encodingKey>
+ <hasMenubar>false</hasMenubar>
+ <hasScrollbars>true</hasScrollbars>
+ <hasToolbar>false</hasToolbar>
+ <height>600</height>
+ <isResizable>true</isResizable>
+ <linkType>url</linkType>
+ <masterLabel>鏁楁垿鏅傜鍚堣＝鍝佸叆鍔�</masterLabel>
+ <openType>newWindow</openType>
+ <position>none</position>
+ <protected>false</protected>
+ <showsLocation>false</showsLocation>
+ <showsStatus>false</showsStatus>
+ <url>/02i/e?
+CF00N10000002CYBM={!Opportunity.Name}
+&CF00N10000002CYBM_lkid={!Opportunity.Id}
+&CF00N10000002CYBR_lkid={!Opportunity.HospitalId__c}
+&CF00N10000002CYBR={!Opportunity.Hospital__c}
+&Account_lkid={!Opportunity.AccountId}
+&Account={!Opportunity.Account}
+&CF00N10000002CYBW_lkid={!Opportunity.Department_ClassId__c}
+&CF00N10000002CYBW={!Opportunity.Department_Class__c}</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Opportunity/webLinks/Create_Event.webLink-meta.xml b/force-app/main/default/objects/Opportunity/webLinks/Create_Event.webLink-meta.xml
new file mode 100644
index 0000000..d127eaf
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/webLinks/Create_Event.webLink-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Create_Event</fullName>
+ <availability>online</availability>
+ <displayType>button</displayType>
+ <linkType>javascript</linkType>
+ <masterLabel>鏂板缓璁″垝</masterLabel>
+ <openType>onClickJavaScript</openType>
+ <protected>false</protected>
+ <url>window.open("/00U/e?retURL=%2Fapex%2FVFClosePage&accid={!URLENCODE(Opportunity.AccountId)}&oid={!URLENCODE(Opportunity.Id)}", "鏂板缓璁″垝")</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Opportunity/webLinks/Cretate_ToDo.webLink-meta.xml b/force-app/main/default/objects/Opportunity/webLinks/Cretate_ToDo.webLink-meta.xml
new file mode 100644
index 0000000..7df71fd
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/webLinks/Cretate_ToDo.webLink-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Cretate_ToDo</fullName>
+ <availability>online</availability>
+ <displayType>massActionButton</displayType>
+ <encodingKey>UTF-8</encodingKey>
+ <linkType>url</linkType>
+ <masterLabel>ToDo浣滄垚</masterLabel>
+ <openType>replace</openType>
+ <protected>false</protected>
+ <requireRowSelection>false</requireRowSelection>
+ <url>/00T/e?what_id={!Opportunity.HospitalId__c}</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Opportunity/webLinks/EditLost.webLink-meta.xml b/force-app/main/default/objects/Opportunity/webLinks/EditLost.webLink-meta.xml
new file mode 100644
index 0000000..1483dc5
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/webLinks/EditLost.webLink-meta.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>EditLost</fullName>
+ <availability>online</availability>
+ <displayType>button</displayType>
+ <linkType>javascript</linkType>
+ <masterLabel>淇敼澶卞崟</masterLabel>
+ <openType>onClickJavaScript</openType>
+ <protected>false</protected>
+ <url>{!REQUIRESCRIPT("/soap/ajax/51.0/connection.js")};
+{!REQUIRESCRIPT("/soap/ajax/51.0/apex.js")};
+{!RequireScript("/resource/CommonUtilJs")};
+
+function foo(){
+var sql = "select id,Report_Status__c,RecordTypeId from Lost_cancel_report__c where RecordTypeId != '01210000000R4hHAAS' and Opportunity__c ='" + '{!Opportunity.Id}'+ "'";
+var sqlResult = sforce.connection.query(sql);
+var lostlist = sqlResult.getArray("records");
+var profileId = '{!$User.ProfileId}';
+var AprofileId = {!CONTAINS($Label.PCLReportProfileId, $User.ProfileId )};
+
+if (sqlResult.size < 0){
+alert('璇峰厛鍒涘缓澶卞崟鎶ュ憡');
+return;
+}else if(sqlResult.size > 1){
+//alert('1');
+for(var lost of lostlist ){
+//alert('3');
+//alert(lost.RecordTypeId);
+if(lost.RecordTypeId == '01210000000R4hMAAS'){
+//alert('4');
+if(lost.Report_Status__c == '鑽夋' || profileId == '00e10000000Y3o5' || (lost.Report_Status__c == '鎵瑰噯' && AprofileId)){
+//alert('5');
+window.open("/apex/PCLLostReportPage?pageStatus=Edit&Id="+lost.Id);
+}else{
+window.open("/apex/PCLLostReportPage?pageStatus=View&Id="+lost.Id);
+}
+}
+}
+}
+else{
+//alert('2');
+//var status = lostlist[0].Report_Status__c;
+if(lostlist[0].Report_Status__c == '鑽夋' || profileId == '00e10000000Y3o5' || (lostlist[0].Report_Status__c == '鎵瑰噯' && AprofileId)){
+window.open("/apex/PCLLostReportPage?pageStatus=Edit&Id="+lostlist[0].Id);
+}else{
+window.open("/apex/PCLLostReportPage?pageStatus=View&Id="+lostlist[0].Id);
+}
+}
+}
+foo();</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Opportunity/webLinks/Estimation.webLink-meta.xml b/force-app/main/default/objects/Opportunity/webLinks/Estimation.webLink-meta.xml
new file mode 100644
index 0000000..c3f9758
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/webLinks/Estimation.webLink-meta.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Estimation</fullName>
+ <availability>online</availability>
+ <displayType>button</displayType>
+ <encodingKey>UTF-8</encodingKey>
+ <hasMenubar>false</hasMenubar>
+ <hasScrollbars>true</hasScrollbars>
+ <hasToolbar>false</hasToolbar>
+ <height>600</height>
+ <isResizable>true</isResizable>
+ <linkType>url</linkType>
+ <masterLabel>***瑕嬬浣滄垚***</masterLabel>
+ <openType>newWindow</openType>
+ <position>none</position>
+ <protected>false</protected>
+ <showsLocation>false</showsLocation>
+ <showsStatus>false</showsStatus>
+ <url>/servlet/servlet.FileDownload?file=015100000013CHf</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Opportunity/webLinks/Follow_up_history.webLink-meta.xml b/force-app/main/default/objects/Opportunity/webLinks/Follow_up_history.webLink-meta.xml
new file mode 100644
index 0000000..630790d
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/webLinks/Follow_up_history.webLink-meta.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Follow_up_history</fullName>
+ <availability>online</availability>
+ <displayType>button</displayType>
+ <encodingKey>UTF-8</encodingKey>
+ <hasMenubar>false</hasMenubar>
+ <hasScrollbars>true</hasScrollbars>
+ <hasToolbar>false</hasToolbar>
+ <height>600</height>
+ <isResizable>true</isResizable>
+ <linkType>url</linkType>
+ <masterLabel>璺熻繘鍘嗗彶</masterLabel>
+ <openType>newWindow</openType>
+ <position>none</position>
+ <protected>false</protected>
+ <showsLocation>false</showsLocation>
+ <showsStatus>false</showsStatus>
+ <url>/00O10000002lqdC?pv0={!Opportunity.Id}</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Opportunity/webLinks/LoseBid.webLink-meta.xml b/force-app/main/default/objects/Opportunity/webLinks/LoseBid.webLink-meta.xml
new file mode 100644
index 0000000..9b3dee9
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/webLinks/LoseBid.webLink-meta.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>LoseBid</fullName>
+ <availability>online</availability>
+ <displayType>button</displayType>
+ <linkType>javascript</linkType>
+ <masterLabel>绔炰簤瀵规墜涓爣</masterLabel>
+ <openType>onClickJavaScript</openType>
+ <protected>false</protected>
+ <url>{!REQUIRESCRIPT("/soap/ajax/51.0/connection.js")};
+{!REQUIRESCRIPT("/soap/ajax/51.0/apex.js")};
+{!RequireScript("/resource/CommonUtilJs")};
+
+var sql = "select taskStatus__c from task__c where OpportunityId__c ='{!Opportunity.Id}' and name like '%涓爣缁撴灉纭%'";
+var flag = true;
+var tasks = sforce.connection.query(sql);
+var taskslist = tasks.getArray("records");
+for(var task of taskslist ){
+if(task.taskStatus__c != '04 鍙栨秷'){
+flag = false;
+}
+}
+if('{!Opportunity.ifOpenBid__c}' == '闈炲叕寮�鎷涙爣'){
+ flag = false;
+}
+
+if(flag){
+alert('鏉′欢涓嶇鍚堬紝涓嶅彲鎿嶄綔');
+}else{
+if (window.confirm('鏄惁纭绔炰簤瀵规墜涓爣锛�')) {
+var opp = new sforce.SObject('Opportunity');
+opp.Id = '{!Opportunity.Id}';
+opp.ConfirmationofAward__c = '绔炰簤瀵规墜涓爣';
+var result = sforce.connection.update([opp]);
+var messages = getConnectDMLErrorMessages(result);
+if (messages.length > 0) {
+alert(messages.join("\n"));
+}else{
+alert('鎿嶄綔鎴愬姛锛�');
+}
+window.location.reload();
+}
+
+}</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Opportunity/webLinks/Lost_Report.webLink-meta.xml b/force-app/main/default/objects/Opportunity/webLinks/Lost_Report.webLink-meta.xml
new file mode 100644
index 0000000..0cf81d5
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/webLinks/Lost_Report.webLink-meta.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Lost_Report</fullName>
+ <availability>online</availability>
+ <displayType>button</displayType>
+ <linkType>javascript</linkType>
+ <masterLabel>澶卞崟</masterLabel>
+ <openType>onClickJavaScript</openType>
+ <protected>false</protected>
+ <url>// js銇牬鍚堛�佺炕瑷炽仌銈屻仧鍊ゃ亴銇с倠銇仹銆佽娉ㄦ剰
+if ('{!Opportunity.StageName}' != '寮曞悎'
+ && '{!Opportunity.StageName}' != '璇环'
+) {
+ alert("鐘舵��1:" + '{!Opportunity.StageName}' + "銆佷笉鑳藉仛 澶卞崟 浜嗭紒");
+}
+else if ('{!Opportunity.SAP_Send_OK__c}' == '1') {
+ alert("宸茬粡涓婁紶SAP銆佷笉鑳藉仛 澶卞崟 浜嗭紒");
+}
+else if ({!Opportunity.Cnt_Lost_cancel_report__c} > 0) {
+ alert("璇环宸茬粡鏈� 鍙栨秷锛忓け鍗曟姤鍛� 浜嗭紒");
+}
+//else if({!Not(ISBLANK(Opportunity.Bidding_Project_Name_Bid__c))} && //'{!Opportunity.InfoTypeBid__c}' != '3锛氱粨鏋�' ){
+//alert("鍏宠仈鎷涙姇鏍囬」鐩殑璇环锛屽彧鑳藉湪鏈夌粨鏋滃悗鍋氬け鍗曟姤鍛婏紒");
+//}
+else {
+ location.href = '/a1U/e?retURL=%2F{!Opportunity.Id}' +
+'&RecordType=01210000000R4hM' +
+'&CF00N10000004lbGT={!URLENCODE(Opportunity.Name)}' +
+'&CF00N10000004lbGT_lkid={!Opportunity.Id}' +
+
+'&CF00N10000006QShg={!URLENCODE(Opportunity.Sales_assistant_name__c)}' +
+'&CF00N10000006QShg_lkid={!URLENCODE(Opportunity.Sales_assistant_ID__c)}' +
+'&CF00N10000006QShq={!URLENCODE(Opportunity.Manager_name__c)}' +
+'&CF00N10000006QShq_lkid={!URLENCODE(Opportunity.Sales_manager_departmentID__c)}' +
+'&CF00N10000006QShb={!URLENCODE(Opportunity.Sales_owner_buchang__c)}' +
+'&CF00N10000006QShb_lkid={!URLENCODE(Opportunity.Sales_owner_buchangID__c)}' +
+'';
+}</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Opportunity/webLinks/NewOpportunity.webLink-meta.xml b/force-app/main/default/objects/Opportunity/webLinks/NewOpportunity.webLink-meta.xml
new file mode 100644
index 0000000..c447484
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/webLinks/NewOpportunity.webLink-meta.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>NewOpportunity</fullName>
+ <availability>online</availability>
+ <description>//20230409 lt update 鍘焨rl 鐜癹s
+/006/e?retURL=%2F{!Account.Id}
+&accid={!Account.Id}
+&RecordType=01210000000QekK
+&CF00N10000002CYBC_lkid={!Account.HospitalId__c}
+&CF00N10000002CYBC={!Account.Hospital__c}
+&CF00N10000002CYB7_lkid={!Account.Department_ClassId__c}
+&CF00N10000002CYB7={!Account.Department_Class__c}
+&ent=Opportunity
+&00N10000002CX2c={!Account.Department_Class_Wd__c}
+&00N10000002ppti={!$User.Province_Text__c}
+&opp11=%e5%bc%95%e5%90%88</description>
+ <displayType>massActionButton</displayType>
+ <linkType>javascript</linkType>
+ <masterLabel>鏂拌寮曞悎</masterLabel>
+ <openType>onClickJavaScript</openType>
+ <protected>false</protected>
+ <requireRowSelection>false</requireRowSelection>
+ <url>{!REQUIRESCRIPT("/soap/ajax/51.0/connection.js")};
+{!REQUIRESCRIPT("/soap/ajax/51.0/apex.js")};
+{!RequireScript("/resource/CommonUtilJs")}
+
+var foo = function() {
+
+const SAP_ProvinceMap = new Map();
+SAP_ProvinceMap.set('瀹佸','瀹佸鑷不鍖�');
+SAP_ProvinceMap.set('鏂扮枂','鏂扮枂鑷不鍖�');
+SAP_ProvinceMap.set('榛戦緳姹�','榛戦緳姹熺渷');
+SAP_ProvinceMap.set('骞胯タ','骞胯タ鑷不鍖�');
+SAP_ProvinceMap.set('澶ц繛','澶ц繛甯�');
+SAP_ProvinceMap.set('娌堥槼','杈藉畞鐪�');
+SAP_ProvinceMap.set('骞夸笢','骞夸笢鐪�');
+SAP_ProvinceMap.set('娣卞湷','娣卞湷甯�');
+SAP_ProvinceMap.set('闈掑矝','闈掑矝甯�');
+SAP_ProvinceMap.set('灞变笢','灞变笢鐪�');
+SAP_ProvinceMap.set('鍥涘窛/瑗胯棌','鍥涘窛鐪�');
+SAP_ProvinceMap.set('瀹夊窘','瀹夊窘鐪�');
+SAP_ProvinceMap.set('鍖椾含','鍖椾含甯�');
+SAP_ProvinceMap.set('绂忓缓','绂忓缓鐪�');
+SAP_ProvinceMap.set('鐢樿們','鐢樿們鐪�');
+SAP_ProvinceMap.set('璐靛窞','璐靛窞鐪�');
+SAP_ProvinceMap.set('娌冲寳','娌冲寳鐪�');
+SAP_ProvinceMap.set('娌冲崡','娌冲崡鐪�');
+SAP_ProvinceMap.set('婀栧寳','婀栧寳鐪�');
+SAP_ProvinceMap.set('婀栧崡','婀栧崡鐪�');
+SAP_ProvinceMap.set('鍚夋灄','鍚夋灄鐪�');
+SAP_ProvinceMap.set('姹熻嫃','姹熻嫃鐪�');
+SAP_ProvinceMap.set('姹熻タ','姹熻タ鐪�');
+SAP_ProvinceMap.set('闈掓捣','闈掓捣鐪�');
+SAP_ProvinceMap.set('灞辫タ','灞辫タ鐪�');
+SAP_ProvinceMap.set('闄曡タ','闄曡タ鐪�');
+SAP_ProvinceMap.set('涓婃捣','涓婃捣甯�');
+SAP_ProvinceMap.set('澶╂触','澶╂触甯�');
+SAP_ProvinceMap.set('浜戝崡','浜戝崡鐪�');
+SAP_ProvinceMap.set('娴欐睙','娴欐睙鐪�');
+SAP_ProvinceMap.set('閲嶅簡','閲嶅簡甯�');
+SAP_ProvinceMap.set('娴峰崡','娴峰崡鐪�');
+
+var province = '{!Account.OCM_man_province_HP__c}';
+
+if(SAP_ProvinceMap.has(province)){
+province = SAP_ProvinceMap.get(province);
+}
+
+var accId = '{!Account.Id}';
+var accname = '{!Account.Name}';
+var accdcw = '{!Account.Department_Class_Wd__c}';
+var hosId = '{!Account.HospitalId__c}';
+var hosname = '{!Account.Hospital__c}';
+var dcId = '{!Account.Department_ClassId__c}';
+var dcname = '{!Account.Department_Class__c}';
+
+var url ='/006/e?retURL=%2F'+encodeURIComponent(accId)
++'&accid='+encodeURIComponent(accId)
++'&RecordType=01210000000QekK'
++'&CF00N10000002CYBC_lkid='+encodeURIComponent(hosId)
++'&CF00N10000002CYBC='+encodeURIComponent(hosname)
++'&CF00N10000002CYB7_lkid='+encodeURIComponent(dcId)
++'&CF00N10000002CYB7='+encodeURIComponent(dcname)
++'&ent=Opportunity'
++'&00N10000002CpF4=OCM%e7%9b%b4%e6%8e%a5%e8%b2%a9%e5%a3%b2'
++'&00N10000002CX2c='+encodeURIComponent(accdcw)
++'&00N10000002ppti='+encodeURIComponent(province)
++'&opp11=%e5%bc%95%e5%90%88';
+window.top.location.href = url;
+}
+foo();</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Opportunity/webLinks/NewOpportunityAgency.webLink-meta.xml b/force-app/main/default/objects/Opportunity/webLinks/NewOpportunityAgency.webLink-meta.xml
new file mode 100644
index 0000000..f15e2d0
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/webLinks/NewOpportunityAgency.webLink-meta.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>NewOpportunityAgency</fullName>
+ <availability>online</availability>
+ <description>//20230407 lt update 鍘焨rl 鐜癹s
+/006/e?retURL=%2F{!Account.Id}
+&accid={!Account.Id}
+&RecordType=01210000000QekK
+&00N10000002CX2c=ET
+&CF00N10000002CYBC_lkid={!Account.Id}
+&CF00N10000002CYBC={!Account.Name}
+&ent=Opportunity
+&00N10000002CpF4=OCM%e7%9b%b4%e6%8e%a5%e8%b2%a9%e5%a3%b2
+&00N10000002CX2c={!Account.Department_Class_Wd__c}
+&00N10000002ppti={!$User.Province_Text__c}
+&opp11=%e5%bc%95%e5%90%88</description>
+ <displayType>massActionButton</displayType>
+ <linkType>javascript</linkType>
+ <masterLabel>鏂板缓璇环</masterLabel>
+ <openType>onClickJavaScript</openType>
+ <protected>false</protected>
+ <requireRowSelection>false</requireRowSelection>
+ <url>{!REQUIRESCRIPT("/soap/ajax/51.0/connection.js")};
+{!REQUIRESCRIPT("/soap/ajax/51.0/apex.js")};
+{!RequireScript("/resource/CommonUtilJs")}
+
+var foo = function() {
+
+var SAP_ProvinceMap = new Map();
+SAP_ProvinceMap.set('瀹佸','瀹佸鑷不鍖�');
+SAP_ProvinceMap.set('鏂扮枂','鏂扮枂鑷不鍖�');
+SAP_ProvinceMap.set('榛戦緳姹�','榛戦緳姹熺渷');
+SAP_ProvinceMap.set('骞胯タ','骞胯タ鑷不鍖�');
+SAP_ProvinceMap.set('澶ц繛','澶ц繛甯�');
+SAP_ProvinceMap.set('娌堥槼','杈藉畞鐪�');
+SAP_ProvinceMap.set('骞夸笢','骞夸笢鐪�');
+SAP_ProvinceMap.set('娣卞湷','娣卞湷甯�');
+SAP_ProvinceMap.set('闈掑矝','闈掑矝甯�');
+SAP_ProvinceMap.set('灞变笢','灞变笢鐪�');
+SAP_ProvinceMap.set('鍥涘窛/瑗胯棌','鍥涘窛鐪�');
+SAP_ProvinceMap.set('瀹夊窘','瀹夊窘鐪�');
+SAP_ProvinceMap.set('鍖椾含','鍖椾含甯�');
+SAP_ProvinceMap.set('绂忓缓','绂忓缓鐪�');
+SAP_ProvinceMap.set('鐢樿們','鐢樿們鐪�');
+SAP_ProvinceMap.set('璐靛窞','璐靛窞鐪�');
+SAP_ProvinceMap.set('娌冲寳','娌冲寳鐪�');
+SAP_ProvinceMap.set('娌冲崡','娌冲崡鐪�');
+SAP_ProvinceMap.set('婀栧寳','婀栧寳鐪�');
+SAP_ProvinceMap.set('婀栧崡','婀栧崡鐪�');
+SAP_ProvinceMap.set('鍚夋灄','鍚夋灄鐪�');
+SAP_ProvinceMap.set('姹熻嫃','姹熻嫃鐪�');
+SAP_ProvinceMap.set('姹熻タ','姹熻タ鐪�');
+SAP_ProvinceMap.set('闈掓捣','闈掓捣鐪�');
+SAP_ProvinceMap.set('灞辫タ','灞辫タ鐪�');
+SAP_ProvinceMap.set('闄曡タ','闄曡タ鐪�');
+SAP_ProvinceMap.set('涓婃捣','涓婃捣甯�');
+SAP_ProvinceMap.set('澶╂触','澶╂触甯�');
+SAP_ProvinceMap.set('浜戝崡','浜戝崡鐪�');
+SAP_ProvinceMap.set('娴欐睙','娴欐睙鐪�');
+SAP_ProvinceMap.set('閲嶅簡','閲嶅簡甯�');
+SAP_ProvinceMap.set('娴峰崡','娴峰崡鐪�');
+
+var province = '{!Account.OCM_man_province_HP__c}';
+if(SAP_ProvinceMap.has(province)){
+province = SAP_ProvinceMap.get(province);
+}
+
+var accId = '{!Account.Id}';
+var accname = '{!Account.Name}';
+var accdcw = '{!Account.Department_Class_Wd__c}';
+
+var url ='/006/e?retURL=%2F'+encodeURIComponent(accId)
++'&accid='+encodeURIComponent(accId)
++'&RecordType=01210000000QekK&00N10000002CX2c=ET'
++'&CF00N10000002CYBC_lkid='+encodeURIComponent(accId)
++'&CF00N10000002CYBC='+encodeURIComponent(accname)
++'&ent=Opportunity'
++'&00N10000002CpF4=OCM%e7%9b%b4%e6%8e%a5%e8%b2%a9%e5%a3%b2'
++'&00N10000002CX2c='+encodeURIComponent(accdcw)
++'&00N10000002ppti='+encodeURIComponent(province)
++'&opp11=%e5%bc%95%e5%90%88';
+window.top.location.href = url;
+}
+foo();</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Opportunity/webLinks/NewOpportunity_Agency.webLink-meta.xml b/force-app/main/default/objects/Opportunity/webLinks/NewOpportunity_Agency.webLink-meta.xml
new file mode 100644
index 0000000..019d9a5
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/webLinks/NewOpportunity_Agency.webLink-meta.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>NewOpportunity_Agency</fullName>
+ <availability>online</availability>
+ <displayType>button</displayType>
+ <linkType>javascript</linkType>
+ <masterLabel>鍏变韩缁欑粡閿�鍟�</masterLabel>
+ <openType>onClickJavaScript</openType>
+ <protected>false</protected>
+ <url>if (document.getElementsByName('newopportunity_agency')[0].className == 'btn') {
+
+var bottons = document.getElementsByName('newopportunity_agency');
+for (var i=0;i<bottons.length;i++)
+{
+bottons[i].className += "btnDisabled";
+bottons[i].disabled = true;
+}
+
+
+{!RequireScript("/soap/ajax/51.0/connection.js")}
+{!RequireScript("/soap/ajax/51.0/apex.js")}
+{!RequireScript("/resource/CommonUtilJs")}
+
+sforce.connection.sessionId = "{!GETSESSIONID()}";
+
+var newflag = true;
+if ('{!Opportunity.Agency1Id__c}' == '') {
+ newflag = false;
+ alert("缁忛攢鍟嗕笉瀛樺湪锛屼笉鑳借浆鎴愩�愮粡閿�鍟嗙洰鏍囪浠枫�戙��");
+}
+else if ('{!Opportunity.Agency_Opportunity__c}' != '') {
+ newflag = false;
+ alert("宸茬粡杞垚杩囥�愮粡閿�鍟嗙洰鏍囪浠枫�戙��");
+}
+else if ('{!Opportunity.Trade__c}' != '鍐呰部') {
+ newflag = false;
+ alert("涓嶆槸鍐呰锤锛屼笉鑳借浆鎴愩�愮粡閿�鍟嗙洰鏍囪浠枫�戙��");
+}
+else {
+ var resultSet = sforce.connection.query("SELECT Id, Name FROM Agency_Hospital_Link__c WHERE Agency__c = '{!Opportunity.Agency1Id__c}' AND Hospital__c = '{!Opportunity.HospitalId__c}'");
+ var records = resultSet.getArray("records");
+ if (records == null || records.length == 0) {
+ newflag = false;
+ alert("娌℃湁鏈夋晥鐨勩�愮粡閿�鍟嗗尰闄€�戙��");
+ }
+}
+
+if (newflag) {
+ var query = "SELECT Id, Name FROM RecordType WHERE SobjectType='Agency_Opportunity__c' And developerName='Opportunity' And IsActive = TRUE";
+ var recTypeList = sforce.connection.query(query).getArray('records');
+ if (recTypeList.length == 0) {
+ alert("娌℃湁鎵惧埌锛岀粡閿�鍟嗚浠风殑瀹氫箟銆�");
+ } else {
+ var recTypeId = recTypeList[0].Id;
+ var query2 = "Select QualifiedApiName, EntityDefinition.KeyPrefix, DurableId From FieldDefinition WHERE EntityDefinition.QualifiedApiName = 'Agency_Opportunity__c'";
+ var records2 = sforce.connection.query(query2).getArray('records');
+ var prefix, fId_Close_Forecasted_Date__c, fId_Agency_Hospital__c
+ , fId_OCM_Change_To_Opportunity_Flg__c, fId_Amount__c
+ , fId_OCMSale_Price__c, fId_Agency__c
+ , fId_StageName__c, fId_Change_To_Opportunity__c
+ , fId_Department_Cateogy__c, fId_Bid_Planned_Date__c;
+ for (var i=0; i< records2.length; i++) {
+ var record = records2[i];
+ prefix = record.EntityDefinition.KeyPrefix.toString();
+ if (record.QualifiedApiName == 'Close_Forecasted_Date__c') {
+ fId_Close_Forecasted_Date__c = record.DurableId.toString().split('.')[1];
+ }
+ if (record.QualifiedApiName == 'OCM_Change_To_Opportunity_Flg__c') {
+ fId_OCM_Change_To_Opportunity_Flg__c = record.DurableId.toString().split('.')[1];
+ }
+ if (record.QualifiedApiName == 'Agency_Hospital__c') {
+ fId_Agency_Hospital__c = record.DurableId.toString().split('.')[1];
+ }
+ if (record.QualifiedApiName == 'Amount__c') {
+ fId_Amount__c = record.DurableId.toString().split('.')[1];
+ }
+ if (record.QualifiedApiName == 'OCMSale_Price__c') {
+ fId_OCMSale_Price__c = record.DurableId.toString().split('.')[1];
+ }
+ if (record.QualifiedApiName == 'Agency__c') {
+ fId_Agency__c = record.DurableId.toString().split('.')[1];
+ }
+ if (record.QualifiedApiName == 'StageName__c') {
+ fId_StageName__c = record.DurableId.toString().split('.')[1];
+ }
+ if (record.QualifiedApiName == 'Change_To_Opportunity__c') {
+ fId_Change_To_Opportunity__c = record.DurableId.toString().split('.')[1];
+ }
+ if (record.QualifiedApiName == 'Department_Cateogy__c') {
+ fId_Department_Cateogy__c = record.DurableId.toString().split('.')[1];
+ }
+ if (record.QualifiedApiName == 'Bid_Planned_Date__c') {
+ fId_Bid_Planned_Date__c = record.DurableId.toString().split('.')[1];
+ }
+ }
+
+ var ahl = records[0];
+ window.open("/a2Y/e?retURL=%2F{!URLENCODE(Opportunity.Id)}&Name={!URLENCODE('(OLYMPUS)'+Opportunity.Name)}&RecordType=" + recTypeId +
+ "&"+fId_Close_Forecasted_Date__c+"={!Opportunity.Close_Forecasted_Date__c}" +
+ "&"+fId_Bid_Planned_Date__c+"={!Opportunity.Bid_Planned_Date__c}"+
+ "&"+fId_OCM_Change_To_Opportunity_Flg__c+"=1" +
+ "&CF"+fId_Agency_Hospital__c+"_lkid=" + ahl.Id +
+ "&CF"+fId_Agency_Hospital__c+"=" + encodeURIComponent(ahl.Name) +
+ "&"+fId_Amount__c+"=" + '{!Opportunity.Dealer_Final_Price__c}'.substr(4) +
+ "&"+fId_OCMSale_Price__c+"=" + '{!Opportunity.Wholesale_Price__c}'.substr(4) +
+ "&CF"+fId_Agency__c+"_lkid={!URLENCODE(Opportunity.Agency1Id__c)}" +
+ "&CF"+fId_Agency__c+"={!URLENCODE(Opportunity.Agency1__c)}" +
+ "&"+fId_StageName__c+"={!URLENCODE(text(Opportunity.Opportunity_stage__c))}" +
+ "&CF"+fId_Change_To_Opportunity__c+"_lkid={!Opportunity.Id}" +
+ "&CF"+fId_Change_To_Opportunity__c+"={!URLENCODE(Opportunity.Name)}" +
+ "&"+fId_Department_Cateogy__c+"={!URLENCODE(text(Opportunity.Opportunity_Category__c))}");
+ }
+ }
+}</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Opportunity/webLinks/OLYwinBid.webLink-meta.xml b/force-app/main/default/objects/Opportunity/webLinks/OLYwinBid.webLink-meta.xml
new file mode 100644
index 0000000..7e62b2f
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/webLinks/OLYwinBid.webLink-meta.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OLYwinBid</fullName>
+ <availability>online</availability>
+ <description>OLYwinBid
+20221130 update 闈炲叕寮�OLY涓爣锛屼腑鏍囨棩绌轰负鐐瑰嚮鎸夐挳鏃ワ紝涓嶄负绌轰笉鍋氫慨鏀�</description>
+ <displayType>button</displayType>
+ <linkType>javascript</linkType>
+ <masterLabel>OLY涓爣</masterLabel>
+ <openType>onClickJavaScript</openType>
+ <protected>false</protected>
+ <url>{!REQUIRESCRIPT("/soap/ajax/51.0/connection.js")};
+{!REQUIRESCRIPT("/soap/ajax/51.0/apex.js")};
+{!RequireScript("/resource/CommonUtilJs")};
+
+var sql = "select taskStatus__c from task__c where OpportunityId__c ='{!Opportunity.Id}' and name like '%涓爣缁撴灉纭%'";
+var flag = true;
+var tasks = sforce.connection.query(sql);
+var taskslist = tasks.getArray("records");
+for(var task of taskslist ){
+if(task.taskStatus__c != '04 鍙栨秷'){
+flag = false;
+}
+}
+if('{!Opportunity.ifOpenBid__c}' == '闈炲叕寮�鎷涙爣'){
+flag = false;
+}
+if(flag){
+alert('鏉′欢涓嶇鍚堬紝涓嶅彲鎿嶄綔');
+}else{
+if (window.confirm('鏄惁纭OLY涓爣锛�')) {
+var opp = new sforce.SObject('Opportunity');
+opp.Id = '{!Opportunity.Id}';
+opp.ConfirmationofAward__c = 'OLY涓爣';
+if('{!Opportunity.ifOpenBid__c}' == '闈炲叕寮�鎷涙爣' && {!ISBLANK(Opportunity.Closing_Bid_Date__c )}){
+opp.Closing_Bid_Date__c = new Date();
+}
+var result = sforce.connection.update([opp]);
+var messages = getConnectDMLErrorMessages(result);
+if (messages.length > 0) {
+alert(messages.join("\n"));
+}else{
+alert('鎿嶄綔鎴愬姛锛�');
+}
+window.location.reload();
+}
+}</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Opportunity/webLinks/Opponent_Bid_Information.webLink-meta.xml b/force-app/main/default/objects/Opportunity/webLinks/Opponent_Bid_Information.webLink-meta.xml
new file mode 100644
index 0000000..ab21209
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/webLinks/Opponent_Bid_Information.webLink-meta.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Opponent_Bid_Information</fullName>
+ <availability>online</availability>
+ <description>if ('{!Opportunity.StageName}' != '寮曞悎'
+&& '{!Opportunity.StageName}' != '璇环'
+) {
+alert("鐘舵��1:" + '{!Opportunity.StageName}' + "銆佷笉鑳藉仛 澶卞崟 浜嗭紒");
+}
+else if ('{!Opportunity.SAP_Send_OK__c}' == '1') {
+alert("宸茬粡涓婁紶SAP銆佷笉鑳藉仛 澶卞崟 浜嗭紒");
+}
+else if ({!Opportunity.Cnt_Lost_cancel_report__c} > 0) {
+alert("璇环宸茬粡鏈� 鍙栨秷锛忓け鍗曟姤鍛� 浜嗭紒");
+}
+else {
+location.href = '/a1U/e?retURL=%2F{!Opportunity.Id}' +
+'&RecordType=01210000000VLUN'+
+'&CF00N10000004lbGT={!URLENCODE(Opportunity.Name)}' +
+'&CF00N10000004lbGT_lkid={!Opportunity.Id}' +
+'&CF00N10000006QShg={!URLENCODE(Opportunity.Sales_assistant_name__c)}' +
+'&CF00N10000006QShg_lkid={!URLENCODE(Opportunity.Sales_assistant_ID__c)}' +
+'&CF00N10000006QShq={!URLENCODE(Opportunity.Manager_name__c)}' +
+'&CF00N10000006QShq_lkid={!URLENCODE(Opportunity.Sales_manager_departmentID__c)}' +
+'&CF00N10000006QShb={!URLENCODE(Opportunity.Sales_owner_buchang__c)}' +
+'&CF00N10000006QShb_lkid={!URLENCODE(Opportunity.Sales_owner_buchangID__c)}' +
+'';
+}</description>
+ <displayType>button</displayType>
+ <linkType>javascript</linkType>
+ <masterLabel>閮ㄥ垎澶卞崟</masterLabel>
+ <openType>onClickJavaScript</openType>
+ <protected>false</protected>
+ <url>// js銇牬鍚堛�佺炕瑷炽仌銈屻仧鍊ゃ亴銇с倠銇仹銆佽娉ㄦ剰
+if ('{!Opportunity.StageName}' != '寮曞悎'
+ && '{!Opportunity.StageName}' != '璇环'
+) {
+ alert("鐘舵��1:" + '{!Opportunity.StageName}' + "銆佷笉鑳藉仛 澶卞崟 浜嗭紒");
+}
+else if ('{!Opportunity.SAP_Send_OK__c}' == '1') {
+ alert("宸茬粡涓婁紶SAP銆佷笉鑳藉仛 澶卞崟 浜嗭紒");
+}
+else if ({!Opportunity.Cnt_Lost_cancel_report__c} > 0) {
+ alert("璇环宸茬粡鏈� 鍙栨秷锛忓け鍗曟姤鍛� 浜嗭紒");
+}
+//else if({!Not(ISBLANK(Opportunity.Bidding_Project_Name_Bid__c))} && //'{!Opportunity.InfoTypeBid__c}' != '3锛氱粨鏋�' ){
+//alert("鍏宠仈鎷涙姇鏍囬」鐩殑璇环锛屽彧鑳藉湪鏈夌粨鏋滃悗鍋氬け鍗曟姤鍛婏紒");
+//}
+else {
+ location.href = '/a1U/e?retURL=%2F{!Opportunity.Id}' +
+'&RecordType=01210000000VLUN' +
+'&CF00N10000004lbGT={!URLENCODE(Opportunity.Name)}' +
+'&CF00N10000004lbGT_lkid={!Opportunity.Id}' +
+
+'&CF00N10000006QShg={!URLENCODE(Opportunity.Sales_assistant_name__c)}' +
+'&CF00N10000006QShg_lkid={!URLENCODE(Opportunity.Sales_assistant_ID__c)}' +
+'&CF00N10000006QShq={!URLENCODE(Opportunity.Manager_name__c)}' +
+'&CF00N10000006QShq_lkid={!URLENCODE(Opportunity.Sales_manager_departmentID__c)}' +
+'&CF00N10000006QShb={!URLENCODE(Opportunity.Sales_owner_buchang__c)}' +
+'&CF00N10000006QShb_lkid={!URLENCODE(Opportunity.Sales_owner_buchangID__c)}' +
+'';
+}</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Opportunity/webLinks/Oppor_Splite.webLink-meta.xml b/force-app/main/default/objects/Opportunity/webLinks/Oppor_Splite.webLink-meta.xml
new file mode 100644
index 0000000..e4829a4
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/webLinks/Oppor_Splite.webLink-meta.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Oppor_Splite</fullName>
+ <availability>online</availability>
+ <displayType>button</displayType>
+ <linkType>javascript</linkType>
+ <masterLabel>鎷嗗崟</masterLabel>
+ <openType>onClickJavaScript</openType>
+ <protected>false</protected>
+ <url>if('{!Opportunity.Id}'=='宸茬粓姝�'){
+alert('闇�姹傝〃宸茬粓姝紝涓嶈兘鎷嗗崟');
+}else if('{!Opportunity.Authorized_DB_No__c}'==''){
+alert('娌℃湁鍚堝悓鎺堟潈缂栫爜锛屼笉鑳芥媶鍗�');
+}else if('{!Opportunity.Estimation_Decision__c}'==true){
+alert('鎶ヤ环宸茬粡Decided锛屼笉鑳芥媶鍗�');
+}else if('{!Opportunity.SI_Decide_ID__c}'==''){
+alert('闇�姹傝〃鏈壒鍑嗭紝涓嶈兘鎷嗗崟');
+}else if('{!Opportunity.Id}'!='鑽夋涓�'&&'{!Opportunity.Id}'!='宸叉彁浜�'&&'{!Opportunity.Id}'!='宸茬粓姝�'){
+window.open("/{!URLENCODE(Opportunity.Id)}/e?clone=1&retURL=%2F{!URLENCODE(Opportunity.Id)}&00N10000002Cbwh=*&CF00N10000006qHai={!URLENCODE(Opportunity.Name)}&00Np0000001DOwi=***&00Np0000001CxmR={!URLENCODE(Opportunity.Opportunity_No__c)}&CF00N10000006qHai_lkid={!URLENCODE(Opportunity.Id)}&00N10000006qHav={!URLENCODE(Opportunity.Opportunity_No__c)}&00N10000009Glvn={!Opportunity.IsAuthorized__c}&00N10000008pnmd=1&00N10000002DXkZ=&00N10000002DXke=&00N10000002CmTf=&00N10000002Cb9P=&00N10000002DItz=&00N10000003O9oO=&00N10000003O9o4=&00N10000002CYHy=&00Np00000030gzb=&00Np0000002ajGe=&00Np00000034Qlb");
+}</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Opportunity/webLinks/Predicted_Date_Change.webLink-meta.xml b/force-app/main/default/objects/Opportunity/webLinks/Predicted_Date_Change.webLink-meta.xml
new file mode 100644
index 0000000..b7faa94
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/webLinks/Predicted_Date_Change.webLink-meta.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Predicted_Date_Change</fullName>
+ <availability>online</availability>
+ <displayType>button</displayType>
+ <linkType>javascript</linkType>
+ <masterLabel>淇敼棰勬祴鏃�</masterLabel>
+ <openType>onClickJavaScript</openType>
+ <protected>false</protected>
+ <url>{!REQUIRESCRIPT("/soap/ajax/51.0/connection.js")};
+{!REQUIRESCRIPT("/soap/ajax/51.0/apex.js")};
+{!RequireScript("/resource/CommonUtilJs")};
+
+function foo(){
+// 20221206 ljh DB202212030068 start
+//var DirectLossFLG = '{!Opportunity.DirectLossFLG__c}';
+//var CreatedDay = '{!Opportunity.Created_Day__c}';
+//var Day = '{!DATE(2022,12,03)}';
+//if((DirectLossFLG == 'true' || DirectLossFLG == 1 ) && CreatedDay > Day){
+// alert('浠庢嫑鏍囬」鐩偣鍑诲け鍗曟柊寤虹殑璇环锛岄娴婳CSM绛剧害鏃�(KPI)鍜岄娴嬪彂璐ф棩涓嶅厑璁镐慨鏀�');
+// return;
+//}
+// 20221206 ljh DB202212030068 end
+var sql = "select id from InquiryPredictsDateChange__c where Predicted_Date_Status__c = '瀹℃壒涓�' and Opportunity__c ='" + '{!Opportunity.Id}'+ "'";
+var sqlResult = sforce.connection.query(sql);
+
+if (sqlResult.size > 0) {
+alert('宸插瓨鍦ㄥ緟瀹℃壒鐨勫彉鏇寸敵璇凤紒');
+return;
+} else {
+window.open('/apex/ImprovedForecastTime?id={!Opportunity.Id}','','height=500,width=800,top=200,left=250,location=no');
+
+}
+}
+
+
+foo();</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Opportunity/webLinks/Quotation_Product.webLink-meta.xml b/force-app/main/default/objects/Opportunity/webLinks/Quotation_Product.webLink-meta.xml
new file mode 100644
index 0000000..9f6d130
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/webLinks/Quotation_Product.webLink-meta.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Quotation_Product</fullName>
+ <availability>online</availability>
+ <displayType>button</displayType>
+ <encodingKey>UTF-8</encodingKey>
+ <hasMenubar>false</hasMenubar>
+ <hasScrollbars>true</hasScrollbars>
+ <hasToolbar>false</hasToolbar>
+ <height>600</height>
+ <isResizable>true</isResizable>
+ <linkType>url</linkType>
+ <masterLabel>鎶ヤ环浜у搧</masterLabel>
+ <openType>newWindow</openType>
+ <position>none</position>
+ <protected>false</protected>
+ <showsLocation>false</showsLocation>
+ <showsStatus>false</showsStatus>
+ <url>/00O10000002jviu?pv0={!Opportunity.Id}</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Opportunity/webLinks/Quotation_Product_New.webLink-meta.xml b/force-app/main/default/objects/Opportunity/webLinks/Quotation_Product_New.webLink-meta.xml
new file mode 100644
index 0000000..8925fe9
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/webLinks/Quotation_Product_New.webLink-meta.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Quotation_Product_New</fullName>
+ <availability>online</availability>
+ <displayType>button</displayType>
+ <linkType>javascript</linkType>
+ <masterLabel>鎶ヤ环浜у搧.</masterLabel>
+ <openType>onClickJavaScript</openType>
+ <protected>false</protected>
+ <url>var foo = function() {
+
+var Currency = '{!Opportunity.CurrencyIsoCode}';
+var OppID = '{!Opportunity.Id}';
+
+
+if (Currency == 'CNY'){
+var url = '/00O10000002jviu?pv0=' + OppID;
+}
+else if (Currency == 'USD'){
+var url = '/00O10000005Ju6L?pv0=' + OppID;
+}
+
+window.open(url);
+
+}
+
+foo();</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Opportunity/webLinks/Quotation_Product_NotUse.webLink-meta.xml b/force-app/main/default/objects/Opportunity/webLinks/Quotation_Product_NotUse.webLink-meta.xml
new file mode 100644
index 0000000..68f947d
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/webLinks/Quotation_Product_NotUse.webLink-meta.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Quotation_Product_NotUse</fullName>
+ <availability>online</availability>
+ <displayType>button</displayType>
+ <encodingKey>UTF-8</encodingKey>
+ <hasMenubar>false</hasMenubar>
+ <hasScrollbars>true</hasScrollbars>
+ <hasToolbar>false</hasToolbar>
+ <height>600</height>
+ <isResizable>true</isResizable>
+ <linkType>url</linkType>
+ <masterLabel>绉戝淇濇湁璁惧涓�瑙�</masterLabel>
+ <openType>newWindow</openType>
+ <position>none</position>
+ <protected>false</protected>
+ <showsLocation>false</showsLocation>
+ <showsStatus>false</showsStatus>
+ <url>/00O10000002lqGb?pv0={!Opportunity.Department_ClassId__c}</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Opportunity/webLinks/Quotation_request.webLink-meta.xml b/force-app/main/default/objects/Opportunity/webLinks/Quotation_request.webLink-meta.xml
new file mode 100644
index 0000000..c245526
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/webLinks/Quotation_request.webLink-meta.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Quotation_request</fullName>
+ <availability>online</availability>
+ <displayType>button</displayType>
+ <linkType>javascript</linkType>
+ <masterLabel>鎶ヤ环濮旀墭</masterLabel>
+ <openType>onClickJavaScript</openType>
+ <protected>false</protected>
+ <url>{!RequireScript("/soap/ajax/51.0/connection.js")}
+{!RequireScript("/soap/ajax/51.0/apex.js")}
+var foo = function() {
+var sql;
+sql = "select id from QuoteIrai__c where Note__c like '%{!Opportunity.Id}%' and QuoteIrai_Status__c = '鑽夋涓�'";
+var sqlResult = sforce.connection.query(sql);
+var records = sqlResult.getArray("records");
+var size =records.length;
+if(size > 1){
+alert("鏈�2涓垨鑰�2涓互涓婄殑鑽夋涓姤浠峰鎵橈紝璇风‘璁ゃ��");
+}else if(size == 1){
+var raes = records[0].Id;
+location.href = "/apex/NewQuoteIrai?id="+ raes+"&tenderid={!Opportunity.Bidding_Project_Name_BidId__c}" ;
+}else{
+location.href = "/apex/NewQuoteIrai?oppid={!Opportunity.Id}&oppquoid={!Opportunity.Estimation_Id__c}&tenderid={!Opportunity.Bidding_Project_Name_BidId__c}" ;
+}
+}
+foo();</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Opportunity/webLinks/Request_DB.webLink-meta.xml b/force-app/main/default/objects/Opportunity/webLinks/Request_DB.webLink-meta.xml
new file mode 100644
index 0000000..1ad8d85
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/webLinks/Request_DB.webLink-meta.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Request_DB</fullName>
+ <availability>online</availability>
+ <displayType>button</displayType>
+ <linkType>javascript</linkType>
+ <masterLabel>鎺堟潈濮旀墭</masterLabel>
+ <openType>onClickJavaScript</openType>
+ <protected>false</protected>
+ <url>var profileId = '{!$User.ProfileId}';
+if (profileId != '00e10000000Y3o5' && profileId != '00e10000000xnp2' &&
+profileId != '00e10000000xnpH') {
+alert("鎮ㄦ病鏈夋巿鏉冨鎵樼殑鏉冮檺銆傝鑱旂郴绯荤粺绠＄悊鍛樸��");
+}
+
+
+// js銇牬鍚堛�佺炕瑷炽仌銈屻仧鍊ゃ亴銇с倠銇仹銆佽娉ㄦ剰
+else if ('{!Opportunity.StageName}' != '寮曞悎'
+&& '{!Opportunity.StageName}' != '璇环'
+) {
+alert("鐘舵��1:" + '{!Opportunity.StageName}' + "銆佷笉鑳藉仛鎺堟潈鐢宠锛�");
+}
+else if ('{!Opportunity.SAP_Send_OK__c}' == '1') {
+alert("宸茬粡涓婁紶SAP銆佷笉鑳藉仛鎺堟潈鐢宠浜嗭紒");
+}
+else if ({!Opportunity.Cnt_Lost_cancel_report__c} - {!Opportunity.Cnt_Lost_cancel_Draft__c} > 0) {
+alert("璇环宸茬粡鏈夊彇娑堬紡澶卞崟鎶ュ憡浜嗭紒");
+}
+else {
+location.href = '/a2C/e?retURL=%2F{!URLENCODE(Opportunity.Id)}' +
+'&RecordType=01210000000RNXi' +
+'&CF00N10000006QdJz={!URLENCODE(Opportunity.Agency1__c)}' +
+'&CF00N10000006QdJz_lkid={!URLENCODE(Opportunity.Agency1Id__c)}' +
+'&CF00N10000006QdKn={!URLENCODE(Opportunity.Name)}' +
+'&CF00N10000006QdKn_lkid={!URLENCODE(Opportunity.Id)}' +
+'&00N10000006QdK4={!URLENCODE(Opportunity.Name)}' +
+'&00N10000006QdYB={!Opportunity.Bid_Planned_Date__c}' +
+'&CF00N10000006QdZT={!URLENCODE(Opportunity.Sales_assistant_name__c)}' +
+'&CF00N10000006QdZT_lkid={!URLENCODE(Opportunity.Sales_assistant_ID__c)}' +
+
+
+
+
+
+
+
+
+
+
+'';
+}</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Opportunity/webLinks/Stock_apply.webLink-meta.xml b/force-app/main/default/objects/Opportunity/webLinks/Stock_apply.webLink-meta.xml
new file mode 100644
index 0000000..4398f25
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/webLinks/Stock_apply.webLink-meta.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Stock_apply</fullName>
+ <availability>online</availability>
+ <displayType>button</displayType>
+ <linkType>javascript</linkType>
+ <masterLabel>澶囪揣鐢宠</masterLabel>
+ <openType>onClickJavaScript</openType>
+ <protected>false</protected>
+ <url>{!RequireScript("/soap/ajax/51.0/connection.js")}
+{!RequireScript("/soap/ajax/51.0/apex.js")}
+{!RequireScript("/resource/CommonUtilJs")}
+var foo = function() {
+ var status = '{!JSENCODE(TEXT(Opportunity.Stock_apply_status__c))}';
+ if (status != '鑽夋涓�' && status != '濉啓瀹屾瘯' && status != '涓嶆壒鍑�' && status != '') {
+ alert('澶囪揣鐢宠鐘舵�佷笉姝ｇ‘锛屼笉鑳芥彁浜ゅ璐х敵璇枫��');
+ return;
+ }
+ var oppfile = '{!Opportunity.Last_opportunity_fileId__c}';
+ if (oppfile == null || oppfile == '') {
+ alert('璇蜂笂浼犺浠锋枃浠躲��');
+ return;
+ }
+
+ if (!confirm("涓�鏃︽彁浜ゆ璁板綍浠ュ緟鎵瑰噯锛屾牴鎹偍鐨勮缃偍鍙兘涓嶅啀鑳藉缂栬緫姝よ褰曟垨灏嗕粬浠庢壒鍑嗚繃绋嬩腑璋冨洖銆傛槸鍚︾户缁紵")) {
+ return;
+ }
+
+ var rac = new sforce.SObject("Opportunity");
+ rac.Id = "{!Opportunity.Id}";
+ rac.Stock_apply_status__c = "濉啓瀹屾瘯";
+ var result = sforce.connection.update([rac]);
+ var messages = getConnectDMLErrorMessages(result);
+ if (messages.length > 0) {
+ alert(messages.join("\n"));
+ return;
+ }
+
+ var request = new sforce.ProcessSubmitRequest();
+ request.objectId = "{!Opportunity.Id}";
+ var processResults = sforce.connection.process([request]);
+ if (processResults[0].errors != null) {
+ var back = new sforce.SObject("Opportunity");
+ back.Id = "{!Opportunity.Id}";
+ back.Stock_apply_status__c = "鑽夋涓�";
+ var backResult = sforce.connection.update([back]);
+ backMessages = getConnectDMLErrorMessages(backResult);
+ if (backMessages.length > 0) {
+ alert(backMessages.join("\n"));
+ return;
+ }
+
+ var errmsg = processResults[0].errors.message.toString();
+ alert(errmsg);
+ return;
+ }
+ window.location.reload();
+};
+foo();</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Opportunity/webLinks/Stock_cancel.webLink-meta.xml b/force-app/main/default/objects/Opportunity/webLinks/Stock_cancel.webLink-meta.xml
new file mode 100644
index 0000000..53c424e
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/webLinks/Stock_cancel.webLink-meta.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Stock_cancel</fullName>
+ <availability>online</availability>
+ <displayType>button</displayType>
+ <linkType>javascript</linkType>
+ <masterLabel>鎾ら攢澶囪揣</masterLabel>
+ <openType>onClickJavaScript</openType>
+ <protected>false</protected>
+ <url>{!RequireScript("/soap/ajax/51.0/connection.js")}
+{!RequireScript("/soap/ajax/51.0/apex.js")}
+{!RequireScript("/resource/CommonUtilJs")}
+var foo = function() {
+ // CHAN-BCS8T5 LHJ 20190604 Start
+ //var status = '{!JSENCODE(TEXT(Opportunity.Stock_apply_status__c))}';
+ //if (status != '鎵瑰噯' && status != '鎾ら攢濉啓瀹屾瘯') {
+ // alert('澶囪揣鐢宠鐘舵�佷笉姝ｇ‘锛屼笉鑳芥彁浜ゆ挙閿�澶囪揣鐢宠銆�');
+ // return;
+ //}
+ // CHAN-BCS8T5 LHJ 20190604 End
+ var reason = '{!Opportunity.Stock_cancel_reason__c}';
+ if (reason == null || reason == '') {
+ alert('蹇呴』濉啓鎾ら攢澶囪揣鐞嗙敱銆�');
+ return
+ }
+
+ // CHAN-BCS8T5 LHJ 20190604 Start
+ var stage = '{!Opportunity.Whether_Upload_Question_Document__c}';
+ if (stage == '0') {
+ alert('璇蜂笂浼犺川鐤戝嚱銆�');
+ return;
+ }
+ // CHAN-BCS8T5 LHJ 20190604 End
+
+ if (!confirm("涓�鏃︽彁浜ゆ璁板綍浠ュ緟鎵瑰噯锛屾牴鎹偍鐨勮缃偍鍙兘涓嶅啀鑳藉缂栬緫姝よ褰曟垨灏嗕粬浠庢壒鍑嗚繃绋嬩腑璋冨洖銆傛槸鍚︾户缁紵")) {
+ return;
+ }
+
+ var rac = new sforce.SObject("Opportunity");
+ rac.Id = "{!Opportunity.Id}";
+ rac.Stock_apply_status__c = "鎾ら攢濉啓瀹屾瘯";
+ var result = sforce.connection.update([rac]);
+ var messages = getConnectDMLErrorMessages(result);
+ if (messages.length > 0) {
+ alert(messages.join("\n"));
+ return;
+ }
+
+ var request = new sforce.ProcessSubmitRequest();
+ request.objectId = "{!Opportunity.Id}";
+ var processResults = sforce.connection.process([request]);
+ if (processResults[0].errors != null) {
+ var back = new sforce.SObject("Opportunity");
+ back.Id = "{!Opportunity.Id}";
+ back.Stock_apply_status__c = "鎵瑰噯";
+ var backResult = sforce.connection.update([back]);
+ backMessages = getConnectDMLErrorMessages(backResult);
+ if (backMessages.length > 0) {
+ alert(backMessages.join("\n"));
+ return;
+ }
+
+ var errmsg = processResults[0].errors.message.toString();
+ alert(errmsg);
+ return;
+ }
+ window.location.reload();
+};
+foo();</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Opportunity/webLinks/copy_to_base.webLink-meta.xml b/force-app/main/default/objects/Opportunity/webLinks/copy_to_base.webLink-meta.xml
new file mode 100644
index 0000000..80a9560
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/webLinks/copy_to_base.webLink-meta.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>copy_to_base</fullName>
+ <availability>online</availability>
+ <description>CHAN-AUPBCU 璇环:澶嶅埗鍔熻兘淇敼
+DB202211435774 澶嶅埗锛堝甫浜у搧锛夐殣钘忥紝鍚庡彴澶嶅埗(涓嶅甫浜у搧)鎷垮嚭鏉�</description>
+ <displayType>button</displayType>
+ <encodingKey>UTF-8</encodingKey>
+ <linkType>url</linkType>
+ <masterLabel>澶嶅埗(涓嶅甫浜у搧)</masterLabel>
+ <openType>replace</openType>
+ <protected>false</protected>
+ <url>/{!Opportunity.Id}/e?clone=1&retURL=%2F{!Opportunity.Id}&common.udd.actions.ActionsUtilORIG_URI=%2F{!Opportunity.Id}%2Fe
+&00N10000002Cbwh=&00N10000005aKOZ=&00N10000002DXkj=&00N10000002DaDX=&00N10000002DaAn=&00N10000002Cb9P=&00N10000006qHrz=&00N10000003O1ba=
+&00N100000072rnD=&00N100000072rnE=&00N100000072rnC=&00N100000072rnF=&00N100000072rnG=&00N10000006qHar=&CF00N100000072rn9=&CF00N10000006qOGR=
+&00N10000005Ht1k=&00N10000005Ht1p=&00N10000002CX1y=&00N10000004lg5X=&opp6=&00N10000006pruX=&opp17=&00N10000002CX31=&CF00N10000006psSq=
+&CF00N10000006psSq_lkid=&00N10000006psSv=&00N10000002CpEp=&00N10000002CpEV=&00N10000002DXkZ=&00N10000002DXke=&00N10000002CmTf=&CF00N10000002CXRc=
+&CF00N10000002CXRc_lkid=&00N10000002DaFi=&CF00N10000002CXRh=&CF00N10000002CXRh_lkid=&00N10000002Dbac=&00N10000002Dbam=&00N10000002Dbah=&00N10000002DbaD=
+&00N10000002DbaI=&00N10000002CX1o=&00N10000002DbaX=&00N10000002DbaS=&00N10000002DaDI=&00N10000002CYHP=&00N10000002CYGv=&00N10000002CYHZ=
+&00N10000002CYHe=&00N10000002CYIc=&00N10000002CYHy=&00N10000002DItz=&00N10000003O9oO=&00N10000003O9o4=&00N10000002CYH6=&00N10000002CpEG=
+&00N10000002DxC5=&00N10000002ERkx=&00N10000002EBh5=&00N100000046f5n=&00N10000002oNvw=&00N10000002GAjR=&00N10000002CpKo=&00N10000002CpN4=
+&CF00N10000006PQLx=&CF00N10000006PQLx_lkid=&00N10000002CpKj=&00N10000002CpNE=&00N10000002Cb9Z=&00N10000002EJwi=&opp14=&00N10000003MbF3=
+&00N10000006qHav=&CF00N10000006qHai=&CF00N10000006qHai_lkid=&00N10000006qHaj=&CF00N10000006gPDi=&CF00N10000006gPDi_lkid=&CF00N10000006gPDk=&CF00N10000006gPDk_lkid=
+&CF00N10000006gPDl=&CF00N10000006gPDl_lkid=&00N10000007qqfo=&00N10000008pRZr=&00N10000007qqfn=</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Opportunity/webLinks/copy_to_base_item.webLink-meta.xml b/force-app/main/default/objects/Opportunity/webLinks/copy_to_base_item.webLink-meta.xml
new file mode 100644
index 0000000..6442748
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/webLinks/copy_to_base_item.webLink-meta.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>copy_to_base_item</fullName>
+ <availability>online</availability>
+ <description>CHAN-AUPBCU 璇环:澶嶅埗鍔熻兘淇敼
+SWAG-C248UF---Start---
+&00N10000008rxMy=&opp11='寮曞悎'
+SWAG-C248UF---End---</description>
+ <displayType>button</displayType>
+ <encodingKey>UTF-8</encodingKey>
+ <linkType>url</linkType>
+ <masterLabel>澶嶅埗(甯︿骇鍝�)</masterLabel>
+ <openType>replace</openType>
+ <protected>false</protected>
+ <url>/{!Opportunity.Id}/e?clone=1&retURL=%2F{!Opportunity.Id}&common.udd.actions.ActionsUtilORIG_URI=%2F{!Opportunity.Id}%2Fe&cloneli=1
+&00N10000002Cbwh=&00N10000005aKOZ=&00N10000002DXkj=&00N10000002DaDX=&00N10000002DaAn=&00N10000002Cb9P=&00N10000006qHrz=&00N10000003O1ba=
+&00N100000072rnD=&00N100000072rnE=&00N100000072rnC=&00N100000072rnF=&00N100000072rnG=&00N10000006qHar=&CF00N100000072rn9=&CF00N10000006qOGR=
+&00N10000005Ht1k=&00N10000005Ht1p=&00N10000002CX1y=&00N10000004lg5X=&opp6=&00N10000006pruX=&opp17=&00N10000002CX31=&CF00N10000006psSq=
+&CF00N10000006psSq_lkid=&00N10000006psSv=&00N10000002CpEp=&00N10000002CpEV=&00N10000002DXkZ=&00N10000002DXke=&00N10000002CmTf=&CF00N10000002CXRc=
+&CF00N10000002CXRc_lkid=&00N10000002DaFi=&CF00N10000002CXRh=&CF00N10000002CXRh_lkid=&00N10000002Dbac=&00N10000002Dbam=&00N10000002Dbah=&00N10000002DbaD=
+&00N10000002DbaI=&00N10000002CX1o=&00N10000002DbaX=&00N10000002DbaS=&00N10000002DaDI=&00N10000002CYHP=&00N10000002CYGv=&00N10000002CYHZ=
+&00N10000002CYHe=&00N10000002CYIc=&00N10000002CYHy=&00N10000002DItz=&00N10000003O9oO=&00N10000003O9o4=&00N10000002CYH6=&00N10000002CpEG=
+&00N10000002DxC5=&00N10000002ERkx=&00N10000002EBh5=&00N100000046f5n=&00N10000002oNvw=&00N10000002GAjR=&00N10000002CpKo=&00N10000002CpN4=
+&CF00N10000006PQLx=&CF00N10000006PQLx_lkid=&00N10000002CpKj=&00N10000002CpNE=&00N10000002Cb9Z=&00N10000002EJwi=&opp14=&00N10000003MbF3=
+&00N10000006qHav=&CF00N10000006qHai=&CF00N10000006qHai_lkid=&00N10000006qHaj=&CF00N10000006gPDi=&CF00N10000006gPDi_lkid=&CF00N10000006gPDk=&CF00N10000006gPDk_lkid=
+&CF00N10000006gPDl=&CF00N10000006gPDl_lkid=&00Np00000030gzb=&00Np00000034Qlb=&00N10000002DaB2=&00Np0000002ajGo=&00N10000008rxMy=&opp11='寮曞悎'&00Np0000002ajGe</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Opportunity/webLinks/enquiryNoBidding.webLink-meta.xml b/force-app/main/default/objects/Opportunity/webLinks/enquiryNoBidding.webLink-meta.xml
new file mode 100644
index 0000000..1d2ab3d
--- /dev/null
+++ b/force-app/main/default/objects/Opportunity/webLinks/enquiryNoBidding.webLink-meta.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>enquiryNoBidding</fullName>
+ <availability>online</availability>
+ <description>涓嶅簲鏍囩敵璇�</description>
+ <displayType>button</displayType>
+ <linkType>javascript</linkType>
+ <masterLabel>涓嶅簲鏍囩敵璇�</masterLabel>
+ <openType>onClickJavaScript</openType>
+ <protected>false</protected>
+ <url>function EnquiryNoBidding(){
+
+window.open ('/apex/EnquiryNoBiddingPage?oid={!Opportunity.Id}', '', 'height=350, width=600, top=200, left=350,location=no');
+
+}
+EnquiryNoBidding();</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Opportunity2__c/fields/StageNameDeal__c.field-meta.xml b/force-app/main/default/objects/Opportunity2__c/fields/StageNameDeal__c.field-meta.xml
index b7a4e32..1074027 100644
--- a/force-app/main/default/objects/Opportunity2__c/fields/StageNameDeal__c.field-meta.xml
+++ b/force-app/main/default/objects/Opportunity2__c/fields/StageNameDeal__c.field-meta.xml
@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>StageNameDeal__c</fullName>
+ <description>20231020BK
+if(StageNameDiff__c == '鎴愪氦',1,0)</description>
<externalId>false</externalId>
- <formula>if(StageNameDiff__c == '鎴愪氦',1,0)</formula>
+ <formula>if(Or(StageNameDiff__c == '鎴愪氦',StageNameDiff__c == '鏂板鎴愪氦'),1,0)</formula>
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
<label>鐘舵��1鏄惁鎴愪氦</label>
<precision>18</precision>
diff --git a/force-app/main/default/objects/Opportunity2__c/fields/StageNameDiff__c.field-meta.xml b/force-app/main/default/objects/Opportunity2__c/fields/StageNameDiff__c.field-meta.xml
index 4945655..2aa5cce 100644
--- a/force-app/main/default/objects/Opportunity2__c/fields/StageNameDiff__c.field-meta.xml
+++ b/force-app/main/default/objects/Opportunity2__c/fields/StageNameDiff__c.field-meta.xml
@@ -1,12 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>StageNameDiff__c</fullName>
- <externalId>false</externalId>
- <formula>if(OR(StageName_Text__c == '娉ㄦ畫',StageName_Text__c == '鍑鸿嵎',StageName_Text__c == '瀹屼簡') && StageNameLastM__c == '璇环','鎴愪氦',
+ <description>20231020 BK
+if(OR(StageName_Text__c == '娉ㄦ畫',StageName_Text__c == '鍑鸿嵎',StageName_Text__c == '瀹屼簡') && StageNameLastM__c == '璇环','鎴愪氦',
if(StageName_Text__c == '鍓婇櫎' && StageNameLastM__c != '鍙栨秷','鍙栨秷',
if(StageName_Text__c == '鏁楁垿' && StageNameLastM__c != '澶卞崟','澶卞崟',
if(StageName__c == StageNameLastM__c,'鏃犲彉鍖�',
-if(AND(StageNameLastM__c == '',StageName_Text__c != ''),'鏂板','-')))))</formula>
+if(AND(StageNameLastM__c == '',StageName_Text__c != ''),'鏂板','-')))))</description>
+ <externalId>false</externalId>
+ <formula>if(OR(StageName_Text__c == '娉ㄦ畫',StageName_Text__c == '鍑鸿嵎',StageName_Text__c == '瀹屼簡') && StageNameLastM__c == '璇环','鎴愪氦',
+
+if(OR(StageName_Text__c == '娉ㄦ畫',StageName_Text__c == '鍑鸿嵎',StageName_Text__c == '瀹屼簡') && StageNameLastM__c == '','鏂板鎴愪氦',
+
+if(StageName_Text__c == '鍓婇櫎' && StageNameLastM__c != '鍙栨秷','鍙栨秷',
+
+if(StageName_Text__c == '鏁楁垿' && StageNameLastM__c != '澶卞崟','澶卞崟',
+
+if(AND(StageNameLastM__c == '',StageName_Text__c != ''),'鏂板',
+
+if(StageName_Text__c == '寮曞悎' && OR(StageNameLastM__c == '娉ㄦ畫',StageNameLastM__c == '鍙戣揣',StageNameLastM__c == '瀹屼簡'),'鍥為��',
+
+'鏃犲彉鍖�'))))))</formula>
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
<label>鐘舵��1鍙樺寲</label>
<required>false</required>
diff --git a/force-app/main/default/objects/OpportunityFileOrder__c/validationRules/SpecificInquiryFileType.validationRule-meta.xml b/force-app/main/default/objects/OpportunityFileOrder__c/validationRules/SpecificInquiryFileType.validationRule-meta.xml
index b0bf89d..5d7d5b2 100644
--- a/force-app/main/default/objects/OpportunityFileOrder__c/validationRules/SpecificInquiryFileType.validationRule-meta.xml
+++ b/force-app/main/default/objects/OpportunityFileOrder__c/validationRules/SpecificInquiryFileType.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>SpecificInquiryFileType</fullName>
- <active>false</active>
+ <active>true</active>
<description>2021.06.03 鏉庢椇 淇敼
娣诲姞 2S6钀ヤ笟鍔╃悊鍜�119_钀ヤ笟绠＄悊閮�
2022.10.31 澧炲姞119_钀ヤ笟绠＄悊閮╛缁忕悊</description>
diff --git a/force-app/main/default/objects/OpportunityFileOrder__c/validationRules/SpecificInquiryFileType01.validationRule-meta.xml b/force-app/main/default/objects/OpportunityFileOrder__c/validationRules/SpecificInquiryFileType01.validationRule-meta.xml
index b36bcfc..3e0e6c0 100644
--- a/force-app/main/default/objects/OpportunityFileOrder__c/validationRules/SpecificInquiryFileType01.validationRule-meta.xml
+++ b/force-app/main/default/objects/OpportunityFileOrder__c/validationRules/SpecificInquiryFileType01.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>SpecificInquiryFileType01</fullName>
- <active>false</active>
+ <active>true</active>
<description>2021.06.07锛屾潕鏃� 娣诲姞2S6钀ヤ笟鍔╃悊鍜�119_钀ヤ笟绠＄悊閮�</description>
<errorConditionFormula>NOT(ISNEW()) && $User.UserRoleId != '00E10000001Z5qL' && $User.ProfileId != '00e10000000xnoi' && $User.ProfileId != '00ep0000000OXVH' && $User.ProfileId != '00e10000000xnon' && $User.ProfileId != '00e1000000125Pw' && $User.ProfileId != '00ep0000000On52' && $User.ProfileId != '00e10000000dEQx' && $User.ProfileId != '00e10000000dzzG' && $User.ProfileId != '00e10000000Y3o5' && $User.ProfileId != '00e10000000xo1D' && $User.ProfileId != '00e10000000xyVi' && $User.ProfileId != '00e10000000dE0K' && $User.ProfileId != '00e10000000xnpR' && $User.ProfileId != '00e10000000xyK6' && $User.ProfileId != '00e10000000s3EL'</errorConditionFormula>
<errorDisplayField>LatestUploadUser__c</errorDisplayField>
diff --git a/force-app/main/default/objects/OpportunitySpecialApply__c/validationRules/Other_Reason_Must_Memo.validationRule-meta.xml b/force-app/main/default/objects/OpportunitySpecialApply__c/validationRules/Other_Reason_Must_Memo.validationRule-meta.xml
index 2e42c97..5a5ebc1 100644
--- a/force-app/main/default/objects/OpportunitySpecialApply__c/validationRules/Other_Reason_Must_Memo.validationRule-meta.xml
+++ b/force-app/main/default/objects/OpportunitySpecialApply__c/validationRules/Other_Reason_Must_Memo.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Other_Reason_Must_Memo</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>ISBLANK(Apply_Memo__c) && text(Apply_Reason__c)=='鍏朵粬'</errorConditionFormula>
<errorDisplayField>Apply_Memo__c</errorDisplayField>
<errorMessage>鐞嗙敱涓衡�滃叾浠栤�濇椂锛岃澶囨敞鍏蜂綋鍘熷洜銆�</errorMessage>
diff --git a/force-app/main/default/objects/Opportunity_File__c/validationRules/SpecificInquiryFileType00.validationRule-meta.xml b/force-app/main/default/objects/Opportunity_File__c/validationRules/SpecificInquiryFileType00.validationRule-meta.xml
index 1972fa2..d3f0c1a 100644
--- a/force-app/main/default/objects/Opportunity_File__c/validationRules/SpecificInquiryFileType00.validationRule-meta.xml
+++ b/force-app/main/default/objects/Opportunity_File__c/validationRules/SpecificInquiryFileType00.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>SpecificInquiryFileType00</fullName>
- <active>false</active>
+ <active>true</active>
<description>2M1銆�2M2銆�2M5銆佷互鍙婄郴缁熺鐞嗗憳鍙互鍒涘缓绫诲瀷涓�"G.T1娓呭崟"鐨勮浠锋枃浠�</description>
<errorConditionFormula>ISNEW() && TEXT(Oppor_File_Stage__c) = 'G' && $User.ProfileId != '00e10000000xnoi' && $User.ProfileId != '00ep0000000OXVH' && $User.ProfileId != '00e10000000xnon' && $User.ProfileId != '00e1000000125Pw' && $User.ProfileId != '00ep0000000On52' && $User.ProfileId != '00e10000000dEQx' && $User.ProfileId != '00e10000000dzzG' && $User.ProfileId != '00e10000000Y3o5' && $User.ProfileId != '00e10000000xo1D' && $User.ProfileId != '00e10000000xyVi'</errorConditionFormula>
<errorDisplayField>Oppor_File_Stage__c</errorDisplayField>
diff --git a/force-app/main/default/objects/Opportunity_File__c/validationRules/SpecificInquiryFileType01.validationRule-meta.xml b/force-app/main/default/objects/Opportunity_File__c/validationRules/SpecificInquiryFileType01.validationRule-meta.xml
index c238975..405f250 100644
--- a/force-app/main/default/objects/Opportunity_File__c/validationRules/SpecificInquiryFileType01.validationRule-meta.xml
+++ b/force-app/main/default/objects/Opportunity_File__c/validationRules/SpecificInquiryFileType01.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>SpecificInquiryFileType01</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>NOT(ISNEW()) && TEXT(PRIORVALUE(Oppor_File_Stage__c)) = 'G' && TEXT(Oppor_File_Stage__c) != 'G'</errorConditionFormula>
<errorMessage>璇环鏂囦欢绫诲瀷涓�"G.T1娓呭崟"鏃讹紝涓嶅彲淇敼璇环鏂囦欢绫诲瀷</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Opportunity_File__c/validationRules/SpecificInquiryFileType02.validationRule-meta.xml b/force-app/main/default/objects/Opportunity_File__c/validationRules/SpecificInquiryFileType02.validationRule-meta.xml
index 744b8a2..9562611 100644
--- a/force-app/main/default/objects/Opportunity_File__c/validationRules/SpecificInquiryFileType02.validationRule-meta.xml
+++ b/force-app/main/default/objects/Opportunity_File__c/validationRules/SpecificInquiryFileType02.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>SpecificInquiryFileType02</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>NOT(ISNEW()) && TEXT(PRIORVALUE(Oppor_File_Stage__c)) != 'G'&& TEXT(Oppor_File_Stage__c) = 'G'</errorConditionFormula>
<errorMessage>涓嶅彲鏇存敼璇环鏂囦欢绫诲瀷涓�"G.T1娓呭崟"</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Order__c/Order__c.object-meta.xml b/force-app/main/default/objects/Order__c/Order__c.object-meta.xml
index f851628..0b2252e 100644
--- a/force-app/main/default/objects/Order__c/Order__c.object-meta.xml
+++ b/force-app/main/default/objects/Order__c/Order__c.object-meta.xml
@@ -128,16 +128,22 @@
</actionOverrides>
<actionOverrides>
<actionName>View</actionName>
- <type>Default</type>
- </actionOverrides>
- <actionOverrides>
- <actionName>View</actionName>
+ <comment>Action override created by Lightning App Builder during activation.</comment>
+ <content>FlexiPage</content>
<formFactor>Large</formFactor>
- <type>Default</type>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>Flexipage</type>
</actionOverrides>
<actionOverrides>
<actionName>View</actionName>
+ <comment>Action override created by Lightning App Builder during activation.</comment>
+ <content>FlexiPage</content>
<formFactor>Small</formFactor>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>Flexipage</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>View</actionName>
<type>Default</type>
</actionOverrides>
<allowInChatterGroups>false</allowInChatterGroups>
diff --git a/force-app/main/default/objects/PBIAuthorization__c/fields/MSOM_A_MarketAnalysis__c.field-meta.xml b/force-app/main/default/objects/PBIAuthorization__c/fields/MSOM_A_MarketAnalysis__c.field-meta.xml
index f74849d..35f20a0 100644
--- a/force-app/main/default/objects/PBIAuthorization__c/fields/MSOM_A_MarketAnalysis__c.field-meta.xml
+++ b/force-app/main/default/objects/PBIAuthorization__c/fields/MSOM_A_MarketAnalysis__c.field-meta.xml
@@ -5,7 +5,7 @@
<description>钀ヤ笟鍔╃悊锛岃惀涓氱獥鍙�</description>
<externalId>false</externalId>
<inlineHelpText>钀ヤ笟鍔╃悊锛岃惀涓氱獥鍙�</inlineHelpText>
- <label>MSOM-A 甯傚満鍔ㄦ�佸垎鏋�</label>
+ <label>MSOM-1 甯傚満鍔ㄦ�佸垎鏋愶紙鍚槑缁嗭級</label>
<trackHistory>true</trackHistory>
<trackTrending>false</trackTrending>
<type>Checkbox</type>
diff --git a/force-app/main/default/objects/PBIAuthorization__c/fields/MSOM_B_MarketAnalysis__c.field-meta.xml b/force-app/main/default/objects/PBIAuthorization__c/fields/MSOM_B_MarketAnalysis__c.field-meta.xml
index 072079f..0bf6539 100644
--- a/force-app/main/default/objects/PBIAuthorization__c/fields/MSOM_B_MarketAnalysis__c.field-meta.xml
+++ b/force-app/main/default/objects/PBIAuthorization__c/fields/MSOM_B_MarketAnalysis__c.field-meta.xml
@@ -5,7 +5,7 @@
<description>钀ヤ笟CL7鍙婁互涓婏紙閿�鍞�/甯傚満锛夊競鍦猴紱BU绐楀彛锛堝紶鏅紝鍐锛屽垬鑺筹紝椹枃闈欙紝寰愪繆浼燂紝鐜嬩繆锛岄偣姹燂級銆佺鐞嗗矖鎬荤洃鍙婁互涓婏紝鐗圭害搴楋細鐧界锛屽懆宀┿�傛垬鐣ュ垱鏂帮細閭嚒銆侀檲鐞涖�佸畼鎬�</description>
<externalId>false</externalId>
<inlineHelpText>钀ヤ笟CL7鍙婁互涓婏紙閿�鍞�/甯傚満锛夊競鍦猴紱BU绐楀彛锛堝紶鏅紝鍐锛屽垬鑺筹紝椹枃闈欙紝寰愪繆浼燂紝鐜嬩繆锛岄偣姹燂級銆佺鐞嗗矖鎬荤洃鍙婁互涓婏紝鐗圭害搴楋細鐧界锛屽懆宀┿�傛垬鐣ュ垱鏂帮細閭嚒銆侀檲鐞涖�佸畼鎬�</inlineHelpText>
- <label>MSOM-B 甯傚満鍔ㄦ�佸垎鏋愶紙涓嶅惈鏄庣粏锛�</label>
+ <label>MSOM-2 甯傚満鍔ㄦ�佸垎鏋愶紙涓嶅惈鏄庣粏锛�</label>
<trackHistory>true</trackHistory>
<trackTrending>false</trackTrending>
<type>Checkbox</type>
diff --git a/force-app/main/default/objects/PBIAuthorization__c/fields/SOM_monthly_report__c.field-meta.xml b/force-app/main/default/objects/PBIAuthorization__c/fields/SOM_monthly_report__c.field-meta.xml
index 3a5b6d1..87e708d 100644
--- a/force-app/main/default/objects/PBIAuthorization__c/fields/SOM_monthly_report__c.field-meta.xml
+++ b/force-app/main/default/objects/PBIAuthorization__c/fields/SOM_monthly_report__c.field-meta.xml
@@ -4,7 +4,7 @@
<defaultValue>false</defaultValue>
<description>PBI鑷姩鍙戞湀鎶�</description>
<externalId>false</externalId>
- <label>SOM鑷姩鏈堟姤</label>
+ <label>MSOM-3 甯傚満鍔ㄦ�佸垎鏋愭湀鎶�</label>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Checkbox</type>
diff --git a/force-app/main/default/objects/PCLLostBrand__c/PCLLostBrand__c.object-meta.xml b/force-app/main/default/objects/PCLLostBrand__c/PCLLostBrand__c.object-meta.xml
index 007cc56..05ec99f 100644
--- a/force-app/main/default/objects/PCLLostBrand__c/PCLLostBrand__c.object-meta.xml
+++ b/force-app/main/default/objects/PCLLostBrand__c/PCLLostBrand__c.object-meta.xml
@@ -146,7 +146,7 @@
<enableActivities>false</enableActivities>
<enableBulkApi>true</enableBulkApi>
<enableFeeds>false</enableFeeds>
- <enableHistory>false</enableHistory>
+ <enableHistory>true</enableHistory>
<enableLicensing>false</enableLicensing>
<enableReports>true</enableReports>
<enableSearch>false</enableSearch>
@@ -156,6 +156,7 @@
<label>璇环澶卞崟鍝佺墝</label>
<nameField>
<label>璇环澶卞崟鍝佺墝鍚嶇О</label>
+ <trackHistory>false</trackHistory>
<type>Text</type>
</nameField>
<searchLayouts></searchLayouts>
diff --git a/force-app/main/default/objects/PCLLostBrand__c/fields/AgencyMannual__c.field-meta.xml b/force-app/main/default/objects/PCLLostBrand__c/fields/AgencyMannual__c.field-meta.xml
index 29ca953..64b930b 100644
--- a/force-app/main/default/objects/PCLLostBrand__c/fields/AgencyMannual__c.field-meta.xml
+++ b/force-app/main/default/objects/PCLLostBrand__c/fields/AgencyMannual__c.field-meta.xml
@@ -5,6 +5,7 @@
<label>涓爣缁忛攢鍟嗭紙鎵嬪姩锛�</label>
<length>255</length>
<required>false</required>
+ <trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Text</type>
<unique>false</unique>
diff --git a/force-app/main/default/objects/PCLLostBrand__c/fields/Agency__c.field-meta.xml b/force-app/main/default/objects/PCLLostBrand__c/fields/Agency__c.field-meta.xml
index 7eaa40d..924f5d8 100644
--- a/force-app/main/default/objects/PCLLostBrand__c/fields/Agency__c.field-meta.xml
+++ b/force-app/main/default/objects/PCLLostBrand__c/fields/Agency__c.field-meta.xml
@@ -29,6 +29,7 @@
<relationshipLabel>璇环澶卞崟鍝佺墝</relationshipLabel>
<relationshipName>AgencyLost</relationshipName>
<required>false</required>
+ <trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Lookup</type>
</CustomField>
diff --git a/force-app/main/default/objects/PCLLostBrand__c/fields/Brand_Differentiation__c.field-meta.xml b/force-app/main/default/objects/PCLLostBrand__c/fields/Brand_Differentiation__c.field-meta.xml
index d7e12f8..518c690 100644
--- a/force-app/main/default/objects/PCLLostBrand__c/fields/Brand_Differentiation__c.field-meta.xml
+++ b/force-app/main/default/objects/PCLLostBrand__c/fields/Brand_Differentiation__c.field-meta.xml
@@ -3,92 +3,131 @@
<fullName>Brand_Differentiation__c</fullName>
<externalId>false</externalId>
<formula>CASE(TEXT(Lost_By_Company__c),
-"STORZ","杩涘彛",
-"FUJIFILM","杩涘彛",
-"PENTAX","杩涘彛",
-"杩堢憺","鍥戒骇",
-"寮�绔�","鍥戒骇",
-"STRYKER","杩涘彛",
-"WOLF","杩涘彛",
-"寮虹敓","杩涘彛",
-"鏌儬","杩涘彛",
-"ERBE","杩涘彛",
-"娌堝ぇ","鍥戒骇",
-"鏂板崕","鍥戒骇",
-"鏉窞妗愬簮","鍥戒骇",
-"鏂板厜缁�","鍥戒骇",
-"涓婃捣鍖诲厜","鍥戒骇",
-"铔囩墝","杩涘彛",
-"娆ф櫘鏇艰开","鍥戒骇",
-"鐝犳捣瑙嗘柊","鍥戒骇",
-"涓婃捣鍖荤枟鍣ㄦ","鍥戒骇",
-"涓婃捣涓栭煶","鍥戒骇",
-"鏂板叴鍐呯闀�","鍥戒骇",
-"XION","杩涘彛",
-"鍥炬牸鍖荤枟","鍥戒骇",
-"绮鹃攼","鍥戒骇",
-"鍗椾含缇庨珮","鍥戒骇",
-"澶т簳","鍥戒骇",
-"娆ф浖","鍥戒骇",
-"渚濊鏅�","鍥戒骇",
-"缇庢鼎杈�","鍥戒骇",
-"涓婃捣娆уお鍖荤枟","鍥戒骇",
-"鏉窞鏃犲垱鍏夌數","鍥戒骇",
-"鏉窞濂藉厠","鍥戒骇",
-"鎽勮氨涔�-楂樼編鏍�","杩涘彛",
-"Arthrex","杩涘彛",
-"浼樿搴�","鍥戒骇",
-"楣板埄瑙�","鍥戒骇",
-"娣卞湷甯傜宸�","鍥戒骇",
-"寰峰浗鍚夌背","杩涘彛",
-"娉板窞鑾辫禌","鍥戒骇",
-"鏉窞婢冲厜","鍥戒骇",
-"娆ц氨鏇艰开","鍥戒骇",
-"鍖椾含鍐犻偊","鍥戒骇",
-"鍚涚壒蹇呰緵鏍�","杩涘彛",
-"CooperSurgical","杩涘彛",
-"ConMed","杩涘彛",
-"鐝犳捣缁村皵搴�","鍥戒骇",
-"鍖椾含楹﹁开搴风淮","鍥戒骇",
-"寰峰浗STEMA","杩涘彛",
-"HUGER","鍥戒骇",
-"浼熶鸡","杩涘彛",
-"鍗氬▉","杩涘彛",
-"Poly","杩涘彛",
-"DELON","鍥戒骇",
-"鏄庢嘲绉�","杩涘彛",
-"绱㈡礇鏅�","杩涘彛",
-"澶у拰","鍥戒骇",
-"妯变簳","杩涘彛",
-"鏉窞鏄撹矾鍖荤枟","鍥戒骇",
-"缇庣編","鍥戒骇",
-"濂ョ珛","鍥戒骇",
-"妤疯吘","鍥戒骇",
-"椤哄厓","鍥戒骇",
-"婢冲崕","鍥戒骇",
-"鍘氬嚡","鍥戒骇",
-"鐟炲","鍥戒骇",
-"瀹夊拰鍔犲埄灏�","鍥戒骇",
-"閫熻繄","鍥戒骇",
-"婀栧崡鐎氬痉","鍥戒骇",
-"杩堢鍞�","鍥戒骇",
-"鍗婅竟澶�","鍥戒骇",
-"鍏冨悎娉戒紬","鍥戒骇",
-"鍗庡锛堜笂娴凤級","鍥戒骇",
-"涓婃捣閫告��","鍥戒骇",
-"閼捣鍚堟槦","鍥戒骇",
-"鐟炴嵎","鍥戒骇",
-"鐩堢敳","鍥戒骇",
-"鐧惧畞鐩堝垱","鍥戒骇",
-"浠ヨ搴�","鍥戒骇",
-"璧涜寰�","鍥戒骇",
-"鐟炴嘲","鍥戒骇",
-"瀹夌櫨","鍥戒骇",
-"搴峰熀","鍥戒骇",
-"鍢夊杽椋為様","鍥戒骇"
+ "STORZ","杩涘彛",
+ "FUJIFILM","杩涘彛",
+ "PENTAX","杩涘彛",
+ "杩堢憺","鍥戒骇",
+ "寮�绔�","鍥戒骇",
+ "STRYKER","杩涘彛",
+ "WOLF","杩涘彛",
+ "寮虹敓","杩涘彛",
+ "鏌儬","杩涘彛",
+ "ERBE","杩涘彛",
+ "娌堝ぇ","鍥戒骇",
+ "鏂板崕","鍥戒骇",
+ "鏉窞妗愬簮","鍥戒骇",
+ "鏂板厜缁�","鍥戒骇",
+ "涓婃捣鍖诲厜","鍥戒骇",
+ "铔囩墝","杩涘彛",
+ "娆ф櫘鏇艰开","鍥戒骇",
+ "鐝犳捣瑙嗘柊","鍥戒骇",
+ "涓婃捣鍖荤枟鍣ㄦ","鍥戒骇",
+ "涓婃捣涓栭煶","鍥戒骇",
+ "鏂板叴鍐呯闀�","鍥戒骇",
+ "XION","杩涘彛",
+ "鍥炬牸鍖荤枟","鍥戒骇",
+ "绮鹃攼","鍥戒骇",
+ "鍗椾含缇庨珮","鍥戒骇",
+ "澶т簳","鍥戒骇",
+ "娆ф浖","鍥戒骇",
+ "渚濊鏅�","鍥戒骇",
+ "缇庢鼎杈�","鍥戒骇",
+ "涓婃捣娆уお鍖荤枟","鍥戒骇",
+ "鏉窞鏃犲垱鍏夌數","鍥戒骇",
+ "鏉窞濂藉厠","鍥戒骇",
+ "鎽勮氨涔�-楂樼編鏍�","杩涘彛",
+ "Arthrex","杩涘彛",
+ "浼樿搴�","鍥戒骇",
+ "楣板埄瑙�","鍥戒骇",
+ "娣卞湷甯傜宸�","鍥戒骇",
+ "寰峰浗鍚夌背","杩涘彛",
+ "娉板窞鑾辫禌","鍥戒骇",
+ "鏉窞婢冲厜","鍥戒骇",
+ "娆ц氨鏇艰开","鍥戒骇",
+ "鍖椾含鍐犻偊","鍥戒骇",
+ "鍚涚壒蹇呰緵鏍�","杩涘彛",
+ "CooperSurgical","杩涘彛",
+ "ConMed","杩涘彛",
+ "鐝犳捣缁村皵搴�","鍥戒骇",
+ "鍖椾含楹﹁开搴风淮","鍥戒骇",
+ "寰峰浗STEMA","杩涘彛",
+ "HUGER","鍥戒骇",
+ "浼熶鸡","杩涘彛",
+ "鍗氬▉","杩涘彛",
+ "Poly","杩涘彛",
+ "DELON","鍥戒骇",
+ "鏄庢嘲绉�","杩涘彛",
+ "绱㈡礇鏅�","杩涘彛",
+ "澶у拰","鍥戒骇",
+ "妯变簳","杩涘彛",
+ "鏉窞鏄撹矾鍖荤枟","鍥戒骇",
+ "缇庣編","鍥戒骇",
+ "濂ョ珛","鍥戒骇",
+ "妤疯吘","鍥戒骇",
+ "椤哄厓","鍥戒骇",
+ "婢冲崕","鍥戒骇",
+ "鍘氬嚡","鍥戒骇",
+ "鐟炲","鍥戒骇",
+ "瀹夊拰鍔犲埄灏�","鍥戒骇",
+ "閫熻繄","鍥戒骇",
+ "婀栧崡鐎氬痉","鍥戒骇",
+ "杩堢鍞�","鍥戒骇",
+ "鍗婅竟澶�","鍥戒骇",
+ "鍏冨悎娉戒紬","鍥戒骇",
+ "鍗庡锛堜笂娴凤級","鍥戒骇",
+ "涓婃捣閫告��","鍥戒骇",
+ "閼捣鍚堟槦","鍥戒骇",
+ "鐟炴嵎","鍥戒骇",
+ "鐩堢敳","鍥戒骇",
+ "鐧惧畞鐩堝垱","鍥戒骇",
+ "浠ヨ搴�","鍥戒骇",
+ "璧涜寰�","鍥戒骇",
+ "鐟炴嘲","鍥戒骇",
+ "瀹夌櫨","鍥戒骇",
+ "搴峰熀","鍥戒骇",
+ "鑰佽偗","鍥戒骇",
+ "椤哄厓锛堟ū浜曪級","杩涘彛",
+ "濞侀珮","鍥戒骇",
+ "閲戝凹鍏�","鍥戒骇",
+ "鍊嶅姏鏇�","杩涘彛",
+ "娆у�嶆磥","鍥戒骇",
+ "鍚夊ソ","鍥戒骇",
+ "鑽ｆ澃鏄�","鍥戒骇",
+ "杈夎秺","鍥戒骇",
+ "娲佺編","鍥戒骇",
+ "鏂拌埅澶�","鍥戒骇",
+ "涓滃北","鍥戒骇",
+ "鍒╄揪","鍥戒骇",
+ "瀹忓厜","鍥戒骇",
+ "缁村畨","鍥戒骇",
+ "浠佽兘杈�","鍥戒骇",
+ "绾㈣緣","鍥戒骇",
+ "鐧借薄","鍥戒骇",
+ "鍑柉鏅�","鍥戒骇",
+ "杩堝皵","鍥戒骇",
+ "闆�鑹炬柉杈�","鍥戒骇",
+ "鐏汉","鍥戒骇",
+ "VATHIN锛堝崕鑺尰鐤楋級","鍥戒骇",
+ "Steelco","杩涘彛",
+ "绂忚开濞丄SP","杩涘彛",
+ "鐩婅秴","鍥戒骇",
+ "鐟炲厠鏂�","鍥戒骇",
+ "瀹濆▋","鍥戒骇",
+ "娌��","鍥戒骇",
+ "寤堕櫟","鍥戒骇",
+ "璐濇灄","鍥戒骇",
+ "涓滄柟绁炲仴","鍥戒骇",
+ "搴疯开","鍥戒骇",
+ "鍙歌繄","鍥戒骇",
+ "娆уお","鍥戒骇",
+ "涓婂尰鍏�","鍥戒骇",
+ "瀹夊拰","鍥戒骇",
+ "鍗庡","鍥戒骇",
+ "閫告��","鍥戒骇"
,null)</formula>
<label>鍝佺墝鍖哄垎</label>
<required>false</required>
+ <trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Text</type>
<unique>false</unique>
diff --git a/force-app/main/default/objects/PCLLostBrand__c/fields/ChannelSpecificReasons__c.field-meta.xml b/force-app/main/default/objects/PCLLostBrand__c/fields/ChannelSpecificReasons__c.field-meta.xml
index a3c6a35..9bac2e0 100644
--- a/force-app/main/default/objects/PCLLostBrand__c/fields/ChannelSpecificReasons__c.field-meta.xml
+++ b/force-app/main/default/objects/PCLLostBrand__c/fields/ChannelSpecificReasons__c.field-meta.xml
@@ -4,6 +4,7 @@
<externalId>false</externalId>
<label>娓犻亾鍏蜂綋鍘熷洜</label>
<required>false</required>
+ <trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Picklist</type>
<valueSet>
diff --git a/force-app/main/default/objects/PCLLostBrand__c/fields/InclusionUltrasound__c.field-meta.xml b/force-app/main/default/objects/PCLLostBrand__c/fields/InclusionUltrasound__c.field-meta.xml
index 503582f..1587b38 100644
--- a/force-app/main/default/objects/PCLLostBrand__c/fields/InclusionUltrasound__c.field-meta.xml
+++ b/force-app/main/default/objects/PCLLostBrand__c/fields/InclusionUltrasound__c.field-meta.xml
@@ -15,6 +15,7 @@
</summaryFilterItems>
<summaryForeignKey>PCLLostProduct__c.PCLLostBrand__c</summaryForeignKey>
<summaryOperation>count</summaryOperation>
+ <trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Summary</type>
</CustomField>
diff --git a/force-app/main/default/objects/PCLLostBrand__c/fields/LostPrice__c.field-meta.xml b/force-app/main/default/objects/PCLLostBrand__c/fields/LostPrice__c.field-meta.xml
index 3e93c7e..d7a3392 100644
--- a/force-app/main/default/objects/PCLLostBrand__c/fields/LostPrice__c.field-meta.xml
+++ b/force-app/main/default/objects/PCLLostBrand__c/fields/LostPrice__c.field-meta.xml
@@ -6,6 +6,7 @@
<precision>18</precision>
<required>false</required>
<scale>0</scale>
+ <trackHistory>true</trackHistory>
<trackTrending>false</trackTrending>
<type>Number</type>
<unique>false</unique>
diff --git a/force-app/main/default/objects/PCLLostBrand__c/fields/LostPrices_ThousandY__c.field-meta.xml b/force-app/main/default/objects/PCLLostBrand__c/fields/LostPrices_ThousandY__c.field-meta.xml
index cfe0954..0db6b19 100644
--- a/force-app/main/default/objects/PCLLostBrand__c/fields/LostPrices_ThousandY__c.field-meta.xml
+++ b/force-app/main/default/objects/PCLLostBrand__c/fields/LostPrices_ThousandY__c.field-meta.xml
@@ -8,6 +8,7 @@
<precision>18</precision>
<required>false</required>
<scale>0</scale>
+ <trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Number</type>
<unique>false</unique>
diff --git a/force-app/main/default/objects/PCLLostBrand__c/fields/Lost_By_Company_Mannual__c.field-meta.xml b/force-app/main/default/objects/PCLLostBrand__c/fields/Lost_By_Company_Mannual__c.field-meta.xml
index 5786c3c..6647649 100644
--- a/force-app/main/default/objects/PCLLostBrand__c/fields/Lost_By_Company_Mannual__c.field-meta.xml
+++ b/force-app/main/default/objects/PCLLostBrand__c/fields/Lost_By_Company_Mannual__c.field-meta.xml
@@ -5,6 +5,7 @@
<label>澶卞崟鍝佺墝锛堟墜鍔級</label>
<length>255</length>
<required>false</required>
+ <trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Text</type>
<unique>false</unique>
diff --git a/force-app/main/default/objects/PCLLostBrand__c/fields/Lost_By_Company__c.field-meta.xml b/force-app/main/default/objects/PCLLostBrand__c/fields/Lost_By_Company__c.field-meta.xml
index 307ccbb..57ffa43 100644
--- a/force-app/main/default/objects/PCLLostBrand__c/fields/Lost_By_Company__c.field-meta.xml
+++ b/force-app/main/default/objects/PCLLostBrand__c/fields/Lost_By_Company__c.field-meta.xml
@@ -4,6 +4,7 @@
<externalId>false</externalId>
<label>澶卞崟鍝佺墝</label>
<required>false</required>
+ <trackHistory>true</trackHistory>
<trackTrending>false</trackTrending>
<type>Picklist</type>
<valueSet>
diff --git a/force-app/main/default/objects/PCLLostBrand__c/fields/Lost_Reason_Sub__c.field-meta.xml b/force-app/main/default/objects/PCLLostBrand__c/fields/Lost_Reason_Sub__c.field-meta.xml
index a18831f..e9b2e4e 100644
--- a/force-app/main/default/objects/PCLLostBrand__c/fields/Lost_Reason_Sub__c.field-meta.xml
+++ b/force-app/main/default/objects/PCLLostBrand__c/fields/Lost_Reason_Sub__c.field-meta.xml
@@ -4,6 +4,7 @@
<externalId>false</externalId>
<label>澶卞崟鍘熷洜(娆�)</label>
<required>false</required>
+ <trackHistory>true</trackHistory>
<trackTrending>false</trackTrending>
<type>Picklist</type>
<valueSet>
@@ -30,9 +31,9 @@
<label>鏈嶅姟涓嶅埌浣�</label>
</value>
<value>
- <fullName>琛屾斂鍐崇瓥</fullName>
+ <fullName>鍥戒骇鏀跨瓥</fullName>
<default>false</default>
- <label>琛屾斂鍐崇瓥</label>
+ <label>鍥戒骇鏀跨瓥</label>
</value>
<value>
<fullName>绔炲搧鍘熸湁鍩虹涓婂娣昏澶�</fullName>
@@ -45,15 +46,15 @@
<label>娓犻亾鍥犵礌</label>
</value>
<value>
- <fullName>鏌愮浜у搧缂哄け</fullName>
- <default>false</default>
- <label>鏌愮浜у搧缂哄け</label>
- </value>
- <value>
<fullName>閲囪喘骞宠 </fullName>
<default>false</default>
<label>閲囪喘骞宠 </label>
</value>
+ <value>
+ <fullName>鏃犱骇鍝佸簲鏍�</fullName>
+ <default>false</default>
+ <label>鏃犱骇鍝佸簲鏍�</label>
+ </value>
</valueSetDefinition>
</valueSet>
</CustomField>
diff --git a/force-app/main/default/objects/PCLLostBrand__c/fields/Lost_cancel_report__c.field-meta.xml b/force-app/main/default/objects/PCLLostBrand__c/fields/Lost_cancel_report__c.field-meta.xml
index 521c7e6..99fa2d5 100644
--- a/force-app/main/default/objects/PCLLostBrand__c/fields/Lost_cancel_report__c.field-meta.xml
+++ b/force-app/main/default/objects/PCLLostBrand__c/fields/Lost_cancel_report__c.field-meta.xml
@@ -8,6 +8,7 @@
<relationshipName>PCLLostBrands</relationshipName>
<relationshipOrder>0</relationshipOrder>
<reparentableMasterDetail>true</reparentableMasterDetail>
+ <trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>MasterDetail</type>
<writeRequiresMasterRead>true</writeRequiresMasterRead>
diff --git a/force-app/main/default/objects/PCLLostBrand__c/fields/Lost_reason_main__c.field-meta.xml b/force-app/main/default/objects/PCLLostBrand__c/fields/Lost_reason_main__c.field-meta.xml
index 6eb68d8..1e84ad8 100644
--- a/force-app/main/default/objects/PCLLostBrand__c/fields/Lost_reason_main__c.field-meta.xml
+++ b/force-app/main/default/objects/PCLLostBrand__c/fields/Lost_reason_main__c.field-meta.xml
@@ -4,6 +4,7 @@
<externalId>false</externalId>
<label>澶卞崟鍘熷洜(涓�)</label>
<required>false</required>
+ <trackHistory>true</trackHistory>
<trackTrending>false</trackTrending>
<type>Picklist</type>
<valueSet>
@@ -45,15 +46,15 @@
<label>娓犻亾鍥犵礌</label>
</value>
<value>
- <fullName>鏌愮浜у搧缂哄け</fullName>
- <default>false</default>
- <label>鏌愮浜у搧缂哄け</label>
- </value>
- <value>
<fullName>閲囪喘骞宠 </fullName>
<default>false</default>
<label>閲囪喘骞宠 </label>
</value>
+ <value>
+ <fullName>鏃犱骇鍝佸簲鏍�</fullName>
+ <default>false</default>
+ <label>鏃犱骇鍝佸簲鏍�</label>
+ </value>
</valueSetDefinition>
</valueSet>
</CustomField>
diff --git a/force-app/main/default/objects/PCLLostBrand__c/validationRules/SelectOtherAgent.validationRule-meta.xml b/force-app/main/default/objects/PCLLostBrand__c/validationRules/SelectOtherAgent.validationRule-meta.xml
index e494db0..22566c3 100644
--- a/force-app/main/default/objects/PCLLostBrand__c/validationRules/SelectOtherAgent.validationRule-meta.xml
+++ b/force-app/main/default/objects/PCLLostBrand__c/validationRules/SelectOtherAgent.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>SelectOtherAgent</fullName>
- <active>false</active>
+ <active>true</active>
<description>Agency__r.Management_Code__c = '8888888888' && isblank(AgencyMannual__c)</description>
<errorConditionFormula>Agency__r.Management_Code__c = '8888888888' && isblank(AgencyMannual__c)</errorConditionFormula>
<errorDisplayField>AgencyMannual__c</errorDisplayField>
diff --git a/force-app/main/default/objects/PCLLostProduct__c/PCLLostProduct__c.object-meta.xml b/force-app/main/default/objects/PCLLostProduct__c/PCLLostProduct__c.object-meta.xml
index 4ff88f0..eb06017 100644
--- a/force-app/main/default/objects/PCLLostProduct__c/PCLLostProduct__c.object-meta.xml
+++ b/force-app/main/default/objects/PCLLostProduct__c/PCLLostProduct__c.object-meta.xml
@@ -146,7 +146,7 @@
<enableActivities>false</enableActivities>
<enableBulkApi>true</enableBulkApi>
<enableFeeds>false</enableFeeds>
- <enableHistory>false</enableHistory>
+ <enableHistory>true</enableHistory>
<enableLicensing>false</enableLicensing>
<enableReports>true</enableReports>
<enableSearch>false</enableSearch>
@@ -156,6 +156,7 @@
<label>璇环澶卞崟鍨嬪彿</label>
<nameField>
<label>璇环澶卞崟鍨嬪彿鍚嶇О</label>
+ <trackHistory>false</trackHistory>
<type>Text</type>
</nameField>
<searchLayouts></searchLayouts>
diff --git a/force-app/main/default/objects/PCLLostProduct__c/fields/HP_RecordType_DevName__c.field-meta.xml b/force-app/main/default/objects/PCLLostProduct__c/fields/HP_RecordType_DevName__c.field-meta.xml
index 59517fe..1d5c45f 100644
--- a/force-app/main/default/objects/PCLLostProduct__c/fields/HP_RecordType_DevName__c.field-meta.xml
+++ b/force-app/main/default/objects/PCLLostProduct__c/fields/HP_RecordType_DevName__c.field-meta.xml
@@ -6,6 +6,7 @@
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
<label>HP_RecordType_DevName</label>
<required>false</required>
+ <trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Text</type>
<unique>false</unique>
diff --git a/force-app/main/default/objects/PCLLostProduct__c/fields/LostAccount__c.field-meta.xml b/force-app/main/default/objects/PCLLostProduct__c/fields/LostAccount__c.field-meta.xml
index 54fcb13..1acefb5 100644
--- a/force-app/main/default/objects/PCLLostProduct__c/fields/LostAccount__c.field-meta.xml
+++ b/force-app/main/default/objects/PCLLostProduct__c/fields/LostAccount__c.field-meta.xml
@@ -6,6 +6,7 @@
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
<label>澶卞崟鏅�氱瀹�</label>
<required>false</required>
+ <trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Text</type>
<unique>false</unique>
diff --git a/force-app/main/default/objects/PCLLostProduct__c/fields/LostBrandName__c.field-meta.xml b/force-app/main/default/objects/PCLLostProduct__c/fields/LostBrandName__c.field-meta.xml
index 89a13c5..19f7dbd 100644
--- a/force-app/main/default/objects/PCLLostProduct__c/fields/LostBrandName__c.field-meta.xml
+++ b/force-app/main/default/objects/PCLLostProduct__c/fields/LostBrandName__c.field-meta.xml
@@ -4,6 +4,7 @@
<externalId>false</externalId>
<label>鍝佺墝鍚�</label>
<required>false</required>
+ <trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Picklist</type>
<valueSet>
diff --git a/force-app/main/default/objects/PCLLostProduct__c/fields/LostDepartment_Class__c.field-meta.xml b/force-app/main/default/objects/PCLLostProduct__c/fields/LostDepartment_Class__c.field-meta.xml
index 8f56f74..225ad4e 100644
--- a/force-app/main/default/objects/PCLLostProduct__c/fields/LostDepartment_Class__c.field-meta.xml
+++ b/force-app/main/default/objects/PCLLostProduct__c/fields/LostDepartment_Class__c.field-meta.xml
@@ -6,6 +6,7 @@
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
<label>澶卞崟鎴樼暐绉戝</label>
<required>false</required>
+ <trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Text</type>
<unique>false</unique>
diff --git a/force-app/main/default/objects/PCLLostProduct__c/fields/LostHP__c.field-meta.xml b/force-app/main/default/objects/PCLLostProduct__c/fields/LostHP__c.field-meta.xml
index 1582b7a..f3d636f 100644
--- a/force-app/main/default/objects/PCLLostProduct__c/fields/LostHP__c.field-meta.xml
+++ b/force-app/main/default/objects/PCLLostProduct__c/fields/LostHP__c.field-meta.xml
@@ -6,6 +6,7 @@
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
<label>澶卞崟鍖婚櫌</label>
<required>false</required>
+ <trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Text</type>
<unique>false</unique>
diff --git a/force-app/main/default/objects/PCLLostProduct__c/fields/LostProductMannual__c.field-meta.xml b/force-app/main/default/objects/PCLLostProduct__c/fields/LostProductMannual__c.field-meta.xml
index 383c97e..92762bd 100644
--- a/force-app/main/default/objects/PCLLostProduct__c/fields/LostProductMannual__c.field-meta.xml
+++ b/force-app/main/default/objects/PCLLostProduct__c/fields/LostProductMannual__c.field-meta.xml
@@ -5,6 +5,7 @@
<label>澶卞崟瀵规墜鍨嬪彿锛堟墜鍔級</label>
<length>255</length>
<required>false</required>
+ <trackHistory>true</trackHistory>
<trackTrending>false</trackTrending>
<type>Text</type>
<unique>false</unique>
diff --git a/force-app/main/default/objects/PCLLostProduct__c/fields/LostProductName__c.field-meta.xml b/force-app/main/default/objects/PCLLostProduct__c/fields/LostProductName__c.field-meta.xml
index 5cdaaba..5c4bcee 100644
--- a/force-app/main/default/objects/PCLLostProduct__c/fields/LostProductName__c.field-meta.xml
+++ b/force-app/main/default/objects/PCLLostProduct__c/fields/LostProductName__c.field-meta.xml
@@ -5,6 +5,7 @@
<formula>LostProduct__r.Name</formula>
<label>澶卞崟瀵规墜鍨嬪彿</label>
<required>false</required>
+ <trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Text</type>
<unique>false</unique>
diff --git a/force-app/main/default/objects/PCLLostProduct__c/fields/LostProduct__c.field-meta.xml b/force-app/main/default/objects/PCLLostProduct__c/fields/LostProduct__c.field-meta.xml
index 9a6c027..c4043c4 100644
--- a/force-app/main/default/objects/PCLLostProduct__c/fields/LostProduct__c.field-meta.xml
+++ b/force-app/main/default/objects/PCLLostProduct__c/fields/LostProduct__c.field-meta.xml
@@ -32,6 +32,7 @@
<relationshipLabel>璇环澶卞崟鍨嬪彿</relationshipLabel>
<relationshipName>LostProduct</relationshipName>
<required>false</required>
+ <trackHistory>true</trackHistory>
<trackTrending>false</trackTrending>
<type>Lookup</type>
</CustomField>
diff --git a/force-app/main/default/objects/PCLLostProduct__c/fields/Opportunity_No__c.field-meta.xml b/force-app/main/default/objects/PCLLostProduct__c/fields/Opportunity_No__c.field-meta.xml
index 64b0382..0589e65 100644
--- a/force-app/main/default/objects/PCLLostProduct__c/fields/Opportunity_No__c.field-meta.xml
+++ b/force-app/main/default/objects/PCLLostProduct__c/fields/Opportunity_No__c.field-meta.xml
@@ -6,6 +6,7 @@
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
<label>璇环缂栫爜</label>
<required>false</required>
+ <trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Text</type>
<unique>false</unique>
diff --git a/force-app/main/default/objects/PCLLostProduct__c/fields/Opportunity__c.field-meta.xml b/force-app/main/default/objects/PCLLostProduct__c/fields/Opportunity__c.field-meta.xml
index 23abd37..1309eda 100644
--- a/force-app/main/default/objects/PCLLostProduct__c/fields/Opportunity__c.field-meta.xml
+++ b/force-app/main/default/objects/PCLLostProduct__c/fields/Opportunity__c.field-meta.xml
@@ -6,6 +6,7 @@
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
<label>璇环鍚嶇О</label>
<required>false</required>
+ <trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Text</type>
<unique>false</unique>
diff --git a/force-app/main/default/objects/PCLLostProduct__c/fields/PCLLostBrand__c.field-meta.xml b/force-app/main/default/objects/PCLLostProduct__c/fields/PCLLostBrand__c.field-meta.xml
index d9b980e..5b7cde0 100644
--- a/force-app/main/default/objects/PCLLostProduct__c/fields/PCLLostBrand__c.field-meta.xml
+++ b/force-app/main/default/objects/PCLLostProduct__c/fields/PCLLostBrand__c.field-meta.xml
@@ -8,6 +8,7 @@
<relationshipName>PCLLostBrandProduct</relationshipName>
<relationshipOrder>0</relationshipOrder>
<reparentableMasterDetail>true</reparentableMasterDetail>
+ <trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>MasterDetail</type>
<writeRequiresMasterRead>true</writeRequiresMasterRead>
diff --git a/force-app/main/default/objects/PCLLostProduct__c/fields/ProductCategory__c.field-meta.xml b/force-app/main/default/objects/PCLLostProduct__c/fields/ProductCategory__c.field-meta.xml
index c7c5c53..bd0dbda 100644
--- a/force-app/main/default/objects/PCLLostProduct__c/fields/ProductCategory__c.field-meta.xml
+++ b/force-app/main/default/objects/PCLLostProduct__c/fields/ProductCategory__c.field-meta.xml
@@ -1,309 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>ProductCategory__c</fullName>
+ <description>鍗囩骇涓哄叏灞�鍊奸泦</description>
<externalId>false</externalId>
<label>澶卞崟浜у搧鍖哄垎</label>
<required>false</required>
+ <trackHistory>true</trackHistory>
<trackTrending>false</trackTrending>
<type>Picklist</type>
<valueSet>
<controllingField>ProductClass__c</controllingField>
<restricted>true</restricted>
- <valueSetDefinition>
- <sorted>false</sorted>
- <value>
- <fullName>3D</fullName>
- <default>false</default>
- <label>3D</label>
- </value>
- <value>
- <fullName>4K</fullName>
- <default>false</default>
- <label>4K</label>
- </value>
- <value>
- <fullName>HD</fullName>
- <default>false</default>
- <label>HD</label>
- </value>
- <value>
- <fullName>IR</fullName>
- <default>false</default>
- <label>IR</label>
- </value>
- <value>
- <fullName>CV涓绘満</fullName>
- <default>false</default>
- <label>CV涓绘満</label>
- </value>
- <value>
- <fullName>瓒呭０涓绘満</fullName>
- <default>false</default>
- <label>瓒呭０涓绘満</label>
- </value>
- <value>
- <fullName>CDS</fullName>
- <default>false</default>
- <label>CDS</label>
- </value>
- <value>
- <fullName>CHF绾ょ淮鑳嗛亾闀�</fullName>
- <default>false</default>
- <label>CHF绾ょ淮鑳嗛亾闀�</label>
- </value>
- <value>
- <fullName>CHF鐢靛瓙鑳嗛亾闀�</fullName>
- <default>false</default>
- <label>CHF鐢靛瓙鑳嗛亾闀�</label>
- </value>
- <value>
- <fullName>ENF绾ょ淮榧荤闀�</fullName>
- <default>false</default>
- <label>ENF绾ょ淮榧荤闀�</label>
- </value>
- <value>
- <fullName>ENF鐢靛瓙榧荤闀�</fullName>
- <default>false</default>
- <label>ENF鐢靛瓙榧荤闀�</label>
- </value>
- <value>
- <fullName>URF绾ょ淮杈撳翱绠￠暅</fullName>
- <default>false</default>
- <label>URF绾ょ淮杈撳翱绠￠暅</label>
- </value>
- <value>
- <fullName>URF鐢靛瓙杈撳翱绠￠暅</fullName>
- <default>false</default>
- <label>URF鐢靛瓙杈撳翱绠￠暅</label>
- </value>
- <value>
- <fullName>CYF绾ょ淮鑶�鑳遍暅</fullName>
- <default>false</default>
- <label>CYF绾ょ淮鑶�鑳遍暅</label>
- </value>
- <value>
- <fullName>CYF鐢靛瓙鑶�鑳遍暅</fullName>
- <default>false</default>
- <label>CYF鐢靛瓙鑶�鑳遍暅</label>
- </value>
- <value>
- <fullName>LF鎻掔闀�</fullName>
- <default>false</default>
- <label>LF鎻掔闀�</label>
- </value>
- <value>
- <fullName>HD EndoEYE</fullName>
- <default>false</default>
- <label>HD EndoEYE</label>
- </value>
- <value>
- <fullName>鑵硅厰闀滃厜瀛﹁绠�</fullName>
- <default>false</default>
- <label>鑵硅厰闀滃厜瀛﹁绠�</label>
- </value>
- <value>
- <fullName>涓婃秷鍖栭亾-GIF</fullName>
- <default>false</default>
- <label>涓婃秷鍖栭亾-GIF</label>
- </value>
- <value>
- <fullName>涓嬫秷鍖栭亾-CF</fullName>
- <default>false</default>
- <label>涓嬫秷鍖栭亾-CF</label>
- </value>
- <value>
- <fullName>鍗佷簩鎸囪偁 - JF</fullName>
- <default>false</default>
- <label>鍗佷簩鎸囪偁 - JF</label>
- </value>
- <value>
- <fullName>灏忚偁闀�</fullName>
- <default>false</default>
- <label>灏忚偁闀�</label>
- </value>
- <value>
- <fullName>瓒呭０鍐呴暅鍙婂皬鎺㈠ご</fullName>
- <default>false</default>
- <label>瓒呭０鍐呴暅鍙婂皬鎺㈠ご</label>
- </value>
- <value>
- <fullName>BF</fullName>
- <default>false</default>
- <label>BF</label>
- </value>
- <value>
- <fullName>TURis</fullName>
- <default>false</default>
- <label>TURis</label>
- </value>
- <value>
- <fullName>TCRis</fullName>
- <default>false</default>
- <label>TCRis</label>
- </value>
- <value>
- <fullName>纭�у鑵旈暅</fullName>
- <default>false</default>
- <label>纭�у鑵旈暅</label>
- </value>
- <value>
- <fullName>纭�ц唨鑳遍暅</fullName>
- <default>false</default>
- <label>纭�ц唨鑳遍暅</label>
- </value>
- <value>
- <fullName>纭�ц緭灏跨闀�</fullName>
- <default>false</default>
- <label>纭�ц緭灏跨闀�</label>
- </value>
- <value>
- <fullName>纭�ч蓟绐﹂暅</fullName>
- <default>false</default>
- <label>纭�ч蓟绐﹂暅</label>
- </value>
- <value>
- <fullName>涓绘満</fullName>
- <default>false</default>
- <label>涓绘満</label>
- </value>
- <value>
- <fullName>鍒�澶�</fullName>
- <default>false</default>
- <label>鍒�澶�</label>
- </value>
- <value>
- <fullName>鑳介噺鍏朵粬</fullName>
- <default>false</default>
- <label>鑳介噺鍏朵粬</label>
- </value>
- <value>
- <fullName>灏忛暅绉�</fullName>
- <default>false</default>
- <label>灏忛暅绉�</label>
- </value>
- <value>
- <fullName>灏忚偁闀�-SIF</fullName>
- <default>false</default>
- <label>灏忚偁闀�-SIF</label>
- </value>
- <value>
- <fullName>鑳嗛亾闀�-CHF</fullName>
- <default>false</default>
- <label>鑳嗛亾闀�-CHF</label>
- </value>
- <value>
- <fullName>鍛煎惛-BF</fullName>
- <default>false</default>
- <label>鍛煎惛-BF</label>
- </value>
- <value>
- <fullName>瓒呭０鍒�涓绘満</fullName>
- <default>false</default>
- <label>瓒呭０鍒�涓绘満</label>
- </value>
- <value>
- <fullName>瑙嗚薄鎻掔闀�</fullName>
- <default>false</default>
- <label>瑙嗚薄鎻掔闀�</label>
- </value>
- <value>
- <fullName>鍥涙柟鍚戠數瀛愯兏鑵硅厰闀�</fullName>
- <default>false</default>
- <label>鍥涙柟鍚戠數瀛愯兏鑵硅厰闀�</label>
- </value>
- <value>
- <fullName>鎵嬫湳鍣ㄦ</fullName>
- <default>false</default>
- <label>鎵嬫湳鍣ㄦ</label>
- </value>
- <value>
- <fullName>瓒呭０鍐呴暅</fullName>
- <default>false</default>
- <label>瓒呭０鍐呴暅</label>
- </value>
- <value>
- <fullName>瓒呭０鎺㈠ご</fullName>
- <default>false</default>
- <label>瓒呭０鎺㈠ご</label>
- </value>
- <value>
- <fullName>SD</fullName>
- <default>false</default>
- <label>SD</label>
- </value>
- <value>
- <fullName>瓒呭０鍒�澶�</fullName>
- <default>false</default>
- <label>瓒呭０鍒�澶�</label>
- </value>
- <value>
- <fullName>鐢靛垁涓绘満</fullName>
- <default>false</default>
- <label>鐢靛垁涓绘満</label>
- </value>
- <value>
- <fullName>3D EndoEYE</fullName>
- <default>false</default>
- <label>3D EndoEYE</label>
- </value>
- <value>
- <fullName>3D鍥涙柟鍚戠數瀛愰暅</fullName>
- <default>false</default>
- <label>3D鍥涙柟鍚戠數瀛愰暅</label>
- </value>
- <value>
- <fullName>HD/IR</fullName>
- <default>false</default>
- <label>HD/IR</label>
- </value>
- <value>
- <fullName>涓绘満鍏夋簮</fullName>
- <default>false</default>
- <label>涓绘満鍏夋簮</label>
- </value>
- <value>
- <fullName>鍏朵粬</fullName>
- <default>false</default>
- <label>鍏朵粬</label>
- </value>
- <value>
- <fullName>鐢垫瀬</fullName>
- <default>false</default>
- <label>鐢垫瀬</label>
- </value>
- <value>
- <fullName>娉屽翱鐢靛垏闀�</fullName>
- <default>false</default>
- <label>娉屽翱鐢靛垏闀�</label>
- </value>
- <value>
- <fullName>SP涓绘満</fullName>
- <default>false</default>
- <label>SP涓绘満</label>
- </value>
- <value>
- <fullName>鐢靛瓙鑳嗛亾闀�</fullName>
- <default>false</default>
- <label>鐢靛瓙鑳嗛亾闀�</label>
- </value>
- <value>
- <fullName>瀹厰鐢靛垏闀�</fullName>
- <default>false</default>
- <label>瀹厰鐢靛垏闀�</label>
- </value>
- <value>
- <fullName>ESG-400</fullName>
- <default>false</default>
- <isActive>false</isActive>
- <label>ESG-400</label>
- </value>
- <value>
- <fullName>STMS</fullName>
- <default>false</default>
- <isActive>false</isActive>
- <label>STMS</label>
- </value>
- </valueSetDefinition>
+ <valueSetName>ProductCategory</valueSetName>
<valueSettings>
<controllingFieldValue>涓绘満</controllingFieldValue>
<valueName>3D</valueName>
@@ -339,8 +47,8 @@
<controllingFieldValue>闀滃瓙</controllingFieldValue>
<controllingFieldValue>灏忛暅绉�</controllingFieldValue>
<controllingFieldValue>鑳介噺</controllingFieldValue>
- <controllingFieldValue>鎽勫儚澶�</controllingFieldValue>
<controllingFieldValue>鍏朵粬</controllingFieldValue>
+ <controllingFieldValue>鎽勫儚澶�</controllingFieldValue>
<valueName>鍏朵粬</valueName>
</valueSettings>
<valueSettings>
@@ -464,6 +172,10 @@
<valueName>瀹厰鐢靛垏闀�</valueName>
</valueSettings>
<valueSettings>
+ <controllingFieldValue>娲楁秷鏈�</controllingFieldValue>
+ <valueName>娲楁秷鏈�</valueName>
+ </valueSettings>
+ <valueSettings>
<controllingFieldValue>灏忛暅绉�</controllingFieldValue>
<valueName>TURis</valueName>
</valueSettings>
@@ -520,14 +232,6 @@
<valueName>鐢靛垁涓绘満</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鎽勫儚澶�</controllingFieldValue>
- <valueName>SD</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鎽勫儚澶�</controllingFieldValue>
- <valueName>HD/IR</valueName>
- </valueSettings>
- <valueSettings>
<controllingFieldValue>鍏夋簮</controllingFieldValue>
<valueName>涓绘満鍏夋簮</valueName>
</valueSettings>
@@ -535,5 +239,13 @@
<controllingFieldValue>鍏朵粬</controllingFieldValue>
<valueName>鐢垫瀬</valueName>
</valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鎽勫儚澶�</controllingFieldValue>
+ <valueName>SD</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鎽勫儚澶�</controllingFieldValue>
+ <valueName>HD/IR</valueName>
+ </valueSettings>
</valueSet>
</CustomField>
diff --git a/force-app/main/default/objects/PCLLostProduct__c/fields/ProductClass__c.field-meta.xml b/force-app/main/default/objects/PCLLostProduct__c/fields/ProductClass__c.field-meta.xml
index 49ecc48..4b79309 100644
--- a/force-app/main/default/objects/PCLLostProduct__c/fields/ProductClass__c.field-meta.xml
+++ b/force-app/main/default/objects/PCLLostProduct__c/fields/ProductClass__c.field-meta.xml
@@ -1,56 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>ProductClass__c</fullName>
+ <description>鍗囩骇涓哄叏灞�鍊奸泦</description>
<externalId>false</externalId>
<label>澶卞崟浜у搧绫诲埆</label>
<required>false</required>
+ <trackHistory>true</trackHistory>
<trackTrending>false</trackTrending>
<type>Picklist</type>
<valueSet>
<restricted>true</restricted>
- <valueSetDefinition>
- <sorted>false</sorted>
- <value>
- <fullName>涓绘満</fullName>
- <default>false</default>
- <label>涓绘満</label>
- </value>
- <value>
- <fullName>闀滃瓙</fullName>
- <default>false</default>
- <label>闀滃瓙</label>
- </value>
- <value>
- <fullName>灏忛暅绉�</fullName>
- <default>false</default>
- <label>灏忛暅绉�</label>
- </value>
- <value>
- <fullName>鑳介噺</fullName>
- <default>false</default>
- <label>鑳介噺</label>
- </value>
- <value>
- <fullName>鎽勫儚澶�</fullName>
- <default>false</default>
- <label>鎽勫儚澶�</label>
- </value>
- <value>
- <fullName>鍏夋簮</fullName>
- <default>false</default>
- <label>鍏夋簮</label>
- </value>
- <value>
- <fullName>鍏朵粬</fullName>
- <default>false</default>
- <label>鍏朵粬</label>
- </value>
- <value>
- <fullName>4K</fullName>
- <default>false</default>
- <isActive>false</isActive>
- <label>4K</label>
- </value>
- </valueSetDefinition>
+ <valueSetName>ProductClass</valueSetName>
</valueSet>
</CustomField>
diff --git a/force-app/main/default/objects/PCLLostProduct__c/fields/Quantity__c.field-meta.xml b/force-app/main/default/objects/PCLLostProduct__c/fields/Quantity__c.field-meta.xml
index 9aa939c..0f45831 100644
--- a/force-app/main/default/objects/PCLLostProduct__c/fields/Quantity__c.field-meta.xml
+++ b/force-app/main/default/objects/PCLLostProduct__c/fields/Quantity__c.field-meta.xml
@@ -6,6 +6,7 @@
<precision>18</precision>
<required>false</required>
<scale>0</scale>
+ <trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Number</type>
<unique>false</unique>
diff --git a/force-app/main/default/objects/PCLLostProduct__c/fields/Submit_Day__c.field-meta.xml b/force-app/main/default/objects/PCLLostProduct__c/fields/Submit_Day__c.field-meta.xml
index fea62c2..49d12b8 100644
--- a/force-app/main/default/objects/PCLLostProduct__c/fields/Submit_Day__c.field-meta.xml
+++ b/force-app/main/default/objects/PCLLostProduct__c/fields/Submit_Day__c.field-meta.xml
@@ -6,6 +6,7 @@
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
<label>鎻愪氦鏃�</label>
<required>false</required>
+ <trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Date</type>
</CustomField>
diff --git a/force-app/main/default/objects/PCLLostProduct__c/fields/isSpec__c.field-meta.xml b/force-app/main/default/objects/PCLLostProduct__c/fields/isSpec__c.field-meta.xml
index f04b94f..f47e30e 100644
--- a/force-app/main/default/objects/PCLLostProduct__c/fields/isSpec__c.field-meta.xml
+++ b/force-app/main/default/objects/PCLLostProduct__c/fields/isSpec__c.field-meta.xml
@@ -5,6 +5,7 @@
<formula>IF( ISBLANK( TEXT(LostProduct__r.ProductClass__c) ) && ISBLANK(TEXT(LostProduct__r.ProductCategory__c)) , true, false)</formula>
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
<label>鏄惁浜у搧涓绘暟鎹�</label>
+ <trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Checkbox</type>
</CustomField>
diff --git a/force-app/main/default/objects/PCLLostProduct__c/fields/lcrRecordType_DevName__c.field-meta.xml b/force-app/main/default/objects/PCLLostProduct__c/fields/lcrRecordType_DevName__c.field-meta.xml
index e467fa6..a9c177c 100644
--- a/force-app/main/default/objects/PCLLostProduct__c/fields/lcrRecordType_DevName__c.field-meta.xml
+++ b/force-app/main/default/objects/PCLLostProduct__c/fields/lcrRecordType_DevName__c.field-meta.xml
@@ -6,6 +6,7 @@
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
<label>lcrRecordType_DevName</label>
<required>false</required>
+ <trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Text</type>
<unique>false</unique>
diff --git a/force-app/main/default/objects/Product2/Product2.object-meta.xml b/force-app/main/default/objects/Product2/Product2.object-meta.xml
index 9407ef1..094bcdd 100644
--- a/force-app/main/default/objects/Product2/Product2.object-meta.xml
+++ b/force-app/main/default/objects/Product2/Product2.object-meta.xml
@@ -147,23 +147,30 @@
<searchLayouts>
<customTabListAdditionalFields>PRODUCT2.NAME</customTabListAdditionalFields>
<customTabListAdditionalFields>PRODUCT2.CUSTOMER_PRODUCT_ID</customTabListAdditionalFields>
- <customTabListAdditionalFields>PRODUCT2.DESCRIPTION</customTabListAdditionalFields>
+ <customTabListAdditionalFields>Intra_Trade_List_RMB__c</customTabListAdditionalFields>
+ <customTabListAdditionalFields>SFDA_Status__c</customTabListAdditionalFields>
+ <customTabListAdditionalFields>SFDA_Approbated_Date__c</customTabListAdditionalFields>
+ <customTabListAdditionalFields>SFDA_Expiration_Date__c</customTabListAdditionalFields>
<excludedStandardButtons>OpenListInQuip</excludedStandardButtons>
<excludedStandardButtons>NewFromDocument</excludedStandardButtons>
- <excludedStandardButtons>Add</excludedStandardButtons>
- <excludedStandardButtons>MassAddProductsToCategory</excludedStandardButtons>
<excludedStandardButtons>PrintableListView</excludedStandardButtons>
+ <excludedStandardButtons>MassAddProductsToCategory</excludedStandardButtons>
+ <excludedStandardButtons>Add</excludedStandardButtons>
<lookupDialogsAdditionalFields>PRODUCT2.NAME</lookupDialogsAdditionalFields>
+ <lookupDialogsAdditionalFields>Asset_Model_No__c</lookupDialogsAdditionalFields>
<lookupDialogsAdditionalFields>PRODUCT2.CUSTOMER_PRODUCT_ID</lookupDialogsAdditionalFields>
- <lookupDialogsAdditionalFields>PRODUCT2.DESCRIPTION</lookupDialogsAdditionalFields>
<lookupDialogsAdditionalFields>PRODUCT2.FAMILY</lookupDialogsAdditionalFields>
+ <lookupDialogsAdditionalFields>PRODUCT2.DESCRIPTION</lookupDialogsAdditionalFields>
+ <lookupDialogsAdditionalFields>SFDA_Status__c</lookupDialogsAdditionalFields>
+ <lookupDialogsAdditionalFields>SFDA_Approbated_Date__c</lookupDialogsAdditionalFields>
+ <lookupDialogsAdditionalFields>Maintenance_Price_Year__c</lookupDialogsAdditionalFields>
<lookupPhoneDialogsAdditionalFields>PRODUCT2.NAME</lookupPhoneDialogsAdditionalFields>
<lookupPhoneDialogsAdditionalFields>PRODUCT2.CUSTOMER_PRODUCT_ID</lookupPhoneDialogsAdditionalFields>
<lookupPhoneDialogsAdditionalFields>PRODUCT2.DESCRIPTION</lookupPhoneDialogsAdditionalFields>
<lookupPhoneDialogsAdditionalFields>PRODUCT2.FAMILY</lookupPhoneDialogsAdditionalFields>
<searchResultsAdditionalFields>PRODUCT2.NAME</searchResultsAdditionalFields>
<searchResultsAdditionalFields>Asset_Model_No__c</searchResultsAdditionalFields>
- <searchResultsAdditionalFields>ProductCode_Ext__c</searchResultsAdditionalFields>
+ <searchResultsAdditionalFields>PRODUCT2.CUSTOMER_PRODUCT_ID</searchResultsAdditionalFields>
<searchResultsAdditionalFields>SFDA_Status__c</searchResultsAdditionalFields>
<searchResultsAdditionalFields>Intra_Trade_List_RMB__c</searchResultsAdditionalFields>
<searchResultsAdditionalFields>Foreign_Trade_List_US__c</searchResultsAdditionalFields>
diff --git a/force-app/main/default/objects/Product2/fields/ConsumCategory1__c.field-meta.xml b/force-app/main/default/objects/Product2/fields/ConsumCategory1__c.field-meta.xml
index 9627f47..398840f 100644
--- a/force-app/main/default/objects/Product2/fields/ConsumCategory1__c.field-meta.xml
+++ b/force-app/main/default/objects/Product2/fields/ConsumCategory1__c.field-meta.xml
@@ -2,7 +2,7 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>ConsumCategory1__c</fullName>
<externalId>false</externalId>
- <label>鑰楁潗鍒嗙被1</label>
+ <label>鑰楁潗鍒嗙被1(涓嶇敤)</label>
<length>255</length>
<required>false</required>
<trackHistory>false</trackHistory>
diff --git a/force-app/main/default/objects/Product2/fields/ConsumCategory3__c.field-meta.xml b/force-app/main/default/objects/Product2/fields/ConsumCategory3__c.field-meta.xml
index aa8b5fa..9349168 100644
--- a/force-app/main/default/objects/Product2/fields/ConsumCategory3__c.field-meta.xml
+++ b/force-app/main/default/objects/Product2/fields/ConsumCategory3__c.field-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>ConsumCategory3__c</fullName>
- <description>鍘熷悕鈥滆�楁潗鍒嗙被3鈥�</description>
+ <description>鏇剧敤鍚嶏細鈥滆�楁潗鍒嗙被3鈥濓紱鈥滅洰鏍嘐T鈥�</description>
<externalId>false</externalId>
<formula>if( ConsumCategory1F__c =='ET鑰楁潗',
if(ConsumCategory2__c =='鍏朵粬','鍏朵粬',
@@ -43,7 +43,7 @@
)
),null)</formula>
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
- <label>鐩爣ET</label>
+ <label>鐩爣鑰楁潗</label>
<required>false</required>
<trackHistory>false</trackHistory>
<type>Text</type>
diff --git a/force-app/main/default/objects/Product2/fields/Image__c.field-meta.xml b/force-app/main/default/objects/Product2/fields/Image__c.field-meta.xml
index c686585..1cc14f0 100644
--- a/force-app/main/default/objects/Product2/fields/Image__c.field-meta.xml
+++ b/force-app/main/default/objects/Product2/fields/Image__c.field-meta.xml
@@ -6,12 +6,12 @@
IF (IsBlank(Image_DocumentID__c),
"",
IF (Image_Width__c >= Image_Height__c,
-hyperlink("/servlet/servlet.FileDownload?file=" & Image_DocumentID__c,
-image("/servlet/servlet.FileDownload?file=" & Image_DocumentID__c, "銈点儬銉嶃偆銉�", Image_Height__c * 200 / Image_Width__c, 200),
+hyperlink("/sfc/servlet.shepherd/version/download/" & Image_DocumentID__c,
+image("/sfc/servlet.shepherd/version/download/" & Image_DocumentID__c, "銈点儬銉嶃偆銉�", Image_Height__c * 200 / Image_Width__c, 200),
"_blank"
),
-hyperlink("/servlet/servlet.FileDownload?file=" & Image_DocumentID__c,
-image("/servlet/servlet.FileDownload?file=" & Image_DocumentID__c, "銈点儬銉嶃偆銉�", 200, Image_Width__c * 200 / Image_Height__c),
+hyperlink("/sfc/servlet.shepherd/version/download/" & Image_DocumentID__c,
+image("/sfc/servlet.shepherd/version/download/" & Image_DocumentID__c, "銈点儬銉嶃偆銉�", 200, Image_Width__c * 200 / Image_Height__c),
"_blank"
)
)
diff --git a/force-app/main/default/objects/Product2/fields/ProductCategory__c.field-meta.xml b/force-app/main/default/objects/Product2/fields/ProductCategory__c.field-meta.xml
index af6c8a0..fd2b15b 100644
--- a/force-app/main/default/objects/Product2/fields/ProductCategory__c.field-meta.xml
+++ b/force-app/main/default/objects/Product2/fields/ProductCategory__c.field-meta.xml
@@ -9,306 +9,7 @@
<valueSet>
<controllingField>ProductClass__c</controllingField>
<restricted>true</restricted>
- <valueSetDefinition>
- <sorted>false</sorted>
- <value>
- <fullName>3D</fullName>
- <default>false</default>
- <label>3D</label>
- </value>
- <value>
- <fullName>4K</fullName>
- <default>false</default>
- <label>4K</label>
- </value>
- <value>
- <fullName>HD</fullName>
- <default>false</default>
- <label>HD</label>
- </value>
- <value>
- <fullName>IR</fullName>
- <default>false</default>
- <label>IR</label>
- </value>
- <value>
- <fullName>CV涓绘満</fullName>
- <default>false</default>
- <label>CV涓绘満</label>
- </value>
- <value>
- <fullName>瓒呭０涓绘満</fullName>
- <default>false</default>
- <label>瓒呭０涓绘満</label>
- </value>
- <value>
- <fullName>CDS</fullName>
- <default>false</default>
- <label>CDS</label>
- </value>
- <value>
- <fullName>CHF绾ょ淮鑳嗛亾闀�</fullName>
- <default>false</default>
- <label>CHF绾ょ淮鑳嗛亾闀�</label>
- </value>
- <value>
- <fullName>CHF鐢靛瓙鑳嗛亾闀�</fullName>
- <default>false</default>
- <label>CHF鐢靛瓙鑳嗛亾闀�</label>
- </value>
- <value>
- <fullName>ENF绾ょ淮榧荤闀�</fullName>
- <default>false</default>
- <label>ENF绾ょ淮榧荤闀�</label>
- </value>
- <value>
- <fullName>ENF鐢靛瓙榧荤闀�</fullName>
- <default>false</default>
- <label>ENF鐢靛瓙榧荤闀�</label>
- </value>
- <value>
- <fullName>URF绾ょ淮杈撳翱绠￠暅</fullName>
- <default>false</default>
- <label>URF绾ょ淮杈撳翱绠￠暅</label>
- </value>
- <value>
- <fullName>URF鐢靛瓙杈撳翱绠￠暅</fullName>
- <default>false</default>
- <label>URF鐢靛瓙杈撳翱绠￠暅</label>
- </value>
- <value>
- <fullName>CYF绾ょ淮鑶�鑳遍暅</fullName>
- <default>false</default>
- <label>CYF绾ょ淮鑶�鑳遍暅</label>
- </value>
- <value>
- <fullName>CYF鐢靛瓙鑶�鑳遍暅</fullName>
- <default>false</default>
- <label>CYF鐢靛瓙鑶�鑳遍暅</label>
- </value>
- <value>
- <fullName>LF鎻掔闀�</fullName>
- <default>false</default>
- <label>LF鎻掔闀�</label>
- </value>
- <value>
- <fullName>HD EndoEYE</fullName>
- <default>false</default>
- <label>HD EndoEYE</label>
- </value>
- <value>
- <fullName>鑵硅厰闀滃厜瀛﹁绠�</fullName>
- <default>false</default>
- <label>鑵硅厰闀滃厜瀛﹁绠�</label>
- </value>
- <value>
- <fullName>涓婃秷鍖栭亾-GIF</fullName>
- <default>false</default>
- <label>涓婃秷鍖栭亾-GIF</label>
- </value>
- <value>
- <fullName>涓嬫秷鍖栭亾-CF</fullName>
- <default>false</default>
- <label>涓嬫秷鍖栭亾-CF</label>
- </value>
- <value>
- <fullName>鍗佷簩鎸囪偁 - JF</fullName>
- <default>false</default>
- <label>鍗佷簩鎸囪偁 - JF</label>
- </value>
- <value>
- <fullName>灏忚偁闀�</fullName>
- <default>false</default>
- <label>灏忚偁闀�</label>
- </value>
- <value>
- <fullName>瓒呭０鍐呴暅鍙婂皬鎺㈠ご</fullName>
- <default>false</default>
- <label>瓒呭０鍐呴暅鍙婂皬鎺㈠ご</label>
- </value>
- <value>
- <fullName>BF</fullName>
- <default>false</default>
- <label>BF</label>
- </value>
- <value>
- <fullName>TURis</fullName>
- <default>false</default>
- <label>TURis</label>
- </value>
- <value>
- <fullName>TCRis</fullName>
- <default>false</default>
- <label>TCRis</label>
- </value>
- <value>
- <fullName>纭�у鑵旈暅</fullName>
- <default>false</default>
- <label>纭�у鑵旈暅</label>
- </value>
- <value>
- <fullName>纭�ц唨鑳遍暅</fullName>
- <default>false</default>
- <label>纭�ц唨鑳遍暅</label>
- </value>
- <value>
- <fullName>纭�ц緭灏跨闀�</fullName>
- <default>false</default>
- <label>纭�ц緭灏跨闀�</label>
- </value>
- <value>
- <fullName>纭�ч蓟绐﹂暅</fullName>
- <default>false</default>
- <label>纭�ч蓟绐﹂暅</label>
- </value>
- <value>
- <fullName>涓绘満</fullName>
- <default>false</default>
- <label>涓绘満</label>
- </value>
- <value>
- <fullName>鍒�澶�</fullName>
- <default>false</default>
- <label>鍒�澶�</label>
- </value>
- <value>
- <fullName>鑳介噺鍏朵粬</fullName>
- <default>false</default>
- <label>鑳介噺鍏朵粬</label>
- </value>
- <value>
- <fullName>灏忛暅绉�</fullName>
- <default>false</default>
- <label>灏忛暅绉�</label>
- </value>
- <value>
- <fullName>灏忚偁闀�-SIF</fullName>
- <default>false</default>
- <label>灏忚偁闀�-SIF</label>
- </value>
- <value>
- <fullName>鑳嗛亾闀�-CHF</fullName>
- <default>false</default>
- <label>鑳嗛亾闀�-CHF</label>
- </value>
- <value>
- <fullName>鍛煎惛-BF</fullName>
- <default>false</default>
- <label>鍛煎惛-BF</label>
- </value>
- <value>
- <fullName>瓒呭０鍒�涓绘満</fullName>
- <default>false</default>
- <label>瓒呭０鍒�涓绘満</label>
- </value>
- <value>
- <fullName>瑙嗚薄鎻掔闀�</fullName>
- <default>false</default>
- <label>瑙嗚薄鎻掔闀�</label>
- </value>
- <value>
- <fullName>鍥涙柟鍚戠數瀛愯兏鑵硅厰闀�</fullName>
- <default>false</default>
- <label>鍥涙柟鍚戠數瀛愯兏鑵硅厰闀�</label>
- </value>
- <value>
- <fullName>鎵嬫湳鍣ㄦ</fullName>
- <default>false</default>
- <label>鎵嬫湳鍣ㄦ</label>
- </value>
- <value>
- <fullName>瓒呭０鍐呴暅</fullName>
- <default>false</default>
- <label>瓒呭０鍐呴暅</label>
- </value>
- <value>
- <fullName>瓒呭０鎺㈠ご</fullName>
- <default>false</default>
- <label>瓒呭０鎺㈠ご</label>
- </value>
- <value>
- <fullName>SD</fullName>
- <default>false</default>
- <label>SD</label>
- </value>
- <value>
- <fullName>瓒呭０鍒�澶�</fullName>
- <default>false</default>
- <label>瓒呭０鍒�澶�</label>
- </value>
- <value>
- <fullName>鐢靛垁涓绘満</fullName>
- <default>false</default>
- <label>鐢靛垁涓绘満</label>
- </value>
- <value>
- <fullName>3D EndoEYE</fullName>
- <default>false</default>
- <label>3D EndoEYE</label>
- </value>
- <value>
- <fullName>3D鍥涙柟鍚戠數瀛愰暅</fullName>
- <default>false</default>
- <label>3D鍥涙柟鍚戠數瀛愰暅</label>
- </value>
- <value>
- <fullName>HD/IR</fullName>
- <default>false</default>
- <label>HD/IR</label>
- </value>
- <value>
- <fullName>涓绘満鍏夋簮</fullName>
- <default>false</default>
- <label>涓绘満鍏夋簮</label>
- </value>
- <value>
- <fullName>鍏朵粬</fullName>
- <default>false</default>
- <label>鍏朵粬</label>
- </value>
- <value>
- <fullName>鐢垫瀬</fullName>
- <default>false</default>
- <label>鐢垫瀬</label>
- </value>
- <value>
- <fullName>娉屽翱鐢靛垏闀�</fullName>
- <default>false</default>
- <label>娉屽翱鐢靛垏闀�</label>
- </value>
- <value>
- <fullName>SP涓绘満</fullName>
- <default>false</default>
- <label>SP涓绘満</label>
- </value>
- <value>
- <fullName>鐢靛瓙鑳嗛亾闀�</fullName>
- <default>false</default>
- <label>鐢靛瓙鑳嗛亾闀�</label>
- </value>
- <value>
- <fullName>瀹厰鐢靛垏闀�</fullName>
- <default>false</default>
- <label>瀹厰鐢靛垏闀�</label>
- </value>
- <value>
- <fullName>娲楁秷鏈�</fullName>
- <default>false</default>
- <label>娲楁秷鏈�</label>
- </value>
- <value>
- <fullName>ESG-400</fullName>
- <default>false</default>
- <isActive>false</isActive>
- <label>ESG-400</label>
- </value>
- <value>
- <fullName>STMS</fullName>
- <default>false</default>
- <isActive>false</isActive>
- <label>STMS</label>
- </value>
- </valueSetDefinition>
+ <valueSetName>ProductCategory_G</valueSetName>
<valueSettings>
<controllingFieldValue>涓绘満</controllingFieldValue>
<valueName>3D</valueName>
@@ -344,8 +45,8 @@
<controllingFieldValue>闀滃瓙</controllingFieldValue>
<controllingFieldValue>灏忛暅绉�</controllingFieldValue>
<controllingFieldValue>鑳介噺</controllingFieldValue>
- <controllingFieldValue>鎽勫儚澶�</controllingFieldValue>
<controllingFieldValue>鍏朵粬</controllingFieldValue>
+ <controllingFieldValue>鎽勫儚澶�</controllingFieldValue>
<valueName>鍏朵粬</valueName>
</valueSettings>
<valueSettings>
@@ -374,6 +75,7 @@
</valueSettings>
<valueSettings>
<controllingFieldValue>闀滃瓙</controllingFieldValue>
+ <controllingFieldValue>鍏朵粬</controllingFieldValue>
<valueName>URF鐢靛瓙杈撳翱绠￠暅</valueName>
</valueSettings>
<valueSettings>
@@ -419,6 +121,21 @@
<valueSettings>
<controllingFieldValue>闀滃瓙</controllingFieldValue>
<valueName>BF</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>闀滃瓙</controllingFieldValue>
+ <controllingFieldValue>灏忛暅绉�</controllingFieldValue>
+ <valueName>纭�у鑵旈暅</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>闀滃瓙</controllingFieldValue>
+ <controllingFieldValue>灏忛暅绉�</controllingFieldValue>
+ <valueName>纭�ц唨鑳遍暅</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>闀滃瓙</controllingFieldValue>
+ <controllingFieldValue>灏忛暅绉�</controllingFieldValue>
+ <valueName>纭�ц緭灏跨闀�</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>闀滃瓙</controllingFieldValue>
@@ -478,18 +195,6 @@
</valueSettings>
<valueSettings>
<controllingFieldValue>灏忛暅绉�</controllingFieldValue>
- <valueName>纭�у鑵旈暅</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>灏忛暅绉�</controllingFieldValue>
- <valueName>纭�ц唨鑳遍暅</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>灏忛暅绉�</controllingFieldValue>
- <valueName>纭�ц緭灏跨闀�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>灏忛暅绉�</controllingFieldValue>
<valueName>纭�ч蓟绐﹂暅</valueName>
</valueSettings>
<valueSettings>
@@ -525,16 +230,16 @@
<valueName>鐢靛垁涓绘満</valueName>
</valueSettings>
<valueSettings>
+ <controllingFieldValue>鍏朵粬</controllingFieldValue>
+ <valueName>鐢垫瀬</valueName>
+ </valueSettings>
+ <valueSettings>
<controllingFieldValue>鎽勫儚澶�</controllingFieldValue>
<valueName>SD</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>鎽勫儚澶�</controllingFieldValue>
<valueName>HD/IR</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鎽勫儚澶�</controllingFieldValue>
- <valueName>鐢垫瀬</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>鍏夋簮</controllingFieldValue>
diff --git a/force-app/main/default/objects/Product2/fields/ProductClass__c.field-meta.xml b/force-app/main/default/objects/Product2/fields/ProductClass__c.field-meta.xml
index ad9ae69..3ff935b 100644
--- a/force-app/main/default/objects/Product2/fields/ProductClass__c.field-meta.xml
+++ b/force-app/main/default/objects/Product2/fields/ProductClass__c.field-meta.xml
@@ -8,48 +8,6 @@
<type>Picklist</type>
<valueSet>
<restricted>true</restricted>
- <valueSetDefinition>
- <sorted>false</sorted>
- <value>
- <fullName>涓绘満</fullName>
- <default>false</default>
- <label>涓绘満</label>
- </value>
- <value>
- <fullName>闀滃瓙</fullName>
- <default>false</default>
- <label>闀滃瓙</label>
- </value>
- <value>
- <fullName>灏忛暅绉�</fullName>
- <default>false</default>
- <label>灏忛暅绉�</label>
- </value>
- <value>
- <fullName>鑳介噺</fullName>
- <default>false</default>
- <label>鑳介噺</label>
- </value>
- <value>
- <fullName>鎽勫儚澶�</fullName>
- <default>false</default>
- <label>鎽勫儚澶�</label>
- </value>
- <value>
- <fullName>鍏夋簮</fullName>
- <default>false</default>
- <label>鍏夋簮</label>
- </value>
- <value>
- <fullName>鍏朵粬</fullName>
- <default>false</default>
- <label>鍏朵粬</label>
- </value>
- <value>
- <fullName>娲楁秷鏈�</fullName>
- <default>false</default>
- <label>娲楁秷鏈�</label>
- </value>
- </valueSetDefinition>
+ <valueSetName>ProductClass_G</valueSetName>
</valueSet>
</CustomField>
diff --git a/force-app/main/default/objects/Product2/recordTypes/CompetitiveProductsConsumables.recordType-meta.xml b/force-app/main/default/objects/Product2/recordTypes/CompetitiveProductsConsumables.recordType-meta.xml
index 6e597ac..8a0d280 100644
--- a/force-app/main/default/objects/Product2/recordTypes/CompetitiveProductsConsumables.recordType-meta.xml
+++ b/force-app/main/default/objects/Product2/recordTypes/CompetitiveProductsConsumables.recordType-meta.xml
@@ -574,10 +574,6 @@
<default>false</default>
</values>
<values>
- <fullName>瀹厰鐢靛垏闀�</fullName>
- <default>false</default>
- </values>
- <values>
<fullName>灏忚偁闀�</fullName>
<default>false</default>
</values>
diff --git a/force-app/main/default/objects/Product2/recordTypes/OlympusProducts.recordType-meta.xml b/force-app/main/default/objects/Product2/recordTypes/OlympusProducts.recordType-meta.xml
index 3abe312..5fbf213 100644
--- a/force-app/main/default/objects/Product2/recordTypes/OlympusProducts.recordType-meta.xml
+++ b/force-app/main/default/objects/Product2/recordTypes/OlympusProducts.recordType-meta.xml
@@ -585,10 +585,6 @@
<default>false</default>
</values>
<values>
- <fullName>瀹厰鐢靛垏闀�</fullName>
- <default>false</default>
- </values>
- <values>
<fullName>灏忚偁闀�</fullName>
<default>false</default>
</values>
diff --git a/force-app/main/default/objects/Product2/recordTypes/Sample.recordType-meta.xml b/force-app/main/default/objects/Product2/recordTypes/Sample.recordType-meta.xml
index 8ff056f..7aaa473 100644
--- a/force-app/main/default/objects/Product2/recordTypes/Sample.recordType-meta.xml
+++ b/force-app/main/default/objects/Product2/recordTypes/Sample.recordType-meta.xml
@@ -574,10 +574,6 @@
<default>false</default>
</values>
<values>
- <fullName>瀹厰鐢靛垏闀�</fullName>
- <default>false</default>
- </values>
- <values>
<fullName>灏忚偁闀�</fullName>
<default>false</default>
</values>
diff --git a/force-app/main/default/objects/Product2/validationRules/Check_competitor_code.validationRule-meta.xml b/force-app/main/default/objects/Product2/validationRules/Check_competitor_code.validationRule-meta.xml
index 196c7af..45e1386 100644
--- a/force-app/main/default/objects/Product2/validationRules/Check_competitor_code.validationRule-meta.xml
+++ b/force-app/main/default/objects/Product2/validationRules/Check_competitor_code.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Check_competitor_code</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>AND(
Manual_Entry__c = True,
Competitor_asset_check__c = true,
diff --git a/force-app/main/default/objects/Product2/validationRules/CompetitorProductCheckByUserField.validationRule-meta.xml b/force-app/main/default/objects/Product2/validationRules/CompetitorProductCheckByUserField.validationRule-meta.xml
deleted file mode 100644
index 1bdaee1..0000000
--- a/force-app/main/default/objects/Product2/validationRules/CompetitorProductCheckByUserField.validationRule-meta.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
- <fullName>CompetitorProductCheckByUserField</fullName>
- <active>false</active>
- <description>鐢ㄦ埛鍕鹃�夌珵浜変骇鍝佺紪杈戞椂鍙兘鍒涘缓缂栬緫绔炰簤瀵逛骇鍝�</description>
- <errorConditionFormula>($User.EditCompetitorAsset__c && !Competitor_product_dummy__c) && NOT(CONTAINS($Label.ProfileId_SystemAdmin, $Profile.Id))</errorConditionFormula>
- <errorDisplayField>Competitor_product_dummy__c</errorDisplayField>
- <errorMessage>鎮ㄥ彧鑳藉垱寤哄拰缂栬緫绔炰簤瀵规墜浜у搧锛�</errorMessage>
-</ValidationRule>
diff --git a/force-app/main/default/objects/Product2/validationRules/GuaranteeTypeError.validationRule-meta.xml b/force-app/main/default/objects/Product2/validationRules/GuaranteeTypeError.validationRule-meta.xml
index d399a08..d2fbacf 100644
--- a/force-app/main/default/objects/Product2/validationRules/GuaranteeTypeError.validationRule-meta.xml
+++ b/force-app/main/default/objects/Product2/validationRules/GuaranteeTypeError.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>GuaranteeTypeError</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>Extend_new_product_gurantee__c && Extend_new_product_gurantee_MD__c</errorConditionFormula>
<errorMessage>涓嶈兘鍚屾椂閫夋嫨甯傚満鍜屾湇鍔″骞翠繚淇�</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Product2__c/Product2__c.object-meta.xml b/force-app/main/default/objects/Product2__c/Product2__c.object-meta.xml
index be0afde..ab15eb1 100644
--- a/force-app/main/default/objects/Product2__c/Product2__c.object-meta.xml
+++ b/force-app/main/default/objects/Product2__c/Product2__c.object-meta.xml
@@ -169,13 +169,13 @@
<customTabListAdditionalFields>Category3__c</customTabListAdditionalFields>
<customTabListAdditionalFields>Category4__c</customTabListAdditionalFields>
<customTabListAdditionalFields>Category5__c</customTabListAdditionalFields>
- <excludedStandardButtons>ChangeOwner</excludedStandardButtons>
- <excludedStandardButtons>Import</excludedStandardButtons>
- <excludedStandardButtons>MassChangeOwner</excludedStandardButtons>
- <excludedStandardButtons>Accept</excludedStandardButtons>
<excludedStandardButtons>OpenListInQuip</excludedStandardButtons>
<excludedStandardButtons>NewFromDocument</excludedStandardButtons>
+ <excludedStandardButtons>Accept</excludedStandardButtons>
<excludedStandardButtons>PrintableListView</excludedStandardButtons>
+ <excludedStandardButtons>Import</excludedStandardButtons>
+ <excludedStandardButtons>MassChangeOwner</excludedStandardButtons>
+ <excludedStandardButtons>ChangeOwner</excludedStandardButtons>
<lookupDialogsAdditionalFields>Product2__c</lookupDialogsAdditionalFields>
<lookupDialogsAdditionalFields>SFDA_Status__c</lookupDialogsAdditionalFields>
<searchFilterFields>SFDA_Status__c</searchFilterFields>
@@ -186,9 +186,9 @@
<searchResultsAdditionalFields>OT_CODE__c</searchResultsAdditionalFields>
<searchResultsAdditionalFields>Name__c</searchResultsAdditionalFields>
<searchResultsAdditionalFields>SFDA_Status__c</searchResultsAdditionalFields>
+ <searchResultsAdditionalFields>Category1__c</searchResultsAdditionalFields>
<searchResultsAdditionalFields>Category2__c</searchResultsAdditionalFields>
<searchResultsAdditionalFields>Category3__c</searchResultsAdditionalFields>
- <searchResultsAdditionalFields>Category4__c</searchResultsAdditionalFields>
<searchResultsAdditionalFields>Intra_Trade_List_RMB__c</searchResultsAdditionalFields>
<searchResultsAdditionalFields>Foreign_Trade_List_US__c</searchResultsAdditionalFields>
<searchResultsAdditionalFields>Intra_Trade_Service_RMB__c</searchResultsAdditionalFields>
diff --git a/force-app/main/default/objects/Product_Documentation__c/validationRules/E_Learning_require.validationRule-meta.xml b/force-app/main/default/objects/Product_Documentation__c/validationRules/E_Learning_require.validationRule-meta.xml
index 1e69fe2..220650d 100644
--- a/force-app/main/default/objects/Product_Documentation__c/validationRules/E_Learning_require.validationRule-meta.xml
+++ b/force-app/main/default/objects/Product_Documentation__c/validationRules/E_Learning_require.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>E_Learning_require</fullName>
- <active>false</active>
+ <active>true</active>
<description>璩囨枡銈掑叕闁嬨伀銇椼仧娈甸殠銇с�佺壒瀹氥伄璩囨枡鍖哄垎銇枹銇椼仸銇�乁RL銈掑繀闋堝寲
銇熴仩銇椼�佷骇鍝佽祫鏂欏叕寮�缁撴潫銇孴RUE銇仺銇嶃伅涓嶈銆�</description>
<errorConditionFormula>(Text(Material_status__c) = '鍏紑涓�'
diff --git a/force-app/main/default/objects/Product_Documentation__c/validationRules/Select_competitor_product.validationRule-meta.xml b/force-app/main/default/objects/Product_Documentation__c/validationRules/Select_competitor_product.validationRule-meta.xml
index 88fca83..623564c 100644
--- a/force-app/main/default/objects/Product_Documentation__c/validationRules/Select_competitor_product.validationRule-meta.xml
+++ b/force-app/main/default/objects/Product_Documentation__c/validationRules/Select_competitor_product.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Select_competitor_product</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>AND(TEXT( Material_category__c) = "绔炰簤瀵规墜淇℃伅",ISBLANK(Competitor_name__c))</errorConditionFormula>
<errorMessage>璇疯緭鍏ョ珵浜夊鎵嬪搧鐗�</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Product_Set__c/Product_Set__c.object-meta.xml b/force-app/main/default/objects/Product_Set__c/Product_Set__c.object-meta.xml
index eab5c44..a0eb674 100644
--- a/force-app/main/default/objects/Product_Set__c/Product_Set__c.object-meta.xml
+++ b/force-app/main/default/objects/Product_Set__c/Product_Set__c.object-meta.xml
@@ -167,11 +167,11 @@
<customTabListAdditionalFields>Description__c</customTabListAdditionalFields>
<excludedStandardButtons>OpenListInQuip</excludedStandardButtons>
<excludedStandardButtons>NewFromDocument</excludedStandardButtons>
- <excludedStandardButtons>Accept</excludedStandardButtons>
- <excludedStandardButtons>PrintableListView</excludedStandardButtons>
- <excludedStandardButtons>Import</excludedStandardButtons>
<excludedStandardButtons>MassChangeOwner</excludedStandardButtons>
+ <excludedStandardButtons>PrintableListView</excludedStandardButtons>
<excludedStandardButtons>ChangeOwner</excludedStandardButtons>
+ <excludedStandardButtons>Import</excludedStandardButtons>
+ <excludedStandardButtons>Accept</excludedStandardButtons>
<searchResultsAdditionalFields>Standard_set_price__c</searchResultsAdditionalFields>
<searchResultsAdditionalFields>Valid_Date__c</searchResultsAdditionalFields>
<searchResultsAdditionalFields>SFDA_STOP_Product__c</searchResultsAdditionalFields>
diff --git a/force-app/main/default/objects/PromotionHead__c/fields/Status__c.field-meta.xml b/force-app/main/default/objects/PromotionHead__c/fields/Status__c.field-meta.xml
index 84ace2e..ffc8aa3 100644
--- a/force-app/main/default/objects/PromotionHead__c/fields/Status__c.field-meta.xml
+++ b/force-app/main/default/objects/PromotionHead__c/fields/Status__c.field-meta.xml
@@ -2,7 +2,7 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Status__c</fullName>
<externalId>false</externalId>
- <formula>if(ApplyStatus__c != '鍚屾剰','鏃犳晥',if(RecordType.Id == '012C600000003Jr','鏈夋晥',if(DateFrom__c > today(),'鏃犳晥',if (today()<=DateTo__c, '鏈夋晥', '鏃犳晥'))))</formula>
+ <formula>if(ApplyStatus__c != '鍚屾剰','鏃犳晥',if(RecordType.Id == '01210000000aLmv','鏈夋晥',if(DateFrom__c > today(),'鏃犳晥',if (today()<=DateTo__c, '鏈夋晥', '鏃犳晥'))))</formula>
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
<label>鏈夋晥/鏃犳晥</label>
<required>false</required>
diff --git a/force-app/main/default/objects/PromotionHead__c/listViews/ViewTe.listView-meta.xml b/force-app/main/default/objects/PromotionHead__c/listViews/ViewTe.listView-meta.xml
index d8f3482..71e51f6 100644
--- a/force-app/main/default/objects/PromotionHead__c/listViews/ViewTe.listView-meta.xml
+++ b/force-app/main/default/objects/PromotionHead__c/listViews/ViewTe.listView-meta.xml
@@ -9,6 +9,8 @@
<columns>Contract__c</columns>
<columns>Province__c</columns>
<columns>DateTo__c</columns>
+ <columns>NormalDiscount__c</columns>
+ <columns>GuaranteeDiscount__c</columns>
<filterScope>Everything</filterScope>
<filters>
<field>RECORDTYPE</field>
@@ -19,11 +21,6 @@
<field>Status__c</field>
<operation>contains</operation>
<value>鏈夋晥</value>
- </filters>
- <filters>
- <field>Agency__c</field>
- <operation>contains</operation>
- <value>璐濇仼</value>
</filters>
<label>03.鐗圭害鍥哄畾</label>
<language>zh_CN</language>
diff --git a/force-app/main/default/objects/QIS_M_BC__c/validationRules/QIS_M_BC_answer_check.validationRule-meta.xml b/force-app/main/default/objects/QIS_M_BC__c/validationRules/QIS_M_BC_answer_check.validationRule-meta.xml
index 8376540..b1ad262 100644
--- a/force-app/main/default/objects/QIS_M_BC__c/validationRules/QIS_M_BC_answer_check.validationRule-meta.xml
+++ b/force-app/main/default/objects/QIS_M_BC__c/validationRules/QIS_M_BC_answer_check.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>QIS_M_BC_answer_check</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>NOT(ISNULL(QIS_M_BC_answer_day__c)) && ISBLANK(QIS_M_BC_answer_detail__c)</errorConditionFormula>
<errorMessage>濉啓鈥淨IS M-BC鍥炵瓟鏃モ�濈殑鏃跺�欙紝璇峰厛濉啓鈥淨IS M-BC鍥炵瓟鍐呭鈥�</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/QIS_M_BC__c/validationRules/QIS_submit_request_shipment_product_info.validationRule-meta.xml b/force-app/main/default/objects/QIS_M_BC__c/validationRules/QIS_submit_request_shipment_product_info.validationRule-meta.xml
index e2cc74e..304b485 100644
--- a/force-app/main/default/objects/QIS_M_BC__c/validationRules/QIS_submit_request_shipment_product_info.validationRule-meta.xml
+++ b/force-app/main/default/objects/QIS_M_BC__c/validationRules/QIS_submit_request_shipment_product_info.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>QIS_submit_request_shipment_product_info</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>AND(
NOT(ISBLANK(QIS_submit_date_for_MBC__c)),
ISBLANK(text(accsessary_ship__c)))</errorConditionFormula>
diff --git a/force-app/main/default/objects/QIS_M_BC__c/validationRules/Request_input_accsessary_detail_info.validationRule-meta.xml b/force-app/main/default/objects/QIS_M_BC__c/validationRules/Request_input_accsessary_detail_info.validationRule-meta.xml
index df7541a..02faf6d 100644
--- a/force-app/main/default/objects/QIS_M_BC__c/validationRules/Request_input_accsessary_detail_info.validationRule-meta.xml
+++ b/force-app/main/default/objects/QIS_M_BC__c/validationRules/Request_input_accsessary_detail_info.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Request_input_accsessary_detail_info</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>AND(
ISPICKVAL(accsessary_ship__c , "閫�(闆朵欢)"),
ISBLANK(accsessary_detail__c))</errorConditionFormula>
diff --git a/force-app/main/default/objects/QIS_Report__c/QIS_Report__c.object-meta.xml b/force-app/main/default/objects/QIS_Report__c/QIS_Report__c.object-meta.xml
index 15f13ff..6304d06 100644
--- a/force-app/main/default/objects/QIS_Report__c/QIS_Report__c.object-meta.xml
+++ b/force-app/main/default/objects/QIS_Report__c/QIS_Report__c.object-meta.xml
@@ -58,11 +58,13 @@
</actionOverrides>
<actionOverrides>
<actionName>Edit</actionName>
- <type>Default</type>
+ <content>LexQISPIPLAura</content>
+ <formFactor>Large</formFactor>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>LightningComponent</type>
</actionOverrides>
<actionOverrides>
<actionName>Edit</actionName>
- <formFactor>Large</formFactor>
<type>Default</type>
</actionOverrides>
<actionOverrides>
@@ -86,11 +88,13 @@
</actionOverrides>
<actionOverrides>
<actionName>New</actionName>
- <type>Default</type>
+ <content>LexQISPIPLAura</content>
+ <formFactor>Large</formFactor>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>LightningComponent</type>
</actionOverrides>
<actionOverrides>
<actionName>New</actionName>
- <formFactor>Large</formFactor>
<type>Default</type>
</actionOverrides>
<actionOverrides>
@@ -129,7 +133,7 @@
<actionOverrides>
<actionName>View</actionName>
<comment>Action override created by Lightning App Builder during activation.</comment>
- <content>QIS1</content>
+ <content>QIS</content>
<formFactor>Large</formFactor>
<skipRecordTypeSelect>false</skipRecordTypeSelect>
<type>Flexipage</type>
diff --git a/force-app/main/default/objects/QIS_Report__c/fields/Hospital__c.field-meta.xml b/force-app/main/default/objects/QIS_Report__c/fields/Hospital__c.field-meta.xml
index b8b7422..1d2c87d 100644
--- a/force-app/main/default/objects/QIS_Report__c/fields/Hospital__c.field-meta.xml
+++ b/force-app/main/default/objects/QIS_Report__c/fields/Hospital__c.field-meta.xml
@@ -7,13 +7,18 @@
<label>鍖婚櫌</label>
<lookupFilter>
<active>false</active>
- <booleanFilter>1</booleanFilter>
+ <booleanFilter>1 OR 2</booleanFilter>
<errorMessage>鍖婚櫌瀛楁璇烽�夋嫨鍖婚櫌</errorMessage>
<filterItems>
<field>Account.RecordType.DeveloperName</field>
<operation>equals</operation>
<value>HP</value>
</filterItems>
+ <filterItems>
+ <field>$Source.CreatedDate</field>
+ <operation>lessThan</operation>
+ <value>6/25/2019 12:00 涓婂崍</value>
+ </filterItems>
<isOptional>false</isOptional>
</lookupFilter>
<referenceTo>Account</referenceTo>
diff --git a/force-app/main/default/objects/QIS_Report__c/fields/OCSM_QARA_Owner__c.field-meta.xml b/force-app/main/default/objects/QIS_Report__c/fields/OCSM_QARA_Owner__c.field-meta.xml
index e713abf..454270f 100644
--- a/force-app/main/default/objects/QIS_Report__c/fields/OCSM_QARA_Owner__c.field-meta.xml
+++ b/force-app/main/default/objects/QIS_Report__c/fields/OCSM_QARA_Owner__c.field-meta.xml
@@ -1,10 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>OCSM_QARA_Owner__c</fullName>
- <externalId>false</externalId>
- <formula>CASE(MOD( value(RIGHT(Name, 5)) ,5), 0, '鍒樻櫒鐝�', 1, '榛勬亽鎱�',2, '璧靛崥浠�',3, '缃椾箰璇�',4,
+ <description>CASE(MOD( value(RIGHT(Name, 5)) ,5), 0, '鍒樻櫒鐝�', 1, '榛勬亽鎱�',2, '璧靛崥浠�',3, '缃椾箰璇�',4,
if(DATEVALUE(CreatedDate ) - DATE(2022,9,28) > 0 ,'绔ョ孩鐕�','闄堥害绉�')
-,'')</formula>
+,'')</description>
+ <externalId>false</externalId>
+ <formula>if(DATEVALUE(CreatedDate ) - DATE(2024,1,10) > 0,
+CASE(MOD( value(RIGHT(Name, 5)) ,5),
+0, '姝︾传鐠�',
+1, '榛勬亽鎱�',
+2, '姝︾传鐠�',
+3, '楂橀暅楹�',
+4, '楂橀暅楹�',
+'')
+,
+CASE(MOD( value(RIGHT(Name, 5)) ,5),
+0, '鍒樻櫒鐝�',
+1, '榛勬亽鎱�',
+2, '璧靛崥浠�',
+3, '缃椾箰璇�',
+4, if(DATEVALUE(CreatedDate ) - DATE(2022,9,28) > 0 ,
+'绔ョ孩鐕�','闄堥害绉�'),
+'')
+)</formula>
<label>OCSM QARA鎷呭綋浜�</label>
<required>false</required>
<trackHistory>false</trackHistory>
diff --git a/force-app/main/default/objects/QIS_Report__c/listViews/status_QIS.listView-meta.xml b/force-app/main/default/objects/QIS_Report__c/listViews/status_QIS.listView-meta.xml
index e57537f..004a18b 100644
--- a/force-app/main/default/objects/QIS_Report__c/listViews/status_QIS.listView-meta.xml
+++ b/force-app/main/default/objects/QIS_Report__c/listViews/status_QIS.listView-meta.xml
@@ -16,7 +16,8 @@
<filters>
<field>RECORDTYPE</field>
<operation>equals</operation>
- <value>QIS_Report__c.QISRecordType1,QIS_Report__c.RC,QIS_Report__c.OSH,QIS_Report__c.AnswerComp,QIS_Report__c.Comp</value>
+ <value>QIS_Report__c.QISRecordType1,QIS_Report__c.RC,QIS_Report__c.OSH,QIS_Report__c.Comp,QIS_Report__c.AnswerComp</value>
</filters>
<label>ALL锛氭墍鏈夌殑QIS</label>
+ <language>zh_CN</language>
</ListView>
diff --git a/force-app/main/default/objects/QIS_Report__c/validationRules/Department_DepartmentClass_check.validationRule-meta.xml b/force-app/main/default/objects/QIS_Report__c/validationRules/Department_DepartmentClass_check.validationRule-meta.xml
index 094120a..b22584c 100644
--- a/force-app/main/default/objects/QIS_Report__c/validationRules/Department_DepartmentClass_check.validationRule-meta.xml
+++ b/force-app/main/default/objects/QIS_Report__c/validationRules/Department_DepartmentClass_check.validationRule-meta.xml
@@ -9,7 +9,7 @@
<errorConditionFormula>Not(Isblank(nonyushohin__c))
&& Not(Department_Class__c == Hospital_Department__r.ParentId)
&& Not(Text(capital_or_consumable__c) == '鑰楁潗' &&
-Department_Class__c== Hospital_Department__c
+Department_Class__r.Id == Hospital_Department__r.Id
&&
(Department_Class__r.RecordType.DeveloperName == 'Department_Class_ET' ||
Department_Class__r.RecordType.DeveloperName == 'Department_Class_GS' ))</errorConditionFormula>
diff --git a/force-app/main/default/objects/Quote/Quote.object-meta.xml b/force-app/main/default/objects/Quote/Quote.object-meta.xml
new file mode 100644
index 0000000..a0a38f7
--- /dev/null
+++ b/force-app/main/default/objects/Quote/Quote.object-meta.xml
@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomObject xmlns="http://soap.sforce.com/2006/04/metadata">
+ <actionOverrides>
+ <actionName>CancelEdit</actionName>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>CancelEdit</actionName>
+ <formFactor>Large</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>CancelEdit</actionName>
+ <formFactor>Small</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>CreatePdf</actionName>
+ <content>NewQuoteEntry</content>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>Visualforce</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>CreatePdf</actionName>
+ <formFactor>Large</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>CreatePdf</actionName>
+ <formFactor>Small</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>Delete</actionName>
+ <content>YouCantDeleteQuote</content>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>Visualforce</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>Delete</actionName>
+ <formFactor>Large</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>Delete</actionName>
+ <formFactor>Small</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>Edit</actionName>
+ <content>lexQuoteEntryEditBotton</content>
+ <formFactor>Large</formFactor>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>LightningComponent</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>Edit</actionName>
+ <content>lexQuoteEntryEditBotton</content>
+ <formFactor>Small</formFactor>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>LightningComponent</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>Edit</actionName>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>EmailQuote</actionName>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>EmailQuote</actionName>
+ <formFactor>Large</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>EmailQuote</actionName>
+ <formFactor>Small</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>List</actionName>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>List</actionName>
+ <formFactor>Large</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>List</actionName>
+ <formFactor>Small</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>NewQuote</actionName>
+ <content>NewQuoteEntry</content>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>Visualforce</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>NewQuote</actionName>
+ <formFactor>Large</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>NewQuote</actionName>
+ <formFactor>Small</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>SaveEdit</actionName>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>SaveEdit</actionName>
+ <formFactor>Large</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>SaveEdit</actionName>
+ <formFactor>Small</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>SyncQuote</actionName>
+ <content>NewQuoteEntry</content>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>Visualforce</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>SyncQuote</actionName>
+ <formFactor>Large</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>SyncQuote</actionName>
+ <formFactor>Small</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>Tab</actionName>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>Tab</actionName>
+ <formFactor>Large</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>Tab</actionName>
+ <formFactor>Small</formFactor>
+ <type>Default</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>View</actionName>
+ <comment>Action override created by Lightning App Builder during activation.</comment>
+ <content>quote</content>
+ <formFactor>Large</formFactor>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>Flexipage</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>View</actionName>
+ <comment>Action override created by Lightning App Builder during activation.</comment>
+ <content>quote</content>
+ <formFactor>Small</formFactor>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>Flexipage</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>View</actionName>
+ <type>Default</type>
+ </actionOverrides>
+ <compactLayoutAssignment>QuotationMiniatureLayout</compactLayoutAssignment>
+ <enableFeeds>false</enableFeeds>
+ <externalSharingModel>ControlledByParent</externalSharingModel>
+ <searchLayouts>
+ <customTabListAdditionalFields>QUOTE.NAME</customTabListAdditionalFields>
+ <customTabListAdditionalFields>OPPORTUNITY.NAME</customTabListAdditionalFields>
+ <customTabListAdditionalFields>QUOTE.ISSYNCING</customTabListAdditionalFields>
+ <customTabListAdditionalFields>QUOTE.EXPIRATIONDATE</customTabListAdditionalFields>
+ <customTabListAdditionalFields>QUOTE.SUBTOTAL</customTabListAdditionalFields>
+ <customTabListAdditionalFields>QUOTE.TOTALPRICE</customTabListAdditionalFields>
+ <lookupDialogsAdditionalFields>QUOTE.NAME</lookupDialogsAdditionalFields>
+ <lookupDialogsAdditionalFields>OPPORTUNITY.NAME</lookupDialogsAdditionalFields>
+ <lookupDialogsAdditionalFields>QUOTE.ISSYNCING</lookupDialogsAdditionalFields>
+ <lookupDialogsAdditionalFields>QUOTE.EXPIRATIONDATE</lookupDialogsAdditionalFields>
+ <lookupDialogsAdditionalFields>QUOTE.SUBTOTAL</lookupDialogsAdditionalFields>
+ <lookupDialogsAdditionalFields>QUOTE.TOTALPRICE</lookupDialogsAdditionalFields>
+ <lookupPhoneDialogsAdditionalFields>QUOTE.NAME</lookupPhoneDialogsAdditionalFields>
+ <lookupPhoneDialogsAdditionalFields>OPPORTUNITY.NAME</lookupPhoneDialogsAdditionalFields>
+ <lookupPhoneDialogsAdditionalFields>QUOTE.ISSYNCING</lookupPhoneDialogsAdditionalFields>
+ <lookupPhoneDialogsAdditionalFields>QUOTE.EXPIRATIONDATE</lookupPhoneDialogsAdditionalFields>
+ <lookupPhoneDialogsAdditionalFields>QUOTE.SUBTOTAL</lookupPhoneDialogsAdditionalFields>
+ <lookupPhoneDialogsAdditionalFields>QUOTE.TOTALPRICE</lookupPhoneDialogsAdditionalFields>
+ <lookupPhoneDialogsAdditionalFields>QUOTE.PHONE</lookupPhoneDialogsAdditionalFields>
+ <searchResultsAdditionalFields>QUOTE.NAME</searchResultsAdditionalFields>
+ <searchResultsAdditionalFields>Quote_No__c</searchResultsAdditionalFields>
+ <searchResultsAdditionalFields>OPPORTUNITY.NAME</searchResultsAdditionalFields>
+ <searchResultsAdditionalFields>TotalPrice__c</searchResultsAdditionalFields>
+ <searchResultsAdditionalFields>Dealer_Final_Price__c</searchResultsAdditionalFields>
+ <searchResultsAdditionalFields>OCM_Agent1_Price__c</searchResultsAdditionalFields>
+ <searchResultsAdditionalFields>Cancel_Decide__c</searchResultsAdditionalFields>
+ <searchResultsAdditionalFields>LastModifiedBy</searchResultsAdditionalFields>
+ </searchLayouts>
+ <sharingModel>ControlledByParent</sharingModel>
+</CustomObject>
diff --git a/force-app/main/default/objects/Quote/compactLayouts/QuotationMiniatureLayout.compactLayout-meta.xml b/force-app/main/default/objects/Quote/compactLayouts/QuotationMiniatureLayout.compactLayout-meta.xml
new file mode 100644
index 0000000..7b0af77
--- /dev/null
+++ b/force-app/main/default/objects/Quote/compactLayouts/QuotationMiniatureLayout.compactLayout-meta.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CompactLayout xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>QuotationMiniatureLayout</fullName>
+ <fields>Name</fields>
+ <label>鎶ヤ环寰缉甯冨眬</label>
+</CompactLayout>
diff --git a/force-app/main/default/objects/Quote/fields/AccountId.field-meta.xml b/force-app/main/default/objects/Quote/fields/AccountId.field-meta.xml
new file mode 100644
index 0000000..23a2c5d
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/AccountId.field-meta.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>AccountId</fullName>
+ <trackHistory>false</trackHistory>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/AdditionalAddress.field-meta.xml b/force-app/main/default/objects/Quote/fields/AdditionalAddress.field-meta.xml
new file mode 100644
index 0000000..ee4e5c7
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/AdditionalAddress.field-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>AdditionalAddress</fullName>
+ <trackHistory>false</trackHistory>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/AdditionalName.field-meta.xml b/force-app/main/default/objects/Quote/fields/AdditionalName.field-meta.xml
new file mode 100644
index 0000000..37a9901
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/AdditionalName.field-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>AdditionalName</fullName>
+ <trackHistory>false</trackHistory>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Agency1_Profit_F__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Agency1_Profit_F__c.field-meta.xml
new file mode 100644
index 0000000..f4265c0
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Agency1_Profit_F__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Agency1_Profit_F__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(Opportunity.SAP_Send_OK__c && (Agency1__r.Special__c || Agency2__r.Special__c || Opportunity.Account.Parent.Special__c) && $User.ViewSpecialAgencyAmout__c == False, null,
+ Agency1_Profit__c
+)</formula>
+ <label>缁忛攢鍟�1鍒╂鼎棰�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Agency1_Profit_Rate_F__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Agency1_Profit_Rate_F__c.field-meta.xml
new file mode 100644
index 0000000..ae6bb22
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Agency1_Profit_Rate_F__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Agency1_Profit_Rate_F__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(Opportunity.SAP_Send_OK__c && (Agency1__r.Special__c || Agency2__r.Special__c || Opportunity.Account.Parent.Special__c) && $User.ViewSpecialAgencyAmout__c == False, null,
+ Agency1_Profit_Rate__c
+)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>缁忛攢鍟�1鍒╂鼎鐜�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <type>Percent</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Agency1_Profit_Rate__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Agency1_Profit_Rate__c.field-meta.xml
new file mode 100644
index 0000000..77442c7
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Agency1_Profit_Rate__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Agency1_Profit_Rate__c</fullName>
+ <externalId>false</externalId>
+ <label>/OCSM-缁忛攢鍟�1鍒╂鼎鐜�</label>
+ <precision>5</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <type>Percent</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Agency1_Profit__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Agency1_Profit__c.field-meta.xml
new file mode 100644
index 0000000..a10447b
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Agency1_Profit__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Agency1_Profit__c</fullName>
+ <externalId>false</externalId>
+ <label>/OCSM-缁忛攢鍟�1鍒╂鼎棰�</label>
+ <precision>15</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Agency1__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Agency1__c.field-meta.xml
new file mode 100644
index 0000000..2f307e7
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Agency1__c.field-meta.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Agency1__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>1娆¤博澹插簵</label>
+ <lookupFilter>
+ <active>true</active>
+ <filterItems>
+ <field>Account.RecordTypeId</field>
+ <operation>equals</operation>
+ <value>璨╁２搴�</value>
+ </filterItems>
+ <filterItems>
+ <field>Account.Delete_Flag__c</field>
+ <operation>equals</operation>
+ <value>False</value>
+ </filterItems>
+ <filterItems>
+ <field>Account.Sales_Shop_Class__c</field>
+ <operation>equals</operation>
+ <value>鐗圭害缁忛攢鍟�(鍖哄煙), 鐗圭害缁忛攢鍟�(浜у搧), 涓�绾х粡閿�鍟�, 鐗圭害缁忛攢鍟�(浜у搧+鍖哄煙), 闆嗛噰缁忛攢鍟�,鍏朵粬</value>
+ </filterItems>
+ <filterItems>
+ <field>Account.Is_Active_Formula__c</field>
+ <operation>equals</operation>
+ <value>鏈夋晥</value>
+ </filterItems>
+ <isOptional>false</isOptional>
+ </lookupFilter>
+ <referenceTo>Account</referenceTo>
+ <relationshipLabel>瑕嬬</relationshipLabel>
+ <relationshipName>Agency1</relationshipName>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Agency2_Profit_F__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Agency2_Profit_F__c.field-meta.xml
new file mode 100644
index 0000000..972d06d
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Agency2_Profit_F__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Agency2_Profit_F__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(Opportunity.SAP_Send_OK__c && (Agency1__r.Special__c || Agency2__r.Special__c || Opportunity.Account.Parent.Special__c) && $User.ViewSpecialAgencyAmout__c == False, null,
+ Agency2_Profit__c
+)</formula>
+ <label>缁忛攢鍟�1-缁忛攢鍟�2鍒╂鼎棰�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Agency2_Profit_Rate_F__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Agency2_Profit_Rate_F__c.field-meta.xml
new file mode 100644
index 0000000..a40b56d
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Agency2_Profit_Rate_F__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Agency2_Profit_Rate_F__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(Opportunity.SAP_Send_OK__c && (Agency1__r.Special__c || Agency2__r.Special__c || Opportunity.Account.Parent.Special__c) && $User.ViewSpecialAgencyAmout__c == False, null,
+ Agency2_Profit_Rate__c
+)</formula>
+ <label>缁忛攢鍟�1-缁忛攢鍟�2鍒╂鼎鐜�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <type>Percent</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Agency2_Profit_Rate__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Agency2_Profit_Rate__c.field-meta.xml
new file mode 100644
index 0000000..5d7fd24
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Agency2_Profit_Rate__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Agency2_Profit_Rate__c</fullName>
+ <externalId>false</externalId>
+ <label>2娆¤博澹插簵鍒╃泭鐜嘷鍏�</label>
+ <precision>5</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <type>Percent</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Agency2_Profit__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Agency2_Profit__c.field-meta.xml
new file mode 100644
index 0000000..bebf5c0
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Agency2_Profit__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Agency2_Profit__c</fullName>
+ <externalId>false</externalId>
+ <label>2娆¤博澹插簵鍒╃泭閲戦_鍏�</label>
+ <precision>15</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Agency2__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Agency2__c.field-meta.xml
new file mode 100644
index 0000000..0fb28dd
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Agency2__c.field-meta.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Agency2__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>2娆¤博澹插簵</label>
+ <lookupFilter>
+ <active>true</active>
+ <filterItems>
+ <field>Account.RecordTypeId</field>
+ <operation>equals</operation>
+ <value>璨╁２搴�</value>
+ </filterItems>
+ <filterItems>
+ <field>Account.Delete_Flag__c</field>
+ <operation>equals</operation>
+ <value>False</value>
+ </filterItems>
+ <filterItems>
+ <field>Account.Is_Active_Formula__c</field>
+ <operation>equals</operation>
+ <value>鏈夋晥</value>
+ </filterItems>
+ <isOptional>true</isOptional>
+ </lookupFilter>
+ <referenceTo>Account</referenceTo>
+ <relationshipLabel>瑕嬬 (鍙栧紩鍏�)</relationshipLabel>
+ <relationshipName>Agency2</relationshipName>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/AgencyDiscount__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/AgencyDiscount__c.field-meta.xml
new file mode 100644
index 0000000..ab36643
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/AgencyDiscount__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>AgencyDiscount__c</fullName>
+ <externalId>false</externalId>
+ <label>缁忛攢鍟嗘姌鎵�</label>
+ <precision>5</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <type>Percent</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Agent1_Agent2_Price_F__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Agent1_Agent2_Price_F__c.field-meta.xml
new file mode 100644
index 0000000..6b56894
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Agent1_Agent2_Price_F__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Agent1_Agent2_Price_F__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(Opportunity.SAP_Send_OK__c && (Agency1__r.Special__c || Agency2__r.Special__c || Opportunity.Account.Parent.Special__c) && $User.ViewSpecialAgencyAmout__c == False, null,
+ Agent1_Agent2_Price__c
+)</formula>
+ <label>缁忛攢鍟�1-缁忛攢鍟�2閲戦</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Agent1_Agent2_Price_Page__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Agent1_Agent2_Price_Page__c.field-meta.xml
new file mode 100644
index 0000000..0485ce8
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Agent1_Agent2_Price_Page__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Agent1_Agent2_Price_Page__c</fullName>
+ <description>琛ㄧず鐢ㄧ浜屼唬鐞嗗簵鍚堝悓閲戦</description>
+ <externalId>false</externalId>
+ <label>绗簩浠ｇ悊搴楀悎鍚岄噾棰�(鐢婚潰鐢�)</label>
+ <precision>15</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Agent1_Agent2_Price__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Agent1_Agent2_Price__c.field-meta.xml
new file mode 100644
index 0000000..bff4ccd
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Agent1_Agent2_Price__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Agent1_Agent2_Price__c</fullName>
+ <externalId>false</externalId>
+ <label>Agent1-Agent2 閲戦_鍏�</label>
+ <precision>15</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>true</trackHistory>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/BidAnnounce__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/BidAnnounce__c.field-meta.xml
new file mode 100644
index 0000000..769b75e
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/BidAnnounce__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>BidAnnounce__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>涓爣閫氱煡涔�</label>
+ <referenceTo>Bid_Announcement__c</referenceTo>
+ <relationshipLabel>瑕嬬</relationshipLabel>
+ <relationshipName>Quote_Bid</relationshipName>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/BillingAddress.field-meta.xml b/force-app/main/default/objects/Quote/fields/BillingAddress.field-meta.xml
new file mode 100644
index 0000000..15a7f17
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/BillingAddress.field-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>BillingAddress</fullName>
+ <trackHistory>false</trackHistory>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/BillingName.field-meta.xml b/force-app/main/default/objects/Quote/fields/BillingName.field-meta.xml
new file mode 100644
index 0000000..4eed725
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/BillingName.field-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>BillingName</fullName>
+ <trackHistory>false</trackHistory>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Cancel_Decide__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Cancel_Decide__c.field-meta.xml
new file mode 100644
index 0000000..06d562c
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Cancel_Decide__c.field-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Cancel_Decide__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>琚彇娑堣繃</label>
+ <trackHistory>false</trackHistory>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/ContactId.field-meta.xml b/force-app/main/default/objects/Quote/fields/ContactId.field-meta.xml
new file mode 100644
index 0000000..84740e4
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/ContactId.field-meta.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ContactId</fullName>
+ <trackHistory>false</trackHistory>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/ContractId.field-meta.xml b/force-app/main/default/objects/Quote/fields/ContractId.field-meta.xml
new file mode 100644
index 0000000..d41771f
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/ContractId.field-meta.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ContractId</fullName>
+ <trackHistory>false</trackHistory>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Contract__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Contract__c.field-meta.xml
new file mode 100644
index 0000000..f212fab
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Contract__c.field-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Contract__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>濂戠磩鍐呰ǔ</label>
+ <trackHistory>false</trackHistory>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/CurrencyIsoCode.field-meta.xml b/force-app/main/default/objects/Quote/fields/CurrencyIsoCode.field-meta.xml
new file mode 100644
index 0000000..bbca244
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/CurrencyIsoCode.field-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>CurrencyIsoCode</fullName>
+ <trackHistory>false</trackHistory>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Dealer_Final_Price_F__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Dealer_Final_Price_F__c.field-meta.xml
new file mode 100644
index 0000000..f255a9d
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Dealer_Final_Price_F__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Dealer_Final_Price_F__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(Opportunity.SAP_Send_OK__c && (Agency1__r.Special__c || Agency2__r.Special__c || Opportunity.Account.Parent.Special__c) && $User.ViewSpecialAgencyAmout__c == False, null,
+ Dealer_Final_Price__c
+)</formula>
+ <label>鍖婚櫌鍚堝悓閲戦</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Dealer_Final_Price_Page__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Dealer_Final_Price_Page__c.field-meta.xml
new file mode 100644
index 0000000..917cb63
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Dealer_Final_Price_Page__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Dealer_Final_Price_Page__c</fullName>
+ <externalId>false</externalId>
+ <label>鍖婚櫌鐨勫悎鍚岄噾棰�(鐢婚潰鐢�)</label>
+ <precision>15</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Dealer_Final_Price__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Dealer_Final_Price__c.field-meta.xml
new file mode 100644
index 0000000..edf334c
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Dealer_Final_Price__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Dealer_Final_Price__c</fullName>
+ <externalId>false</externalId>
+ <label>鐥呴櫌濂戠磩閲戦_鍏�</label>
+ <precision>15</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>true</trackHistory>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Description.field-meta.xml b/force-app/main/default/objects/Quote/fields/Description.field-meta.xml
new file mode 100644
index 0000000..253d539
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Description.field-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Description</fullName>
+ <trackHistory>false</trackHistory>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Discount.field-meta.xml b/force-app/main/default/objects/Quote/fields/Discount.field-meta.xml
new file mode 100644
index 0000000..31bb5a4
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Discount.field-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Discount</fullName>
+ <trackHistory>false</trackHistory>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Discount_Amount_Calculate_F__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Discount_Amount_Calculate_F__c.field-meta.xml
new file mode 100644
index 0000000..0625942
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Discount_Amount_Calculate_F__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Discount_Amount_Calculate_F__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(Opportunity.SAP_Send_OK__c && (Agency1__r.Special__c || Agency2__r.Special__c || Opportunity.Account.Parent.Special__c) && $User.ViewSpecialAgencyAmout__c == False, null,
+ Discount_Amount_Calculate__c
+)</formula>
+ <label>浼樻儬浠锋牸%</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <type>Percent</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Discount_Amount_Calculate__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Discount_Amount_Calculate__c.field-meta.xml
new file mode 100644
index 0000000..fae7c91
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Discount_Amount_Calculate__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Discount_Amount_Calculate__c</fullName>
+ <externalId>false</externalId>
+ <label>鍊ゅ紩閲戦瑷堢畻</label>
+ <precision>5</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <type>Percent</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Discount_Amount_F__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Discount_Amount_F__c.field-meta.xml
new file mode 100644
index 0000000..0435d3c
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Discount_Amount_F__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Discount_Amount_F__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(Opportunity.SAP_Send_OK__c && (Agency1__r.Special__c || Agency2__r.Special__c || Opportunity.Account.Parent.Special__c) && $User.ViewSpecialAgencyAmout__c == False, null,
+ Discount_Amount__c
+)</formula>
+ <label>浼樻儬浠锋牸</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Discount_Amount__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Discount_Amount__c.field-meta.xml
new file mode 100644
index 0000000..b9f892b
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Discount_Amount__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Discount_Amount__c</fullName>
+ <externalId>false</externalId>
+ <label>鍊ゅ紩閲戦</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Discount__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Discount__c.field-meta.xml
new file mode 100644
index 0000000..eb1a448
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Discount__c.field-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Discount__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>浼樻儬鎶樻墸</label>
+ <trackHistory>false</trackHistory>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Email.field-meta.xml b/force-app/main/default/objects/Quote/fields/Email.field-meta.xml
new file mode 100644
index 0000000..ea71e63
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Email.field-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Email</fullName>
+ <trackHistory>false</trackHistory>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Estimation_List_Price__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Estimation_List_Price__c.field-meta.xml
new file mode 100644
index 0000000..bbb288e
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Estimation_List_Price__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Estimation_List_Price__c</fullName>
+ <externalId>false</externalId>
+ <label>妯欐簴瀹氫尽鍚堣▓渚℃牸</label>
+ <precision>15</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/ExpirationDate.field-meta.xml b/force-app/main/default/objects/Quote/fields/ExpirationDate.field-meta.xml
new file mode 100644
index 0000000..f80c0a2
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/ExpirationDate.field-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ExpirationDate</fullName>
+ <trackHistory>false</trackHistory>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Fax.field-meta.xml b/force-app/main/default/objects/Quote/fields/Fax.field-meta.xml
new file mode 100644
index 0000000..3bea3aa
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Fax.field-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Fax</fullName>
+ <trackHistory>false</trackHistory>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/GrandTotal.field-meta.xml b/force-app/main/default/objects/Quote/fields/GrandTotal.field-meta.xml
new file mode 100644
index 0000000..9c6af5a
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/GrandTotal.field-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>GrandTotal</fullName>
+ <trackHistory>false</trackHistory>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Gurantee_Period__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Gurantee_Period__c.field-meta.xml
new file mode 100644
index 0000000..fa6b1f9
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Gurantee_Period__c.field-meta.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Gurantee_Period__c</fullName>
+ <externalId>false</externalId>
+ <label>鍚堝悓淇濅慨鏈燂紙骞达級</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Picklist</type>
+ <valueSet>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>1</fullName>
+ <default>true</default>
+ <label>1</label>
+ </value>
+ <value>
+ <fullName>2</fullName>
+ <default>false</default>
+ <label>2</label>
+ </value>
+ <value>
+ <fullName>3</fullName>
+ <default>false</default>
+ <label>3</label>
+ </value>
+ <value>
+ <fullName>4</fullName>
+ <default>false</default>
+ <label>4</label>
+ </value>
+ <value>
+ <fullName>5</fullName>
+ <default>false</default>
+ <label>5</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/HasType3Machine__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/HasType3Machine__c.field-meta.xml
new file mode 100644
index 0000000..a59244b
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/HasType3Machine__c.field-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>HasType3Machine__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>鍖呭惈绗�3鍒嗙被鏄富鏈虹殑浜у搧</label>
+ <trackHistory>false</trackHistory>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Have_Virtual__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Have_Virtual__c.field-meta.xml
new file mode 100644
index 0000000..45ffae9
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Have_Virtual__c.field-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Have_Virtual__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>鍖呭惈铏氭嫙浜у搧</label>
+ <trackHistory>false</trackHistory>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Installation_location__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Installation_location__c.field-meta.xml
new file mode 100644
index 0000000..011103f
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Installation_location__c.field-meta.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Installation_location__c</fullName>
+ <externalId>false</externalId>
+ <label>涓绘満瀹夎鍦扮偣</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Picklist</type>
+ <valueSet>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>鎵嬫湳瀹�</fullName>
+ <default>false</default>
+ <label>鎵嬫湳瀹�</label>
+ </value>
+ <value>
+ <fullName>闂ㄨ瘖</fullName>
+ <default>false</default>
+ <label>闂ㄨ瘖</label>
+ </value>
+ <value>
+ <fullName>鍐呴暅瀹�</fullName>
+ <default>false</default>
+ <label>鍐呴暅瀹�</label>
+ </value>
+ <value>
+ <fullName>鍏朵粬</fullName>
+ <default>false</default>
+ <label>鍏朵粬</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Interdepartmental__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Interdepartmental__c.field-meta.xml
new file mode 100644
index 0000000..09ff22a
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Interdepartmental__c.field-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Interdepartmental__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>璺ㄧ瀹�</label>
+ <trackHistory>false</trackHistory>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/IsQuoteTrial__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/IsQuoteTrial__c.field-meta.xml
new file mode 100644
index 0000000..209998b
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/IsQuoteTrial__c.field-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>IsQuoteTrial__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>鏄惁杩涜鎶ヤ环璇曠畻</label>
+ <trackHistory>false</trackHistory>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/IsSelected__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/IsSelected__c.field-meta.xml
new file mode 100644
index 0000000..e706ccd
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/IsSelected__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>IsSelected__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(Opportunity.Estimation_No__c = Quote_No__c,
+"鈭�",
+""
+)</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>閬告姙涓�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/IsSyncing.field-meta.xml b/force-app/main/default/objects/Quote/fields/IsSyncing.field-meta.xml
new file mode 100644
index 0000000..54fde3e
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/IsSyncing.field-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>IsSyncing</fullName>
+ <trackHistory>false</trackHistory>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/LineItemCount.field-meta.xml b/force-app/main/default/objects/Quote/fields/LineItemCount.field-meta.xml
new file mode 100644
index 0000000..fa5c5dc
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/LineItemCount.field-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>LineItemCount</fullName>
+ <trackHistory>false</trackHistory>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/MainEngineWithoutMonitor__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/MainEngineWithoutMonitor__c.field-meta.xml
new file mode 100644
index 0000000..7821314
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/MainEngineWithoutMonitor__c.field-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>MainEngineWithoutMonitor__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>涓绘満涓嶅甫鐩戣鍣ㄥ彴杞�</label>
+ <trackHistory>false</trackHistory>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Majordomo_Sell__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Majordomo_Sell__c.field-meta.xml
new file mode 100644
index 0000000..4a0d9fb
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Majordomo_Sell__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Majordomo_Sell__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>CL4 楂樼骇鎬荤洃锛堥攢鍞級</label>
+ <referenceTo>User</referenceTo>
+ <relationshipName>QuotealeA</relationshipName>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Manager_Sell__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Manager_Sell__c.field-meta.xml
new file mode 100644
index 0000000..cf49629
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Manager_Sell__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Manager_Sell__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>CL6 缁忕悊绾э紙閿�鍞級</label>
+ <referenceTo>User</referenceTo>
+ <relationshipName>Quoteald7</relationshipName>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Manager_Service__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Manager_Service__c.field-meta.xml
new file mode 100644
index 0000000..2f55668
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Manager_Service__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Manager_Service__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>CL6 缁忕悊绾э紙鏈嶅姟锛�</label>
+ <referenceTo>User</referenceTo>
+ <relationshipName>QuotealdR</relationshipName>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Minister_Sell__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Minister_Sell__c.field-meta.xml
new file mode 100644
index 0000000..0e1275f
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Minister_Sell__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Minister_Sell__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>CL5 鎬荤洃绾э紙閿�鍞級</label>
+ <referenceTo>User</referenceTo>
+ <relationshipName>Quotealdb</relationshipName>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Minister_Service__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Minister_Service__c.field-meta.xml
new file mode 100644
index 0000000..6d9c799
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Minister_Service__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Minister_Service__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>CL5 鎬荤洃绾э紙鏈嶅姟锛�</label>
+ <referenceTo>User</referenceTo>
+ <relationshipName>Quotealdq</relationshipName>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/MultiYearWarrantyTotalPrice__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/MultiYearWarrantyTotalPrice__c.field-meta.xml
new file mode 100644
index 0000000..7f8fb06
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/MultiYearWarrantyTotalPrice__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>MultiYearWarrantyTotalPrice__c</fullName>
+ <defaultValue>0.00</defaultValue>
+ <description>鍘熸潵鐨勬爣绛惧悕锛歂o Discount Price鍚堣</description>
+ <externalId>false</externalId>
+ <label>澶氬勾淇濅环鏍煎悎璁�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Name.field-meta.xml b/force-app/main/default/objects/Quote/fields/Name.field-meta.xml
new file mode 100644
index 0000000..794a78c
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Name.field-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Name</fullName>
+ <trackHistory>false</trackHistory>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/OCM_Agent1_Price_F__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/OCM_Agent1_Price_F__c.field-meta.xml
new file mode 100644
index 0000000..68c104d
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/OCM_Agent1_Price_F__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OCM_Agent1_Price_F__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(Opportunity.SAP_Send_OK__c && (Agency1__r.Special__c || Agency2__r.Special__c || Opportunity.Account.Parent.Special__c) && $User.ViewSpecialAgencyAmout__c == False, null,
+ OCM_Agent1_Price__c
+)</formula>
+ <label>OCSM-缁忛攢鍟�1閲戦</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/OCM_Agent1_Price_Page__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/OCM_Agent1_Price_Page__c.field-meta.xml
new file mode 100644
index 0000000..74b1ab1
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/OCM_Agent1_Price_Page__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OCM_Agent1_Price_Page__c</fullName>
+ <description>琛ㄧず鐢ㄧ涓�浠ｇ悊搴楀悎鍚岄噾棰�</description>
+ <externalId>false</externalId>
+ <label>绗竴浠ｇ悊搴楀悎鍚岄噾棰�(鐢婚潰鐢�)</label>
+ <precision>15</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/OCM_Agent1_Price__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/OCM_Agent1_Price__c.field-meta.xml
new file mode 100644
index 0000000..7060d2e
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/OCM_Agent1_Price__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OCM_Agent1_Price__c</fullName>
+ <externalId>false</externalId>
+ <label>/OCSM-缁忛攢鍟�1閲戦</label>
+ <precision>15</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>true</trackHistory>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/OCM_Sales_Forecast_F__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/OCM_Sales_Forecast_F__c.field-meta.xml
new file mode 100644
index 0000000..47f7e23
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/OCM_Sales_Forecast_F__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OCM_Sales_Forecast_F__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(Opportunity.SAP_Send_OK__c && (Agency1__r.Special__c || Agency2__r.Special__c || Opportunity.Account.Parent.Special__c) && $User.ViewSpecialAgencyAmout__c == False, null,
+ OCM_Sales_Forecast__c
+)</formula>
+ <label>OCSM棰勬祴鍙戣揣閲戦(鍚◣)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/OCM_Sales_Forecast_Without_Tax__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/OCM_Sales_Forecast_Without_Tax__c.field-meta.xml
new file mode 100644
index 0000000..debf692
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/OCM_Sales_Forecast_Without_Tax__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OCM_Sales_Forecast_Without_Tax__c</fullName>
+ <description>OCM_Sales_Forecast_F__c / 1.17</description>
+ <externalId>false</externalId>
+ <formula>OCM_Sales_Forecast_F__c / Opportunity.Tax_Intra_F_Copy__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>OCSM棰勬祴鍙戣揣閲戦(涓嶅惈绋�)</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/OCM_Sales_Forecast__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/OCM_Sales_Forecast__c.field-meta.xml
new file mode 100644
index 0000000..3276b00
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/OCM_Sales_Forecast__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OCM_Sales_Forecast__c</fullName>
+ <externalId>false</externalId>
+ <label>/OCSM棰勬祴鍙戣揣閲戦(鍚◣)</label>
+ <precision>15</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Offer_Amount__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Offer_Amount__c.field-meta.xml
new file mode 100644
index 0000000..819504f
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Offer_Amount__c.field-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Offer_Amount__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>鎶ヤ环閲戦</label>
+ <trackHistory>false</trackHistory>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Oppor_Type__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Oppor_Type__c.field-meta.xml
new file mode 100644
index 0000000..2ba4adc
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Oppor_Type__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Oppor_Type__c</fullName>
+ <externalId>false</externalId>
+ <formula>Opportunity.RecordType.DeveloperName</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鎵�灞炶浠风被鍒�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/OpporsAssistance__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/OpporsAssistance__c.field-meta.xml
new file mode 100644
index 0000000..2827dd8
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/OpporsAssistance__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OpporsAssistance__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>璇环鍔╃悊</label>
+ <referenceTo>User</referenceTo>
+ <relationshipName>Quotealkm</relationshipName>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/OpportunityId.field-meta.xml b/force-app/main/default/objects/Quote/fields/OpportunityId.field-meta.xml
new file mode 100644
index 0000000..0ce0a9f
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/OpportunityId.field-meta.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OpportunityId</fullName>
+ <trackHistory>false</trackHistory>
+ <type>MasterDetail</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/OpportunityId__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/OpportunityId__c.field-meta.xml
new file mode 100644
index 0000000..bd1d470
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/OpportunityId__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OpportunityId__c</fullName>
+ <externalId>false</externalId>
+ <formula>OpportunityId</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>OpportunityId</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Opportunity_sub_ownerID__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Opportunity_sub_ownerID__c.field-meta.xml
new file mode 100644
index 0000000..d59455c
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Opportunity_sub_ownerID__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Opportunity_sub_ownerID__c</fullName>
+ <externalId>false</externalId>
+ <formula>Opportunity.Opportunity_sub_owner__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>璇环鍓媴褰揑D</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Opportunity_sub_owner__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Opportunity_sub_owner__c.field-meta.xml
new file mode 100644
index 0000000..ccca938
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Opportunity_sub_owner__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Opportunity_sub_owner__c</fullName>
+ <deleteConstraint>SetNull</deleteConstraint>
+ <externalId>false</externalId>
+ <label>璇环鍓媴褰�</label>
+ <referenceTo>User</referenceTo>
+ <relationshipName>QuoteYQmK</relationshipName>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/OwnerId.field-meta.xml b/force-app/main/default/objects/Quote/fields/OwnerId.field-meta.xml
new file mode 100644
index 0000000..711ada1
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/OwnerId.field-meta.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OwnerId</fullName>
+ <trackHistory>false</trackHistory>
+ <type>Lookup</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Phone.field-meta.xml b/force-app/main/default/objects/Quote/fields/Phone.field-meta.xml
new file mode 100644
index 0000000..73019cf
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Phone.field-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Phone</fullName>
+ <trackHistory>false</trackHistory>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Preferential_Gurantee_Period__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Preferential_Gurantee_Period__c.field-meta.xml
new file mode 100644
index 0000000..febb433
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Preferential_Gurantee_Period__c.field-meta.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Preferential_Gurantee_Period__c</fullName>
+ <defaultValue>false</defaultValue>
+ <description>澶氬勾淇濅慨 澧炲姞 鐢ㄤ簬鏄惁鍦ㄦ姤浠烽〉闈㈡樉绀虹壒娈婁繚淇勾闄�</description>
+ <externalId>false</externalId>
+ <label>淇濅慨骞撮檺</label>
+ <trackHistory>false</trackHistory>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Preferential_Trading_Price__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Preferential_Trading_Price__c.field-meta.xml
new file mode 100644
index 0000000..87284de
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Preferential_Trading_Price__c.field-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Preferential_Trading_Price__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>浼樻儬鎴愪氦浠�</label>
+ <trackHistory>false</trackHistory>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/PriceRefreshDate__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/PriceRefreshDate__c.field-meta.xml
new file mode 100644
index 0000000..1c1bc01
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/PriceRefreshDate__c.field-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>PriceRefreshDate__c</fullName>
+ <externalId>false</externalId>
+ <label>PriceRefreshDate</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Pricing__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Pricing__c.field-meta.xml
new file mode 100644
index 0000000..704ebd8
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Pricing__c.field-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Pricing__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>浼樻儬浠锋牸</label>
+ <trackHistory>false</trackHistory>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Print_HP_Name__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Print_HP_Name__c.field-meta.xml
new file mode 100644
index 0000000..adc5b79
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Print_HP_Name__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Print_HP_Name__c</fullName>
+ <externalId>false</externalId>
+ <label>鍗板埛鐥呴櫌鍚嶇О</label>
+ <length>255</length>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Queto_Confirm_Date__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Queto_Confirm_Date__c.field-meta.xml
new file mode 100644
index 0000000..ea712c8
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Queto_Confirm_Date__c.field-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Queto_Confirm_Date__c</fullName>
+ <externalId>false</externalId>
+ <label>鎶ヤ环纭鏃堕棿</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/QuotationChange__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/QuotationChange__c.field-meta.xml
new file mode 100644
index 0000000..1290673
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/QuotationChange__c.field-meta.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>QuotationChange__c</fullName>
+ <externalId>false</externalId>
+ <label>鎶ヤ环鍙樺寲</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Picklist</type>
+ <valueSet>
+ <restricted>true</restricted>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>閰嶇疆鍑忓皯</fullName>
+ <default>false</default>
+ <label>閰嶇疆鍑忓皯</label>
+ </value>
+ <value>
+ <fullName>涓昏鍨嬪彿璋冩暣</fullName>
+ <default>false</default>
+ <label>涓昏鍨嬪彿璋冩暣</label>
+ </value>
+ <value>
+ <fullName>閰嶇疆澧炲姞</fullName>
+ <default>false</default>
+ <label>閰嶇疆澧炲姞</label>
+ </value>
+ <value>
+ <fullName>鑰楁潗鍙橀厤缃�</fullName>
+ <default>false</default>
+ <label>鑰楁潗鍙橀厤缃�</label>
+ </value>
+ <value>
+ <fullName>閰嶇疆鍙樿�楁潗</fullName>
+ <default>false</default>
+ <label>閰嶇疆鍙樿�楁潗</label>
+ </value>
+ <value>
+ <fullName>閰嶇疆鍗囩骇</fullName>
+ <default>false</default>
+ <label>閰嶇疆鍗囩骇</label>
+ </value>
+ <value>
+ <fullName>閰嶇疆闄嶇骇</fullName>
+ <default>false</default>
+ <label>閰嶇疆闄嶇骇</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/QuoteName__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/QuoteName__c.field-meta.xml
new file mode 100644
index 0000000..3dd1d79
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/QuoteName__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>QuoteName__c</fullName>
+ <externalId>false</externalId>
+ <label>瑕嬬鍚嶇О_System</label>
+ <length>255</length>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/QuoteToAddress.field-meta.xml b/force-app/main/default/objects/Quote/fields/QuoteToAddress.field-meta.xml
new file mode 100644
index 0000000..72a08ab
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/QuoteToAddress.field-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>QuoteToAddress</fullName>
+ <trackHistory>false</trackHistory>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/QuoteToName.field-meta.xml b/force-app/main/default/objects/Quote/fields/QuoteToName.field-meta.xml
new file mode 100644
index 0000000..17b9704
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/QuoteToName.field-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>QuoteToName</fullName>
+ <trackHistory>false</trackHistory>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/QuoteTotal_Page__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/QuoteTotal_Page__c.field-meta.xml
new file mode 100644
index 0000000..2c8a676
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/QuoteTotal_Page__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>QuoteTotal_Page__c</fullName>
+ <description>琛ㄧず鐢ㄦ姤浠锋�婚</description>
+ <externalId>false</externalId>
+ <label>鎶ヤ环鎬婚(鐢婚潰鐢�)</label>
+ <precision>15</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Quote_Adjust_Amount_F__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Quote_Adjust_Amount_F__c.field-meta.xml
new file mode 100644
index 0000000..47c3655
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Quote_Adjust_Amount_F__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Quote_Adjust_Amount_F__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(Opportunity.SAP_Send_OK__c && (Agency1__r.Special__c || Agency2__r.Special__c || Opportunity.Account.Parent.Special__c) && $User.ViewSpecialAgencyAmout__c == False, null,
+ Quote_Adjust_Amount__c
+)</formula>
+ <label>鎶ヤ环璋冩暣閲戦</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Quote_Adjust_Amount_Page__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Quote_Adjust_Amount_Page__c.field-meta.xml
new file mode 100644
index 0000000..3ac9fc0
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Quote_Adjust_Amount_Page__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Quote_Adjust_Amount_Page__c</fullName>
+ <description>琛ㄧず鐢ㄦ姤浠疯皟鏁撮噾棰�</description>
+ <externalId>false</externalId>
+ <label>鎶ヤ环璋冩暣閲戦(鐢婚潰鐢�)</label>
+ <precision>15</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Quote_Adjust_Amount__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Quote_Adjust_Amount__c.field-meta.xml
new file mode 100644
index 0000000..e85f3e4
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Quote_Adjust_Amount__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Quote_Adjust_Amount__c</fullName>
+ <externalId>false</externalId>
+ <label>瑕嬬瑾挎暣閲戦_鍏�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>true</trackHistory>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Quote_Adjust_Calculate_F__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Quote_Adjust_Calculate_F__c.field-meta.xml
new file mode 100644
index 0000000..413ccd8
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Quote_Adjust_Calculate_F__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Quote_Adjust_Calculate_F__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(Opportunity.SAP_Send_OK__c && (Agency1__r.Special__c || Agency2__r.Special__c || Opportunity.Account.Parent.Special__c) && $User.ViewSpecialAgencyAmout__c == False, null,
+ Quote_Adjust_Calculate__c
+)</formula>
+ <label>鎶ヤ环璋冩暣閲戦璁＄畻</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <type>Percent</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Quote_Adjust_Calculate__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Quote_Adjust_Calculate__c.field-meta.xml
new file mode 100644
index 0000000..58b3797
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Quote_Adjust_Calculate__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Quote_Adjust_Calculate__c</fullName>
+ <externalId>false</externalId>
+ <label>瑕嬬瑾挎暣閲戦瑷堢畻_鍏�</label>
+ <precision>5</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>true</trackHistory>
+ <type>Percent</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Quote_Comment__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Quote_Comment__c.field-meta.xml
new file mode 100644
index 0000000..f1c1044
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Quote_Comment__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Quote_Comment__c</fullName>
+ <externalId>false</externalId>
+ <label>瑕嬬琛ㄨ銈炽儭銉炽儓</label>
+ <length>255</length>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Quote_CreatedDate__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Quote_CreatedDate__c.field-meta.xml
new file mode 100644
index 0000000..b550abf
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Quote_CreatedDate__c.field-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Quote_CreatedDate__c</fullName>
+ <externalId>false</externalId>
+ <label>鎶ヤ环浣滄垚鏃�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Quote_Date__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Quote_Date__c.field-meta.xml
new file mode 100644
index 0000000..679d38b
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Quote_Date__c.field-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Quote_Date__c</fullName>
+ <externalId>false</externalId>
+ <label>瑕嬬鎻愬嚭鏃�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Quote_Decision_Date__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Quote_Decision_Date__c.field-meta.xml
new file mode 100644
index 0000000..63850af
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Quote_Decision_Date__c.field-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Quote_Decision_Date__c</fullName>
+ <externalId>false</externalId>
+ <label>鎶ヤ环鍐冲畾鏃�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Quote_Decision__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Quote_Decision__c.field-meta.xml
new file mode 100644
index 0000000..73e5b0a
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Quote_Decision__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Quote_Decision__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(IF(Opportunity.Estimation_Decision__c, Opportunity.Estimation_No__c, "") = Quote_No__c,
+ "鈭�",
+ ""
+)</formula>
+ <label>鍐冲畾</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Quote_Expiration_Date__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Quote_Expiration_Date__c.field-meta.xml
new file mode 100644
index 0000000..bd28581
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Quote_Expiration_Date__c.field-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Quote_Expiration_Date__c</fullName>
+ <externalId>false</externalId>
+ <label>瑕嬬鏈夊姽鏈熼檺鏃�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Quote_No_Auto__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Quote_No_Auto__c.field-meta.xml
new file mode 100644
index 0000000..a5df2fc
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Quote_No_Auto__c.field-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Quote_No_Auto__c</fullName>
+ <displayFormat>{0000000000}</displayFormat>
+ <externalId>false</externalId>
+ <label>瑕嬬鐣彿鎺＄暘</label>
+ <trackHistory>false</trackHistory>
+ <type>AutoNumber</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Quote_No__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Quote_No__c.field-meta.xml
new file mode 100644
index 0000000..fcf1e98
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Quote_No__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Quote_No__c</fullName>
+ <caseSensitive>false</caseSensitive>
+ <externalId>false</externalId>
+ <label>瑕嬬鐣彿</label>
+ <length>255</length>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Text</type>
+ <unique>true</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Quote_No_last2__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Quote_No_last2__c.field-meta.xml
new file mode 100644
index 0000000..3031aa5
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Quote_No_last2__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Quote_No_last2__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(CONTAINS(Quote_No__c , "Old"), "", RIGHT(Quote_No__c , 2))</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>鎶ヤ环缂栫爜鍚庝袱浣�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Text</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Quote_Print_Date__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Quote_Print_Date__c.field-meta.xml
new file mode 100644
index 0000000..ed48be7
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Quote_Print_Date__c.field-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Quote_Print_Date__c</fullName>
+ <externalId>false</externalId>
+ <label>瑕嬬鍗板埛鏃�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/ShippingAddress.field-meta.xml b/force-app/main/default/objects/Quote/fields/ShippingAddress.field-meta.xml
new file mode 100644
index 0000000..fda7a1e
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/ShippingAddress.field-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ShippingAddress</fullName>
+ <trackHistory>false</trackHistory>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/ShippingHandling.field-meta.xml b/force-app/main/default/objects/Quote/fields/ShippingHandling.field-meta.xml
new file mode 100644
index 0000000..6a01218
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/ShippingHandling.field-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ShippingHandling</fullName>
+ <trackHistory>false</trackHistory>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/ShippingName.field-meta.xml b/force-app/main/default/objects/Quote/fields/ShippingName.field-meta.xml
new file mode 100644
index 0000000..3858656
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/ShippingName.field-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ShippingName</fullName>
+ <trackHistory>false</trackHistory>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Status.field-meta.xml b/force-app/main/default/objects/Quote/fields/Status.field-meta.xml
new file mode 100644
index 0000000..3c95c97
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Status.field-meta.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Status</fullName>
+ <trackHistory>false</trackHistory>
+ <type>Picklist</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Stock_Pre_Arrangement__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Stock_Pre_Arrangement__c.field-meta.xml
new file mode 100644
index 0000000..6c82556
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Stock_Pre_Arrangement__c.field-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Stock_Pre_Arrangement__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>浜嬪墠鍦ㄥ韩鎵嬮厤娓堛伩</label>
+ <trackHistory>false</trackHistory>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Stocking_Price__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Stocking_Price__c.field-meta.xml
new file mode 100644
index 0000000..7fd49ef
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Stocking_Price__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Stocking_Price__c</fullName>
+ <externalId>false</externalId>
+ <label>浠曞叆渚℃牸</label>
+ <precision>15</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Subtotal.field-meta.xml b/force-app/main/default/objects/Quote/fields/Subtotal.field-meta.xml
new file mode 100644
index 0000000..896d736
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Subtotal.field-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Subtotal</fullName>
+ <trackHistory>false</trackHistory>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/TOTAL__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/TOTAL__c.field-meta.xml
new file mode 100644
index 0000000..91420db
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/TOTAL__c.field-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>TOTAL__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>TOTAL</label>
+ <trackHistory>false</trackHistory>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Tax.field-meta.xml b/force-app/main/default/objects/Quote/fields/Tax.field-meta.xml
new file mode 100644
index 0000000..1eed5b5
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Tax.field-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Tax</fullName>
+ <trackHistory>false</trackHistory>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/TotalPrice.field-meta.xml b/force-app/main/default/objects/Quote/fields/TotalPrice.field-meta.xml
new file mode 100644
index 0000000..879961a
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/TotalPrice.field-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>TotalPrice</fullName>
+ <trackHistory>false</trackHistory>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/TotalPrice_F__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/TotalPrice_F__c.field-meta.xml
new file mode 100644
index 0000000..0714b05
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/TotalPrice_F__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>TotalPrice_F__c</fullName>
+ <externalId>false</externalId>
+ <formula>IF(Opportunity.SAP_Send_OK__c && (Agency1__r.Special__c || Agency2__r.Special__c || Opportunity.Account.Parent.Special__c) && $User.ViewSpecialAgencyAmout__c == False, null,
+ TotalPrice__c
+)</formula>
+ <label>鎬昏_System</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <type>Currency</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/TotalPrice__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/TotalPrice__c.field-meta.xml
new file mode 100644
index 0000000..ac00469
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/TotalPrice__c.field-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>TotalPrice__c</fullName>
+ <externalId>false</externalId>
+ <label>鎬昏_System_鍏�</label>
+ <summarizedField>QuoteLineItem.TotalPrice__c</summarizedField>
+ <summaryForeignKey>QuoteLineItem.QuoteId</summaryForeignKey>
+ <summaryOperation>sum</summaryOperation>
+ <trackHistory>false</trackHistory>
+ <type>Summary</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/Unit_Price__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/Unit_Price__c.field-meta.xml
new file mode 100644
index 0000000..841a991
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/Unit_Price__c.field-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Unit_Price__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>鍗曚环</label>
+ <trackHistory>false</trackHistory>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/checkQuote__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/checkQuote__c.field-meta.xml
new file mode 100644
index 0000000..1562827
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/checkQuote__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>checkQuote__c</fullName>
+ <externalId>false</externalId>
+ <formula>OCM_Agent1_Price__c - OCM_Sales_Forecast__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <label>璇曠畻涓婄嚎鍚庡樊棰濇牳瀵�</label>
+ <precision>18</precision>
+ <required>false</required>
+ <scale>2</scale>
+ <trackHistory>false</trackHistory>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/multiYearWarranty__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/multiYearWarranty__c.field-meta.xml
new file mode 100644
index 0000000..e1f49df
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/multiYearWarranty__c.field-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>multiYearWarranty__c</fullName>
+ <defaultValue>false</defaultValue>
+ <externalId>false</externalId>
+ <label>鍙栨秷甯傚満澶氬勾淇濅慨</label>
+ <trackHistory>false</trackHistory>
+ <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/fields/quoteSavedDate__c.field-meta.xml b/force-app/main/default/objects/Quote/fields/quoteSavedDate__c.field-meta.xml
new file mode 100644
index 0000000..4533466
--- /dev/null
+++ b/force-app/main/default/objects/Quote/fields/quoteSavedDate__c.field-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>quoteSavedDate__c</fullName>
+ <externalId>false</externalId>
+ <label>鎶ヤ环鏃�</label>
+ <required>false</required>
+ <trackHistory>false</trackHistory>
+ <type>Date</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Quote/listViews/mine.listView-meta.xml b/force-app/main/default/objects/Quote/listViews/mine.listView-meta.xml
new file mode 100644
index 0000000..8f8710c
--- /dev/null
+++ b/force-app/main/default/objects/Quote/listViews/mine.listView-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ListView xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>mine</fullName>
+ <columns>QUOTE.NAME</columns>
+ <columns>OPPORTUNITY.NAME</columns>
+ <columns>QUOTE.ISSYNCING</columns>
+ <columns>QUOTE.EXPIRATIONDATE</columns>
+ <columns>QUOTE.SUBTOTAL</columns>
+ <columns>QUOTE.TOTALPRICE</columns>
+ <filterScope>Mine</filterScope>
+ <label>My Quotes</label>
+</ListView>
diff --git a/force-app/main/default/objects/Quote/validationRules/Forbidden_When_Opp_Cancel.validationRule-meta.xml b/force-app/main/default/objects/Quote/validationRules/Forbidden_When_Opp_Cancel.validationRule-meta.xml
new file mode 100644
index 0000000..1a04fa2
--- /dev/null
+++ b/force-app/main/default/objects/Quote/validationRules/Forbidden_When_Opp_Cancel.validationRule-meta.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Forbidden_When_Opp_Cancel</fullName>
+ <active>true</active>
+ <description>20211119 SWAG-C8WAHA
+鍒犻櫎"鏁楁垿"鐨勬潯浠�</description>
+ <errorConditionFormula>TEXT(Opportunity.StageName) = "鍓婇櫎" &&
+$Profile.Id != '00e10000000Y3o5'</errorConditionFormula>
+ <errorMessage>宸茬粡鍙栨秷鐨勮浠凤紝涓嶅彲浠ユ姤浠�</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Quote/validationRules/Quote_Adjust_Amount_Great_0.validationRule-meta.xml b/force-app/main/default/objects/Quote/validationRules/Quote_Adjust_Amount_Great_0.validationRule-meta.xml
new file mode 100644
index 0000000..954a288
--- /dev/null
+++ b/force-app/main/default/objects/Quote/validationRules/Quote_Adjust_Amount_Great_0.validationRule-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Quote_Adjust_Amount_Great_0</fullName>
+ <active>true</active>
+ <description>鎶ヤ环璋冩暣閲戦涓嶈兘涓鸿礋</description>
+ <errorConditionFormula>Quote_Adjust_Amount__c < 0</errorConditionFormula>
+ <errorDisplayField>Quote_Adjust_Amount__c</errorDisplayField>
+ <errorMessage>鎶ヤ环璋冩暣鐨勯噾棰濅笉鑳戒负璐�</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Quote/validationRules/needInstallationLocation.validationRule-meta.xml b/force-app/main/default/objects/Quote/validationRules/needInstallationLocation.validationRule-meta.xml
new file mode 100644
index 0000000..2368776
--- /dev/null
+++ b/force-app/main/default/objects/Quote/validationRules/needInstallationLocation.validationRule-meta.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>needInstallationLocation</fullName>
+ <active>false</active>
+ <errorConditionFormula>HasType3Machine__c && ISPICKVAL(Installation_location__c, "")</errorConditionFormula>
+ <errorDisplayField>Installation_location__c</errorDisplayField>
+ <errorMessage>鍚湁绗笁鍒嗙被鏄�滀富鏈衡�濈殑浜у搧鏃讹紝璇烽�夋嫨涓绘満瑁呮満鍦扮偣</errorMessage>
+</ValidationRule>
diff --git a/force-app/main/default/objects/Quote/webLinks/CustomCreateQoute.webLink-meta.xml b/force-app/main/default/objects/Quote/webLinks/CustomCreateQoute.webLink-meta.xml
new file mode 100644
index 0000000..203be74
--- /dev/null
+++ b/force-app/main/default/objects/Quote/webLinks/CustomCreateQoute.webLink-meta.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>CustomCreateQoute</fullName>
+ <availability>online</availability>
+ <displayType>massActionButton</displayType>
+ <linkType>javascript</linkType>
+ <masterLabel>鍒涘缓鎶ヤ环</masterLabel>
+ <openType>onClickJavaScript</openType>
+ <protected>false</protected>
+ <requireRowSelection>false</requireRowSelection>
+ <url>{!RequireScript("/soap/ajax/51.0/connection.js")}
+{!RequireScript("/soap/ajax/51.0/apex.js")}
+{!RequireScript("/resource/CommonUtilJs")}
+function foo(){
+ var RecordTypeid = '{!JSENCODE(Opportunity.RecordTypeId)}';
+ if(RecordTypeid=='012100000006KMe'){
+ window.open('/apex/SI_NewQuoteEntry?oppid={!URLENCODE(Opportunity.Id)}');
+ }else{
+ window.open('/apex/NewQuoteEntry?oppid={!URLENCODE(Opportunity.Id)}');
+ }
+}
+foo();</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Quote/webLinks/Decide.webLink-meta.xml b/force-app/main/default/objects/Quote/webLinks/Decide.webLink-meta.xml
new file mode 100644
index 0000000..03ccc40
--- /dev/null
+++ b/force-app/main/default/objects/Quote/webLinks/Decide.webLink-meta.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Decide</fullName>
+ <availability>online</availability>
+ <displayType>massActionButton</displayType>
+ <linkType>javascript</linkType>
+ <masterLabel>鍙栨秷Decide</masterLabel>
+ <openType>onClickJavaScript</openType>
+ <protected>false</protected>
+ <requireRowSelection>false</requireRowSelection>
+ <url>{!REQUIRESCRIPT('/soap/ajax/51.0/connection.js')}
+{!REQUIRESCRIPT('/soap/ajax/51.0/apex.js')}
+
+if ("{! $User.Quote_Correct__c }" == "false") {
+ alert("浣犳病鏈夊彇娑圖ecide鐨勬潈闄�");
+} else {
+ if ("{!Opportunity.Estimation_Decision__c}" != "1" ) {
+ alert("杩樻病鏈塂ecide杩囷紝涓嶈兘鍙栨秷");
+ } else {
+ sforce.connection.sessionId = "{!GETSESSIONID()}";
+ var report1 = new sforce.SObject("Opportunity");
+ report1.Id = "{!Opportunity.Id}";
+ report1.Estimation_Decision__c = "0";
+ // 鍙栨秷decide鏃舵竻绌哄璐х‘璁ゆ棩
+ report1.Stock_Confrim_Date__c = null;
+
+ var result = sforce.connection.update([report1]);
+ if (result[0].getBoolean("success")) {
+ // success
+ alert("鍙栨秷Decide浜嗭紒")
+ window.top.location.reload();
+ } else {
+ alert("鍙栨秷Decide澶辫触:" + result[0].errors.fields + " " + result[0].errors.message);
+ }
+ }
+}</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Quote/webLinks/Quotation_product.webLink-meta.xml b/force-app/main/default/objects/Quote/webLinks/Quotation_product.webLink-meta.xml
new file mode 100644
index 0000000..b3aec32
--- /dev/null
+++ b/force-app/main/default/objects/Quote/webLinks/Quotation_product.webLink-meta.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Quotation_product</fullName>
+ <availability>online</availability>
+ <displayType>button</displayType>
+ <encodingKey>UTF-8</encodingKey>
+ <hasMenubar>false</hasMenubar>
+ <hasScrollbars>true</hasScrollbars>
+ <hasToolbar>false</hasToolbar>
+ <height>600</height>
+ <isResizable>true</isResizable>
+ <linkType>url</linkType>
+ <masterLabel>鎶ヤ环浜у搧</masterLabel>
+ <openType>newWindow</openType>
+ <position>none</position>
+ <protected>false</protected>
+ <showsLocation>false</showsLocation>
+ <showsStatus>false</showsStatus>
+ <url>/lightning/r/Report/00O10000003pxY8/view?fv0={!Quote.Id}</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Quote/webLinks/QuoteEdit_Blank.webLink-meta.xml b/force-app/main/default/objects/Quote/webLinks/QuoteEdit_Blank.webLink-meta.xml
new file mode 100644
index 0000000..2f86e40
--- /dev/null
+++ b/force-app/main/default/objects/Quote/webLinks/QuoteEdit_Blank.webLink-meta.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>QuoteEdit_Blank</fullName>
+ <availability>online</availability>
+ <displayType>button</displayType>
+ <linkType>javascript</linkType>
+ <masterLabel>缂栬緫</masterLabel>
+ <openType>onClickJavaScript</openType>
+ <protected>false</protected>
+ <url>{!RequireScript("/soap/ajax/51.0/connection.js")}
+{!RequireScript("/soap/ajax/51.0/apex.js")}
+{!RequireScript("/resource/CommonUtilJs")}
+function foo(){
+var resultSet = sforce.connection.query("SELECT Id, RecordTypeId FROM Opportunity WHERE Id = '{!Quote.OpportunityId__c}'");
+var records = resultSet.getArray("records");
+
+var RecordTypeid = records[0].RecordTypeId;
+if(RecordTypeid.substr(0, 15) == '012100000006KMe'){
+window.open('/apex/SI_NewQuoteEntry?id={!URLENCODE(Quote.Id)}');
+}else{
+window.open('/apex/NewQuoteEntry?id={!URLENCODE(Quote.Id)}');
+}
+}
+foo();</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Quote/webLinks/QuoteEntryNew.webLink-meta.xml b/force-app/main/default/objects/Quote/webLinks/QuoteEntryNew.webLink-meta.xml
new file mode 100644
index 0000000..f5fc69e
--- /dev/null
+++ b/force-app/main/default/objects/Quote/webLinks/QuoteEntryNew.webLink-meta.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>QuoteEntryNew</fullName>
+ <availability>online</availability>
+ <description>2023-05-31 SI璇环鍒涘缓鎶ヤ环鏃跺彇娑堝璇环绛夌骇鐨勫垽鏂�</description>
+ <displayType>massActionButton</displayType>
+ <linkType>javascript</linkType>
+ <masterLabel>鏂拌瑕嬬</masterLabel>
+ <openType>onClickJavaScript</openType>
+ <protected>false</protected>
+ <requireRowSelection>false</requireRowSelection>
+ <url>{!REQUIRESCRIPT('/soap/ajax/51.0/connection.js')}
+{!RequireScript("/soap/ajax/51.0/apex.js")}
+sforce.connection.sessionId = '{!$Api.Session_ID}';
+var result = sforce.connection.describeSObject("Quote");
+var oppid = '{!Opportunity.Id}' ;
+var excuteRs = sforce.apex.execute("ControllerUtil", "getStatusForISO", {opporID:oppid});
+//alert(excuteRs );
+//alert('{!Opportunity.Opportunity_stage__c}' );
+//&& '{!Opportunity.Opportunity_stage__c}'!='E'&& '{!Opportunity.Opportunity_stage__c}'!='D'
+if (result.createable == "false") {
+ alert('娌℃湁鏂板缓鎶ヤ环鐨勬潈闄愩��');
+} else if ('{!Opportunity.Agency_Is_Delete__c}' == "鈭�") {
+ alert('缁忛攢鍟嗗浜庢棤鏁堢姸鎬侊紝涓嶈兘鏂板缓鎶ヤ环銆�');
+} else if ('{!Opportunity.Account_Is_Active__c}' == "鐒″姽") {
+ alert('绉戝澶勪簬鏃犳晥鐘舵�侊紝涓嶈兘鏂板缓鎶ヤ环銆�');
+} else if ('{!Opportunity.Hospital_Is_Active__c}' == "鐒″姽") {
+ alert('鍖婚櫌澶勪簬鏃犳晥鐘舵�侊紝涓嶈兘鏂板缓鎶ヤ环銆�');
+}
+ // 2023-05-31 DB202304343398 SI璇环鍒涘缓鎶ヤ环鏃跺彇娑堝璇环绛夌骇鐨勫垽鏂�
+ // else if ((excuteRs !='CommitCode')&&'{!Opportunity.RecordTypeId}'=='012100000006KMe'&& '{!Opportunity.Competitor__c}'!='E'&& '{!Opportunity.Competitor__c}'!='D') {
+ else if ((excuteRs !='CommitCode')&&'{!Opportunity.RecordTypeId}'=='012100000006KMe') {
+ alert('娌℃湁鎵瑰噯鐨勯渶姹傝〃锛屼笉鑳芥姤浠枫��');
+} else {
+ if ({!Opportunity.Estimation_Decision__c}==0){
+ if('{!HTMLENCODE(Opportunity.RecordTypeId)}'=='012100000006KMe'){
+var setQuote = sforce.apex.execute("ControllerUtil", "setQuote", {oppid:oppid});
+ window.open('/apex/SI_NewQuoteEntry?oppid={!Opportunity.Id}',"_blank");
+
+ }else{
+ window.open('/apex/NewQuoteEntry?oppid={!Opportunity.Id}',"_blank");
+ }
+ } else {
+ alert('{!$Label.Error_Message9}');
+ }
+}</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Quote/webLinks/QuoteSelect.webLink-meta.xml b/force-app/main/default/objects/Quote/webLinks/QuoteSelect.webLink-meta.xml
new file mode 100644
index 0000000..14c4377
--- /dev/null
+++ b/force-app/main/default/objects/Quote/webLinks/QuoteSelect.webLink-meta.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>QuoteSelect</fullName>
+ <availability>online</availability>
+ <displayType>massActionButton</displayType>
+ <linkType>javascript</linkType>
+ <masterLabel>閫夋嫨鎶ヤ环</masterLabel>
+ <openType>onClickJavaScript</openType>
+ <protected>false</protected>
+ <requireRowSelection>true</requireRowSelection>
+ <url>{!REQUIRESCRIPT('/soap/ajax/51.0/connection.js')}
+{!REQUIRESCRIPT('/soap/ajax/51.0/apex.js')}
+if ("{!Opportunity.Estimation_Decision__c}" == "1" ) {
+ alert("宸茬粡Decide浜嗭紝涓嶈兘鍋氾蓟閫夋嫨鎶ヤ环锛斤紒");
+} else {
+ try{
+ sforce.connection.sessionId = '{!$Api.Session_ID}';
+ var ids = {!GETRECORDIDS($ObjectType.Quote)};
+ if (ids.length > 0) {
+ var oppid = '{!Opportunity.Id}';
+ var quoid = ids[0];
+ var rs = sforce.apex.execute("NewQuoteEntryWebService","selectQuotation",{oppId:oppid,quoId:quoid});
+ if (rs == "true") {
+ alert('閫夋嫨鎶ヤ环鎴愬姛');
+ } else {
+ alert('閫夋嫨鎶ヤ环澶辫触');
+ }
+ window.top.location.reload();
+ } else {
+ alert('璇烽�夋嫨涓�涓姤浠�');
+ }
+ } catch(e){
+ alert(e);
+ }
+}</url>
+</WebLink>
diff --git a/force-app/main/default/objects/Quote/webLinks/ReQuote.webLink-meta.xml b/force-app/main/default/objects/Quote/webLinks/ReQuote.webLink-meta.xml
new file mode 100644
index 0000000..3f14eb1
--- /dev/null
+++ b/force-app/main/default/objects/Quote/webLinks/ReQuote.webLink-meta.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLink xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>ReQuote</fullName>
+ <availability>online</availability>
+ <description>浠庨�変腑鐨勬姤浠稢opy鍑轰竴涓柊鐨勬姤浠�</description>
+ <displayType>massActionButton</displayType>
+ <linkType>javascript</linkType>
+ <masterLabel>鍐嶆姤浠�</masterLabel>
+ <openType>onClickJavaScript</openType>
+ <protected>false</protected>
+ <requireRowSelection>true</requireRowSelection>
+ <url>{!REQUIRESCRIPT('/soap/ajax/51.0/connection.js')}
+{!RequireScript("/soap/ajax/51.0/apex.js")}
+sforce.connection.sessionId = '{!$Api.Session_ID}';
+var oppid = '{!Opportunity.Id}' ;
+var result = sforce.connection.describeSObject("Quote");
+if (result.createable == "false") {
+ alert('娌℃湁鏂板缓鎶ヤ环鐨勬潈闄愩��');
+} else if ('{!Opportunity.Agency_Is_Delete__c}' == "鈭�") {
+ alert('缁忛攢鍟嗗浜庢棤鏁堢姸鎬侊紝涓嶈兘鏂板缓鎶ヤ环銆�');
+} else if ('{!Opportunity.Account_Is_Active__c}' == "鐒″姽") {
+ alert('绉戝澶勪簬鏃犳晥鐘舵�侊紝涓嶈兘鏂板缓鎶ヤ环銆�');
+} else if ('{!Opportunity.Hospital_Is_Active__c}' == "鐒″姽") {
+ alert('鍖婚櫌澶勪簬鏃犳晥鐘舵�侊紝涓嶈兘鏂板缓鎶ヤ环銆�');
+} else{
+ if ({!Opportunity.Estimation_Decision__c}==0){
+ var ids = {!GETRECORDIDS( $ObjectType.Quote)};
+ if (ids.length == 1) {
+ if('{!HTMLENCODE(Opportunity.RecordTypeId)}'=='012100000006KMe'){
+ //var setQuote = sforce.apex.execute("ControllerUtil", "setQuote", {oppid:oppid});
+ window.open('/apex/SI_NewQuoteEntry?oppid={!Opportunity.Id}&copyid=' + ids[0], "_blank");
+
+ }else{
+ window.open('/apex/NewQuoteEntry?oppid={!Opportunity.Id}&copyid=' + ids[0], "_blank");
+ }
+ //window.open('/apex/NewQuoteEntry?oppid={!Opportunity.Id}&copyid=' + ids[0], "_blank");
+ } else {
+ alert('璇烽�夋嫨涓�涓姤浠�');
+ }
+ } else {
+ alert('{!$Label.Error_Message9}');
+ }
+}</url>
+</WebLink>
diff --git a/force-app/main/default/objects/QuoteIrai__c/fields/Account__c.field-meta.xml b/force-app/main/default/objects/QuoteIrai__c/fields/Account__c.field-meta.xml
index 035f991..8ec9773 100644
--- a/force-app/main/default/objects/QuoteIrai__c/fields/Account__c.field-meta.xml
+++ b/force-app/main/default/objects/QuoteIrai__c/fields/Account__c.field-meta.xml
@@ -5,7 +5,7 @@
<externalId>false</externalId>
<label>瀹㈡埛鍚�</label>
<lookupFilter>
- <active>false</active>
+ <active>true</active>
<errorMessage>蹇呴』杈撳叆绉戝</errorMessage>
<filterItems>
<field>Account.RecordTypeId</field>
diff --git a/force-app/main/default/objects/QuoteIrai__c/fields/Agency1_entrust__c.field-meta.xml b/force-app/main/default/objects/QuoteIrai__c/fields/Agency1_entrust__c.field-meta.xml
index 6f18726..fa7e282 100644
--- a/force-app/main/default/objects/QuoteIrai__c/fields/Agency1_entrust__c.field-meta.xml
+++ b/force-app/main/default/objects/QuoteIrai__c/fields/Agency1_entrust__c.field-meta.xml
@@ -5,7 +5,7 @@
<externalId>false</externalId>
<label>绗竴缁忛攢鍟�</label>
<lookupFilter>
- <active>false</active>
+ <active>true</active>
<errorMessage>鍙兘閫夋嫨鐗圭害缁忛攢鍟嗐�佷竴绾х粡閿�鍟嗗拰闆嗛噰缁忛攢鍟�</errorMessage>
<filterItems>
<field>Account.RecordTypeId</field>
@@ -20,7 +20,7 @@
<filterItems>
<field>Account.Sales_Shop_Class__c</field>
<operation>equals</operation>
- <value>鐗圭害缁忛攢鍟�(鍖哄煙), 鐗圭害缁忛攢鍟�(浜у搧), 涓�绾х粡閿�鍟�, 鐗圭害缁忛攢鍟�(浜у搧+鍖哄煙), 鍏朵粬, 闆嗛噰缁忛攢鍟�</value>
+ <value>鐗圭害缁忛攢鍟�(鍖哄煙), 鐗圭害缁忛攢鍟�(浜у搧), 涓�绾х粡閿�鍟�, 鐗圭害缁忛攢鍟�(浜у搧+鍖哄煙), 闆嗛噰缁忛攢鍟�</value>
</filterItems>
<filterItems>
<field>Account.Is_Active_Formula__c</field>
diff --git a/force-app/main/default/objects/QuoteIrai__c/fields/Agency2_entrust__c.field-meta.xml b/force-app/main/default/objects/QuoteIrai__c/fields/Agency2_entrust__c.field-meta.xml
index 44671e4..64ea4b8 100644
--- a/force-app/main/default/objects/QuoteIrai__c/fields/Agency2_entrust__c.field-meta.xml
+++ b/force-app/main/default/objects/QuoteIrai__c/fields/Agency2_entrust__c.field-meta.xml
@@ -16,6 +16,11 @@
<operation>equals</operation>
<value>False</value>
</filterItems>
+ <filterItems>
+ <field>Account.Is_Active_Formula__c</field>
+ <operation>equals</operation>
+ <value>鏈夋晥</value>
+ </filterItems>
<isOptional>false</isOptional>
</lookupFilter>
<referenceTo>Account</referenceTo>
diff --git a/force-app/main/default/objects/QuoteIrai__c/fields/Quotation_Request_list__c.field-meta.xml b/force-app/main/default/objects/QuoteIrai__c/fields/Quotation_Request_list__c.field-meta.xml
index de0e771..1a5268f 100644
--- a/force-app/main/default/objects/QuoteIrai__c/fields/Quotation_Request_list__c.field-meta.xml
+++ b/force-app/main/default/objects/QuoteIrai__c/fields/Quotation_Request_list__c.field-meta.xml
@@ -3,7 +3,7 @@
<fullName>Quotation_Request_list__c</fullName>
<externalId>false</externalId>
<formula>HYPERLINK
-("/00OC60000000VB5?pv0=" + Id, "鎶ヤ环濮旀墭鏄庣粏")</formula>
+("/00O10000003NqhT?pv0=" + Id, "鎶ヤ环濮旀墭鏄庣粏")</formula>
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
<label>鎶ヤ环濮旀墭璇︾粏</label>
<required>false</required>
diff --git a/force-app/main/default/objects/ReceivingNoteDetail__c/fields/Loaner_category__c.field-meta.xml b/force-app/main/default/objects/ReceivingNoteDetail__c/fields/Loaner_category__c.field-meta.xml
index 34015b9..e4e463d 100644
--- a/force-app/main/default/objects/ReceivingNoteDetail__c/fields/Loaner_category__c.field-meta.xml
+++ b/force-app/main/default/objects/ReceivingNoteDetail__c/fields/Loaner_category__c.field-meta.xml
@@ -3,10 +3,11 @@
<fullName>Loaner_category__c</fullName>
<externalId>false</externalId>
<formula>AND(!ISBLANK(RNDAssert__c) , !ISBLANK(Fixture_Set_Detail__c),Is_Body_F__c,
-OR(
-RNDAssert__r.Loaner_categoryI__c != Fixture_Set_Detail__r.Loaner_categoryI__c,
-RNDAssert__r.Loaner_categoryII__c != Fixture_Set_Detail__r.Loaner_categoryII__c
-)
+ OR(
+ RNDAssert__r.Loaner_categoryI__c != Fixture_Set_Detail__r.Loaner_categoryI__c,
+ RNDAssert__r.Loaner_categoryII__c != Fixture_Set_Detail__r.Loaner_categoryII__c,
+ RNDAssert__r.Product_Type__c!= Fixture_Set_Detail__r.Product_Type__c
+ )
)</formula>
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
<label>澶囧搧绫诲瀷涓嶄竴鑷�</label>
diff --git a/force-app/main/default/objects/ReceivingNoteSummary__c/validationRules/Cannot_Change_When_Acceptance.validationRule-meta.xml b/force-app/main/default/objects/ReceivingNoteSummary__c/validationRules/Cannot_Change_When_Acceptance.validationRule-meta.xml
index 8d8cae3..f361e8b 100644
--- a/force-app/main/default/objects/ReceivingNoteSummary__c/validationRules/Cannot_Change_When_Acceptance.validationRule-meta.xml
+++ b/force-app/main/default/objects/ReceivingNoteSummary__c/validationRules/Cannot_Change_When_Acceptance.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Cannot_Change_When_Acceptance</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>DataMigration_Flag__c == false
&& ISCHANGED(Received_Confirm_Time__c)
&& ReceivingNoteDetail_Cnt__c - Wei_Acceptance_Cnt__c > 0</errorConditionFormula>
diff --git a/force-app/main/default/objects/ReceivingNoteSummary__c/validationRules/Cannot_Update_Fixture_Set_After_DataConf.validationRule-meta.xml b/force-app/main/default/objects/ReceivingNoteSummary__c/validationRules/Cannot_Update_Fixture_Set_After_DataConf.validationRule-meta.xml
index 07c2f9f..1ef84cb 100644
--- a/force-app/main/default/objects/ReceivingNoteSummary__c/validationRules/Cannot_Update_Fixture_Set_After_DataConf.validationRule-meta.xml
+++ b/force-app/main/default/objects/ReceivingNoteSummary__c/validationRules/Cannot_Update_Fixture_Set_After_DataConf.validationRule-meta.xml
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Cannot_Update_Fixture_Set_After_DataConf</fullName>
- <active>false</active>
+ <active>true</active>
<description>鏁版嵁纭鍚庝笉鍙慨鏀归厤濂楋紝璇峰彇娑堟暟鎹‘璁ゅ悗閲嶈瘯</description>
<errorConditionFormula>ISCHANGED(Fixture_Set__c) && Wei_DataConfirmation_Cnt__c != ReceivingNoteDetail_Cnt__c</errorConditionFormula>
- <errorDisplayField>passTxtNo3__c</errorDisplayField>
<errorMessage>鏁版嵁纭鍚庝笉鍙慨鏀归厤濂楋紝璇峰彇娑堟暟鎹‘璁ゅ悗閲嶈瘯</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/Rental_Apply_Equipment_Set_Detail__c.object-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/Rental_Apply_Equipment_Set_Detail__c.object-meta.xml
index bc17dd4..2b18106 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/Rental_Apply_Equipment_Set_Detail__c.object-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/Rental_Apply_Equipment_Set_Detail__c.object-meta.xml
@@ -128,16 +128,22 @@
</actionOverrides>
<actionOverrides>
<actionName>View</actionName>
- <type>Default</type>
- </actionOverrides>
- <actionOverrides>
- <actionName>View</actionName>
+ <comment>Action override created by Lightning App Builder during activation.</comment>
+ <content>Rental_Apply_Set</content>
<formFactor>Large</formFactor>
- <type>Default</type>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>Flexipage</type>
</actionOverrides>
<actionOverrides>
<actionName>View</actionName>
+ <comment>Action override created by Lightning App Builder during activation.</comment>
+ <content>Rental_Apply_Set</content>
<formFactor>Small</formFactor>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>Flexipage</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>View</actionName>
<type>Default</type>
</actionOverrides>
<allowInChatterGroups>false</allowInChatterGroups>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/fields/EquipmentSet_Detail_Status_Status__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/fields/EquipmentSet_Detail_Status_Status__c.field-meta.xml
index efb1eb7..29f5861 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/fields/EquipmentSet_Detail_Status_Status__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/fields/EquipmentSet_Detail_Status_Status__c.field-meta.xml
@@ -2,7 +2,7 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>EquipmentSet_Detail_Status_Status__c</fullName>
<externalId>false</externalId>
- <formula>if(isblank(Confirm_Lost_Date__c), IF( CONTAINS(Rental_Apply__r.RecordTypeId, '012C600000003Jz') && RAESD_Status__c == '寰呭簾寮�', '宸插洖搴�', RAESD_Status__c),
+ <formula>if(isblank(Confirm_Lost_Date__c), IF( CONTAINS(Rental_Apply__r.RecordTypeId, '01210000000NPGK') && RAESD_Status__c == '寰呭簾寮�', '宸插洖搴�', RAESD_Status__c),
if(Lost_item_giveup__c=TRUE,RAESD_Status__c,'纭閬楀け')
)</formula>
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/fields/JumpStatus__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/fields/JumpStatus__c.field-meta.xml
new file mode 100644
index 0000000..77f8676
--- /dev/null
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/fields/JumpStatus__c.field-meta.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>JumpStatus__c</fullName>
+ <externalId>false</externalId>
+ <label>鎻掗槦鐘舵��</label>
+ <required>false</required>
+ <trackFeedHistory>false</trackFeedHistory>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Picklist</type>
+ <valueSet>
+ <restricted>true</restricted>
+ <valueSetDefinition>
+ <sorted>false</sorted>
+ <value>
+ <fullName>鑽夋涓�</fullName>
+ <default>false</default>
+ <label>鑽夋涓�</label>
+ </value>
+ <value>
+ <fullName>濉啓瀹屾瘯</fullName>
+ <default>false</default>
+ <label>濉啓瀹屾瘯</label>
+ </value>
+ <value>
+ <fullName>鐢宠涓�</fullName>
+ <default>false</default>
+ <label>鐢宠涓�</label>
+ </value>
+ <value>
+ <fullName>宸叉壒鍑�</fullName>
+ <default>false</default>
+ <label>宸叉壒鍑�</label>
+ </value>
+ </valueSetDefinition>
+ </valueSet>
+</CustomField>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/CanNotSetRDeliverySlipWhenConfirmLost.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/CanNotSetRDeliverySlipWhenConfirmLost.validationRule-meta.xml
index 8ca9eea..e789898 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/CanNotSetRDeliverySlipWhenConfirmLost.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/CanNotSetRDeliverySlipWhenConfirmLost.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>CanNotSetRDeliverySlipWhenConfirmLost</fullName>
- <active>false</active>
+ <active>true</active>
<description>纭閬楀け鏃朵笉鑳借缃洖瀵勫崟</description>
<errorConditionFormula>NOT(ISBLANK(Confirm_Lost_Date__c))
&& NOT(ISBLANK( Return_DeliverySlip__c))</errorConditionFormula>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Can_Not_Change_Inspection_result_afterNG.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Can_Not_Change_Inspection_result_afterNG.validationRule-meta.xml
index 60e31f4..83fe4f4 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Can_Not_Change_Inspection_result_afterNG.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Can_Not_Change_Inspection_result_afterNG.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Can_Not_Change_Inspection_result_afterNG</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>NOT(ISBLANK(After_Inspection_time_Final__c))
&& ISCHANGED(After_Inspection_time__c)</errorConditionFormula>
<errorMessage>鍥炴敹鍚庢娴�(鏈�缁�)璁惧�间互鍚庝笉鑳戒慨鏀瑰洖鏀跺悗妫�娴�(鏈�鍒�)</errorMessage>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Can_Not_Change_QueNum_WhenSelect.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Can_Not_Change_QueNum_WhenSelect.validationRule-meta.xml
index bd22939..bffded4 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Can_Not_Change_QueNum_WhenSelect.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Can_Not_Change_QueNum_WhenSelect.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Can_Not_Change_QueNum_WhenSelect</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>NOT(ISBLANK(Select_Time__c))
&& NOT(ISBLANK(Queue_Day__c))</errorConditionFormula>
<errorMessage>宸茬粡鍒嗛厤鐨勫�熷嚭鏄庣粏涓嶈兘鎺掗槦</errorMessage>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Can_Not_Create_Detail_Return.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Can_Not_Create_Detail_Return.validationRule-meta.xml
index 4a89453..52bf89e 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Can_Not_Create_Detail_Return.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Can_Not_Create_Detail_Return.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Can_Not_Create_Detail_Return</fullName>
- <active>false</active>
+ <active>true</active>
<description>宸插洖瀵勭姸鎬佷笉鑳借拷鍔犻檮灞炲搧</description>
<errorConditionFormula>ISNEW()
&& Rental_Apply_Equipment_Set__r.Wei_Return__c = 0
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Can_Not_Reassign.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Can_Not_Reassign.validationRule-meta.xml
index 545bd70..7e069cc 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Can_Not_Reassign.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Can_Not_Reassign.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Can_Not_Reassign</fullName>
- <active>false</active>
+ <active>true</active>
<description>娌℃湁涓嬫灦鏄庣粏鐨勫彇娑堢悊鐢变笉鑳藉彉鎴愰噸鏂伴噸鏂板垎閰�
2017/12/27:IT 淇敼閿欒娑堟伅涓轰笅鏋跺墠閲嶆柊鍒嗛厤锛岀洿鎺ヤ粠鐢婚潰閲嶆柊閫夋嫨鍗冲彲銆�</description>
<errorConditionFormula>DataMigration_Flag__c == false
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Can_Not_Select_Cancel_Reason_Zhu.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Can_Not_Select_Cancel_Reason_Zhu.validationRule-meta.xml
index 6237b9b..c64ce0b 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Can_Not_Select_Cancel_Reason_Zhu.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Can_Not_Select_Cancel_Reason_Zhu.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Can_Not_Select_Cancel_Reason_Zhu</fullName>
- <active>false</active>
+ <active>true</active>
<description>绯荤粺绠＄悊鍛樺拰澶囧搧涓績浠ュ鍙兘鍙樻垚涓诲姩鍙栨秷</description>
<errorConditionFormula>DataMigration_Flag__c == false
&& LEFT($User.ProfileId, 15) != LEFT($Label.ProfileId_SystemAdmin, 15)
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Can_Not_Set_Asset_When_Insert.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Can_Not_Set_Asset_When_Insert.validationRule-meta.xml
index 07514fa..366bcae 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Can_Not_Set_Asset_When_Insert.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Can_Not_Set_Asset_When_Insert.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Can_Not_Set_Asset_When_Insert</fullName>
- <active>false</active>
+ <active>true</active>
<description>鏂板缓鏁版嵁涓嶈兘鍒嗛厤</description>
<errorConditionFormula>AND(DataMigration_Flag__c == false, ISNEW(), NOT(ISBLANK(Asset__c)), NOT(ISBLANK( Select_Time__c )), NOT( TEXT(Rental_Apply__r.Routine_Check_Status__c) = 'OK' ),
LEFT(Rental_Apply__r.RecordTypeId, 15)=='01210000000RHIi' || LEFT(Rental_Apply__r.RecordTypeId, 15)=='01210000000RHIn')</errorConditionFormula>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Can_not_Delivery_By_Main_Error.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Can_not_Delivery_By_Main_Error.validationRule-meta.xml
index 3da0594..1bf88a7 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Can_not_Delivery_By_Main_Error.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Can_not_Delivery_By_Main_Error.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Can_not_Delivery_By_Main_Error</fullName>
- <active>false</active>
+ <active>true</active>
<description>From 澶囧搧Set</description>
<errorConditionFormula>DataMigration_Flag__c == false
&& (Check_lost_Item_F__c =='娆犲搧' || Inspection_result_after_NG_F__c='NG')
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Cancel_reason_not_null.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Cancel_reason_not_null.validationRule-meta.xml
index edf1e44..5732cfe 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Cancel_reason_not_null.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Cancel_reason_not_null.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Cancel_reason_not_null</fullName>
- <active>false</active>
+ <active>true</active>
<description>鍙栨秷鐨勬椂鍊欙紝鍙栨秷鐞嗙敱涓嶈兘涓虹┖</description>
<errorConditionFormula>DataMigration_Flag__c == false &&
Cancel_Select__c &&
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Cannot_ChangeLost_When_Inspection.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Cannot_ChangeLost_When_Inspection.validationRule-meta.xml
index 891d54e..a1d8a94 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Cannot_ChangeLost_When_Inspection.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Cannot_ChangeLost_When_Inspection.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Cannot_ChangeLost_When_Inspection</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>DataMigration_Flag__c == false
&& ISNEW() == false
&& NOT(ISBLANK(After_Inspection_time_F__c))
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Cannot_ChangeStockDown_WhenCancel.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Cannot_ChangeStockDown_WhenCancel.validationRule-meta.xml
index af68bcd..af9e3c0 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Cannot_ChangeStockDown_WhenCancel.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Cannot_ChangeStockDown_WhenCancel.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Cannot_ChangeStockDown_WhenCancel</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>DataMigration_Flag__c == false &&
Cancel_Select__c &&
ISCHANGED(StockDown__c)</errorConditionFormula>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Cannot_Change_Asset.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Cannot_Change_Asset.validationRule-meta.xml
index 8b01fe2..aff5f50 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Cannot_Change_Asset.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Cannot_Change_Asset.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Cannot_Change_Asset</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>DataMigration_Flag__c == false
&&
StockDown__c
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Cannot_Change_CancelANDCancelR.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Cannot_Change_CancelANDCancelR.validationRule-meta.xml
index 2a2f4ba..4b89392 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Cannot_Change_CancelANDCancelR.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Cannot_Change_CancelANDCancelR.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Cannot_Change_CancelANDCancelR</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>DataMigration_Flag__c == false
&& PRIORVALUE(Cancel_Select__c)
&& (ISCHANGED(Cancel_Select__c)
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Cannot_Change_When_Cancel.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Cannot_Change_When_Cancel.validationRule-meta.xml
index 5da8937..6a36228 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Cannot_Change_When_Cancel.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Cannot_Change_When_Cancel.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Cannot_Change_When_Cancel</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>ISCHANGED(Cancel_Select__c) == false
&& Cancel_Select__c = true
&& (ISCHANGED(Select_Time__c)
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Cannot_Update_When_Finish.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Cannot_Update_When_Finish.validationRule-meta.xml
index 713fd5c..971454e 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Cannot_Update_When_Finish.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Cannot_Update_When_Finish.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Cannot_Update_When_Finish</fullName>
- <active>false</active>
+ <active>true</active>
<description>update lxy 2023/7/27 鍋滅敤鍚庡啀鍚敤锛屾湭浣滀换浣曟洿鏀�</description>
<errorConditionFormula>DataMigration_Flag__c == false
&& ISNEW() == false
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Cannot_check_when_no_cds.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Cannot_check_when_no_cds.validationRule-meta.xml
index adf44dc..9c866fb 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Cannot_check_when_no_cds.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Cannot_check_when_no_cds.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Cannot_check_when_no_cds</fullName>
- <active>false</active>
+ <active>true</active>
<description>From 澶囧搧Set</description>
<errorConditionFormula>DataMigration_Flag__c == false
&& (Not(IsBlank(Shippment_loaner_time2__c)))
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Cannot_stock_when_ng.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Cannot_stock_when_ng.validationRule-meta.xml
index 92fcf2e..30d40e2 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Cannot_stock_when_ng.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Cannot_stock_when_ng.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Cannot_stock_when_ng</fullName>
- <active>false</active>
+ <active>true</active>
<description>From 澶囧搧Set</description>
<errorConditionFormula>DataMigration_Flag__c == false
&& (Shippment_loaner_time2__c!=null)
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Check_NG_For_Un_Delivery.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Check_NG_For_Un_Delivery.validationRule-meta.xml
index 7b5c8c8..ab1c8fc 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Check_NG_For_Un_Delivery.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Check_NG_For_Un_Delivery.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Check_NG_For_Un_Delivery</fullName>
- <active>false</active>
+ <active>true</active>
<description>From 澶囧搧Set</description>
<errorConditionFormula>DataMigration_Flag__c == false
&& NOT( ISPICKVAL(Inspection_result_NG__c, '搴熷純'))
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Check_UnCDS_For_UpLoad.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Check_UnCDS_For_UpLoad.validationRule-meta.xml
index 5986c4f..5614ccd 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Check_UnCDS_For_UpLoad.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Check_UnCDS_For_UpLoad.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Check_UnCDS_For_UpLoad</fullName>
- <active>false</active>
+ <active>true</active>
<description>From 澶囧搧Set</description>
<errorConditionFormula>DataMigration_Flag__c == false
&& OnStock_By_Cancel__c = false
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Delivery_Before_Repair_Aborted.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Delivery_Before_Repair_Aborted.validationRule-meta.xml
index 0f93215..e5675fb 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Delivery_Before_Repair_Aborted.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Delivery_Before_Repair_Aborted.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Delivery_Before_Repair_Aborted</fullName>
- <active>false</active>
+ <active>true</active>
<description>From 澶囧搧Set</description>
<errorConditionFormula>DataMigration_Flag__c == false
&& IsPickval(Inspection_result__c, 'NG')
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/End_day_not_null.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/End_day_not_null.validationRule-meta.xml
index 3f41f44..11470c3 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/End_day_not_null.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/End_day_not_null.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>End_day_not_null</fullName>
- <active>false</active>
+ <active>true</active>
<description>[澶囧搧棰勮鍥炴敹鏃涓嶈兘涓虹┖</description>
<errorConditionFormula>DataMigration_Flag__c == false
&& NOT( ISBLANK(Select_Time__c) )
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Final_arrival_check.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Final_arrival_check.validationRule-meta.xml
index aef8802..154ab2c 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Final_arrival_check.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Final_arrival_check.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Final_arrival_check</fullName>
- <active>false</active>
+ <active>true</active>
<description>From 澶囧搧Set</description>
<errorConditionFormula>DataMigration_Flag__c == false
&& OnStock_By_Cancel__c = false
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Fixture_Cannot_Repair_Without_NG.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Fixture_Cannot_Repair_Without_NG.validationRule-meta.xml
index 3499a03..6cecf69 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Fixture_Cannot_Repair_Without_NG.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Fixture_Cannot_Repair_Without_NG.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Fixture_Cannot_Repair_Without_NG</fullName>
- <active>false</active>
+ <active>true</active>
<description>娌℃湁鐧诲綍妫�鏌G, 涓嶈兘寤轰慨鐞�</description>
<errorConditionFormula>DataMigration_Flag__c == false
&&
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Inspection_After_NG_Aborted.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Inspection_After_NG_Aborted.validationRule-meta.xml
index fa26857..a033fc5 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Inspection_After_NG_Aborted.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Inspection_After_NG_Aborted.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Inspection_After_NG_Aborted</fullName>
- <active>false</active>
+ <active>true</active>
<description>鍔炰簨澶勭殑鐢宠鍗曚笉鍋氭鏍￠獙</description>
<errorConditionFormula>DataMigration_Flag__c == false
&& IsPickval(Inspection_result_NG__c,'搴熷純')
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Inspection_After_NG_Aborted_Comment.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Inspection_After_NG_Aborted_Comment.validationRule-meta.xml
index e81c647..ecb51d5 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Inspection_After_NG_Aborted_Comment.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Inspection_After_NG_Aborted_Comment.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Inspection_After_NG_Aborted_Comment</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>DataMigration_Flag__c == false
&& IsPickval(Pre_NG_abord_reason__c,'鍏朵粬')
&& IsBlank(Pre_Inspection_Comment__c)</errorConditionFormula>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Inspection_result_notOK_cannot_Shippment.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Inspection_result_notOK_cannot_Shippment.validationRule-meta.xml
index eb8ad06..a504c34 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Inspection_result_notOK_cannot_Shippment.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Inspection_result_notOK_cannot_Shippment.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Inspection_result_notOK_cannot_Shippment</fullName>
- <active>false</active>
+ <active>true</active>
<description>From 澶囧搧Set</description>
<errorConditionFormula>DataMigration_Flag__c == false
&& Not($User.Batch_User__c)
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/IsBodyOrIsAccessory.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/IsBodyOrIsAccessory.validationRule-meta.xml
index faaf07b..f1adb62 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/IsBodyOrIsAccessory.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/IsBodyOrIsAccessory.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>IsBodyOrIsAccessory</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>NOT(ISBLANK(Asset__c)) && DataMigration_Flag__c == false &&
Not(
Loaner_accsessary__c || Is_Body__c
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Lost_For_Grounding.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Lost_For_Grounding.validationRule-meta.xml
index e29918b..5134697 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Lost_For_Grounding.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Lost_For_Grounding.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Lost_For_Grounding</fullName>
- <active>false</active>
+ <active>true</active>
<description>From 澶囧搧Set</description>
<errorConditionFormula>DataMigration_Flag__c == false
&& IsBlank(Shippment_loaner_time2__c)
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Must_Set_Both.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Must_Set_Both.validationRule-meta.xml
index fcd4ccc..8aaafc2 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Must_Set_Both.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Must_Set_Both.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Must_Set_Both</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>ISBLANK(Text(CDSChargement__c)) != ISBLANK(Text(CDSType__c))</errorConditionFormula>
<errorMessage>CDS鎷呭綋/CDS鏂瑰紡鏈夊�兼椂锛孋DS鏂瑰紡/CDS鎷呭綋涓嶈兘涓虹┖銆�</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Need_Shippment_info_before_receive.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Need_Shippment_info_before_receive.validationRule-meta.xml
index 7a2ba80..76ec078 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Need_Shippment_info_before_receive.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Need_Shippment_info_before_receive.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Need_Shippment_info_before_receive</fullName>
- <active>false</active>
+ <active>true</active>
<description>From 澶囧搧Set</description>
<errorConditionFormula>DataMigration_Flag__c == false
&& ISBLANK(DeliverySlip__c)
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Need_shipment_request_before_logistic.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Need_shipment_request_before_logistic.validationRule-meta.xml
index e961e8a..296220f 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Need_shipment_request_before_logistic.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Need_shipment_request_before_logistic.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Need_shipment_request_before_logistic</fullName>
- <active>false</active>
+ <active>true</active>
<description>From 澶囧搧Set</description>
<errorConditionFormula>DataMigration_Flag__c == false
&& IsBlank(Shipment_request_time2__c)
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Only_Can_Select_Same_asset_location.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Only_Can_Select_Same_asset_location.validationRule-meta.xml
index b2f6a66..cbc7c27 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Only_Can_Select_Same_asset_location.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Only_Can_Select_Same_asset_location.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Only_Can_Select_Same_asset_location</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>DataMigration_Flag__c == false
&& LEFT($User.ProfileId, 15) = LEFT($Label.ProfileId_EquipmentCenter, 15)
&& ISCHANGED(Asset__c)
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Receive_After_NG_Aborted.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Receive_After_NG_Aborted.validationRule-meta.xml
index b15b72e..ffcaa35 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Receive_After_NG_Aborted.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Receive_After_NG_Aborted.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Receive_After_NG_Aborted</fullName>
- <active>false</active>
+ <active>true</active>
<description>鍔炰簨澶勭殑鐢宠鍗曚笉鍋氭鏍￠獙20220508 LJH 鎻愪氦鐢宠鍒板鍝佸嚭搴撴椂闀� 鍘嗗彶鏁版嵁澶勭悊 && LEFT($User.ProfileId, 15) != LEFT($Label.ProfileId_SystemAdmin, 15)</description>
<errorConditionFormula>DataMigration_Flag__c == false
&& (IsPickval(Inspection_result_after_NG__c, '搴熷純')
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Receive_After_NG_Aborted_Comment.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Receive_After_NG_Aborted_Comment.validationRule-meta.xml
index ff01dca..087e9b2 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Receive_After_NG_Aborted_Comment.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Receive_After_NG_Aborted_Comment.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Receive_After_NG_Aborted_Comment</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>DataMigration_Flag__c == false
&& IsPickval(Inspection_NG_abord_reason__c, '鍏朵粬')
&& IsBlank(Inspection_Comment__c)</errorConditionFormula>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Receive_After_Repair_Aborted.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Receive_After_Repair_Aborted.validationRule-meta.xml
index 7e4ce29..909aac2 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Receive_After_Repair_Aborted.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Receive_After_Repair_Aborted.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Receive_After_Repair_Aborted</fullName>
- <active>false</active>
+ <active>true</active>
<description>From 澶囧搧Set</description>
<errorConditionFormula>DataMigration_Flag__c == false
&& IsPickval(Inspection_result_after__c, 'NG')
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Receive_After_Repair_Aborted_Final.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Receive_After_Repair_Aborted_Final.validationRule-meta.xml
index da9bddf..0e14ffd 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Receive_After_Repair_Aborted_Final.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Receive_After_Repair_Aborted_Final.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Receive_After_Repair_Aborted_Final</fullName>
- <active>false</active>
+ <active>true</active>
<description>鍥炴敹鍚嶯G蹇呴』閫夋嫨缁翠慨鎴栬�呭簾寮�</description>
<errorConditionFormula>DataMigration_Flag__c == false
&& IsPickval(Inspection_result_after_Final__c, 'NG')
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Repair_For_Main_Cant_Reload.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Repair_For_Main_Cant_Reload.validationRule-meta.xml
index c0d4827..3c1bccd 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Repair_For_Main_Cant_Reload.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Repair_For_Main_Cant_Reload.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Repair_For_Main_Cant_Reload</fullName>
- <active>false</active>
+ <active>true</active>
<description>From 澶囧搧Set</description>
<errorConditionFormula>DataMigration_Flag__c == false
&&
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Request_Return_Logistic_Number.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Request_Return_Logistic_Number.validationRule-meta.xml
index 8edde59..872cab1 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Request_Return_Logistic_Number.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Request_Return_Logistic_Number.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Request_Return_Logistic_Number</fullName>
- <active>false</active>
+ <active>true</active>
<description>From 澶囧搧Set</description>
<errorConditionFormula>DataMigration_Flag__c == false
&& OnStock_By_Cancel__c = false
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Start_day_need_to_bigger_than_today.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Start_day_need_to_bigger_than_today.validationRule-meta.xml
index 3ea839a..8b592ca 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Start_day_need_to_bigger_than_today.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Start_day_need_to_bigger_than_today.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Start_day_need_to_bigger_than_today</fullName>
- <active>false</active>
+ <active>true</active>
<description>[澶囧搧棰勮鍑鸿揣鏃蹇呴』鍏ュ姏浠庝粖澶╁紑濮嬭捣鐨勬棩鏈�
update lxy 2021/7/20 鍙槸鍋滅敤鍚庡啀鍚敤</description>
<errorConditionFormula>DataMigration_Flag__c == false
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Start_day_not_null.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Start_day_not_null.validationRule-meta.xml
index a887c91..8a3ce77 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Start_day_not_null.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/Start_day_not_null.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Start_day_not_null</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>DataMigration_Flag__c == false
&& IsChanged(Select_Time__c) && Not(Isblank(Select_Time__c))
&& ISBLANK(Rental_Apply_Equipment_Set__r.Rental_Start_Date__c)
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/UniqueKey_Not_Null.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/UniqueKey_Not_Null.validationRule-meta.xml
index ce604bc..0ba6a9e 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/UniqueKey_Not_Null.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/UniqueKey_Not_Null.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>UniqueKey_Not_Null</fullName>
- <active>false</active>
+ <active>true</active>
<description>鍊熷嚭澶囧搧閰嶅涓�瑙堟槑缁嗘暟鎹殑UniqueKey涓嶅厑璁镐负绌�</description>
<errorConditionFormula>IsNew() && DataMigration_Flag__c == false &&
(ISBLANK(IndexFromUniqueKey__c) || ISBLANK(UniqueKey__c))</errorConditionFormula>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/rentalNumChk.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/rentalNumChk.validationRule-meta.xml
index 73ef7c7..e8ee741 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/rentalNumChk.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/rentalNumChk.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>rentalNumChk</fullName>
- <active>false</active>
+ <active>true</active>
<description>鍊熷嚭澶囧搧閰嶅涓�瑙堟槑缁嗗彲鍊熷嚭鏁伴噺涓嶈兘瓒呰繃澶囧搧閰嶅鏄庣粏璁惧畾鐨勬暟閲�
IsBlank(Fixture_Set_Detail__c) 鐨勮瘽涔熶笉璁╂敼</description>
<errorConditionFormula>DataMigration_Flag__c == false
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/rentalNumReduceChk.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/rentalNumReduceChk.validationRule-meta.xml
index 661fe12..b8ad63d 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/rentalNumReduceChk.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/rentalNumReduceChk.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>rentalNumReduceChk</fullName>
- <active>false</active>
+ <active>true</active>
<description>鍙湁鐘舵�佹槸鑽夋涓椂锛屾暟閲忓彲浠ュ彉鏇�</description>
<errorConditionFormula>DataMigration_Flag__c == false
&& Canceled_Id__c = null
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/repair_can_not_Shipment.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/repair_can_not_Shipment.validationRule-meta.xml
index f4aa9da..d956abd 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/repair_can_not_Shipment.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/validationRules/repair_can_not_Shipment.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>repair_can_not_Shipment</fullName>
- <active>false</active>
+ <active>true</active>
<description>From 澶囧搧Set</description>
<errorConditionFormula>DataMigration_Flag__c == false
&&
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/Rental_Apply_Equipment_Set__c.object-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/Rental_Apply_Equipment_Set__c.object-meta.xml
index 3de1381..1224b07 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/Rental_Apply_Equipment_Set__c.object-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/Rental_Apply_Equipment_Set__c.object-meta.xml
@@ -152,7 +152,7 @@
+ Id (濡傛灉Cancel鐨勮瘽 or 浠ｆ浛鍝�)</description>
<enableActivities>false</enableActivities>
<enableBulkApi>true</enableBulkApi>
- <enableFeeds>true</enableFeeds>
+ <enableFeeds>false</enableFeeds>
<enableHistory>true</enableHistory>
<enableLicensing>false</enableLicensing>
<enableReports>true</enableReports>
@@ -163,7 +163,6 @@
<label>鍊熷嚭澶囧搧閰嶅涓�瑙�</label>
<nameField>
<label>No.</label>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<type>Text</type>
</nameField>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Add_Day_For_RC__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Add_Day_For_RC__c.field-meta.xml
index a12300a..1421386 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Add_Day_For_RC__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Add_Day_For_RC__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>RC鏈畾鍒版湡寤舵椂.</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>true</trackHistory>
<trackTrending>false</trackTrending>
<type>Date</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Add_RetalFSetDetail_Text__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Add_RetalFSetDetail_Text__c.field-meta.xml
index 750218d..e33030e 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Add_RetalFSetDetail_Text__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Add_RetalFSetDetail_Text__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>杩藉姞鏄庣粏瀹℃壒Text</label>
<length>131072</length>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>LongTextArea</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/After_Inspection_time__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/After_Inspection_time__c.field-meta.xml
index c23df5d..56b639d 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/After_Inspection_time__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/After_Inspection_time__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>****鍥炴敹鍚�-妫�娴嬪畬姣曟椂闂�</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>DateTime</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Arrival_wh_time__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Arrival_wh_time__c.field-meta.xml
index 7470038..2f2b572 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Arrival_wh_time__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Arrival_wh_time__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>****鍥炲簱纭瀹屾瘯鏃堕棿</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>DateTime</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Asset_return_Day__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Asset_return_Day__c.field-meta.xml
index e92fde0..0e5111d 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Asset_return_Day__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Asset_return_Day__c.field-meta.xml
@@ -5,7 +5,6 @@
<inlineHelpText>鎺掗槦鍙傝�冧俊鎭�</inlineHelpText>
<label>鎺掗槦澶囧搧鍥炲瘎鏃�</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Date</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Asset_return_time__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Asset_return_time__c.field-meta.xml
index 71543f2..8ffba2a 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Asset_return_time__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Asset_return_time__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>鍥炲瘎鏃堕棿</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>true</trackHistory>
<trackTrending>false</trackTrending>
<type>DateTime</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Bie_Ben_Bu_Ku_Cun_Jia__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Bie_Ben_Bu_Ku_Cun_Jia__c.field-meta.xml
index 42a7157..0b7e8c6 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Bie_Ben_Bu_Ku_Cun_Jia__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Bie_Ben_Bu_Ku_Cun_Jia__c.field-meta.xml
@@ -5,7 +5,6 @@
<label>鍒湰閮ㄥ簱瀛�(Sys)</label>
<length>255</length>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Text</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Bie_Chan_Pin_Fen_Lei_Jia__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Bie_Chan_Pin_Fen_Lei_Jia__c.field-meta.xml
index 4ffd32b..a5f89a1 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Bie_Chan_Pin_Fen_Lei_Jia__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Bie_Chan_Pin_Fen_Lei_Jia__c.field-meta.xml
@@ -5,7 +5,6 @@
<label>鍒骇鍝佸垎绫�(Sys)</label>
<length>255</length>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Text</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Bie_Cun_Fang_Di_Ku_Cun_Jia__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Bie_Cun_Fang_Di_Ku_Cun_Jia__c.field-meta.xml
index aee4675..55b9a6e 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Bie_Cun_Fang_Di_Ku_Cun_Jia__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Bie_Cun_Fang_Di_Ku_Cun_Jia__c.field-meta.xml
@@ -5,7 +5,6 @@
<label>鍒瓨鏀惧湴鐨勫簱瀛�(Sys)</label>
<length>255</length>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Text</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Bie_Sheng_Ku_Cun_jia__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Bie_Sheng_Ku_Cun_jia__c.field-meta.xml
index 0e70df7..e5e15be 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Bie_Sheng_Ku_Cun_jia__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Bie_Sheng_Ku_Cun_jia__c.field-meta.xml
@@ -5,7 +5,6 @@
<label>******鍒渷搴撳瓨***(鍒犻櫎锛�)</label>
<length>255</length>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Text</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Bie_Yong_Tu_Ku_Cun_Jia__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Bie_Yong_Tu_Ku_Cun_Jia__c.field-meta.xml
index ce956f5..bfbc8c9 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Bie_Yong_Tu_Ku_Cun_Jia__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Bie_Yong_Tu_Ku_Cun_Jia__c.field-meta.xml
@@ -5,7 +5,6 @@
<label>鍒敤閫斿簱瀛�(Sys)</label>
<length>255</length>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Text</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Bollow_Date_Add_10_WD__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Bollow_Date_Add_10_WD__c.field-meta.xml
index 6dbd498..8277690 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Bollow_Date_Add_10_WD__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Bollow_Date_Add_10_WD__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>澶囧搧涓績鍑哄簱鏃�(绗�10涓伐浣滄棩)</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>true</trackHistory>
<trackTrending>false</trackTrending>
<type>Date</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Bollow_Date_Add_7_WD__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Bollow_Date_Add_7_WD__c.field-meta.xml
index 94866ef..2aef80d 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Bollow_Date_Add_7_WD__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Bollow_Date_Add_7_WD__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>澶囧搧涓績鍑哄簱鏃�(绗�7涓伐浣滄棩)</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Date</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/BuchangApprovalManagerSales__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/BuchangApprovalManagerSales__c.field-meta.xml
index 8756e23..ee1f8ff 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/BuchangApprovalManagerSales__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/BuchangApprovalManagerSales__c.field-meta.xml
@@ -7,7 +7,6 @@
<referenceTo>User</referenceTo>
<relationshipName>Buchang3dqh</relationshipName>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Lookup</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/BuchangApprovalManager__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/BuchangApprovalManager__c.field-meta.xml
index abc76d5..f0e6086 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/BuchangApprovalManager__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/BuchangApprovalManager__c.field-meta.xml
@@ -7,7 +7,6 @@
<referenceTo>User</referenceTo>
<relationshipName>Buchang2dqh</relationshipName>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Lookup</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Cancel_Date__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Cancel_Date__c.field-meta.xml
index ff91e8a..e44bf73 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Cancel_Date__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Cancel_Date__c.field-meta.xml
@@ -6,7 +6,6 @@
<externalId>false</externalId>
<label>鍙栨秷鏃�</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Date</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Cancel_Mem_Name__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Cancel_Mem_Name__c.field-meta.xml
index 656a41b..37d84aa 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Cancel_Mem_Name__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Cancel_Mem_Name__c.field-meta.xml
@@ -6,7 +6,6 @@
<label>鍙栨秷鑰�</label>
<length>255</length>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Text</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Cancel_Mem__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Cancel_Mem__c.field-meta.xml
index e936706..784b27f 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Cancel_Mem__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Cancel_Mem__c.field-meta.xml
@@ -8,7 +8,6 @@
<referenceTo>User</referenceTo>
<relationshipName>RAES_Cancel_Man</relationshipName>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Lookup</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Cancel_Reason__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Cancel_Reason__c.field-meta.xml
index f1eaf8e..c6a81ce 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Cancel_Reason__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Cancel_Reason__c.field-meta.xml
@@ -5,7 +5,6 @@
<externalId>false</externalId>
<label>鍙栨秷鐞嗙敱</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Picklist</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Cancel_Select__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Cancel_Select__c.field-meta.xml
index 6e89667..e36a7d5 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Cancel_Select__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Cancel_Select__c.field-meta.xml
@@ -7,7 +7,6 @@
渚嬪鐢宠鑰呮敹璐G鍚庝竴瑙堥噸鏂板垎閰嶅氨鏄郴缁熷彇娑�</description>
<externalId>false</externalId>
<label>鍙栨秷鍒嗛厤(Sys)</label>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Checkbox</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Cancel_Time__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Cancel_Time__c.field-meta.xml
index f94adb3..2f2bd16 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Cancel_Time__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Cancel_Time__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>鍙栨秷鏃堕棿</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>true</trackHistory>
<trackTrending>false</trackTrending>
<type>Time</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Canceled_Id__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Canceled_Id__c.field-meta.xml
index d88c702..00d83ef 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Canceled_Id__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Canceled_Id__c.field-meta.xml
@@ -5,7 +5,6 @@
<label>Canceled_Id (Text)</label>
<length>18</length>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Text</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Canceled__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Canceled__c.field-meta.xml
index b4135b9..c4e5eca 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Canceled__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Canceled__c.field-meta.xml
@@ -10,7 +10,6 @@
<relationshipLabel>鍊熷嚭澶囧搧閰嶅涓�瑙� (Copyed)</relationshipLabel>
<relationshipName>Copyed_Rental_Apply_Equipment_Set</relationshipName>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Lookup</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Condition_Final_Reply_Days__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Condition_Final_Reply_Days__c.field-meta.xml
index fbd5e7b..b21a5f9 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Condition_Final_Reply_Days__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Condition_Final_Reply_Days__c.field-meta.xml
@@ -8,7 +8,6 @@
<precision>18</precision>
<required>false</required>
<scale>0</scale>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Number</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Condition_Seven_Days__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Condition_Seven_Days__c.field-meta.xml
index 0492835..c5f0f8c 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Condition_Seven_Days__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Condition_Seven_Days__c.field-meta.xml
@@ -8,7 +8,6 @@
<precision>18</precision>
<required>false</required>
<scale>0</scale>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Number</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Condition_X21_Days__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Condition_X21_Days__c.field-meta.xml
index bb669c1..06c2577 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Condition_X21_Days__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Condition_X21_Days__c.field-meta.xml
@@ -8,7 +8,6 @@
<precision>18</precision>
<required>false</required>
<scale>0</scale>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Number</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/DataMigration_Flag__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/DataMigration_Flag__c.field-meta.xml
index 241dd03..4a83cce 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/DataMigration_Flag__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/DataMigration_Flag__c.field-meta.xml
@@ -5,7 +5,6 @@
<description>validation check 绛夛紝鐪嬭繖涓狥lag锛屼笉鎶ラ敊</description>
<externalId>false</externalId>
<label>DataMigration_Flag</label>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Checkbox</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Delay_Final_Reply_Days__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Delay_Final_Reply_Days__c.field-meta.xml
index c754642..63d84ed 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Delay_Final_Reply_Days__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Delay_Final_Reply_Days__c.field-meta.xml
@@ -8,7 +8,6 @@
<precision>18</precision>
<required>false</required>
<scale>0</scale>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Number</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Demo_purpose2_T__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Demo_purpose2_T__c.field-meta.xml
index f44dc66..4964005 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Demo_purpose2_T__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Demo_purpose2_T__c.field-meta.xml
@@ -5,7 +5,6 @@
<label>Demo_purpose2_Text</label>
<length>255</length>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Text</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Equipment_Set_Borrowed__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Equipment_Set_Borrowed__c.field-meta.xml
index 3ef1088..38063aa 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Equipment_Set_Borrowed__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Equipment_Set_Borrowed__c.field-meta.xml
@@ -5,7 +5,6 @@
<label>澶囧搧set(鍊熷嚭鏃�)</label>
<length>255</length>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Text</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Equipment_Set__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Equipment_Set__c.field-meta.xml
index 67e5dba..1c9a55e 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Equipment_Set__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Equipment_Set__c.field-meta.xml
@@ -7,7 +7,6 @@
<referenceTo>Equipment_Set__c</referenceTo>
<relationshipName>Rental_Apply_Equipment_Set</relationshipName>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Lookup</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Extend_Date__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Extend_Date__c.field-meta.xml
index 55600df..37512a6 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Extend_Date__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Extend_Date__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>寤舵湡鏃堕棿</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Date</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Extend_Final_reply_day_Text_Holiday_back__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Extend_Final_reply_day_Text_Holiday_back__c.field-meta.xml
index c9df13c..cec1dc0 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Extend_Final_reply_day_Text_Holiday_back__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Extend_Final_reply_day_Text_Holiday_back__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>鏈�鏂伴瀹氬綊杩樻棩_寤惰繜(闀垮亣瀵瑰簲澶囦唤)</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Date</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Extend_Final_reply_day_Text__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Extend_Final_reply_day_Text__c.field-meta.xml
index 762ab25..1328edb 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Extend_Final_reply_day_Text__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Extend_Final_reply_day_Text__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>鏈�鏂伴瀹氬綊杩樻棩_寤惰繜</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Date</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Extend_Status__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Extend_Status__c.field-meta.xml
index 7f92aae..2730641 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Extend_Status__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Extend_Status__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>****寤舵湡鐢宠鐘舵��</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Picklist</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Extend_request_reason__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Extend_request_reason__c.field-meta.xml
index 32783b7..bead978 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Extend_request_reason__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Extend_request_reason__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>****寤舵湡鐢宠鐞嗙敱</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>TextArea</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Extend_workday__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Extend_workday__c.field-meta.xml
index 42538eb..9855d7c 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Extend_workday__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Extend_workday__c.field-meta.xml
@@ -6,7 +6,6 @@
<precision>18</precision>
<required>false</required>
<scale>0</scale>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Number</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Final_reply_day_text__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Final_reply_day_text__c.field-meta.xml
index 77ffb7c..7e77b79 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Final_reply_day_text__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Final_reply_day_text__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>鏈�缁堝�熷嚭澶囧搧鍥炴敹鏈熼檺(鏂囨湰)</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>true</trackHistory>
<trackTrending>false</trackTrending>
<type>Date</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Final_reply_day_text_for_sum__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Final_reply_day_text_for_sum__c.field-meta.xml
index 24f1063..cf9e181 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Final_reply_day_text_for_sum__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Final_reply_day_text_for_sum__c.field-meta.xml
@@ -5,7 +5,6 @@
<externalId>false</externalId>
<label>鍊熷嚭澶囧搧鍥炴敹鏈熼檺(鏂囨湰)</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Date</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/First_RAESD__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/First_RAESD__c.field-meta.xml
index 0d881ea..497aa65 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/First_RAESD__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/First_RAESD__c.field-meta.xml
@@ -8,7 +8,6 @@
<relationshipLabel>鍊熷嚭澶囧搧閰嶅涓�瑙�</relationshipLabel>
<relationshipName>First_RAES</relationshipName>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>true</trackHistory>
<trackTrending>false</trackTrending>
<type>Lookup</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Fixture_Set__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Fixture_Set__c.field-meta.xml
index af7f40b..b31d57b 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Fixture_Set__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Fixture_Set__c.field-meta.xml
@@ -8,7 +8,6 @@
<relationshipLabel>鍊熷嚭澶囧搧閰嶅涓�瑙�</relationshipLabel>
<relationshipName>Rental_Apply_Equipment_Set</relationshipName>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Lookup</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Fu_Shu_Pin_Fen_Pei_Jia__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Fu_Shu_Pin_Fen_Pei_Jia__c.field-meta.xml
index 50ae866..37b0a01 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Fu_Shu_Pin_Fen_Pei_Jia__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Fu_Shu_Pin_Fen_Pei_Jia__c.field-meta.xml
@@ -5,7 +5,6 @@
<label>闄勫睘鍝佸垎閰�(Sys)</label>
<length>255</length>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Text</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Groupby_SortInt__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Groupby_SortInt__c.field-meta.xml
index 50b5ddf..a0b13c4 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Groupby_SortInt__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Groupby_SortInt__c.field-meta.xml
@@ -6,7 +6,6 @@
<precision>18</precision>
<required>false</required>
<scale>0</scale>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Number</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Guzhangpaicha_Final_reply_day_Text_Holid__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Guzhangpaicha_Final_reply_day_Text_Holid__c.field-meta.xml
index 53ed5e5..b20ca7c 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Guzhangpaicha_Final_reply_day_Text_Holid__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Guzhangpaicha_Final_reply_day_Text_Holid__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>鏈�鏂伴瀹氬綊杩樻棩_鏁呴殰鎺掓煡(闀垮亣瀵瑰簲澶囦唤)</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Date</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Guzhangpaicha_Final_reply_day_Text__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Guzhangpaicha_Final_reply_day_Text__c.field-meta.xml
index 03a3135..b328a83 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Guzhangpaicha_Final_reply_day_Text__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Guzhangpaicha_Final_reply_day_Text__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>鏈�鏂伴瀹氬綊杩樻棩_鏁呴殰鎺掓煡</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Date</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/IndexFromUniqueKey__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/IndexFromUniqueKey__c.field-meta.xml
index 0e74614..8026de9 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/IndexFromUniqueKey__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/IndexFromUniqueKey__c.field-meta.xml
@@ -6,7 +6,6 @@
<precision>10</precision>
<required>false</required>
<scale>0</scale>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Number</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Inspection_after_ng__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Inspection_after_ng__c.field-meta.xml
index 38e852c..5786c15 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Inspection_after_ng__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Inspection_after_ng__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>****鍥炴敹鍚庢鏌G鍒ゆ柇</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Picklist</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Inspection_before_ng__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Inspection_before_ng__c.field-meta.xml
index 1006d48..6110431 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Inspection_before_ng__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Inspection_before_ng__c.field-meta.xml
@@ -6,7 +6,6 @@
<externalId>false</externalId>
<label>鍙戣揣鍓嶆鏌G鍒ゆ柇</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Picklist</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Inspection_result_after_OK__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Inspection_result_after_OK__c.field-meta.xml
index f49f704..cbc93ce 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Inspection_result_after_OK__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Inspection_result_after_OK__c.field-meta.xml
@@ -5,7 +5,6 @@
<inlineHelpText>鎺掗槦鍙傝�冧俊鎭�</inlineHelpText>
<label>鎺掗槦澶囧搧妫�娴婳K鏃堕棿</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Date</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Irreplaceable_flag__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Irreplaceable_flag__c.field-meta.xml
index 4d8a05c..3bf8dc9 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Irreplaceable_flag__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Irreplaceable_flag__c.field-meta.xml
@@ -4,7 +4,6 @@
<defaultValue>false</defaultValue>
<externalId>false</externalId>
<label>浠ｆ浛鍝佷笉鍙�</label>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Checkbox</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/IsCancelMainAssign__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/IsCancelMainAssign__c.field-meta.xml
index ae870dd..384e5df 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/IsCancelMainAssign__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/IsCancelMainAssign__c.field-meta.xml
@@ -5,7 +5,6 @@
<description>澶囧搧鏅鸿兘鍖栬拷鍔狅紝鍒嗛厤浠ｆ浛鍝佹椂锛岃鐪嬪師閰嶅鐨勪富浣撴槸鍚﹀凡缁忓垎閰嶏紝鎵�浠ュ垎閰嶄唬鏇垮搧鏃讹紝鍜孋ancelId涓�璧疯祴鍊兼潵渚涘悗缁娇鐢�</description>
<externalId>false</externalId>
<label>IsCancelMainAssign</label>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Checkbox</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/IsOPD_Account__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/IsOPD_Account__c.field-meta.xml
index 729ae0b..eb5f307 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/IsOPD_Account__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/IsOPD_Account__c.field-meta.xml
@@ -6,7 +6,6 @@
<precision>18</precision>
<required>false</required>
<scale>0</scale>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Number</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Jie_Chu_Shi_Jian_Jia__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Jie_Chu_Shi_Jian_Jia__c.field-meta.xml
index ba66c49..4956b5a 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Jie_Chu_Shi_Jian_Jia__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Jie_Chu_Shi_Jian_Jia__c.field-meta.xml
@@ -6,7 +6,6 @@
<precision>18</precision>
<required>false</required>
<scale>0</scale>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Number</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/JingliApprovalManager__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/JingliApprovalManager__c.field-meta.xml
index e703c7e..d4473b4 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/JingliApprovalManager__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/JingliApprovalManager__c.field-meta.xml
@@ -7,7 +7,6 @@
<referenceTo>User</referenceTo>
<relationshipName>Jingli2dqX</relationshipName>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Lookup</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Ke_Yi_Fen_Pei_Zhu_Ti_Jia__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Ke_Yi_Fen_Pei_Zhu_Ti_Jia__c.field-meta.xml
index ab61220..eeb921e 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Ke_Yi_Fen_Pei_Zhu_Ti_Jia__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Ke_Yi_Fen_Pei_Zhu_Ti_Jia__c.field-meta.xml
@@ -6,7 +6,6 @@
<precision>18</precision>
<required>false</required>
<scale>0</scale>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Number</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/KeyCode__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/KeyCode__c.field-meta.xml
index d9481ca..36202f9 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/KeyCode__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/KeyCode__c.field-meta.xml
@@ -5,7 +5,6 @@
<label>澶囧搧淇℃伅杞ЩKeyCode</label>
<length>100</length>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Text</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/LendNum__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/LendNum__c.field-meta.xml
index 1f7301d..0ec41d0 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/LendNum__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/LendNum__c.field-meta.xml
@@ -6,7 +6,6 @@
<precision>18</precision>
<required>false</required>
<scale>0</scale>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Number</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Loaner_cancel_Remarks__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Loaner_cancel_Remarks__c.field-meta.xml
index f19e778..04f5e74 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Loaner_cancel_Remarks__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Loaner_cancel_Remarks__c.field-meta.xml
@@ -5,7 +5,6 @@
<label>鍙栨秷鐞嗙敱澶囨敞</label>
<length>255</length>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Text</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Loaner_cancel_reason__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Loaner_cancel_reason__c.field-meta.xml
index 201bf33..0d388a8 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Loaner_cancel_reason__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Loaner_cancel_reason__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>涓�瑙堝彇娑堢悊鐢�</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Picklist</type>
@@ -89,6 +88,22 @@
</value>
</valueSetDefinition>
<valueSettings>
+ <controllingFieldValue>琚姩鍙栨秷</controllingFieldValue>
+ <valueName>搴撳瓨涓嶈冻</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>琚姩鍙栨秷</controllingFieldValue>
+ <valueName>淇悊鍝佸凡杩斿洖</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>琚姩鍙栨秷</controllingFieldValue>
+ <valueName>鏃犱繚鏈�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>琚姩鍙栨秷</controllingFieldValue>
+ <valueName>鍏朵粬</valueName>
+ </valueSettings>
+ <valueSettings>
<controllingFieldValue>涓诲姩鍙栨秷</controllingFieldValue>
<valueName>璁″垝璋冩暣鍙樻洿</valueName>
</valueSettings>
@@ -119,22 +134,6 @@
<valueSettings>
<controllingFieldValue>涓诲姩鍙栨秷</controllingFieldValue>
<valueName>鎷呭綋绂昏亴</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>琚姩鍙栨秷</controllingFieldValue>
- <valueName>搴撳瓨涓嶈冻</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>琚姩鍙栨秷</controllingFieldValue>
- <valueName>淇悊鍝佸凡杩斿洖</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>琚姩鍙栨秷</controllingFieldValue>
- <valueName>鏃犱繚鏈�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>琚姩鍙栨秷</controllingFieldValue>
- <valueName>鍏朵粬</valueName>
</valueSettings>
</valueSet>
</CustomField>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Loaner_centre_mail_address__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Loaner_centre_mail_address__c.field-meta.xml
index 4207337..ca3f448 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Loaner_centre_mail_address__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Loaner_centre_mail_address__c.field-meta.xml
@@ -5,7 +5,6 @@
<externalId>false</externalId>
<label>澶囧搧涓績鐨勯偖绠卞湴鍧�</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Email</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Loaner_code_text__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Loaner_code_text__c.field-meta.xml
index 29a5afb..368ec62 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Loaner_code_text__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Loaner_code_text__c.field-meta.xml
@@ -5,7 +5,6 @@
<label>澶囧搧閰嶅鍨嬪彿(鍊熷嚭鏃�)</label>
<length>200</length>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Text</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Loaner_name_text__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Loaner_name_text__c.field-meta.xml
index 7eaa3db..ff1c8e7 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Loaner_name_text__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Loaner_name_text__c.field-meta.xml
@@ -5,7 +5,6 @@
<label>澶囧搧閰嶅涓枃鍚�(鍊熷嚭鏃�)</label>
<length>50</length>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Text</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Loaner_received_time__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Loaner_received_time__c.field-meta.xml
index dcb2fb9..6f9b576 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Loaner_received_time__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Loaner_received_time__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>鐜板満绛炬敹鏃堕棿</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>true</trackHistory>
<trackTrending>false</trackTrending>
<type>DateTime</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Lost_item_check_OK__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Lost_item_check_OK__c.field-meta.xml
index 542ee93..4ec173c 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Lost_item_check_OK__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Lost_item_check_OK__c.field-meta.xml
@@ -5,7 +5,6 @@
<inlineHelpText>鎺掗槦鍙傝�冧俊鎭�</inlineHelpText>
<label>鎺掗槦澶囧搧娆犲搧OK鏃堕棿</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Date</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Mail_Send_Btn__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Mail_Send_Btn__c.field-meta.xml
index bd6fbf1..99ed507 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Mail_Send_Btn__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Mail_Send_Btn__c.field-meta.xml
@@ -5,7 +5,6 @@
<label>Mail Send Btn</label>
<length>1</length>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Text</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Manual_Queue__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Manual_Queue__c.field-meta.xml
index 7d5cac9..0315522 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Manual_Queue__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Manual_Queue__c.field-meta.xml
@@ -4,7 +4,6 @@
<defaultValue>false</defaultValue>
<externalId>false</externalId>
<label>鎵嬪姩鎺掗槦</label>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Checkbox</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Min_Final_reply_day_Text_Holiday_backup__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Min_Final_reply_day_Text_Holiday_backup__c.field-meta.xml
index 7461d27..0e06f1b 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Min_Final_reply_day_Text_Holiday_backup__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Min_Final_reply_day_Text_Holiday_backup__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>鏈�鏂伴瀹氬綊杩樻棩_鏈�灏�(闀垮亣瀵瑰簲澶囦唤)</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Date</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Min_Final_reply_day_Text__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Min_Final_reply_day_Text__c.field-meta.xml
index 173f834..b5cccf1 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Min_Final_reply_day_Text__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Min_Final_reply_day_Text__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>鏈�鏂伴瀹氬綊杩樻棩_鏈�灏�</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Date</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/NG_Final_reply_day_Text_Holiday_backup__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/NG_Final_reply_day_Text_Holiday_backup__c.field-meta.xml
index d3a37a6..ccfe07a 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/NG_Final_reply_day_Text_Holiday_backup__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/NG_Final_reply_day_Text_Holiday_backup__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>鏈�鏂伴瀹氬綊杩樻棩_鏀惰揣NG(闀垮亣瀵瑰簲澶囦唤)</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Date</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/NG_Final_reply_day_Text__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/NG_Final_reply_day_Text__c.field-meta.xml
index ae26e6e..8185289 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/NG_Final_reply_day_Text__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/NG_Final_reply_day_Text__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>鏈�鏂伴瀹氬綊杩樻棩_鏀惰揣NG</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Date</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/NG_Return_DeliverySlip_Information__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/NG_Return_DeliverySlip_Information__c.field-meta.xml
index 91a6830..c191765 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/NG_Return_DeliverySlip_Information__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/NG_Return_DeliverySlip_Information__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>鐢宠鑰呮敹璐G鍥炲瘎鍗曚俊鎭�</label>
<length>65535</length>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Html</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/NG_Return_DeliverySlip__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/NG_Return_DeliverySlip__c.field-meta.xml
index b58b1cb..245ef29 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/NG_Return_DeliverySlip__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/NG_Return_DeliverySlip__c.field-meta.xml
@@ -8,7 +8,6 @@
<relationshipLabel>鍊熷嚭澶囧搧閰嶅涓�瑙�</relationshipLabel>
<relationshipName>NG_Return_DeliverySlip</relationshipName>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Lookup</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/NG_Select_Again__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/NG_Select_Again__c.field-meta.xml
index 1ba1faf..73cb0fa 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/NG_Select_Again__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/NG_Select_Again__c.field-meta.xml
@@ -4,7 +4,6 @@
<defaultValue>false</defaultValue>
<externalId>false</externalId>
<label>NG閲嶆柊鍒嗛厤</label>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Checkbox</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/New_Rental_Apply_Equipment__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/New_Rental_Apply_Equipment__c.field-meta.xml
index e44374f..6606b4f 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/New_Rental_Apply_Equipment__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/New_Rental_Apply_Equipment__c.field-meta.xml
@@ -9,7 +9,6 @@
<relationshipLabel>鍊熷嚭澶囧搧閰嶅涓�瑙� (鏃у�熷嚭澶囧搧閰嶅涓�瑙�)</relationshipLabel>
<relationshipName>Old_Rental_Apply_Equipment</relationshipName>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Lookup</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Old_Rental_Apply__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Old_Rental_Apply__c.field-meta.xml
index d013ebe..ad81237 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Old_Rental_Apply__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Old_Rental_Apply__c.field-meta.xml
@@ -9,7 +9,6 @@
<relationshipLabel>鍊熷嚭澶囧搧閰嶅涓�瑙� (宸插垎鍗�)</relationshipLabel>
<relationshipName>Split_Rental_Apply_Equipment_Set</relationshipName>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>true</trackHistory>
<trackTrending>false</trackTrending>
<type>Lookup</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Old_RetalFSetDetail_Cnt__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Old_RetalFSetDetail_Cnt__c.field-meta.xml
index bee97dd..ef409cb 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Old_RetalFSetDetail_Cnt__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Old_RetalFSetDetail_Cnt__c.field-meta.xml
@@ -6,7 +6,6 @@
<precision>18</precision>
<required>false</required>
<scale>0</scale>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Number</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Pai_Dui_Jia__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Pai_Dui_Jia__c.field-meta.xml
index bc11477..27ea35b 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Pai_Dui_Jia__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Pai_Dui_Jia__c.field-meta.xml
@@ -6,7 +6,6 @@
<precision>18</precision>
<required>false</required>
<scale>0</scale>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Number</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Pre_inspection_time__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Pre_inspection_time__c.field-meta.xml
index 23e7927..c74726b 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Pre_inspection_time__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Pre_inspection_time__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>****鍙戣揣鍓�-妫�娴嬪悎鏍兼椂闂�</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>DateTime</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Product2__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Product2__c.field-meta.xml
index c17b5cb..c965922 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Product2__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Product2__c.field-meta.xml
@@ -5,7 +5,6 @@
<label>涓讳綋浜у搧</label>
<length>128</length>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Text</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/QIS_Final_reply_day_Text_Holiday_backup__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/QIS_Final_reply_day_Text_Holiday_backup__c.field-meta.xml
index cf35c45..6e3579b 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/QIS_Final_reply_day_Text_Holiday_backup__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/QIS_Final_reply_day_Text_Holiday_backup__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>鏈�鏂伴瀹氬綊杩樻棩_绱㈣禂QIS(闀垮亣瀵瑰簲澶囦唤)</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Date</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/QIS_Final_reply_day_Text__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/QIS_Final_reply_day_Text__c.field-meta.xml
index 03d18ce..2467639 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/QIS_Final_reply_day_Text__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/QIS_Final_reply_day_Text__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>鏈�鏂伴瀹氬綊杩樻棩_绱㈣禂QIS</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Date</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/QueueDetail__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/QueueDetail__c.field-meta.xml
index c9e8afc..4653f0f 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/QueueDetail__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/QueueDetail__c.field-meta.xml
@@ -5,7 +5,6 @@
<label>鎺掗槦澶囧搧棰勮鏄庣粏</label>
<length>32</length>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>true</trackHistory>
<trackTrending>false</trackTrending>
<type>Text</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/QueueShippmentDate__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/QueueShippmentDate__c.field-meta.xml
index a255279..5bdb2b3 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/QueueShippmentDate__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/QueueShippmentDate__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>鎺掗槦澶囧搧棰勮鍑哄簱鏃堕棿Sys</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>true</trackHistory>
<trackTrending>false</trackTrending>
<type>Date</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/RcUnexpectExpiryDelay__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/RcUnexpectExpiryDelay__c.field-meta.xml
index f439ac0..995946f 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/RcUnexpectExpiryDelay__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/RcUnexpectExpiryDelay__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>RC鏈畾鍒版湡寤舵椂</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Date</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Re_Delay_Apply_Date__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Re_Delay_Apply_Date__c.field-meta.xml
index b09800a..f53be6a 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Re_Delay_Apply_Date__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Re_Delay_Apply_Date__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>鍐嶅欢闀跨敵璇锋棩鏈�</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Date</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Re_Inform_Mail__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Re_Inform_Mail__c.field-meta.xml
index 8b866bc..aceb0db 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Re_Inform_Mail__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Re_Inform_Mail__c.field-meta.xml
@@ -6,7 +6,6 @@
<label>Re Inform Mail</label>
<length>1</length>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Text</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Received_Confirm_NG_Not_Return_Text__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Received_Confirm_NG_Not_Return_Text__c.field-meta.xml
index 62394cd..efdc1db 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Received_Confirm_NG_Not_Return_Text__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Received_Confirm_NG_Not_Return_Text__c.field-meta.xml
@@ -6,7 +6,6 @@
<precision>18</precision>
<required>false</required>
<scale>0</scale>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Number</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Received_Confirm_Status_Text__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Received_Confirm_Status_Text__c.field-meta.xml
index 0cac3e9..d8e6c97 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Received_Confirm_Status_Text__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Received_Confirm_Status_Text__c.field-meta.xml
@@ -5,7 +5,6 @@
<label>鏀惰揣纭鐘舵��(鏂囨湰)</label>
<length>255</length>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Text</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Received_Confirm_Text__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Received_Confirm_Text__c.field-meta.xml
index a5e84dc..5cbfc2c 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Received_Confirm_Text__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Received_Confirm_Text__c.field-meta.xml
@@ -6,7 +6,6 @@
<label>鐜板満鏀跺埌纭缁撴灉(Text)</label>
<length>255</length>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Text</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Received_Confirm__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Received_Confirm__c.field-meta.xml
index 046c248..4dcfdbf 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Received_Confirm__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Received_Confirm__c.field-meta.xml
@@ -5,7 +5,6 @@
<externalId>false</externalId>
<label>鐜板満鏀跺埌纭缁撴灉</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>true</trackHistory>
<trackTrending>false</trackTrending>
<type>Picklist</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Received_NG_ReAssign_Text__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Received_NG_ReAssign_Text__c.field-meta.xml
index db8c0db..bc1cd84 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Received_NG_ReAssign_Text__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Received_NG_ReAssign_Text__c.field-meta.xml
@@ -4,7 +4,6 @@
<defaultValue>false</defaultValue>
<externalId>false</externalId>
<label>鍒拌揣NG閲嶆柊鍒嗛厤锛圱ext锛�</label>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Checkbox</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Received_confirmation_staff2__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Received_confirmation_staff2__c.field-meta.xml
index 5d0c810..256004e 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Received_confirmation_staff2__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Received_confirmation_staff2__c.field-meta.xml
@@ -7,7 +7,6 @@
<referenceTo>User</referenceTo>
<relationshipName>Received_confirmation_staff2</relationshipName>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Lookup</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Received_ng_detail__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Received_ng_detail__c.field-meta.xml
index e653520..75c8b08 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Received_ng_detail__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Received_ng_detail__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>鏀跺埌纭NG鍐呭</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>true</trackHistory>
<trackTrending>false</trackTrending>
<type>TextArea</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Rental_Apply__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Rental_Apply__c.field-meta.xml
index 50f60f9..7812a12 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Rental_Apply__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Rental_Apply__c.field-meta.xml
@@ -8,7 +8,6 @@
<relationshipName>Rental_Apply_Equipment_Set</relationshipName>
<relationshipOrder>0</relationshipOrder>
<reparentableMasterDetail>true</reparentableMasterDetail>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>true</trackHistory>
<trackTrending>false</trackTrending>
<type>MasterDetail</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Rental_Asset_SerialNumber__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Rental_Asset_SerialNumber__c.field-meta.xml
index e5a712d..87d4bd5 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Rental_Asset_SerialNumber__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Rental_Asset_SerialNumber__c.field-meta.xml
@@ -6,7 +6,6 @@
<inlineHelpText>渚嬶細銆�,0387,銆嶃�併��,0378,0387,銆�</inlineHelpText>
<label>鍊熷嚭璁惧鏈鸿韩鍙风爜</label>
<length>65535</length>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>LongTextArea</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Rental_Date_byHand__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Rental_Date_byHand__c.field-meta.xml
index 365227e..f04c12b 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Rental_Date_byHand__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Rental_Date_byHand__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>澶囧搧棰勮鍥炴敹鏃�(鎵嬪姩)</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Date</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Rental_End_Date__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Rental_End_Date__c.field-meta.xml
index 704112c..926bb86 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Rental_End_Date__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Rental_End_Date__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>澶囧搧棰勮鍥炴敹鏃�</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>true</trackHistory>
<trackTrending>false</trackTrending>
<type>Date</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Rental_Num__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Rental_Num__c.field-meta.xml
index 94014f7..fe7ffc0 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Rental_Num__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Rental_Num__c.field-meta.xml
@@ -7,7 +7,6 @@
<precision>18</precision>
<required>false</required>
<scale>0</scale>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Number</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Rental_Start_Date__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Rental_Start_Date__c.field-meta.xml
index 8bb0273..c04d20a 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Rental_Start_Date__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Rental_Start_Date__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>澶囧搧棰勮鍑鸿揣鏃�</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>true</trackHistory>
<trackTrending>false</trackTrending>
<type>Date</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Rental_workday__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Rental_workday__c.field-meta.xml
index 77a0613..b9fa0ec 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Rental_workday__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Rental_workday__c.field-meta.xml
@@ -6,7 +6,6 @@
<precision>18</precision>
<required>false</required>
<scale>0</scale>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Number</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Repair_Agreed_Quotation_Text__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Repair_Agreed_Quotation_Text__c.field-meta.xml
index 6ad8c5b..d372a1e 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Repair_Agreed_Quotation_Text__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Repair_Agreed_Quotation_Text__c.field-meta.xml
@@ -6,7 +6,6 @@
<precision>18</precision>
<required>false</required>
<scale>0</scale>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Number</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Repair_Status_Text__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Repair_Status_Text__c.field-meta.xml
index ba2f58f..6c55d02 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Repair_Status_Text__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Repair_Status_Text__c.field-meta.xml
@@ -6,7 +6,6 @@
<label>淇悊鐘舵�侊紙鏂囨湰锛�</label>
<length>255</length>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Text</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Repair_cancel_Final_reply_day_Text_Holid__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Repair_cancel_Final_reply_day_Text_Holid__c.field-meta.xml
index f9cb3d6..6878d8f 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Repair_cancel_Final_reply_day_Text_Holid__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Repair_cancel_Final_reply_day_Text_Holid__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>鏈�鏂伴瀹氬綊杩樻棩_淇悊鍙栨秷(闀垮亣瀵瑰簲澶囦唤)</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Date</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Repair_cancel_Final_reply_day_Text__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Repair_cancel_Final_reply_day_Text__c.field-meta.xml
index 594577c..9de70f7 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Repair_cancel_Final_reply_day_Text__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Repair_cancel_Final_reply_day_Text__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>鏈�鏂伴瀹氬綊杩樻棩_淇悊鍙栨秷</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Date</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Repair_delete_Final_reply_day_Text_Ho__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Repair_delete_Final_reply_day_Text_Ho__c.field-meta.xml
index 37c0189..b5269d2 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Repair_delete_Final_reply_day_Text_Ho__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Repair_delete_Final_reply_day_Text_Ho__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>鏈�鏂伴瀹氬綊杩樻棩_淇悊鍒犻櫎(闀垮亣瀵瑰簲澶囦唤)</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Date</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Repair_delete_Final_reply_day_Text__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Repair_delete_Final_reply_day_Text__c.field-meta.xml
index c4a2f56..9e31658 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Repair_delete_Final_reply_day_Text__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Repair_delete_Final_reply_day_Text__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>鏈�鏂伴瀹氬綊杩樻棩_淇悊鍒犻櫎</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Date</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Request_asset_extend_time__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Request_asset_extend_time__c.field-meta.xml
index 2d71019..f82bf6d 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Request_asset_extend_time__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Request_asset_extend_time__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>****寤舵湡鐢宠鏃堕棿</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>DateTime</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Request_extend_day__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Request_extend_day__c.field-meta.xml
index 1e12a4f..ebeaff9 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Request_extend_day__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Request_extend_day__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>****寤舵湡甯屾湜缁撴潫鏃�</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Date</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Return_Distributor_method2__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Return_Distributor_method2__c.field-meta.xml
index a2452e0..1d1a6a9 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Return_Distributor_method2__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Return_Distributor_method2__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>****鍥炲瘎-杩愯緭鏂瑰紡</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Picklist</type>
@@ -34,6 +33,14 @@
</value>
</valueSetDefinition>
<valueSettings>
+ <controllingFieldValue>Fedex</controllingFieldValue>
+ <valueName>浼樺厛杈�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>Fedex</controllingFieldValue>
+ <valueName>鏅揪</valueName>
+ </valueSettings>
+ <valueSettings>
<controllingFieldValue>鍒╄</controllingFieldValue>
<controllingFieldValue>鍢夐噷澶ч��</controllingFieldValue>
<controllingFieldValue>鑾辨瘮鐗�</controllingFieldValue>
@@ -46,14 +53,6 @@
<controllingFieldValue>鑾辨瘮鐗�</controllingFieldValue>
<controllingFieldValue>鎱ч�氶�熼��</controllingFieldValue>
<valueName>绌鸿繍</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>Fedex</controllingFieldValue>
- <valueName>浼樺厛杈�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>Fedex</controllingFieldValue>
- <valueName>鏅揪</valueName>
</valueSettings>
</valueSet>
</CustomField>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Return_Fedex_number2__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Return_Fedex_number2__c.field-meta.xml
index 380ddd7..0d6a34a 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Return_Fedex_number2__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Return_Fedex_number2__c.field-meta.xml
@@ -5,7 +5,6 @@
<label>****鍥炲瘎-鍙戣揣杩愯緭鍗曞彿</label>
<length>30</length>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Text</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Return_delivery_company2__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Return_delivery_company2__c.field-meta.xml
index 77e69e3..2aa2336 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Return_delivery_company2__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Return_delivery_company2__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>****鍥炲瘎-鐗╂祦鍏徃</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Picklist</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Return_to_office_Final_reply_day_Text_Ho__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Return_to_office_Final_reply_day_Text_Ho__c.field-meta.xml
index ea85990..3fa6474 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Return_to_office_Final_reply_day_Text_Ho__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Return_to_office_Final_reply_day_Text_Ho__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>鏈�鏂伴瀹氬綊杩樻棩_淇悊鍝佽繑閫佹棩(闀垮亣瀵瑰簲澶囦唤)</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Date</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Return_to_office_Final_reply_day_Text__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Return_to_office_Final_reply_day_Text__c.field-meta.xml
index 14b8ffe..e17c3e1 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Return_to_office_Final_reply_day_Text__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Return_to_office_Final_reply_day_Text__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>鏈�鏂伴瀹氬綊杩樻棩_淇悊鍝佽繑閫佹棩</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Date</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Return_to_office_Final_reply_day_U_RC_Ho__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Return_to_office_Final_reply_day_U_RC_Ho__c.field-meta.xml
index da5a3aa..bc42a4e 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Return_to_office_Final_reply_day_U_RC_Ho__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Return_to_office_Final_reply_day_U_RC_Ho__c.field-meta.xml
@@ -4,7 +4,6 @@
<defaultValue>false</defaultValue>
<externalId>false</externalId>
<label>鏈�鏂伴瀹氬綊杩樻棩(浣跨敤)_涓�鑸敤鎴穇RC淇悊鍝佽繑閫佹棩浣跨敤鏉′欢(闀垮亣瀵瑰簲澶囦唤)</label>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Checkbox</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Return_to_office_Final_reply_day_U_RC__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Return_to_office_Final_reply_day_U_RC__c.field-meta.xml
index c5e9a59..17cf3da 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Return_to_office_Final_reply_day_U_RC__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Return_to_office_Final_reply_day_U_RC__c.field-meta.xml
@@ -4,7 +4,6 @@
<defaultValue>false</defaultValue>
<externalId>false</externalId>
<label>鏈�鏂伴瀹氬綊杩樻棩(浣跨敤)_涓�鑸敤鎴穇RC淇悊鍝佽繑閫佹棩浣跨敤鏉′欢</label>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Checkbox</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/SalesManager__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/SalesManager__c.field-meta.xml
index d9292cb..fbde52b 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/SalesManager__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/SalesManager__c.field-meta.xml
@@ -7,7 +7,6 @@
<referenceTo>User</referenceTo>
<relationshipName>Jingli3dqX</relationshipName>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Lookup</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Same_Accessory_flag__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Same_Accessory_flag__c.field-meta.xml
index 9015cb9..8c570c8 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Same_Accessory_flag__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Same_Accessory_flag__c.field-meta.xml
@@ -4,7 +4,6 @@
<defaultValue>false</defaultValue>
<externalId>false</externalId>
<label>鍚屼竴闄勫睘鍝�</label>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Checkbox</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Send_to_return_email__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Send_to_return_email__c.field-meta.xml
index 25af464..ca235b0 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Send_to_return_email__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Send_to_return_email__c.field-meta.xml
@@ -4,7 +4,6 @@
<defaultValue>false</defaultValue>
<externalId>false</externalId>
<label>鍙戦�佸洖鏀剁粨鏋滃弽棣堥偖浠�</label>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Checkbox</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/SetOrderPoint_sum_Text__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/SetOrderPoint_sum_Text__c.field-meta.xml
index 370391e..4909822 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/SetOrderPoint_sum_Text__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/SetOrderPoint_sum_Text__c.field-meta.xml
@@ -6,7 +6,6 @@
<precision>18</precision>
<required>false</required>
<scale>2</scale>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Number</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Shipment_request_time__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Shipment_request_time__c.field-meta.xml
index f83f869..ad45704 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Shipment_request_time__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Shipment_request_time__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>****鍑哄簱鎸囩ず鏃堕棿</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>DateTime</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Shippment_loaner_time__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Shippment_loaner_time__c.field-meta.xml
index 27e6798..05e6cf1 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Shippment_loaner_time__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Shippment_loaner_time__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>****澶囧搧涓績鍑哄簱鏃堕棿</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>DateTime</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/StockDown_time__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/StockDown_time__c.field-meta.xml
index c2c3e20..8522db8 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/StockDown_time__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/StockDown_time__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>****涓嬫灦鏃堕棿</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>DateTime</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Substitute_Select_Again_text__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Substitute_Select_Again_text__c.field-meta.xml
index f836964..c3e3ba5 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Substitute_Select_Again_text__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Substitute_Select_Again_text__c.field-meta.xml
@@ -4,7 +4,6 @@
<defaultValue>false</defaultValue>
<externalId>false</externalId>
<label>浠ｆ浛鍝侀噸鏂板垎閰嶏紙Text锛�</label>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Checkbox</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Substitute_flag__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Substitute_flag__c.field-meta.xml
index cd81d4b..9edc2ad 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Substitute_flag__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Substitute_flag__c.field-meta.xml
@@ -4,7 +4,6 @@
<defaultValue>false</defaultValue>
<externalId>false</externalId>
<label>浠ｆ浛鍝�</label>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Checkbox</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/UniqueKey__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/UniqueKey__c.field-meta.xml
index 236a36c..58c896b 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/UniqueKey__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/UniqueKey__c.field-meta.xml
@@ -8,7 +8,6 @@
<label>UniqueKey</label>
<length>255</length>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Text</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/VF_Rental_Num__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/VF_Rental_Num__c.field-meta.xml
index d6fb8b6..c80aaa1 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/VF_Rental_Num__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/VF_Rental_Num__c.field-meta.xml
@@ -6,7 +6,6 @@
<precision>18</precision>
<required>false</required>
<scale>0</scale>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Number</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Yigoudaihuo_Final_reply_day_Text_Holiday__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Yigoudaihuo_Final_reply_day_Text_Holiday__c.field-meta.xml
index 4aa33cf..a67ca8f 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Yigoudaihuo_Final_reply_day_Text_Holiday__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Yigoudaihuo_Final_reply_day_Text_Holiday__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>鏈�鏂伴瀹氬綊杩樻棩_宸茶喘寰呰揣(闀垮亣瀵瑰簲澶囦唤)</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Date</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Yigoudaihuo_Final_reply_day_Text__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Yigoudaihuo_Final_reply_day_Text__c.field-meta.xml
index b2742a5..0cff4d8 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Yigoudaihuo_Final_reply_day_Text__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Yigoudaihuo_Final_reply_day_Text__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>鏈�鏂伴瀹氬綊杩樻棩_宸茶喘寰呰揣</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Date</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Yizhouweixiu_Final_reply_day_TextHoliday__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Yizhouweixiu_Final_reply_day_TextHoliday__c.field-meta.xml
index 62b696a..b5e29a1 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Yizhouweixiu_Final_reply_day_TextHoliday__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Yizhouweixiu_Final_reply_day_TextHoliday__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>鏈�鏂伴瀹氬綊杩樻棩_涓�鍛ㄤ箣鍐呮湭閫佷慨(闀垮亣瀵瑰簲澶囦唤)</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Date</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Yizhouweixiu_Final_reply_day_Text__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Yizhouweixiu_Final_reply_day_Text__c.field-meta.xml
index 98f8b7c..76afc55 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Yizhouweixiu_Final_reply_day_Text__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Yizhouweixiu_Final_reply_day_Text__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>鏈�鏂伴瀹氬綊杩樻棩_涓�鍛ㄤ箣鍐呮湭閫佷慨</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Date</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Zhu_Ti_Fen_Pei_Jia__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Zhu_Ti_Fen_Pei_Jia__c.field-meta.xml
index e90e163..c99a4ce 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Zhu_Ti_Fen_Pei_Jia__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Zhu_Ti_Fen_Pei_Jia__c.field-meta.xml
@@ -5,7 +5,6 @@
<label>涓讳綋鍒嗛厤(Sys)</label>
<length>255</length>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Text</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/ZongjianApprovalManager__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/ZongjianApprovalManager__c.field-meta.xml
index ca47196..d7eb52a 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/ZongjianApprovalManager__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/ZongjianApprovalManager__c.field-meta.xml
@@ -7,7 +7,6 @@
<referenceTo>User</referenceTo>
<relationshipName>Zongjian2dr1</relationshipName>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Lookup</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Zsq_Rental_Apply__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Zsq_Rental_Apply__c.field-meta.xml
index 1afb333..01efc11 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Zsq_Rental_Apply__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Zsq_Rental_Apply__c.field-meta.xml
@@ -8,7 +8,6 @@
<relationshipLabel>鍊熷嚭澶囧搧閰嶅涓�瑙� (鍐嶇敵璇�)</relationshipLabel>
<relationshipName>Zsq_Rental_Apply_YL</relationshipName>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Lookup</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/applyUser__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/applyUser__c.field-meta.xml
index 6de59df..913064c 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/applyUser__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/applyUser__c.field-meta.xml
@@ -7,7 +7,6 @@
<referenceTo>User</referenceTo>
<relationshipName>SET</relationshipName>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Lookup</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/asset_extend_approval_time__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/asset_extend_approval_time__c.field-meta.xml
index b9385a6..a0557a3 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/asset_extend_approval_time__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/asset_extend_approval_time__c.field-meta.xml
@@ -4,7 +4,6 @@
<externalId>false</externalId>
<label>****寤舵湡鐢宠鎵瑰噯鏃堕棿</label>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>DateTime</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/canDelete__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/canDelete__c.field-meta.xml
index f316ed5..a681e48 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/canDelete__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/canDelete__c.field-meta.xml
@@ -4,7 +4,6 @@
<defaultValue>false</defaultValue>
<externalId>false</externalId>
<label>鍔炰簨澶勫垎閰嶆浛浠ｅ搧鍒犻櫎璺宠繃楠岃瘉</label>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Checkbox</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/zsqybpyl__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/zsqybpyl__c.field-meta.xml
index d4f9027..3a3f01a 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/zsqybpyl__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/zsqybpyl__c.field-meta.xml
@@ -8,7 +8,6 @@
<relationshipLabel>鍊熷嚭澶囧搧閰嶅涓�瑙� (鍐嶇敵璇�)</relationshipLabel>
<relationshipName>Zsq_Rental_Apply_Set</relationshipName>
<required>false</required>
- <trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Lookup</type>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Can_Not_Cancel_When_Have_Shipment.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Can_Not_Cancel_When_Have_Shipment.validationRule-meta.xml
index 7b61047..f008cf9 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Can_Not_Cancel_When_Have_Shipment.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Can_Not_Cancel_When_Have_Shipment.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Can_Not_Cancel_When_Have_Shipment</fullName>
- <active>false</active>
+ <active>true</active>
<description>鏈夊嚭搴撴槑缁嗙殑涓�瑙堜笉鑳藉彇娑�
鐢宠鑰呮敹璐G鐨勪緥澶�</description>
<errorConditionFormula>DataMigration_Flag__c == false &&
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Can_Not_Chagne_Cancel_Reason_ToSubstitut.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Can_Not_Chagne_Cancel_Reason_ToSubstitut.validationRule-meta.xml
index c5c73e4..e167010 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Can_Not_Chagne_Cancel_Reason_ToSubstitut.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Can_Not_Chagne_Cancel_Reason_ToSubstitut.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Can_Not_Chagne_Cancel_Reason_ToSubstitut</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>NOT( ISBLANK(Text(PRIORVALUE(Cancel_Reason__c)))) && Text(PRIORVALUE(Cancel_Reason__c)) != '浠ｆ浛鍝�' && Text(Cancel_Reason__c) = '浠ｆ浛鍝�'</errorConditionFormula>
<errorMessage>鍙栨秷鐞嗙敱涓嶈兘浠庡埆鐨勭悊鐢卞彉鎴愪唬鏇垮搧</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Can_Not_Change_Name.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Can_Not_Change_Name.validationRule-meta.xml
index 188a621..0099487 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Can_Not_Change_Name.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Can_Not_Change_Name.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Can_Not_Change_Name</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>DataMigration_Flag__c == false
&& Not(ISNEW())
&& ISBLANK(Fixture_Set__c)
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Can_Not_Change_Received_Confirm.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Can_Not_Change_Received_Confirm.validationRule-meta.xml
index 1114dc4..c05ac2c 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Can_Not_Change_Received_Confirm.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Can_Not_Change_Received_Confirm.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Can_Not_Change_Received_Confirm</fullName>
- <active>false</active>
+ <active>true</active>
<description>update lxy 2022/6/2 DLIU-CEYBNF 鍘绘帀寤舵湡鐘舵��=宸叉壒鍑嗐�侀┏鍥炴椂涓嶈兘淇敼鐨勬潯浠�
|| ISPICKVAL(Rental_Apply__r.ExtensionStatus__c, '宸叉壒鍑�')
|| ISPICKVAL(Rental_Apply__r.ExtensionStatus__c, '椹冲洖')</description>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Can_Not_Change_RepairRenewal_Confirm.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Can_Not_Change_RepairRenewal_Confirm.validationRule-meta.xml
index c0b637c..90128a8 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Can_Not_Change_RepairRenewal_Confirm.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Can_Not_Change_RepairRenewal_Confirm.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Can_Not_Change_RepairRenewal_Confirm</fullName>
- <active>false</active>
+ <active>true</active>
<description>鏂颁竴瑙堢幇鍦烘敹鍒扮‘璁ょ粨鏋滀换浣曟儏鍐典笅鍧囦笉鑳戒慨鏀�</description>
<errorConditionFormula>!ISNEW() && TEXT(Rental_Apply__r.Routine_Check_Status__c) = 'OK' && ISCHANGED(Received_Confirm__c)</errorConditionFormula>
<errorDisplayField>Received_Confirm__c</errorDisplayField>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Cancel_reason_not_null.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Cancel_reason_not_null.validationRule-meta.xml
index 7280d21..f0234d1 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Cancel_reason_not_null.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Cancel_reason_not_null.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Cancel_reason_not_null</fullName>
- <active>false</active>
+ <active>true</active>
<description>鍙栨秷鐨勬椂鍊欙紝鍙栨秷鐞嗙敱涓嶈兘涓虹┖</description>
<errorConditionFormula>DataMigration_Flag__c == false &&
Cancel_Select__c &&
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Cannot_Cancel_When_Application.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Cannot_Cancel_When_Application.validationRule-meta.xml
index e2cd5a0..6d683d1 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Cannot_Cancel_When_Application.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Cannot_Cancel_When_Application.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Cannot_Cancel_When_Application</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>(ISPICKVAL(Rental_Apply__r.Status__c, '鐢宠涓�')
|| (ISPICKVAL(Rental_Apply__r.Add_Approval_Status__c, '鐢宠涓�')
&& Wei_Request_approve_finish__c > 0
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Cannot_Change_CancelANDCancelR.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Cannot_Change_CancelANDCancelR.validationRule-meta.xml
index 9afb59f..23afc12 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Cannot_Change_CancelANDCancelR.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Cannot_Change_CancelANDCancelR.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Cannot_Change_CancelANDCancelR</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>DataMigration_Flag__c == false
&& PRIORVALUE(Cancel_Select__c)
&& (ISCHANGED(Cancel_Select__c)
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Cannot_reply_before_received.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Cannot_reply_before_received.validationRule-meta.xml
index bedb7c1..81376d1 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Cannot_reply_before_received.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Cannot_reply_before_received.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Cannot_reply_before_received</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>/*bp2
AND(Send_to_return_email__c = TRUE,
OR(
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/First_RAESD_Cannot_Canceled.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/First_RAESD_Cannot_Canceled.validationRule-meta.xml
index 931e89c..5e01c90 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/First_RAESD_Cannot_Canceled.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/First_RAESD_Cannot_Canceled.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>First_RAESD_Cannot_Canceled</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>ISCHANGED(First_RAESD__c)
&& First_RAESD__r.Cancel_Select__c == true</errorConditionFormula>
<errorDisplayField>First_RAESD__c</errorDisplayField>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Need_detail_when_confirm_ng.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Need_detail_when_confirm_ng.validationRule-meta.xml
index b2f3c16..3b425b4 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Need_detail_when_confirm_ng.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Need_detail_when_confirm_ng.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Need_detail_when_confirm_ng</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>DataMigration_Flag__c == false &&
TEXT(Received_Confirm__c) = 'NG' && Received_ng_detail__c = null</errorConditionFormula>
<errorMessage>纭缁撴灉NG鐨勬椂鍊欙紝蹇呴』濉啓璇︾粏鐨勫紓甯稿唴瀹�</errorMessage>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Not_date_over_37_or_47_day_for_trial.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Not_date_over_37_or_47_day_for_trial.validationRule-meta.xml
index 97f6aa0..c465899 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Not_date_over_37_or_47_day_for_trial.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Not_date_over_37_or_47_day_for_trial.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Not_date_over_37_or_47_day_for_trial</fullName>
- <active>false</active>
+ <active>true</active>
<description>浜у搧璇曠敤(闄ゅ浼氬睍浼氬拰鏂颁骇鍝佽瘎浠峰)鐨勬椂鍊欙紝涓嶅厑璁稿叆鍔涜秴杩�37澶�(鍋忚繙鍦�47澶�)浠ヤ笂鐨勬湡闂�</description>
<errorConditionFormula>(ISNew() ||
text(Rental_Apply__r.Status__c) = '鑽夋涓�' ||
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Not_date_over_90_day_for_newproduct.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Not_date_over_90_day_for_newproduct.validationRule-meta.xml
index 70ad3cd..90def73 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Not_date_over_90_day_for_newproduct.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Not_date_over_90_day_for_newproduct.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Not_date_over_90_day_for_newproduct</fullName>
- <active>false</active>
+ <active>true</active>
<description>鍒嗛厤鐢婚潰鍏ュ姏澶囧搧棰勮鍥炴敹鏃heck锛堟柊浜у搧璇勪环锛氬嚭璐ф棩璧�90澶╁唴锛�</description>
<errorConditionFormula>DataMigration_Flag__c == false
&& ((Demo_purpose2__c = "鏂颁骇鍝佽瘎浠�")
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Received_Confirm_Not_Changed.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Received_Confirm_Not_Changed.validationRule-meta.xml
index f01dfe2..8f69cbb 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Received_Confirm_Not_Changed.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Received_Confirm_Not_Changed.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Received_Confirm_Not_Changed</fullName>
- <active>false</active>
+ <active>true</active>
<description>2018/0115: IT淇敼
鍥犱负Phase2鏈夊垎鎵瑰彂璐х殑鎯呭喌锛屼慨鏀逛簡瑙勫垯銆�</description>
<errorConditionFormula>DataMigration_Flag__c == false &&
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Request_input_extend_day.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Request_input_extend_day.validationRule-meta.xml
index e6c207e..bc4e04b 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Request_input_extend_day.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Request_input_extend_day.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Request_input_extend_day</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>DataMigration_Flag__c == false &&
AND(
NOT(ISBLANK(Request_extend_day__c)),
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Start_day_no_bigger_than_end_day.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Start_day_no_bigger_than_end_day.validationRule-meta.xml
index d8b52a0..6b838c2 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Start_day_no_bigger_than_end_day.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/Start_day_no_bigger_than_end_day.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Start_day_no_bigger_than_end_day</fullName>
- <active>false</active>
+ <active>true</active>
<description>[澶囧搧棰勮鍑鸿揣鏃蹇呴』灏忎簬绛変簬[澶囧搧棰勮鍥炴敹鏃</description>
<errorConditionFormula>DataMigration_Flag__c == false &&
Rental_Start_Date__c > Rental_End_Date__c</errorConditionFormula>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/UniqueKey_Not_Null.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/UniqueKey_Not_Null.validationRule-meta.xml
index df4c952..afd0ef8 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/UniqueKey_Not_Null.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/UniqueKey_Not_Null.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>UniqueKey_Not_Null</fullName>
- <active>false</active>
+ <active>true</active>
<description>鍊熷嚭澶囧搧閰嶅涓�瑙堟暟鎹殑UniqueKey涓嶅厑璁镐负绌�</description>
<errorConditionFormula>IsNew() && DataMigration_Flag__c == false &&
(ISBLANK(IndexFromUniqueKey__c) || ISBLANK(UniqueKey__c))</errorConditionFormula>
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/allow_second_delay.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/allow_second_delay.validationRule-meta.xml
index 24bf272..cdbae3d 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/allow_second_delay.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/allow_second_delay.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>allow_second_delay</fullName>
- <active>false</active>
+ <active>true</active>
<description>缁翠慨浠ｇ敤銇牬鍚堛�佸欢闀风敵璜嬨倰2鍥炪仹銇嶃倠銈堛亞銇仚銈嬨��</description>
<errorConditionFormula>DataMigration_Flag__c == false &&
if(Re_Delay_Apply_Date__c!=null
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/cannot_hospital_sign_without_site_time.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/cannot_hospital_sign_without_site_time.validationRule-meta.xml
index fabe4ba..b2f162e 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/cannot_hospital_sign_without_site_time.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/cannot_hospital_sign_without_site_time.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>cannot_hospital_sign_without_site_time</fullName>
- <active>false</active>
+ <active>true</active>
<description>褰撴病鏈夋敹鍒扮幇鍦虹‘璁ゅ鐞嗭紝涓嶈兘杩涜鍖婚櫌鏀跺埌绛惧瓧澶勭悊锛�</description>
<errorConditionFormula>/*bp2 HP_received_time__c 銈掑墛闄ゃ仐銇熴亜
ISNULL( Loaner_received_time__c ) && NOT(ISNULL( HP_received_time__c ))
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/cannot_update2.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/cannot_update2.validationRule-meta.xml
index c403c83..b7e3aa4 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/cannot_update2.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/cannot_update2.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>cannot_update2</fullName>
- <active>false</active>
+ <active>true</active>
<description>澶囧搧绠＄悊鍛橈紝鍦ㄥ嚭搴撴寚绀轰箣鍚庝笉鑳戒慨鏀瑰叾浠栧瓧娈碉紝鍑哄簱鍚庡洖搴撳墠鍙互淇敼寤舵湡鐩稿叧瀛楁銆�</description>
<errorConditionFormula>DataMigration_Flag__c == false &&
NOT(ISNEW())
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/rentalNumReduceChk.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/rentalNumReduceChk.validationRule-meta.xml
index fff21e6..ba7b6dd 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/rentalNumReduceChk.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/validationRules/rentalNumReduceChk.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>rentalNumReduceChk</fullName>
- <active>false</active>
+ <active>true</active>
<description>鍙湁鐘舵�佹槸鑽夋涓椂锛屾暟閲忓彲浠ュ彉鏇�</description>
<errorConditionFormula>DataMigration_Flag__c == false
&& Canceled_Id__c = null
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/webLinks/RentalApplyJump.webLink-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/webLinks/RentalApplyJump.webLink-meta.xml
index 155c3b4..1220d88 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/webLinks/RentalApplyJump.webLink-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/webLinks/RentalApplyJump.webLink-meta.xml
@@ -4,7 +4,7 @@
<availability>online</availability>
<displayType>massActionButton</displayType>
<linkType>javascript</linkType>
- <masterLabel>鎻掗槦鐢宠</masterLabel>
+ <masterLabel>鎻掗槦鐢宠(鍘�)</masterLabel>
<openType>onClickJavaScript</openType>
<protected>false</protected>
<requireRowSelection>true</requireRowSelection>
diff --git a/force-app/main/default/objects/Rental_Apply_Fault__c/fields/AttachmentImage1__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Fault__c/fields/AttachmentImage1__c.field-meta.xml
index fd72ac1..7e8e892 100644
--- a/force-app/main/default/objects/Rental_Apply_Fault__c/fields/AttachmentImage1__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Fault__c/fields/AttachmentImage1__c.field-meta.xml
@@ -2,7 +2,7 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>AttachmentImage1__c</fullName>
<externalId>false</externalId>
- <formula>IF(ISBLANK(AttachmentId1__c),'',IMAGE('/servlet/servlet.FileDownload?file='+AttachmentId1__c,'闄勪欢鍥剧墖', 400, 400))</formula>
+ <formula>IF(ISBLANK(AttachmentId1__c),'',IMAGE('/sfc/servlet.shepherd/version/download/'+AttachmentId1__c,'闄勪欢鍥剧墖', 400, 400))</formula>
<label>鍥剧墖1</label>
<required>false</required>
<trackTrending>false</trackTrending>
diff --git a/force-app/main/default/objects/Rental_Apply_Fault__c/fields/AttachmentImage2__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Fault__c/fields/AttachmentImage2__c.field-meta.xml
index cca9576..611db83 100644
--- a/force-app/main/default/objects/Rental_Apply_Fault__c/fields/AttachmentImage2__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Fault__c/fields/AttachmentImage2__c.field-meta.xml
@@ -2,7 +2,7 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>AttachmentImage2__c</fullName>
<externalId>false</externalId>
- <formula>IF(ISBlank(AttachmentId2__c),'',IMAGE('/servlet/servlet.FileDownload?file='+AttachmentId2__c,'闄勪欢鍥剧墖', 400, 400))</formula>
+ <formula>IF(ISBlank(AttachmentId2__c),'',IMAGE('/sfc/servlet.shepherd/version/download/'+AttachmentId2__c,'闄勪欢鍥剧墖', 400, 400))</formula>
<label>鍥剧墖2</label>
<required>false</required>
<trackTrending>false</trackTrending>
diff --git a/force-app/main/default/objects/Rental_Apply_Fault__c/validationRules/NOT_TO_CHANGE_Detail.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Fault__c/validationRules/NOT_TO_CHANGE_Detail.validationRule-meta.xml
index 05cb05c..f2ebde3 100644
--- a/force-app/main/default/objects/Rental_Apply_Fault__c/validationRules/NOT_TO_CHANGE_Detail.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Fault__c/validationRules/NOT_TO_CHANGE_Detail.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>NOT_TO_CHANGE_Detail</fullName>
- <active>false</active>
+ <active>true</active>
<description>涓嶅彲浠ヤ慨鏀瑰熀鏈俊鎭�</description>
<errorConditionFormula>!ISNEW()
&&(ISCHANGED(Rental_Apply_Equipment_Set_Detail__c)
diff --git a/force-app/main/default/objects/Rental_Apply_Fault__c/validationRules/NOT_TO_CHANGE_Reply_message.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Fault__c/validationRules/NOT_TO_CHANGE_Reply_message.validationRule-meta.xml
index 61057b5..c219be6 100644
--- a/force-app/main/default/objects/Rental_Apply_Fault__c/validationRules/NOT_TO_CHANGE_Reply_message.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Fault__c/validationRules/NOT_TO_CHANGE_Reply_message.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>NOT_TO_CHANGE_Reply_message</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>TEXT(status__c) != '鑽夋涓�' && (ISCHANGED(FaultDesc__c) || ISCHANGED(Reply_message__c))</errorConditionFormula>
<errorMessage>鍙湁鑽夋涓殑鍒嗘瀽鎶ュ憡鍙互淇敼鏁呴殰鐜拌薄銆佹崯鍧忓師鍥犲垎鏋愬強棰勯槻寤鸿</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Rental_Apply_Fault__c/validationRules/NOT_TO_CHANGE_UseExplain.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply_Fault__c/validationRules/NOT_TO_CHANGE_UseExplain.validationRule-meta.xml
index 51343fd..0a47102 100644
--- a/force-app/main/default/objects/Rental_Apply_Fault__c/validationRules/NOT_TO_CHANGE_UseExplain.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Fault__c/validationRules/NOT_TO_CHANGE_UseExplain.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>NOT_TO_CHANGE_UseExplain</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>TEXT(status__c) != '宸插彂閫�' && ISCHANGED(UseExplain__c)</errorConditionFormula>
<errorDisplayField>UseExplain__c</errorDisplayField>
<errorMessage>鍙湁宸插彂閫佺殑鍒嗘瀽鎶ュ憡鍙互淇敼澶囧搧浣跨敤鎯呭喌璇存槑</errorMessage>
diff --git a/force-app/main/default/objects/Rental_Apply__c/Rental_Apply__c.object-meta.xml b/force-app/main/default/objects/Rental_Apply__c/Rental_Apply__c.object-meta.xml
index b292590..9b5ba4c 100644
--- a/force-app/main/default/objects/Rental_Apply__c/Rental_Apply__c.object-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/Rental_Apply__c.object-meta.xml
@@ -133,7 +133,7 @@
<actionOverrides>
<actionName>View</actionName>
<comment>Action override created by Lightning App Builder during activation.</comment>
- <content>FlexiPage11213335</content>
+ <content>RentalApply</content>
<formFactor>Large</formFactor>
<skipRecordTypeSelect>false</skipRecordTypeSelect>
<type>Flexipage</type>
@@ -141,7 +141,7 @@
<actionOverrides>
<actionName>View</actionName>
<comment>Action override created by Lightning App Builder during activation.</comment>
- <content>FlexiPage11213335</content>
+ <content>RentalApply</content>
<formFactor>Small</formFactor>
<skipRecordTypeSelect>false</skipRecordTypeSelect>
<type>Flexipage</type>
@@ -180,13 +180,13 @@
<customTabListAdditionalFields>Return_dadeline_final__c</customTabListAdditionalFields>
<customTabListAdditionalFields>Asset_loaner_closed_day__c</customTabListAdditionalFields>
<customTabListAdditionalFields>Person_In_Charge__c</customTabListAdditionalFields>
+ <excludedStandardButtons>PrintableListView</excludedStandardButtons>
<excludedStandardButtons>OpenListInQuip</excludedStandardButtons>
<excludedStandardButtons>NewFromDocument</excludedStandardButtons>
- <excludedStandardButtons>Accept</excludedStandardButtons>
<excludedStandardButtons>ChangeOwner</excludedStandardButtons>
<excludedStandardButtons>Import</excludedStandardButtons>
<excludedStandardButtons>MassChangeOwner</excludedStandardButtons>
- <excludedStandardButtons>PrintableListView</excludedStandardButtons>
+ <excludedStandardButtons>Accept</excludedStandardButtons>
<lookupDialogsAdditionalFields>RA_Status__c</lookupDialogsAdditionalFields>
<lookupDialogsAdditionalFields>demo_purpose2__c</lookupDialogsAdditionalFields>
<lookupDialogsAdditionalFields>Hospital__c</lookupDialogsAdditionalFields>
diff --git a/force-app/main/default/objects/Rental_Apply__c/fields/Apply_Look__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply__c/fields/Apply_Look__c.field-meta.xml
index 8f205b0..71f2bcb 100644
--- a/force-app/main/default/objects/Rental_Apply__c/fields/Apply_Look__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/fields/Apply_Look__c.field-meta.xml
@@ -8,9 +8,9 @@
IF(
BLANKVALUE(Text(Cross_Region_Assign__c),
CASE(Loaner_centre_mail_address__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', '骞垮窞 澶囧搧涓績',''
))
=
diff --git a/force-app/main/default/objects/Rental_Apply__c/fields/CL5_CL5_CL6_CL6__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply__c/fields/CL5_CL5_CL6_CL6__c.field-meta.xml
index fb97b93..52fb20d 100644
--- a/force-app/main/default/objects/Rental_Apply__c/fields/CL5_CL5_CL6_CL6__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/fields/CL5_CL5_CL6_CL6__c.field-meta.xml
@@ -3,7 +3,7 @@
<fullName>CL5_CL5_CL6_CL6__c</fullName>
<description>20231218 鏅鸿兘鍖栨坊鍔犻�昏緫 閲嶅閰嶅涓虹┖鎵嶈繘瀹℃壒娴�</description>
<externalId>false</externalId>
- <formula>NOT(ISBLANK( SalesManager__c ) ) && SalesManager__c = OPDPlan__r.SalesManager__c && NOT(ISBLANK( BuchangApprovalManagerSales__c ) ) && BuchangApprovalManagerSales__c = OPDPlan__r.BuchangApprovalManagerSales__c && ISBLANK(repeatFixtureTXT__c) && ISBLANK(OPDRepeatFixture__c)</formula>
+ <formula>NOT(ISBLANK( SalesManager__c ) ) && SalesManager__c = OPDPlan__r.SalesManager__c && NOT(ISBLANK( BuchangApprovalManagerSales__c ) ) && BuchangApprovalManagerSales__c = OPDPlan__r.BuchangApprovalManagerSales__c && ISBLANK(repeatFixtureTXT__c)</formula>
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
<label>CL5=CL5_CL6=CL6</label>
<trackHistory>false</trackHistory>
diff --git a/force-app/main/default/objects/Rental_Apply__c/fields/First_level_Old_Apply__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply__c/fields/First_level_Old_Apply__c.field-meta.xml
index 33f9006..86fce12 100644
--- a/force-app/main/default/objects/Rental_Apply__c/fields/First_level_Old_Apply__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/fields/First_level_Old_Apply__c.field-meta.xml
@@ -2,7 +2,7 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>First_level_Old_Apply__c</fullName>
<externalId>false</externalId>
- <formula>if(Old_Rental_Apply__c!=null && Text(Split_Apply_Reason__c)!='琛ュ厖鍊熺敤',First_level_actual_approver__c,'')</formula>
+ <formula>if(Old_Rental_Apply__c!=null && Text(Split_Apply_Reason__c)!='杩藉姞OPD璁″垝'&& Text(Split_Apply_Reason__c)!='琛ュ厖鍊熺敤',First_level_actual_approver__c,'')</formula>
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
<label>涓�绾э紙鏃х敵璇峰崟锛�</label>
<required>false</required>
diff --git a/force-app/main/default/objects/Rental_Apply__c/fields/Loaner_medical_Staff__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply__c/fields/Loaner_medical_Staff__c.field-meta.xml
index c80d86d..965898b 100644
--- a/force-app/main/default/objects/Rental_Apply__c/fields/Loaner_medical_Staff__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/fields/Loaner_medical_Staff__c.field-meta.xml
@@ -5,7 +5,7 @@
<externalId>false</externalId>
<label>绉戝璐熻矗浜�</label>
<lookupFilter>
- <active>false</active>
+ <active>true</active>
<filterItems>
<field>Contact.RecordTypeId</field>
<operation>equals</operation>
diff --git a/force-app/main/default/objects/Rental_Apply__c/fields/Need_Buzhang_Sale_NewApp__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply__c/fields/Need_Buzhang_Sale_NewApp__c.field-meta.xml
index 899ef80..c826197 100644
--- a/force-app/main/default/objects/Rental_Apply__c/fields/Need_Buzhang_Sale_NewApp__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/fields/Need_Buzhang_Sale_NewApp__c.field-meta.xml
@@ -2,32 +2,37 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Need_Buzhang_Sale_NewApp__c</fullName>
<description>OPD璁″垝鏃朵笂绾匡紝鐢ㄤ綔鎺ㄥ箍缁忕悊鍜岀粡鐞嗕竴鑷达紝鍙互鐩存帴涓�姝ュ鎵归�氳繃鐢�
-20220422 ljh 鍘绘帀 鍖荤枟鍗庡寳钀ヤ笟鏈儴 SFDC-CDPAYF</description>
+20220422 ljh 鍘绘帀 鍖荤枟鍗庡寳钀ヤ笟鏈儴 SFDC-CDPAYF
+20231221 sx 閲嶅瀹℃壒閰嶅涓虹┖鏃舵墠鐩存帴鎵瑰噯锛屽惁鍒欒璧癱l3瀹℃壒</description>
<externalId>false</externalId>
- <formula>!((NOT( ISBLANK( SalesManager__c ))
-&& (SalesManager_eq_Buchang__c = false
-|| NOT((ISPICKVAL(Owner:User.Dept__c, '鑳介噺浜嬩笟鏈儴')
-|| ISPICKVAL(Owner:User.Dept__c, '鍖荤枟涓滃寳钀ヤ笟鏈儴')
-|| ISPICKVAL(Owner:User.Dept__c, '鍖荤枟鍗庝笢钀ヤ笟鏈儴')
-|| ISPICKVAL(Owner:User.Dept__c, '鍖荤枟鍗庡崡钀ヤ笟鏈儴')
-|| ISPICKVAL(Owner:User.Dept__c, '鍖荤枟澶囧搧绠＄悊涓績')
-|| ISPICKVAL(Owner:User.Dept__c, '鍖荤枟鏈嶅姟鏈儴')
-|| ISPICKVAL(Owner:User.Dept__c, '娑堝寲路鍛煎惛棰嗗煙瑙ｅ喅鏂规鏈儴')
+ <formula>!(
+ (NOT(ISBLANK( SalesManager__c ))
+ && (SalesManager_eq_Buchang__c = false
+ || NOT((ISPICKVAL(Owner:User.Dept__c, '鑳介噺浜嬩笟鏈儴')
+ || ISPICKVAL(Owner:User.Dept__c, '鍖荤枟涓滃寳钀ヤ笟鏈儴')
+ || ISPICKVAL(Owner:User.Dept__c, '鍖荤枟鍗庝笢钀ヤ笟鏈儴')
+ || ISPICKVAL(Owner:User.Dept__c, '鍖荤枟鍗庡崡钀ヤ笟鏈儴')
+ || ISPICKVAL(Owner:User.Dept__c, '鍖荤枟澶囧搧绠＄悊涓績')
+ || ISPICKVAL(Owner:User.Dept__c, '鍖荤枟鏈嶅姟鏈儴')
+ || ISPICKVAL(Owner:User.Dept__c, '娑堝寲路鍛煎惛棰嗗煙瑙ｅ喅鏂规鏈儴')))
+ )
+ && OPDPlan__r.SalesManager__c != SalesManager__c)
+)
+&&
+!(
+ NOT( ISBLANK( BuchangApprovalManagerSales__c ) )
+ && (ISPICKVAL(Owner:User.Dept__c, '鑳介噺浜嬩笟鏈儴')
+ || ISPICKVAL(Owner:User.Dept__c, '鍖荤枟涓滃寳钀ヤ笟鏈儴')
+ || ISPICKVAL(Owner:User.Dept__c, '鍖荤枟鍗庝笢钀ヤ笟鏈儴')
+ || ISPICKVAL(Owner:User.Dept__c, '鍖荤枟鍗庡崡钀ヤ笟鏈儴')
+ || ISPICKVAL(Owner:User.Dept__c, '鍖荤枟澶囧搧绠＄悊涓績')
+ || ISPICKVAL(Owner:User.Dept__c, '鍖荤枟鏈嶅姟鏈儴')
+ || ISPICKVAL(Owner:User.Dept__c, '娑堝寲路鍛煎惛棰嗗煙瑙ｅ喅鏂规鏈儴')
+ || ISBLANK( SalesManager__c )
+ )
)
-)
-) && OPDPlan__r.SalesManager__c != SalesManager__c)) && !(
-NOT( ISBLANK( BuchangApprovalManagerSales__c ) )
-&& (ISPICKVAL(Owner:User.Dept__c, '鑳介噺浜嬩笟鏈儴')
-|| ISPICKVAL(Owner:User.Dept__c, '鍖荤枟涓滃寳钀ヤ笟鏈儴')
-|| ISPICKVAL(Owner:User.Dept__c, '鍖荤枟鍗庝笢钀ヤ笟鏈儴')
-|| ISPICKVAL(Owner:User.Dept__c, '鍖荤枟鍗庡崡钀ヤ笟鏈儴')
-|| ISPICKVAL(Owner:User.Dept__c, '鍖荤枟澶囧搧绠＄悊涓績')
-|| ISPICKVAL(Owner:User.Dept__c, '鍖荤枟鏈嶅姟鏈儴')
-|| ISPICKVAL(Owner:User.Dept__c, '娑堝寲路鍛煎惛棰嗗煙瑙ｅ喅鏂规鏈儴')
-|| ISBLANK( SalesManager__c )
-)
-
-)&& !(Text(demo_purpose2__c) = '鍏朵粬')</formula>
+&& !(Text(demo_purpose2__c) = '鍏朵粬')
+&& ISBLANK(repeatFixtureTXT__c)</formula>
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
<label>澶囧搧鍊熷嚭鐢宠-瑕丆L5 鎬荤洃绾э紙閿�鍞級鐩存帴鎵瑰噯</label>
<trackHistory>false</trackHistory>
diff --git a/force-app/main/default/objects/Rental_Apply__c/fields/OPDLendSortBefore__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply__c/fields/OPDLendSortBefore__c.field-meta.xml
index 9c881e1..5ed13fe 100644
--- a/force-app/main/default/objects/Rental_Apply__c/fields/OPDLendSortBefore__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/fields/OPDLendSortBefore__c.field-meta.xml
@@ -4,7 +4,7 @@
<externalId>false</externalId>
<formula>OPDPlan__r.OPDLendSortBefore__c</formula>
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
- <label>澶囧搧鍑哄�熶紭鍏堝害锛堜笂鏈堬級</label>
+ <label>OPD浼樺厛搴︼紙涓婃湀锛�</label>
<precision>18</precision>
<required>false</required>
<scale>0</scale>
diff --git a/force-app/main/default/objects/Rental_Apply__c/fields/OPDLendSort__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply__c/fields/OPDLendSort__c.field-meta.xml
index e98948e..c0f912b 100644
--- a/force-app/main/default/objects/Rental_Apply__c/fields/OPDLendSort__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/fields/OPDLendSort__c.field-meta.xml
@@ -4,7 +4,7 @@
<externalId>false</externalId>
<formula>OPDPlan__r.OPDLendSort__c</formula>
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
- <label>澶囧搧鍑哄�熶紭鍏堝害</label>
+ <label>OPD浼樺厛搴�</label>
<precision>18</precision>
<required>false</required>
<scale>0</scale>
diff --git a/force-app/main/default/objects/Rental_Apply__c/fields/QRImg__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply__c/fields/QRImg__c.field-meta.xml
index 724306e..ceaacfb 100644
--- a/force-app/main/default/objects/Rental_Apply__c/fields/QRImg__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/fields/QRImg__c.field-meta.xml
@@ -2,7 +2,7 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>QRImg__c</fullName>
<externalId>false</externalId>
- <formula>IMAGE("/servlet/servlet.FileDownload?file=" & QRId__c, "qrcode")</formula>
+ <formula>IMAGE("/sfc/servlet.shepherd/version/download/" & QRId__c, "qrcode")</formula>
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
<label>QRImg</label>
<required>false</required>
diff --git a/force-app/main/default/objects/Rental_Apply__c/fields/RA_Status__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply__c/fields/RA_Status__c.field-meta.xml
index 4f736c6..8aaac26 100644
--- a/force-app/main/default/objects/Rental_Apply__c/fields/RA_Status__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/fields/RA_Status__c.field-meta.xml
@@ -6,6 +6,7 @@
<externalId>false</externalId>
<formula>IF(TEXT(Status__c) = '鍙栨秷','鍙栨秷',
IF(TEXT(Status__c) = '鍒犻櫎','鍒犻櫎',
+ IF(TEXT(Status__c) = '鐢宠涓紙OPD鏈�氳繃锛�', '鐢宠涓紙OPD鏈�氳繃锛�',
IF(AND(Cancel_Select__c > 0, Rental_Apply_Equipment_Set_Cnt__c = 0), '鍙栨秷',
IF(Not(OR(Status_Text__c == '宸叉壒鍑�', Status_Text__c == '宸插嚭搴撴寚绀�')), TEXT(Status__c),
IF (ShelfUp_ng_num__c == 0, '瀹屼簡',
@@ -30,10 +31,12 @@
)
)
)
+ )
)</formula>
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
<inlineHelpText>鑽夋涓�
鐢宠涓�
+鐢宠涓紙OPD鏈�氳繃锛�
宸叉壒鍑�
宸插嚭搴撴寚绀�
宸蹭笅鏋�
diff --git a/force-app/main/default/objects/Rental_Apply__c/fields/Rental_Status__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply__c/fields/Rental_Status__c.field-meta.xml
index b9383d4..9b487ad 100644
--- a/force-app/main/default/objects/Rental_Apply__c/fields/Rental_Status__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/fields/Rental_Status__c.field-meta.xml
@@ -16,6 +16,11 @@
<label>鑽夋涓�</label>
</value>
<value>
+ <fullName>鐢宠涓紙OPD鏈�氳繃锛�</fullName>
+ <default>false</default>
+ <label>鐢宠涓紙OPD鏈�氳繃锛�</label>
+ </value>
+ <value>
<fullName>鐢宠涓�</fullName>
<default>false</default>
<label>鐢宠涓�</label>
diff --git a/force-app/main/default/objects/Rental_Apply__c/fields/Request_shipping_day__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply__c/fields/Request_shipping_day__c.field-meta.xml
index a97f055..58559b2 100644
--- a/force-app/main/default/objects/Rental_Apply__c/fields/Request_shipping_day__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/fields/Request_shipping_day__c.field-meta.xml
@@ -5,7 +5,7 @@
<inlineHelpText>鎸囩敵璇蜂汉瑕佹眰澶囧搧鍒拌揪涓�娆＄墿娴佹寚瀹氬湴鐐圭殑鏃ユ湡</inlineHelpText>
<label>甯屾湜鍒拌揣鏃�</label>
<required>false</required>
- <trackHistory>false</trackHistory>
+ <trackHistory>true</trackHistory>
<trackTrending>false</trackTrending>
<type>Date</type>
</CustomField>
diff --git a/force-app/main/default/objects/Rental_Apply__c/fields/Second_level_Old_Apply__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply__c/fields/Second_level_Old_Apply__c.field-meta.xml
index 1dbf692..24e54d6 100644
--- a/force-app/main/default/objects/Rental_Apply__c/fields/Second_level_Old_Apply__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/fields/Second_level_Old_Apply__c.field-meta.xml
@@ -2,7 +2,7 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Second_level_Old_Apply__c</fullName>
<externalId>false</externalId>
- <formula>if(Old_Rental_Apply__c!=null && Text(Split_Apply_Reason__c)!='琛ュ厖鍊熺敤',Second_level_actual_approver__c,'')</formula>
+ <formula>if(Old_Rental_Apply__c!=null && Text(Split_Apply_Reason__c)!='杩藉姞OPD璁″垝' && Text(Split_Apply_Reason__c)!='琛ュ厖鍊熺敤' ,Second_level_actual_approver__c,'')</formula>
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
<label>浜岀骇锛堟棫鐢宠鍗曪級</label>
<required>false</required>
diff --git a/force-app/main/default/objects/Rental_Apply__c/fields/Shippment_adress_detail__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply__c/fields/Shippment_adress_detail__c.field-meta.xml
index b6e95ad..725232b 100644
--- a/force-app/main/default/objects/Rental_Apply__c/fields/Shippment_adress_detail__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/fields/Shippment_adress_detail__c.field-meta.xml
@@ -15,6 +15,7 @@
'鍖婚櫌', Hospital__r.Address_Together__c,
'缁忛攢鍟�', Dealer__r.Address_Together__c,
'鐩撮��', direct_shippment_address__c,
+'鍖荤枟鏈烘瀯', Medical_Institution_Address_F__c+Medical_Institution_Address_sup_F__c,
'')</formula>
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
<label>鍙戦�佸姙浜嬪鍦板潃璇︾粏</label>
diff --git a/force-app/main/default/objects/Rental_Apply__c/fields/Status__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply__c/fields/Status__c.field-meta.xml
index 4e9301c..b58f804 100644
--- a/force-app/main/default/objects/Rental_Apply__c/fields/Status__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/fields/Status__c.field-meta.xml
@@ -50,6 +50,11 @@
<default>false</default>
<label>涓嶆壒鍑�</label>
</value>
+ <value>
+ <fullName>鐢宠涓紙OPD鏈�氳繃锛�</fullName>
+ <default>false</default>
+ <label>鐢宠涓紙OPD鏈�氳繃锛�</label>
+ </value>
</valueSetDefinition>
</valueSet>
</CustomField>
diff --git a/force-app/main/default/objects/Rental_Apply__c/fields/demo_purpose2__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply__c/fields/demo_purpose2__c.field-meta.xml
index 52fbe35..6f86c68 100644
--- a/force-app/main/default/objects/Rental_Apply__c/fields/demo_purpose2__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/fields/demo_purpose2__c.field-meta.xml
@@ -91,26 +91,6 @@
</value>
</valueSetDefinition>
<valueSettings>
- <controllingFieldValue>浜у搧璇曠敤</controllingFieldValue>
- <valueName>璇曠敤锛堟棤璇环锛�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>浜у搧璇曠敤</controllingFieldValue>
- <valueName>璇曠敤锛堟湁璇环锛�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>浜у搧璇曠敤</controllingFieldValue>
- <valueName>宸茶喘寰呰揣</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>浜у搧璇曠敤</controllingFieldValue>
- <valueName>瀛︿細灞曚細</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>浜у搧璇曠敤</controllingFieldValue>
- <valueName>鏂颁骇鍝佽瘎浠�</valueName>
- </valueSettings>
- <valueSettings>
<controllingFieldValue>缁翠慨浠ｇ敤</controllingFieldValue>
<valueName>涓�鑸敤鎴�</valueName>
</valueSettings>
@@ -135,12 +115,32 @@
<valueName>鏁呴殰鎺掓煡</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鍗忚鍊熺敤</controllingFieldValue>
- <valueName>鍗忚鍊熺敤</valueName>
- </valueSettings>
- <valueSettings>
<controllingFieldValue>鍏朵粬</controllingFieldValue>
<valueName>鍏朵粬</valueName>
</valueSettings>
+ <valueSettings>
+ <controllingFieldValue>浜у搧璇曠敤</controllingFieldValue>
+ <valueName>璇曠敤锛堟棤璇环锛�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>浜у搧璇曠敤</controllingFieldValue>
+ <valueName>璇曠敤锛堟湁璇环锛�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>浜у搧璇曠敤</controllingFieldValue>
+ <valueName>宸茶喘寰呰揣</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>浜у搧璇曠敤</controllingFieldValue>
+ <valueName>瀛︿細灞曚細</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>浜у搧璇曠敤</controllingFieldValue>
+ <valueName>鏂颁骇鍝佽瘎浠�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鍗忚鍊熺敤</controllingFieldValue>
+ <valueName>鍗忚鍊熺敤</valueName>
+ </valueSettings>
</valueSet>
</CustomField>
diff --git a/force-app/main/default/objects/Rental_Apply__c/listViews/All_Shipped.listView-meta.xml b/force-app/main/default/objects/Rental_Apply__c/listViews/All_Shipped.listView-meta.xml
index a3c2d44..b6d7483 100644
--- a/force-app/main/default/objects/Rental_Apply__c/listViews/All_Shipped.listView-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/listViews/All_Shipped.listView-meta.xml
@@ -21,4 +21,5 @@
<value>宸插嚭搴�,鐢宠鑰呭凡鏀惰揣,鍖婚櫌宸茶鏈虹‘璁�</value>
</filters>
<label>05_宸插嚭搴撶殑澶囧搧鐢宠</label>
+ <language>zh_CN</language>
</ListView>
diff --git a/force-app/main/default/objects/Rental_Apply__c/listViews/View100.listView-meta.xml b/force-app/main/default/objects/Rental_Apply__c/listViews/View100.listView-meta.xml
index 08a4ba7..2552175 100644
--- a/force-app/main/default/objects/Rental_Apply__c/listViews/View100.listView-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/listViews/View100.listView-meta.xml
@@ -16,14 +16,13 @@
<columns>applyUser__c</columns>
<filterScope>Everything</filterScope>
<filters>
- <field>RA_Status__c</field>
- <operation>equals</operation>
- <value>鑽夋涓�</value>
+ <field>NAME</field>
+ <operation>contains</operation>
+ <value>MA</value>
</filters>
<filters>
<field>Demo_purpose1__c</field>
- <operation>equals</operation>
- <value>缁翠慨浠ｇ敤</value>
+ <operation>notEqual</operation>
</filters>
<label>缁翠慨鑽夋</label>
<language>zh_CN</language>
diff --git a/force-app/main/default/objects/Rental_Apply__c/recordTypes/Demo_request_past_data.recordType-meta.xml b/force-app/main/default/objects/Rental_Apply__c/recordTypes/Demo_request_past_data.recordType-meta.xml
index c0d7ee8..3de3c30 100644
--- a/force-app/main/default/objects/Rental_Apply__c/recordTypes/Demo_request_past_data.recordType-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/recordTypes/Demo_request_past_data.recordType-meta.xml
@@ -973,13 +973,6 @@
</values>
</picklistValues>
<picklistValues>
- <picklist>photoType__c</picklist>
- <values>
- <fullName>borrow_application</fullName>
- <default>true</default>
- </values>
- </picklistValues>
- <picklistValues>
<picklist>repeatFixtureApprovalStatus__c</picklist>
<values>
<fullName>瀹℃壒涓�</fullName>
diff --git a/force-app/main/default/objects/Rental_Apply__c/recordTypes/StandardRequest.recordType-meta.xml b/force-app/main/default/objects/Rental_Apply__c/recordTypes/StandardRequest.recordType-meta.xml
index e37aca8..729344e 100644
--- a/force-app/main/default/objects/Rental_Apply__c/recordTypes/StandardRequest.recordType-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/recordTypes/StandardRequest.recordType-meta.xml
@@ -522,6 +522,10 @@
<default>false</default>
</values>
<values>
+ <fullName>鐢宠涓�%EF%BC%88OPD鏈�氳繃%EF%BC%89</fullName>
+ <default>false</default>
+ </values>
+ <values>
<fullName>鐢宠鑰呭凡鏀惰揣</fullName>
<default>false</default>
</values>
@@ -1002,13 +1006,6 @@
<values>
<fullName>缁忛攢鍟�</fullName>
<default>false</default>
- </values>
- </picklistValues>
- <picklistValues>
- <picklist>photoType__c</picklist>
- <values>
- <fullName>borrow_application</fullName>
- <default>true</default>
</values>
</picklistValues>
<picklistValues>
diff --git a/force-app/main/default/objects/Rental_Apply__c/validationRules/After_Inquiry_Finished.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply__c/validationRules/After_Inquiry_Finished.validationRule-meta.xml
index ebffbad..ec588e1 100644
--- a/force-app/main/default/objects/Rental_Apply__c/validationRules/After_Inquiry_Finished.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/validationRules/After_Inquiry_Finished.validationRule-meta.xml
@@ -3,7 +3,7 @@
<fullName>After_Inquiry_Finished</fullName>
<active>true</active>
<description>瀹屾瘯鐨勮浠蜂笉鑳芥彁浜ゅ鍝佸�熷嚭鐢宠</description>
- <errorConditionFormula>ISNEW() && TEXT(demo_purpose2__c) =='璇曠敤锛堟湁璇环锛�' && Follow_UP_Opp__c != null && TEXT(Follow_UP_Opp__r.StageName) <> '寮曞悎' && NOT($User.Batch_User__c) && $User.ProfileId <>'00eC600000003SX' && Isblank(Old_Rental_Apply__c)</errorConditionFormula>
+ <errorConditionFormula>ISNEW() && TEXT(demo_purpose2__c) =='璇曠敤锛堟湁璇环锛�' && Follow_UP_Opp__c != null && TEXT(Follow_UP_Opp__r.StageName) <> '寮曞悎' && NOT($User.Batch_User__c) && $User.ProfileId <>'00e10000000dEQx' && Isblank(Old_Rental_Apply__c)</errorConditionFormula>
<errorDisplayField>Follow_UP_Opp__c</errorDisplayField>
<errorMessage>瀹屾瘯鐨勮浠蜂笉鑳芥彁浜ゅ鍝佸�熷嚭鐢宠</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Rental_Apply__c/validationRules/After_Request_shipping.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply__c/validationRules/After_Request_shipping.validationRule-meta.xml
index 51d7ec7..d8619fb 100644
--- a/force-app/main/default/objects/Rental_Apply__c/validationRules/After_Request_shipping.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/validationRules/After_Request_shipping.validationRule-meta.xml
@@ -8,15 +8,16 @@
|| ( Lost_item_finish__c > 0 && Lost_product_cnt__c <> Rental_Apply_Equipment_Set_Detail_Cnt__c)</description>
<errorConditionFormula>( Loaner_received_ng_num__c > 0)
&&
-(($User.ProfileId <>'00eC800000005Cb')
+(($User.ProfileId <>'00e10000000Y3o5')
+ && ($User.ProfileId <>'00e10000000xo1D')
)
&&
(ISCHANGED(HP_received_sign_day__c )
|| ISCHANGED(HP_received_sign_text__c)
)
-&& NOT($User.Batch_User__c) && $User.ProfileId <>'00eC600000003SX'
-&& $User.ProfileId <>'00eC600000004y6'
+&& NOT($User.Batch_User__c) && $User.ProfileId <>'00e10000000dEQx'
+&& $User.ProfileId <>'00e10000000xnoY'
+&& $User.ProfileId <>'00ep0000000O4tG'
&& DataMigration_Flag__c = False</errorConditionFormula>
- <errorDisplayField>Return_to_wh_staff__c</errorDisplayField>
<errorMessage>鐜板満鍒拌揣纭鍚庯紝鎵嶅彲浠ユ搷浣滆鏈哄拰涓婁紶绛炬敹鍗�</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Rental_Apply__c/validationRules/After_Shippment_loaner.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply__c/validationRules/After_Shippment_loaner.validationRule-meta.xml
index 0508026..b451ea0 100644
--- a/force-app/main/default/objects/Rental_Apply__c/validationRules/After_Shippment_loaner.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/validationRules/After_Shippment_loaner.validationRule-meta.xml
@@ -5,8 +5,9 @@
<description>//bp2 澶囧搧鍑哄簱鍓嶏紝涓嶈兘缂栬緫鍥炲簱鐗╂祦淇℃伅</description>
<errorConditionFormula>ISNULL(Shippment_loaner_time__c)
&&
-(($User.ProfileId <>'00eC800000005Cb')&&
-($User.ProfileId <>'00eC600000004y5')
+(($User.ProfileId <>'00e10000000Y3o5')&&
+($User.ProfileId <>'00e10000000xnoT')&&
+($User.ProfileId <>'00e10000000xo1D')
)
&&
(
diff --git a/force-app/main/default/objects/Rental_Apply__c/validationRules/AllOperateApplyCheck.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply__c/validationRules/AllOperateApplyCheck.validationRule-meta.xml
index d3d4421..b0a99ba 100644
--- a/force-app/main/default/objects/Rental_Apply__c/validationRules/AllOperateApplyCheck.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/validationRules/AllOperateApplyCheck.validationRule-meta.xml
@@ -3,7 +3,6 @@
<fullName>AllOperateApplyCheck</fullName>
<active>true</active>
<description>DB202302216197锛氣�滄暣浣撴墜鏈涓氬姟鎺ㄨ繘璇锯�濇棤娉曡繘琛屽叏鐩殑鐨勫鍝佸嚭鍊�</description>
- <errorConditionFormula>(ISNEW()|| TEXT(Status__c)='鑽夋涓�')&& Owner:User.Category6__c = '鏁翠綋鎵嬫湳瀹や笟鍔℃帹杩涜' && NOT($User.Batch_User__c) && $User.ProfileId <>'00eC600000003SX' && $User.ProfileId <>'00eC800000005Cb'</errorConditionFormula>
- <errorDisplayField>Return_to_wh_staff__c</errorDisplayField>
+ <errorConditionFormula>(ISNEW()|| TEXT(Status__c)='鑽夋涓�')&& Owner:User.Category6__c = '鏁翠綋鎵嬫湳瀹や笟鍔℃帹杩涜' && NOT($User.Batch_User__c) && $User.ProfileId <>'00e10000000dEQx' && $User.ProfileId <>'00e10000000Y3o5'</errorConditionFormula>
<errorMessage>銆愭暣浣撴墜鏈涓氬姟鎺ㄨ繘璇俱�戞棤娉曠敵璇峰鍝�</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Rental_Apply__c/validationRules/Applicant_CancelReason_Active_Only.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply__c/validationRules/Applicant_CancelReason_Active_Only.validationRule-meta.xml
index 9a3139b..a04e490 100644
--- a/force-app/main/default/objects/Rental_Apply__c/validationRules/Applicant_CancelReason_Active_Only.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/validationRules/Applicant_CancelReason_Active_Only.validationRule-meta.xml
@@ -2,12 +2,13 @@
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Applicant_CancelReason_Active_Only</fullName>
<active>true</active>
- <errorConditionFormula>(($User.ProfileId <>'00eC800000005Cb')&&
-($User.ProfileId <>'00eC600000004y5')&&
+ <errorConditionFormula>(($User.ProfileId <>'00e10000000Y3o5')&&
+($User.ProfileId <>'00e10000000xnoT')&&
(NOT(CONTAINS($Label.ProfileId_EquCenAdmin, $User.ProfileId)))&&
+($User.ProfileId <>'00e10000000xo1D') &&
(NOT(CONTAINS($Label.ProfileId_EquCenCheckAndDepot, $User.ProfileId))))
&& Text(Cancel_Reason__c) <> '涓诲姩鍙栨秷'
-&& ISPICKVAL(Status__c, '鍙栨秷') && NOT($User.Batch_User__c) && $User.ProfileId <>'00eC600000003SX'</errorConditionFormula>
+&& ISPICKVAL(Status__c, '鍙栨秷') && NOT($User.Batch_User__c) && $User.ProfileId <>'00e10000000dEQx'</errorConditionFormula>
<errorDisplayField>Cancel_Reason__c</errorDisplayField>
<errorMessage>鐢宠浜哄彧鑳介�夋嫨涓诲姩鍙栨秷銆�</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Rental_Apply__c/validationRules/Applicant_Check.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply__c/validationRules/Applicant_Check.validationRule-meta.xml
deleted file mode 100644
index aa03c76..0000000
--- a/force-app/main/default/objects/Rental_Apply__c/validationRules/Applicant_Check.validationRule-meta.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
- <fullName>Applicant_Check</fullName>
- <active>true</active>
- <errorConditionFormula>(ISNEW()|| TEXT(Status__c)='鑽夋涓�')&&TEXT(Owner:User.Dept__c)<> '娑堝寲路鍛煎惛棰嗗煙瑙ｅ喅鏂规鏈儴'&&(
-(
-((TEXT(demo_purpose2__c)='瀛︿細灞曚細' && Campaign__r.RecordTypeId =='012C600000003I1' && (TEXT(Owner:User.Job_Category__c )<>'閿�鍞湇鍔�'&& TEXT(Owner:User.Job_Category__c )<>'閿�鍞帹骞�'&& TEXT(Owner:User.Job_Category__c )<>'閿�鍞競鍦�'&& TEXT(Owner:User.Job_Category__c )<>'鍩硅'))
-)&&($User.ProfileId <>'00eC800000005Cb')&&
-($User.ProfileId <>'00eC600000003SX')&&
-($User.ProfileId <>'00eC600000004y5')&&
-TEXT(Owner:User.Job_Category__c )<>'鏀彺' ||
-((TEXT(demo_purpose2__c)='瀛︿細灞曚細' && Campaign__r.RecordTypeId !='012C600000003I1' && TEXT(Owner:User.Job_Category__c )<>'閿�鍞帹骞�'
-&& TEXT(Owner:User.Job_Category__c )<>'閿�鍞競鍦�'&& TEXT(Owner:User.Job_Category__c )<>'鍩硅'
-&& TEXT(Owner:User.Job_Category__c )<>'GI甯傚満'
-&& TEXT(Owner:User.Job_Category__c )<>'SP甯傚満'
-&& TEXT(Owner:User.Job_Category__c )<>'绠＄悊'
-&& TEXT(Owner:User.Job_Category__c )<>'甯傚満'
-&& TEXT(Owner:User.Job_Category__c )<>'MA'
-)
-)&&($User.ProfileId <>'00eC800000005Cb')&&
-($User.ProfileId <>'00eC600000003SX')&&
-($User.ProfileId <>'00eC600000004y5')&&
-TEXT(Owner:User.Job_Category__c )<>'鏀彺'
-)||
-
-(
-(
-TEXT(demo_purpose2__c)='璇曠敤锛堟棤璇环锛�'||
-TEXT(demo_purpose2__c)='璇曠敤锛堟湁璇环锛�'||
-TEXT(demo_purpose2__c)='宸茶喘寰呰揣'
-
-)&&(
-($User.ProfileId <>'00eC800000005Cb')&&
-($User.ProfileId <>'00eC600000003SX')&&
-($User.ProfileId <>'00eC600000004y5')&&
-TEXT(Owner:User.Job_Category__c )<>'鏀彺'&&
-TEXT(Owner:User.Job_Category__c )<>'閿�鍞帹骞�' &&
-TEXT(Owner:User.Job_Category__c )<>'GI甯傚満' &&
-TEXT(Owner:User.Job_Category__c )<>'SP甯傚満' &&
-TEXT(Owner:User.Job_Category__c )<>'绠＄悊' &&
-TEXT(Owner:User.Job_Category__c )<>'甯傚満'&&
-TEXT(Owner:User.Job_Category__c )<>'閿�鍞競鍦�' )
-)||(
-(TEXT(demo_purpose2__c)='鏂颁骇鍝佽瘎浠�')
-&&(
-TEXT(Owner:User.Dept__c)<> '娑堝寲路鍛煎惛鍐呴暅浜嬩笟鏈儴'&&
-TEXT(Owner:User.Dept__c)<> '澶栫浜嬩笟鏈儴'&&
-TEXT(Owner:User.Dept__c)<> '鑳介噺浜嬩笟鏈儴'
-)
-
-)||((TEXT(demo_purpose2__c)='涓�鑸敤鎴�'||
-TEXT(demo_purpose2__c)='鍐嶄慨鐞�'||
-TEXT(demo_purpose2__c)='淇濅慨鐢ㄦ埛'||
-TEXT(demo_purpose2__c)='甯傚満澶氬勾淇濅慨'||
-TEXT(demo_purpose2__c)='绱㈣禂QIS'||
-TEXT(demo_purpose2__c)='鏁呴殰鎺掓煡'
-)&&(
-($User.ProfileId <>'00eC800000005Cb')&&
-($User.ProfileId <>'00eC600000004y5')&&
-TEXT(Owner:User.Job_Category__c )<>'鏀彺'&&
-TEXT(Owner:User.Job_Category__c )<>'閿�鍞湇鍔�'
-)
-)||((TEXT(Demo_purpose1__c)='鍗忚鍊熺敤'
-)&&(
-($User.ProfileId <>'00eC800000005Cb')&&
-TEXT(Owner:User.Job_Category__c )<>'鏀彺'&&
-TEXT(Owner:User.Job_Category__c )<>'閿�鍞帹骞�' &&
-TEXT(Owner:User.Job_Category__c )<>'閿�鍞湇鍔�' &&
-TEXT(Owner:User.Job_Category__c )<>'MA' &&
-TEXT(Owner:User.Job_Category__c )<>'甯傚満' &&
-TEXT(Owner:User.Job_Category__c )<>'绠＄悊'
-)
-)
-)
-&& NOT($User.Batch_User__c) && $User.ProfileId <>'00eC600000003SX'</errorConditionFormula>
- <errorDisplayField>Return_to_wh_staff__c</errorDisplayField>
- <errorMessage>鐢宠鑰呯殑鏉冮檺涓嶇鍚堣鈥樹娇鐢ㄧ洰鐨勨�欑殑鎻愬嚭瑕佹眰</errorMessage>
-</ValidationRule>
diff --git a/force-app/main/default/objects/Rental_Apply__c/validationRules/Applicant_Set_Must_One.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply__c/validationRules/Applicant_Set_Must_One.validationRule-meta.xml
index a4dce96..c67ae86 100644
--- a/force-app/main/default/objects/Rental_Apply__c/validationRules/Applicant_Set_Must_One.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/validationRules/Applicant_Set_Must_One.validationRule-meta.xml
@@ -4,6 +4,5 @@
<active>true</active>
<errorConditionFormula>TEXT(Status__c)='濉啓瀹屾瘯' &&
Rental_Apply_Equipment_Set_Detail_Cnt__c = 0</errorConditionFormula>
- <errorDisplayField>Return_to_wh_staff__c</errorDisplayField>
<errorMessage>鑷冲皯鐢宠涓�涓厤濂�</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Rental_Apply__c/validationRules/Before_Request_Apporve.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply__c/validationRules/Before_Request_Apporve.validationRule-meta.xml
index 41ee038..1475497 100644
--- a/force-app/main/default/objects/Rental_Apply__c/validationRules/Before_Request_Apporve.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/validationRules/Before_Request_Apporve.validationRule-meta.xml
@@ -8,9 +8,10 @@
&& RA_Status__c <> '宸插垎閰�' &&
RA_Status__c <> '鍙栨秷')
&&
-(($User.ProfileId <>'00eC800000005Cb')&&
-($User.ProfileId <>'00eC600000004y5')&&
-(NOT(CONTAINS($Label.ProfileId_EquCenCheckAndDepot, $User.ProfileId)))
+(($User.ProfileId <>'00e10000000Y3o5')&&
+($User.ProfileId <>'00e10000000xnoT')&&
+(NOT(CONTAINS($Label.ProfileId_EquCenCheckAndDepot, $User.ProfileId)))&&
+($User.ProfileId <>'00e10000000xo1D')
)
&&
ISCHANGED(Loaner_cancel_request__c)</errorConditionFormula>
diff --git a/force-app/main/default/objects/Rental_Apply__c/validationRules/Campaign_CancelingStatus_Confim.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply__c/validationRules/Campaign_CancelingStatus_Confim.validationRule-meta.xml
index e78c59f..5cae6d0 100644
--- a/force-app/main/default/objects/Rental_Apply__c/validationRules/Campaign_CancelingStatus_Confim.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/validationRules/Campaign_CancelingStatus_Confim.validationRule-meta.xml
@@ -7,6 +7,5 @@
IF( Campaign__c != null ,
IF( TEXT(Campaign__r.Status) = '鍙栨秷鐢宠涓�' , true, false),
false))&&or(isnew(),text(Status__c)=='鑽夋涓�')&& Not(ischanged(Loaner_cancel_request__c))</errorConditionFormula>
- <errorDisplayField>Return_to_wh_staff__c</errorDisplayField>
<errorMessage>瀛︿細鍙栨秷鐢宠涓紝涓嶈兘淇濆瓨</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Rental_Apply__c/validationRules/Campaign_EndStatus_Confim.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply__c/validationRules/Campaign_EndStatus_Confim.validationRule-meta.xml
index 0acdddc..22c22f0 100644
--- a/force-app/main/default/objects/Rental_Apply__c/validationRules/Campaign_EndStatus_Confim.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/validationRules/Campaign_EndStatus_Confim.validationRule-meta.xml
@@ -9,7 +9,6 @@
<errorConditionFormula>AND( TEXT(demo_purpose2__c) = '瀛︿細灞曚細',
IF( Campaign__c != null , IF( TEXT(Campaign__r.Status) = '宸茬粨鏉�' , true, false),
false))&&or(isnew(),text(Status__c)=='鑽夋涓�') && Not(ischanged(Loaner_cancel_request__c)) &&
-$User.ProfileId <>'00eC800000005Cb'</errorConditionFormula>
- <errorDisplayField>Return_to_wh_staff__c</errorDisplayField>
+$User.ProfileId <>'00e10000000Y3o5'</errorConditionFormula>
<errorMessage>瀛︿細宸茬粨鏉燂紝涓嶈兘淇濆瓨</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Rental_Apply__c/validationRules/Campaign_SubreportStatus_Confim.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply__c/validationRules/Campaign_SubreportStatus_Confim.validationRule-meta.xml
index 203e9dd..b9ca90b 100644
--- a/force-app/main/default/objects/Rental_Apply__c/validationRules/Campaign_SubreportStatus_Confim.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/validationRules/Campaign_SubreportStatus_Confim.validationRule-meta.xml
@@ -7,6 +7,5 @@
IF( Campaign__c != null ,
IF( TEXT(Campaign__r.Status) = '宸叉彁浜ゆ姤鍛�' , true, false),
false))&&or(isnew(),text(Status__c)=='鑽夋涓�')&& Not(ischanged(Loaner_cancel_request__c))</errorConditionFormula>
- <errorDisplayField>Return_to_wh_staff__c</errorDisplayField>
<errorMessage>瀛︿細宸叉彁浜ゆ姤鍛婏紝涓嶈兘淇濆瓨</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Rental_Apply__c/validationRules/Can_not_create_from_this_repair.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply__c/validationRules/Can_not_create_from_this_repair.validationRule-meta.xml
index 6925a44..1127183 100644
--- a/force-app/main/default/objects/Rental_Apply__c/validationRules/Can_not_create_from_this_repair.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/validationRules/Can_not_create_from_this_repair.validationRule-meta.xml
@@ -4,7 +4,7 @@
<active>true</active>
<description>2016/09/20涔嬪墠
ISNEW() && Repair__c != null && NOT(ISNULL(Repair__r.Repair_Final_Inspection_Date__c))</description>
- <errorConditionFormula>($User.ProfileId <>'00eC800000005Cb')
+ <errorConditionFormula>($User.ProfileId <>'00e10000000Y3o5')
&& Not(ischanged(Repair_Final_Inspection_Date__c))
&&(
TEXT(demo_purpose2__c)=='涓�鑸敤鎴�'||
diff --git a/force-app/main/default/objects/Rental_Apply__c/validationRules/Cannot_change_PIC.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply__c/validationRules/Cannot_change_PIC.validationRule-meta.xml
index 68aa100..18d8e9d 100644
--- a/force-app/main/default/objects/Rental_Apply__c/validationRules/Cannot_change_PIC.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/validationRules/Cannot_change_PIC.validationRule-meta.xml
@@ -2,7 +2,7 @@
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Cannot_change_PIC</fullName>
<active>true</active>
- <errorConditionFormula>$Profile.Id != "00eC800000005Cb" && ISCHANGED( Person_In_Charge__c )&& RA_Status__c <> '鑽夋涓�'</errorConditionFormula>
+ <errorConditionFormula>$Profile.Id != "00e10000000Y3o5" && ISCHANGED( Person_In_Charge__c )&& RA_Status__c <> '鑽夋涓�'</errorConditionFormula>
<errorDisplayField>Person_In_Charge__c</errorDisplayField>
<errorMessage>涓嶈兘鏇存敼涓绘媴褰�</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Rental_Apply__c/validationRules/For_AH_only_have_contract.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply__c/validationRules/For_AH_only_have_contract.validationRule-meta.xml
index d0ef006..9b3630d 100644
--- a/force-app/main/default/objects/Rental_Apply__c/validationRules/For_AH_only_have_contract.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/validationRules/For_AH_only_have_contract.validationRule-meta.xml
@@ -3,8 +3,8 @@
<fullName>For_AH_only_have_contract</fullName>
<active>true</active>
<description>濂ヨ緣璁惧锛屼繚淇湡鍐呬笉鎻愪緵澶囧搧.</description>
- <errorConditionFormula>RecordTypeId <> "012C600000003K0"
-&& $User.ProfileId <>'00eC800000005Cb'
+ <errorConditionFormula>RecordTypeId <> "01210000000RHIn"
+&& $User.ProfileId <>'00e10000000Y3o5'
&& (TEXT(demo_purpose2__c) == '涓�鑸敤鎴�' || TEXT(demo_purpose2__c) == '鍐嶄慨鐞�')
&& Repair__c != null
&& Repair__r.NewProductGuaranteeObject__c == '2: 鏈嶅姟澶氬勾淇濅慨'
diff --git a/force-app/main/default/objects/Rental_Apply__c/validationRules/For_Repair_loaner_Need_repair_number.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply__c/validationRules/For_Repair_loaner_Need_repair_number.validationRule-meta.xml
index 87f26b1..3b57792 100644
--- a/force-app/main/default/objects/Rental_Apply__c/validationRules/For_Repair_loaner_Need_repair_number.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/validationRules/For_Repair_loaner_Need_repair_number.validationRule-meta.xml
@@ -2,7 +2,7 @@
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>For_Repair_loaner_Need_repair_number</fullName>
<active>true</active>
- <errorConditionFormula>RecordTypeId <> "012C600000003K0" &&
+ <errorConditionFormula>RecordTypeId <> "01210000000RHIn" &&
NOT($User.Batch_User__c) &&
ISBLANK(Old_Rental_Apply__c) &&
AND(
diff --git a/force-app/main/default/objects/Rental_Apply__c/validationRules/For_contract_loaner_only_active_contract.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply__c/validationRules/For_contract_loaner_only_active_contract.validationRule-meta.xml
index a083f64..6769ab5 100644
--- a/force-app/main/default/objects/Rental_Apply__c/validationRules/For_contract_loaner_only_active_contract.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/validationRules/For_contract_loaner_only_active_contract.validationRule-meta.xml
@@ -2,7 +2,7 @@
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>For_contract_loaner_only_active_contract</fullName>
<active>false</active>
- <errorConditionFormula>RecordTypeId <> "012C600000003K0" &&
+ <errorConditionFormula>RecordTypeId <> "01210000000RHIn" &&
ISBLANK(Old_Rental_Apply__c) &&
(AND(RA_Status__c <> '宸插嚭搴�', Text(Status__c) <> '鍒犻櫎', Text(Status__c) <> '鍙栨秷',
ISPICKVAL(demo_purpose2__c, "淇濅慨鍚堝悓鐢ㄦ埛缁翠慨浠ｇ敤"),
diff --git a/force-app/main/default/objects/Rental_Apply__c/validationRules/For_contract_loaner_only_have_contract.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply__c/validationRules/For_contract_loaner_only_have_contract.validationRule-meta.xml
index 7fb8084..3765305 100644
--- a/force-app/main/default/objects/Rental_Apply__c/validationRules/For_contract_loaner_only_have_contract.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/validationRules/For_contract_loaner_only_have_contract.validationRule-meta.xml
@@ -3,11 +3,11 @@
<fullName>For_contract_loaner_only_have_contract</fullName>
<active>true</active>
<description>淇濅慨鐢ㄦ埛锛屽綋娌℃湁缁翠慨鍚堝悓鐨勬椂鍊欙紝涓嶈兘鐢宠澶囧搧</description>
- <errorConditionFormula>RecordTypeId <> "012C600000003K0" &&
+ <errorConditionFormula>RecordTypeId <> "01210000000RHIn" &&
(TEXT(demo_purpose2__c) == '淇濅慨鐢ㄦ埛') &&
Repair__c != null &&
(Repair__r.Number_of_EffectiveContract__c == '鏃�') &&
-($User.ProfileId <>'00eC800000005Cb') && NOT(AND(Repair__r.NewProductGuaranteeObject__c == '2: 澶氬勾淇濅慨' || Repair__r.NewProductGuaranteeObject__c == '2: 鏈嶅姟澶氬勾淇濅慨',
+($User.ProfileId <>'00e10000000Y3o5') && NOT(AND(Repair__r.NewProductGuaranteeObject__c == '2: 澶氬勾淇濅慨' || Repair__r.NewProductGuaranteeObject__c == '2: 鏈嶅姟澶氬勾淇濅慨',
OR(Repair__r.Delivered_Product__r.Product2.Asset_Model_No__c == 'LTF-190-10-3D',
Repair__r.Delivered_Product__r.Product2.Asset_Model_No__c == 'LTF-S190-5',
Repair__r.Delivered_Product__r.Product2.Asset_Model_No__c == 'CYF-VHA',
diff --git a/force-app/main/default/objects/Rental_Apply__c/validationRules/HP_Recieved_Required_Check.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply__c/validationRules/HP_Recieved_Required_Check.validationRule-meta.xml
index b8416a2..5a6a3a0 100644
--- a/force-app/main/default/objects/Rental_Apply__c/validationRules/HP_Recieved_Required_Check.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/validationRules/HP_Recieved_Required_Check.validationRule-meta.xml
@@ -2,15 +2,7 @@
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>HP_Recieved_Required_Check</fullName>
<active>true</active>
- <errorConditionFormula>and(
-
-not(isnull( HP_received_sign_day__c)),
-
-isblank( HP_received_sign_text__c),
-
-not(DataMigration_Flag__c),
-
-$User.Id!= $Label.ByPassTrigger )</errorConditionFormula>
+ <errorConditionFormula>and(not(isnull( HP_received_sign_day__c)),isblank( HP_received_sign_text__c),not(DataMigration_Flag__c), $User.Id!= $Label.ByPassTrigger )</errorConditionFormula>
<errorDisplayField>HP_received_sign_rich__c</errorDisplayField>
<errorMessage>璇蜂笂浼犵鏀跺崟</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Rental_Apply__c/validationRules/IF_IsJum_Rental_Eq_True2.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply__c/validationRules/IF_IsJum_Rental_Eq_True2.validationRule-meta.xml
index 6edbe68..4f0d49a 100644
--- a/force-app/main/default/objects/Rental_Apply__c/validationRules/IF_IsJum_Rental_Eq_True2.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/validationRules/IF_IsJum_Rental_Eq_True2.validationRule-meta.xml
@@ -4,6 +4,5 @@
<active>true</active>
<description>鏄惁鎻掗槦(澶囧搧): 鍙兘鎻掗槦涓�娆★紝瑕佸鍔犻獙璇佽鍒欍�傛彃闃熶竴娆′箣鍚庯紝鏄惁鎻掗槦(澶囧搧)鍜屾彃闃熷師鍥�(澶囧搧)涓嶈兘淇敼</description>
<errorConditionFormula>Text(JumpDate_Rental__c) != null && (ISCHANGED( IsJump_Rental__c )== true || ISCHANGED( JumpCause_Rental__c )== true)</errorConditionFormula>
- <errorDisplayField>Return_to_wh_staff__c</errorDisplayField>
<errorMessage>鎻掗槦涓�娆′箣鍚庯紝鏄惁鎻掗槦(澶囧搧)鍜屾彃闃熷師鍥�(澶囧搧)涓嶈兘淇敼</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Rental_Apply__c/validationRules/IF_OPDPlan_validation.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply__c/validationRules/IF_OPDPlan_validation.validationRule-meta.xml
index bae2441..fa64880 100644
--- a/force-app/main/default/objects/Rental_Apply__c/validationRules/IF_OPDPlan_validation.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/validationRules/IF_OPDPlan_validation.validationRule-meta.xml
@@ -5,7 +5,6 @@
<description>濡傛灉OPD璁″垝涓虹┖锛屽鍝佸�熺敤鐩殑2鏄湁璇环/鏃犺浠�/鏂颁骇鍝佽瘯鐢�/瀛︿細浼氳鐨勫鍝佺敵璇峰崟淇濆瓨鏃剁郴缁熸姤閿欙細
update lxy 2020/11/19 娣诲姞浜咺SNULL(Old_Rental_Apply__c )鏉′欢</description>
<errorConditionFormula>ISNEW() && (TEXT(demo_purpose2__c) =='璇曠敤锛堟棤璇环锛�' || TEXT(demo_purpose2__c) =='璇曠敤锛堟湁璇环锛�' ||TEXT(demo_purpose2__c) =='瀛︿細灞曚細' ||TEXT(demo_purpose2__c) =='鏂颁骇鍝佽瘎浠�') && OPDPlan__c =='' && ISBLANK(Old_Rental_Apply__c ) && $User.ProfileId <>'00e10000000Y3o5'</errorConditionFormula>
- <errorDisplayField>Return_to_wh_staff__c</errorDisplayField>
<errorMessage>璇峰厛鍒涘缓OPD璁″垝鍐嶅垱寤哄鍝佺敵璇凤細
璇环璇曠敤锛氳浠蜂腑鍒涘缓OPD璁″垝锛屾棤璇环璇曠敤/鏂颁骇鍝佽瘯鐢細绉戝涓垱寤篛PD璁″垝锛屽浼氫細璁細鍒涘缓浼氳锛屼細璁壒鍑嗗悗锛屼粠浼氳椤甸潰鍒涘缓銆�</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Rental_Apply__c/validationRules/New_Request_Verify.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply__c/validationRules/New_Request_Verify.validationRule-meta.xml
index ba8584e..0d45872 100644
--- a/force-app/main/default/objects/Rental_Apply__c/validationRules/New_Request_Verify.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/validationRules/New_Request_Verify.validationRule-meta.xml
@@ -14,6 +14,5 @@
(not(ISBLANK(HP_received_sign_text__c)) && NOT(TEXT(Routine_Check_Status__c) = 'OK')) ||
(not(ISBLANK(HP_received_sign_day__c)) && NOT(TEXT(Routine_Check_Status__c) = 'OK'))
)</errorConditionFormula>
- <errorDisplayField>Return_to_wh_staff__c</errorDisplayField>
<errorMessage>鏂板缓澶囧搧鍊熷嚭鐢宠鏃讹紝涓嶈兘濉啓鍥炲簱鐗╂祦淇℃伅鍜岀瀛椾俊鎭�</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Rental_Apply__c/validationRules/NotNeed_Opp_Try.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply__c/validationRules/NotNeed_Opp_Try.validationRule-meta.xml
index c3912a2..3370155 100644
--- a/force-app/main/default/objects/Rental_Apply__c/validationRules/NotNeed_Opp_Try.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/validationRules/NotNeed_Opp_Try.validationRule-meta.xml
@@ -4,6 +4,5 @@
<active>true</active>
<description>璇曠敤锛堟棤璇环锛夌洰鐨勭殑澶囧搧鐢宠鍗曪紝涓嶈兘鍏宠仈璇环淇℃伅</description>
<errorConditionFormula>ISNEW() && ISPICKVAL(demo_purpose2__c , "璇曠敤锛堟棤璇环锛�") && Follow_UP_Opp__c != null</errorConditionFormula>
- <errorDisplayField>Return_to_wh_staff__c</errorDisplayField>
<errorMessage>璇曠敤锛堟棤璇环锛夌洰鐨勭殑澶囧搧鐢宠鍗曪紝涓嶈兘鍏宠仈璇环淇℃伅锛�</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Rental_Apply__c/validationRules/OPDPlan_if_Have_Blank.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply__c/validationRules/OPDPlan_if_Have_Blank.validationRule-meta.xml
index a3516da..6a7d886 100644
--- a/force-app/main/default/objects/Rental_Apply__c/validationRules/OPDPlan_if_Have_Blank.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/validationRules/OPDPlan_if_Have_Blank.validationRule-meta.xml
@@ -4,6 +4,5 @@
<active>true</active>
<description>OPD璁″垝缂栫爜涓虹┖锛岃鍏堟柊寤篛PD璁″垝</description>
<errorConditionFormula>( ISNEW() || ISCHANGED(demo_purpose2__c) || ISCHANGED(OPDPlan__c) )&&(Text(demo_purpose2__c)='璇曠敤锛堟棤璇环锛�' || Text(demo_purpose2__c)='璇曠敤锛堟湁璇环锛�' || Text(demo_purpose2__c)='瀛︿細灞曚細' || Text(demo_purpose2__c)='鏂颁骇鍝佽瘎浠�' ) && ISBLANK(OPDPlan__c) && $User.ProfileId <>'00e10000000Y3o5'</errorConditionFormula>
- <errorDisplayField>Return_to_wh_staff__c</errorDisplayField>
<errorMessage>OPD璁″垝缂栫爜涓虹┖锛岃鍏堟柊寤篛PD璁″垝</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Rental_Apply__c/validationRules/QIS_next_action_Confim.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply__c/validationRules/QIS_next_action_Confim.validationRule-meta.xml
index 14c7521..0065805 100644
--- a/force-app/main/default/objects/Rental_Apply__c/validationRules/QIS_next_action_Confim.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/validationRules/QIS_next_action_Confim.validationRule-meta.xml
@@ -7,6 +7,5 @@
TEXT(demo_purpose2__c) = '绱㈣禂QIS',
TEXT(QIS_number__r.next_action__c) = '閫佸洖')&&or(isnew(),text(Status__c)=='鑽夋涓�')&& Not(ischanged(Loaner_cancel_request__c)) &&
$User.ProfileId <>'00e10000000Y3o5'</errorConditionFormula>
- <errorDisplayField>Return_to_wh_staff__c</errorDisplayField>
<errorMessage>QIS鐨勫搴旀柟娉曚负鈥滈�佸洖鈥濓紝涓嶅彲鍊熺敤澶囧搧</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Rental_Apply__c/validationRules/Repair_Create_RAC_Rule.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply__c/validationRules/Repair_Create_RAC_Rule.validationRule-meta.xml
index b62e534..a1d3aa3 100644
--- a/force-app/main/default/objects/Rental_Apply__c/validationRules/Repair_Create_RAC_Rule.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/validationRules/Repair_Create_RAC_Rule.validationRule-meta.xml
@@ -6,6 +6,5 @@
update lxy 2020/11/23 鍘绘帀&& Repair__r.Status1__c== '鑽夋涓�'</description>
<errorConditionFormula>ISNEW() && (TEXT(demo_purpose2__c) == '淇濅慨鐢ㄦ埛' || TEXT(demo_purpose2__c) == '甯傚満澶氬勾淇濅慨')
&& Repair__c != null && IsBlank(Repair__r.FSE_ApplyForRepair_Day__c)</errorConditionFormula>
- <errorDisplayField>Return_to_wh_staff__c</errorDisplayField>
<errorMessage>FSE鐢宠淇悊鍚庢墠鍙互鐢宠澶囧搧</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Rental_Apply__c/validationRules/Repair_Ordered_Date_Must_Null.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply__c/validationRules/Repair_Ordered_Date_Must_Null.validationRule-meta.xml
index c3178fe..e8ac12f 100644
--- a/force-app/main/default/objects/Rental_Apply__c/validationRules/Repair_Ordered_Date_Must_Null.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/validationRules/Repair_Ordered_Date_Must_Null.validationRule-meta.xml
@@ -7,6 +7,5 @@
&& ISPICKVAL(demo_purpose2__c, '鏁呴殰鎺掓煡')
&& NOT(ISBLANK(Repair__r.Repair_Ordered_Date__c))&&
ISBLANK(Old_Rental_Apply__c)</errorConditionFormula>
- <errorDisplayField>Return_to_wh_staff__c</errorDisplayField>
<errorMessage>鍒涘缓鏁呴殰鎺掓煡鐢宠鏃讹紝淇悊鐨刐4.淇悊鍝丷C鍙楃悊鏃蹇呴』涓虹┖銆�</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Rental_Apply__c/validationRules/Request_approval_day_Check.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply__c/validationRules/Request_approval_day_Check.validationRule-meta.xml
deleted file mode 100644
index 2543b89..0000000
--- a/force-app/main/default/objects/Rental_Apply__c/validationRules/Request_approval_day_Check.validationRule-meta.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
- <fullName>Request_approval_day_Check</fullName>
- <active>true</active>
- <errorConditionFormula>TEXT(Demo_purpose1__c)<>null&& !ISPICKVAL(demo_purpose2__c, "瀛︿細灞曚細")&& !ISPICKVAL(demo_purpose2__c, "璇曠敤锛堟棤璇环锛�")&& !ISPICKVAL(demo_purpose2__c, "璇曠敤锛堟湁璇环锛�") && !ISPICKVAL(demo_purpose2__c, "鏂颁骇鍝佽瘎浠�") && (TEXT(Status__c)="濉啓瀹屾瘯" && TODAY() < Request_shipping_day__c - 7)</errorConditionFormula>
- <errorMessage>蹇呴』鎻愬墠浜庡笇鏈涘埌璐ф棩7澶╀箣鍐呮彁浜ょ敵璇�</errorMessage>
-</ValidationRule>
diff --git a/force-app/main/default/objects/Rental_Apply__c/validationRules/Track_Number_Need.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply__c/validationRules/Track_Number_Need.validationRule-meta.xml
index a21cade..dbd8860 100644
--- a/force-app/main/default/objects/Rental_Apply__c/validationRules/Track_Number_Need.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/validationRules/Track_Number_Need.validationRule-meta.xml
@@ -4,6 +4,5 @@
<active>true</active>
<description>鑷彁蹇呴』杈撳叆鍗曞彿锛堥殢渚垮啓鐐逛粈涔堬級</description>
<errorConditionFormula>(Text(delivery_company__c)=='鑷彁'||Text( Return_Track_Company__c)=='鑷彁' )&& (isnull(Return_Track_Number__c)||isblank(Return_Track_Number__c)||isnull( Tracking_Number__c )||isblank(Tracking_Number__c))</errorConditionFormula>
- <errorDisplayField>Return_to_wh_staff__c</errorDisplayField>
<errorMessage>璇峰～鍐欑墿娴佽繍杈撳崟鍙�</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Rental_Apply__c/validationRules/checkOPDPlan.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply__c/validationRules/checkOPDPlan.validationRule-meta.xml
index de50537..354c726 100644
--- a/force-app/main/default/objects/Rental_Apply__c/validationRules/checkOPDPlan.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/validationRules/checkOPDPlan.validationRule-meta.xml
@@ -4,6 +4,5 @@
<active>true</active>
<description>鏂板缓闈炲垎鍗曞鍝佹椂锛屽鍝佺洰鐨�2鏄笅杩�4涓紝鍏宠仈鐨凮PD璁″垝涓嶆槸瀛︿細锛屽氨蹇呴』淇濊瘉OPD璁″垝鍜屽鍝佹槸1瀵�1鐨�</description>
<errorConditionFormula>ISNEW() && (TEXT(demo_purpose2__c) =='璇曠敤锛堟棤璇环锛�' || TEXT(demo_purpose2__c) =='璇曠敤锛堟湁璇环锛�' ||TEXT(demo_purpose2__c) =='瀛︿細灞曚細' ||TEXT(demo_purpose2__c) =='鏂颁骇鍝佽瘎浠�') && ISBLANK(Old_Rental_Apply__c ) && !IsBlank(OPDPlan__r.Rental_Apply2__c) && Text(OPDPlan__r.OPDType__c)!='瀛︿細'</errorConditionFormula>
- <errorDisplayField>Return_to_wh_staff__c</errorDisplayField>
<errorMessage>涓�涓狾PD璁″垝鍙彲鍏宠仈鍒涘缓涓�涓鍝佺敵璇峰崟</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/RepairAgainAn__c/RepairAgainAn__c.object-meta.xml b/force-app/main/default/objects/RepairAgainAn__c/RepairAgainAn__c.object-meta.xml
index 300e9d3..d42d756 100644
--- a/force-app/main/default/objects/RepairAgainAn__c/RepairAgainAn__c.object-meta.xml
+++ b/force-app/main/default/objects/RepairAgainAn__c/RepairAgainAn__c.object-meta.xml
@@ -128,11 +128,14 @@
</actionOverrides>
<actionOverrides>
<actionName>View</actionName>
- <type>Default</type>
+ <comment>Action override created by Lightning App Builder during activation.</comment>
+ <content>FlexiPage3</content>
+ <formFactor>Large</formFactor>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>Flexipage</type>
</actionOverrides>
<actionOverrides>
<actionName>View</actionName>
- <formFactor>Large</formFactor>
<type>Default</type>
</actionOverrides>
<actionOverrides>
diff --git a/force-app/main/default/objects/RepairSubOrder__c/RepairSubOrder__c.object-meta.xml b/force-app/main/default/objects/RepairSubOrder__c/RepairSubOrder__c.object-meta.xml
index 4768a1c..e57826a 100644
--- a/force-app/main/default/objects/RepairSubOrder__c/RepairSubOrder__c.object-meta.xml
+++ b/force-app/main/default/objects/RepairSubOrder__c/RepairSubOrder__c.object-meta.xml
@@ -58,11 +58,13 @@
</actionOverrides>
<actionOverrides>
<actionName>Edit</actionName>
- <type>Default</type>
+ <content>LexRepairSubOrderPIPLAura</content>
+ <formFactor>Large</formFactor>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>LightningComponent</type>
</actionOverrides>
<actionOverrides>
<actionName>Edit</actionName>
- <formFactor>Large</formFactor>
<type>Default</type>
</actionOverrides>
<actionOverrides>
@@ -86,11 +88,13 @@
</actionOverrides>
<actionOverrides>
<actionName>New</actionName>
- <type>Default</type>
+ <content>LexRepairSubOrderPIPLAura</content>
+ <formFactor>Large</formFactor>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>LightningComponent</type>
</actionOverrides>
<actionOverrides>
<actionName>New</actionName>
- <formFactor>Large</formFactor>
<type>Default</type>
</actionOverrides>
<actionOverrides>
@@ -160,9 +164,9 @@
<type>Text</type>
</nameField>
<searchLayouts>
+ <excludedStandardButtons>Accept</excludedStandardButtons>
<excludedStandardButtons>OpenListInQuip</excludedStandardButtons>
<excludedStandardButtons>NewFromDocument</excludedStandardButtons>
- <excludedStandardButtons>Accept</excludedStandardButtons>
<excludedStandardButtons>ChangeOwner</excludedStandardButtons>
<excludedStandardButtons>Import</excludedStandardButtons>
<excludedStandardButtons>MassChangeOwner</excludedStandardButtons>
diff --git a/force-app/main/default/objects/RepairSubOrder__c/fields/AWS_Data_Id__c.field-meta.xml b/force-app/main/default/objects/RepairSubOrder__c/fields/AWS_Data_Id__c.field-meta.xml
index fb5fb1d..49fcfa0 100644
--- a/force-app/main/default/objects/RepairSubOrder__c/fields/AWS_Data_Id__c.field-meta.xml
+++ b/force-app/main/default/objects/RepairSubOrder__c/fields/AWS_Data_Id__c.field-meta.xml
@@ -7,7 +7,7 @@
<label>AWS Data Id</label>
<length>255</length>
<required>false</required>
- <trackHistory>false</trackHistory>
+ <trackHistory>true</trackHistory>
<trackTrending>false</trackTrending>
<type>Text</type>
<unique>true</unique>
diff --git a/force-app/main/default/objects/RepairSubOrder__c/listViews/RepairSubList_Pending.listView-meta.xml b/force-app/main/default/objects/RepairSubOrder__c/listViews/RepairSubList_Pending.listView-meta.xml
index ee33e62..d7b56c6 100644
--- a/force-app/main/default/objects/RepairSubOrder__c/listViews/RepairSubList_Pending.listView-meta.xml
+++ b/force-app/main/default/objects/RepairSubOrder__c/listViews/RepairSubList_Pending.listView-meta.xml
@@ -10,6 +10,7 @@
<columns>Status__c</columns>
<columns>Applicanter__c</columns>
<columns>ApplicantType__c</columns>
+ <columns>CREATED_DATE</columns>
<filterScope>Everything</filterScope>
<filters>
<field>Status__c</field>
@@ -17,5 +18,4 @@
<value>寰呭鐞�</value>
</filters>
<label>鎶ヤ慨瀛愬崟_寰呭鐞�</label>
- <language>zh_CN</language>
</ListView>
diff --git a/force-app/main/default/objects/Repair_Quotation__c/fields/Discount_reason_list_comma_c__c.field-meta.xml b/force-app/main/default/objects/Repair_Quotation__c/fields/Discount_reason_list_comma_c__c.field-meta.xml
index 3a444aa..867c52e 100644
--- a/force-app/main/default/objects/Repair_Quotation__c/fields/Discount_reason_list_comma_c__c.field-meta.xml
+++ b/force-app/main/default/objects/Repair_Quotation__c/fields/Discount_reason_list_comma_c__c.field-meta.xml
@@ -35,6 +35,7 @@
IF(Set_discount__c = 0, '', '濂楅鎶樻墸,') +
IF(Servince_contract_discount_amount__c = 0, '' , '缁翠慨鍚堝悓,') +
IF(Delivery_compensation__c = 0, '', '杩愯緭绱㈣禂,') +
+IF(LimitPrice_contract_discount_amount__c = 0, '', '涓婇檺鍚堝悓,') +
IF(Other_discount__c = 0, '', '鍏朵粬,'),
0,
LEN(
@@ -54,6 +55,7 @@
IF(Set_discount__c = 0, '', '濂楅鎶樻墸,') +
IF(Servince_contract_discount_amount__c = 0, '' , '缁翠慨鍚堝悓,') +
IF(Delivery_compensation__c = 0, '', '杩愯緭绱㈣禂,') +
+IF(LimitPrice_contract_discount_amount__c = 0, '', '涓婇檺鍚堝悓,') +
IF(Other_discount__c = 0, '', '鍏朵粬,')
) - 1
)</formula>
diff --git a/force-app/main/default/objects/Repair_Quotation__c/fields/Usage_Ratio_Price__c.field-meta.xml b/force-app/main/default/objects/Repair_Quotation__c/fields/Usage_Ratio_Price__c.field-meta.xml
index 93d3ceb..4cfb07b 100644
--- a/force-app/main/default/objects/Repair_Quotation__c/fields/Usage_Ratio_Price__c.field-meta.xml
+++ b/force-app/main/default/objects/Repair_Quotation__c/fields/Usage_Ratio_Price__c.field-meta.xml
@@ -4,7 +4,7 @@
<externalId>false</externalId>
<formula>IF((LimitPrice_contract_discount_amount__c==null || LimitPrice_contract_discount_amount__c==0),(Loaner_repair__c + long_term_insurance__c + long_term_insurance_MD__c + Servince_contract_discount_amount__c + Other_discount__c) * (-1), ListPrice__c )</formula>
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
- <inlineHelpText>(Loaner_repair__c + long_term_insurance__c + long_term_insurance_MD__c + Servince_contract_discount_amount__c + Other_discount__c) (-1)--0327</inlineHelpText>
+ <inlineHelpText>(Loaner_repair__c + long_term_insurance__c + long_term_insurance_MD__c + Servince_contract_discount_amount__c + Other_discount__c) * (-1)--0327</inlineHelpText>
<label>璁″叆鍚堝悓娑堣垂鐜囩殑淇悊閲戦</label>
<precision>18</precision>
<required>false</required>
diff --git a/force-app/main/default/objects/Repair_Quotation__c/validationRules/Edit_Disabled_When_Repair_Finished.validationRule-meta.xml b/force-app/main/default/objects/Repair_Quotation__c/validationRules/Edit_Disabled_When_Repair_Finished.validationRule-meta.xml
index 9deee74..3377db1 100644
--- a/force-app/main/default/objects/Repair_Quotation__c/validationRules/Edit_Disabled_When_Repair_Finished.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair_Quotation__c/validationRules/Edit_Disabled_When_Repair_Finished.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Edit_Disabled_When_Repair_Finished</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>OR(not(isnull( Repair__r.RepairOrder_Complete_Day__c )), Repair__r.Status1__c ='5.瀹屾瘯')&&
(
ISCHANGED(Request_amount_after_discount__c) ||
diff --git a/force-app/main/default/objects/Repair_Quotation__c/validationRules/Service_Background_Description.validationRule-meta.xml b/force-app/main/default/objects/Repair_Quotation__c/validationRules/Service_Background_Description.validationRule-meta.xml
index 3ac563c..a222bb3 100644
--- a/force-app/main/default/objects/Repair_Quotation__c/validationRules/Service_Background_Description.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair_Quotation__c/validationRules/Service_Background_Description.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Service_Background_Description</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>TEXT(CutPriceStatus_Service__c ) = "宸叉彁浜�" && ISBLANK(Background_Description__c)</errorConditionFormula>
<errorDisplayField>Background_Description__c</errorDisplayField>
<errorMessage>鏈嶅姟鏈儴鍑忎环鐢宠鏃讹紝蹇呴』濉啓鑳屾櫙璇存槑锛�</errorMessage>
diff --git a/force-app/main/default/objects/Repair_Quotation__c/validationRules/Service_CutPrice.validationRule-meta.xml b/force-app/main/default/objects/Repair_Quotation__c/validationRules/Service_CutPrice.validationRule-meta.xml
index 0ff136d..8503bb7 100644
--- a/force-app/main/default/objects/Repair_Quotation__c/validationRules/Service_CutPrice.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair_Quotation__c/validationRules/Service_CutPrice.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Service_CutPrice</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>TEXT( CutPriceStatus_Service__c ) = "宸叉彁浜�" && (ISBLANK( Expect_CutPrice__c ) || Expect_CutPrice__c < 0)</errorConditionFormula>
<errorDisplayField>Expect_CutPrice__c</errorDisplayField>
<errorMessage>鏈嶅姟鏈儴鍑忎环鐢宠鏃讹紝蹇呴』杈撳叆鏈嶅姟鏈儴鏈熸湜鍑忎环閲戦锛�</errorMessage>
diff --git a/force-app/main/default/objects/Repair_Quotation__c/validationRules/Service_CutPriceEditDisabledWhenFinished.validationRule-meta.xml b/force-app/main/default/objects/Repair_Quotation__c/validationRules/Service_CutPriceEditDisabledWhenFinished.validationRule-meta.xml
index c7d9892..0d4ac95 100644
--- a/force-app/main/default/objects/Repair_Quotation__c/validationRules/Service_CutPriceEditDisabledWhenFinished.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair_Quotation__c/validationRules/Service_CutPriceEditDisabledWhenFinished.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Service_CutPriceEditDisabledWhenFinished</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>OR(not(isnull( ServiceCutPriceApprovalDate__c)), TEXT(CutPriceStatus_Service__c) ='鎵瑰噯')&&
(
ISCHANGED(Expect_CutPrice__c) ||
diff --git a/force-app/main/default/objects/Repair_Quotation__c/validationRules/Service_CutPrice_Greaterthan_Zero.validationRule-meta.xml b/force-app/main/default/objects/Repair_Quotation__c/validationRules/Service_CutPrice_Greaterthan_Zero.validationRule-meta.xml
index 6fee4d4..57f296e 100644
--- a/force-app/main/default/objects/Repair_Quotation__c/validationRules/Service_CutPrice_Greaterthan_Zero.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair_Quotation__c/validationRules/Service_CutPrice_Greaterthan_Zero.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Service_CutPrice_Greaterthan_Zero</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>ISCHANGED( Expect_CutPrice__c ) &&
( Expect_CutPrice__c < 0 ||
Expect_CutPrice__c > ListPrice__c)</errorConditionFormula>
diff --git a/force-app/main/default/objects/Repair_Quotation__c/validationRules/Service_CutPrice_Reason.validationRule-meta.xml b/force-app/main/default/objects/Repair_Quotation__c/validationRules/Service_CutPrice_Reason.validationRule-meta.xml
index 4e34298..281da31 100644
--- a/force-app/main/default/objects/Repair_Quotation__c/validationRules/Service_CutPrice_Reason.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair_Quotation__c/validationRules/Service_CutPrice_Reason.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Service_CutPrice_Reason</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>TEXT(CutPriceStatus_Service__c ) = "宸叉彁浜�" && ISBLANK(Text(CutPrice_Reason_Service__c ))</errorConditionFormula>
<errorDisplayField>CutPrice_Reason_Service__c</errorDisplayField>
<errorMessage>鏈嶅姟鏈儴鍑忎环鐢宠鏃讹紝蹇呴』閫夋嫨鏈嶅姟鏈儴鍑忎环鐞嗙敱锛�</errorMessage>
diff --git a/force-app/main/default/objects/Repair_Quotation__c/validationRules/Service_CutPrice_apply_when.validationRule-meta.xml b/force-app/main/default/objects/Repair_Quotation__c/validationRules/Service_CutPrice_apply_when.validationRule-meta.xml
index f417f35..b1b42c7 100644
--- a/force-app/main/default/objects/Repair_Quotation__c/validationRules/Service_CutPrice_apply_when.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair_Quotation__c/validationRules/Service_CutPrice_apply_when.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Service_CutPrice_apply_when</fullName>
- <active>false</active>
+ <active>true</active>
<description>9.鐢ㄦ埛鍚屾剰鏃� 鏈夊�兼湁灏变笉鑳界敵璇蜂簡</description>
<errorConditionFormula>TEXT(CutPriceStatus_Service__c) = "宸叉彁浜�" && isChanged(CutPriceStatus_Service__c) &&
Not(Isnull(Repair__r.Agreed_Date__c))</errorConditionFormula>
diff --git a/force-app/main/default/objects/Repair_Quotation__c/validationRules/discount_apply_user.validationRule-meta.xml b/force-app/main/default/objects/Repair_Quotation__c/validationRules/discount_apply_user.validationRule-meta.xml
index 7aea6ef..e956cab 100644
--- a/force-app/main/default/objects/Repair_Quotation__c/validationRules/discount_apply_user.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair_Quotation__c/validationRules/discount_apply_user.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>discount_apply_user</fullName>
- <active>false</active>
+ <active>true</active>
<description>銆屼慨鐞嗕富璐熻矗浜恒�嶃仺銆屼慨鐞嗗鎵樿�呫�嶃仺銆屽姪鐞嗐�嶃��銇伩銆傜敵璜嬪彲鑳�</description>
<errorConditionFormula>TEXT(Repair_quotation_status__c) = "鍑忎环鐢宠濉啓瀹屾瘯" && isChanged(Repair_quotation_status__c) &&
Not(OR(
diff --git a/force-app/main/default/objects/Repair_Quotation__c/validationRules/discount_apply_when.validationRule-meta.xml b/force-app/main/default/objects/Repair_Quotation__c/validationRules/discount_apply_when.validationRule-meta.xml
index aea2c40..970fc83 100644
--- a/force-app/main/default/objects/Repair_Quotation__c/validationRules/discount_apply_when.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair_Quotation__c/validationRules/discount_apply_when.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>discount_apply_when</fullName>
- <active>false</active>
+ <active>true</active>
<description>9.鐢ㄦ埛鍚屾剰鏃� 鏈夊�兼湁灏变笉鑳界敵璇蜂簡</description>
<errorConditionFormula>TEXT(Repair_quotation_status__c) = "鍑忎环鐢宠濉啓瀹屾瘯" && isChanged(Repair_quotation_status__c) &&
Not(Isnull(Repair__r.Agreed_Date__c))</errorConditionFormula>
diff --git a/force-app/main/default/objects/Repair_Quotation__c/validationRules/need_discount_RC_Mail_Address.validationRule-meta.xml b/force-app/main/default/objects/Repair_Quotation__c/validationRules/need_discount_RC_Mail_Address.validationRule-meta.xml
index 26d380c..f19a40c 100644
--- a/force-app/main/default/objects/Repair_Quotation__c/validationRules/need_discount_RC_Mail_Address.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair_Quotation__c/validationRules/need_discount_RC_Mail_Address.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>need_discount_RC_Mail_Address</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>TEXT(Repair_quotation_status__c) = "鍑忎环鐢宠濉啓瀹屾瘯"
&& (ISBLANK(RC_Mail_Address__c)
|| ISBLANK(Incharge_Staff_Email__c)
diff --git a/force-app/main/default/objects/Repair_Quotation__c/validationRules/need_discount_price_Greaterthan_Zero.validationRule-meta.xml b/force-app/main/default/objects/Repair_Quotation__c/validationRules/need_discount_price_Greaterthan_Zero.validationRule-meta.xml
index 6abeef5..4238e6b 100644
--- a/force-app/main/default/objects/Repair_Quotation__c/validationRules/need_discount_price_Greaterthan_Zero.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair_Quotation__c/validationRules/need_discount_price_Greaterthan_Zero.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>need_discount_price_Greaterthan_Zero</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>ISCHANGED(Request_amount_after_discount__c) &&
(Request_amount_after_discount__c < 0 ||
Request_amount_after_discount__c >= ListPrice__c)</errorConditionFormula>
diff --git a/force-app/main/default/objects/Repair_Quotation__c/validationRules/need_discount_ratio_Greaterthan_Zero.validationRule-meta.xml b/force-app/main/default/objects/Repair_Quotation__c/validationRules/need_discount_ratio_Greaterthan_Zero.validationRule-meta.xml
index 405656b..5963109 100644
--- a/force-app/main/default/objects/Repair_Quotation__c/validationRules/need_discount_ratio_Greaterthan_Zero.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair_Quotation__c/validationRules/need_discount_ratio_Greaterthan_Zero.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>need_discount_ratio_Greaterthan_Zero</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>NOT(isnull(Request_discount_ratio2__c)) && (Request_discount_ratio2__c >1||Request_discount_ratio2__c <= 0)</errorConditionFormula>
<errorDisplayField>Request_discount_ratio2__c</errorDisplayField>
<errorMessage>甯屾湜鍑忎环鐜囦笉鑳藉皬浜庣瓑浜�0鎴栬�呬笉鑳借秴杩�100%</errorMessage>
diff --git a/force-app/main/default/objects/Repair__c/Repair__c.object-meta.xml b/force-app/main/default/objects/Repair__c/Repair__c.object-meta.xml
index d2f6af7..0546a16 100644
--- a/force-app/main/default/objects/Repair__c/Repair__c.object-meta.xml
+++ b/force-app/main/default/objects/Repair__c/Repair__c.object-meta.xml
@@ -44,7 +44,9 @@
</actionOverrides>
<actionOverrides>
<actionName>Delete</actionName>
- <type>Default</type>
+ <content>CustomDeleteVF</content>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>Visualforce</type>
</actionOverrides>
<actionOverrides>
<actionName>Delete</actionName>
@@ -58,11 +60,13 @@
</actionOverrides>
<actionOverrides>
<actionName>Edit</actionName>
- <type>Default</type>
+ <content>LexRepairPIPLAura</content>
+ <formFactor>Large</formFactor>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>LightningComponent</type>
</actionOverrides>
<actionOverrides>
<actionName>Edit</actionName>
- <formFactor>Large</formFactor>
<type>Default</type>
</actionOverrides>
<actionOverrides>
@@ -86,11 +90,13 @@
</actionOverrides>
<actionOverrides>
<actionName>New</actionName>
- <type>Default</type>
+ <content>LexRepairPIPLAura</content>
+ <formFactor>Large</formFactor>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>LightningComponent</type>
</actionOverrides>
<actionOverrides>
<actionName>New</actionName>
- <formFactor>Large</formFactor>
<type>Default</type>
</actionOverrides>
<actionOverrides>
@@ -129,7 +135,7 @@
<actionOverrides>
<actionName>View</actionName>
<comment>Action override created by Lightning App Builder during activation.</comment>
- <content>FlexiPage11213342</content>
+ <content>FlexiPage6</content>
<formFactor>Large</formFactor>
<skipRecordTypeSelect>false</skipRecordTypeSelect>
<type>Flexipage</type>
@@ -177,9 +183,9 @@
<customTabListAdditionalFields>Repair_Final_Inspection_Date__c</customTabListAdditionalFields>
<customTabListAdditionalFields>Invoice_Date__c</customTabListAdditionalFields>
<customTabListAdditionalFields>Received_Date__c</customTabListAdditionalFields>
+ <excludedStandardButtons>Accept</excludedStandardButtons>
<excludedStandardButtons>OpenListInQuip</excludedStandardButtons>
<excludedStandardButtons>NewFromDocument</excludedStandardButtons>
- <excludedStandardButtons>Accept</excludedStandardButtons>
<excludedStandardButtons>ChangeOwner</excludedStandardButtons>
<excludedStandardButtons>Import</excludedStandardButtons>
<excludedStandardButtons>MassChangeOwner</excludedStandardButtons>
@@ -192,6 +198,7 @@
<lookupDialogsAdditionalFields>Repair_Ordered_Date__c</lookupDialogsAdditionalFields>
<searchResultsAdditionalFields>Service_Repair_No__c</searchResultsAdditionalFields>
<searchResultsAdditionalFields>OwnershipMachine_No__c</searchResultsAdditionalFields>
+ <searchResultsAdditionalFields>SerialNumber__c</searchResultsAdditionalFields>
<searchResultsAdditionalFields>Failure_Occurrence_Date__c</searchResultsAdditionalFields>
<searchResultsAdditionalFields>Repair_Ordered_Date__c</searchResultsAdditionalFields>
<searchResultsAdditionalFields>HP_Name__c</searchResultsAdditionalFields>
diff --git a/force-app/main/default/objects/Repair__c/fields/Elapsed_OnCall_QIS_Time__c.field-meta.xml b/force-app/main/default/objects/Repair__c/fields/Elapsed_OnCall_QIS_Time__c.field-meta.xml
index a5cb132..b9c3337 100644
--- a/force-app/main/default/objects/Repair__c/fields/Elapsed_OnCall_QIS_Time__c.field-meta.xml
+++ b/force-app/main/default/objects/Repair__c/fields/Elapsed_OnCall_QIS_Time__c.field-meta.xml
@@ -4,7 +4,7 @@
<externalId>false</externalId>
<formula>1</formula>
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
- <inlineHelpText>Final_complete_time__c - Trable_occur_da</inlineHelpText>
+ <inlineHelpText>Final_complete_time__c - Trable_occur_daY_collect__c</inlineHelpText>
<label>浠嶰nCall缁忚繃鏃堕棿</label>
<precision>18</precision>
<required>false</required>
diff --git a/force-app/main/default/objects/Repair__c/fields/Excess_check__c.field-meta.xml b/force-app/main/default/objects/Repair__c/fields/Excess_check__c.field-meta.xml
index 88ced3b..27269c7 100644
--- a/force-app/main/default/objects/Repair__c/fields/Excess_check__c.field-meta.xml
+++ b/force-app/main/default/objects/Repair__c/fields/Excess_check__c.field-meta.xml
@@ -8,7 +8,7 @@
,null)
)</formula>
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
- <inlineHelpText>More than 90 Days after the Invoice Date</inlineHelpText>
+ <inlineHelpText>寮�鍙戣〃鏃ュ悗瓒呰繃90澶�</inlineHelpText>
<label>瓒呰繃浜嗗洖娆炬棩鐨勬湡闄�</label>
<required>false</required>
<trackHistory>false</trackHistory>
diff --git a/force-app/main/default/objects/Repair__c/fields/FSE_owner__c.field-meta.xml b/force-app/main/default/objects/Repair__c/fields/FSE_owner__c.field-meta.xml
index 5619ab4..d40163d 100644
--- a/force-app/main/default/objects/Repair__c/fields/FSE_owner__c.field-meta.xml
+++ b/force-app/main/default/objects/Repair__c/fields/FSE_owner__c.field-meta.xml
@@ -3,16 +3,16 @@
<fullName>FSE_owner__c</fullName>
<description>淇鍓嶏細Hospital__r.FSE_Main__r.Alias</description>
<externalId>false</externalId>
- <formula>CASE(Account__r.Parent.RecordTypeId,
-'012C600000003HN',Hospital__r.FSE_GI_Main_Leader__r.Alias,
-'012C600000003HK',Hospital__r.FSE_GI_Main_Leader__r.Alias,
-'012C600000003HM',Hospital__r.FSE_GI_Main_Leader__r.Alias,
-'012C600000003HO',Hospital__r.FSE_SP_Main_Leader__r.Alias,
-'012C600000003HR',Hospital__r.FSE_SP_Main_Leader__r.Alias,
-'012C600000003HL',Hospital__r.FSE_SP_Main_Leader__r.Alias,
-'012C600000003HP',Hospital__r.FSE_SP_Main_Leader__r.Alias,
-'012C600000003HQ',Hospital__r.FSE_SP_Main_Leader__r.Alias,
-''
+ <formula>CASE(Account__r.Parent.RecordTypeId,
+'01210000000QemL',Hospital__r.FSE_GI_Main_Leader__r.Alias,
+'01210000000QezZ',Hospital__r.FSE_GI_Main_Leader__r.Alias,
+'01210000000QemQ',Hospital__r.FSE_GI_Main_Leader__r.Alias,
+'01210000000Qeze',Hospital__r.FSE_SP_Main_Leader__r.Alias,
+'01210000000Qezj',Hospital__r.FSE_SP_Main_Leader__r.Alias,
+'01210000000Qezt',Hospital__r.FSE_SP_Main_Leader__r.Alias,
+'01210000000Qezo',Hospital__r.FSE_SP_Main_Leader__r.Alias,
+'01210000000Qezy',Hospital__r.FSE_SP_Main_Leader__r.Alias,
+''
)</formula>
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
<label>鍖婚櫌FSE涓昏礋璐ｄ汉</label>
diff --git a/force-app/main/default/objects/Repair__c/fields/FSE_ownerid__c.field-meta.xml b/force-app/main/default/objects/Repair__c/fields/FSE_ownerid__c.field-meta.xml
index 84120af..feabbba 100644
--- a/force-app/main/default/objects/Repair__c/fields/FSE_ownerid__c.field-meta.xml
+++ b/force-app/main/default/objects/Repair__c/fields/FSE_ownerid__c.field-meta.xml
@@ -2,16 +2,16 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>FSE_ownerid__c</fullName>
<externalId>false</externalId>
- <formula>CASE(Account__r.Parent.RecordTypeId,
-'012C600000003HN',Hospital__r.FSE_GI_Main_Leader__r.Id,
-'012C600000003HK',Hospital__r.FSE_GI_Main_Leader__r.Id,
-'012C600000003HM',Hospital__r.FSE_GI_Main_Leader__r.Id,
-'012C600000003HO',Hospital__r.FSE_SP_Main_Leader__r.Id,
-'012C600000003HR',Hospital__r.FSE_SP_Main_Leader__r.Id,
-'012C600000003HL',Hospital__r.FSE_SP_Main_Leader__r.Id,
-'012C600000003HP',Hospital__r.FSE_SP_Main_Leader__r.Id,
-'012C600000003HQ',Hospital__r.FSE_SP_Main_Leader__r.Id,
-''
+ <formula>CASE(Account__r.Parent.RecordTypeId,
+'01210000000QemL',Hospital__r.FSE_GI_Main_Leader__r.Id,
+'01210000000QezZ',Hospital__r.FSE_GI_Main_Leader__r.Id,
+'01210000000QemQ',Hospital__r.FSE_GI_Main_Leader__r.Id,
+'01210000000Qeze',Hospital__r.FSE_SP_Main_Leader__r.Id,
+'01210000000Qezj',Hospital__r.FSE_SP_Main_Leader__r.Id,
+'01210000000Qezt',Hospital__r.FSE_SP_Main_Leader__r.Id,
+'01210000000Qezo',Hospital__r.FSE_SP_Main_Leader__r.Id,
+'01210000000Qezy',Hospital__r.FSE_SP_Main_Leader__r.Id,
+''
)</formula>
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
<label>鍖婚櫌FSE涓昏礋璐ｄ汉ID</label>
diff --git a/force-app/main/default/objects/Repair__c/fields/Incharge_Staff_Contact__c.field-meta.xml b/force-app/main/default/objects/Repair__c/fields/Incharge_Staff_Contact__c.field-meta.xml
index 0ec8d8f..5d32e71 100644
--- a/force-app/main/default/objects/Repair__c/fields/Incharge_Staff_Contact__c.field-meta.xml
+++ b/force-app/main/default/objects/Repair__c/fields/Incharge_Staff_Contact__c.field-meta.xml
@@ -5,7 +5,7 @@
<externalId>false</externalId>
<label>淇悊濮旀墭鑰咃紙鍛樺伐锛�</label>
<lookupFilter>
- <active>false</active>
+ <active>true</active>
<filterItems>
<field>Contact.RecordTypeId</field>
<operation>equals</operation>
diff --git a/force-app/main/default/objects/Repair__c/fields/OCSM_QARA_Owner__c.field-meta.xml b/force-app/main/default/objects/Repair__c/fields/OCSM_QARA_Owner__c.field-meta.xml
index baa4e00..3ecf025 100644
--- a/force-app/main/default/objects/Repair__c/fields/OCSM_QARA_Owner__c.field-meta.xml
+++ b/force-app/main/default/objects/Repair__c/fields/OCSM_QARA_Owner__c.field-meta.xml
@@ -1,10 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>OCSM_QARA_Owner__c</fullName>
- <externalId>false</externalId>
- <formula>CASE(MOD( value(RIGHT(Name, 6)) ,5), 0, '鍒樻櫒鐝�', 1, '榛勬亽鎱�',2, '璧靛崥浠�',3, '缃椾箰璇�',4,
+ <description>CASE(MOD( value(RIGHT(Name, 6)) ,5), 0, '鍒樻櫒鐝�', 1, '榛勬亽鎱�',2, '璧靛崥浠�',3, '缃椾箰璇�',4,
if(DATEVALUE(CreatedDate ) - DATE(2022,9,28) > 0 ,'绔ョ孩鐕�','闄堥害绉�')
-,'')</formula>
+,'')</description>
+ <externalId>false</externalId>
+ <formula>if(DATEVALUE(CreatedDate ) - DATE(2024,1,10) > 0,
+ CASE(MOD( value(RIGHT(Name, 6)) ,5),
+ 0, '姝︾传鐠�',
+ 1, '榛勬亽鎱�',
+ 2, '姝︾传鐠�',
+ 3, '楂橀暅楹�',
+ 4, '楂橀暅楹�',
+ '')
+ ,
+ CASE(MOD( value(RIGHT(Name, 6)) ,5),
+ 0, '鍒樻櫒鐝�',
+ 1, '榛勬亽鎱�',
+ 2, '璧靛崥浠�',
+ 3, '缃椾箰璇�',
+ 4, if(DATEVALUE(CreatedDate ) - DATE(2022,9,28) > 0 ,
+ '绔ョ孩鐕�','闄堥害绉�'),
+ '')
+)</formula>
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
<label>OCSM QARA鎷呭綋浜�</label>
<required>false</required>
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
new file mode 100644
index 0000000..56afe51
--- /dev/null
+++ b/force-app/main/default/objects/Repair__c/fields/Rental_Apply_Equipment_Set_Detail__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?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/objects/Repair__c/fields/Repair_Return_Province__c.field-meta.xml b/force-app/main/default/objects/Repair__c/fields/Repair_Return_Province__c.field-meta.xml
index c0737cb..f3ecdd2 100644
--- a/force-app/main/default/objects/Repair__c/fields/Repair_Return_Province__c.field-meta.xml
+++ b/force-app/main/default/objects/Repair__c/fields/Repair_Return_Province__c.field-meta.xml
@@ -169,41 +169,90 @@
</value>
</valueSetDefinition>
<valueSettings>
- <controllingFieldValue>SORC</controllingFieldValue>
+ <controllingFieldValue>涓婃捣</controllingFieldValue>
+ <controllingFieldValue>涓婃捣寮犳睙</controllingFieldValue>
+ <controllingFieldValue>涓婃捣RC</controllingFieldValue>
+ <controllingFieldValue>涓婃捣澶囧搧涓績</controllingFieldValue>
+ <valueName>涓婃捣</valueName>
+ </valueSettings>
+ <valueSettings>
<controllingFieldValue>鍖椾含鍏遍�氬姙浜嬪</controllingFieldValue>
+ <controllingFieldValue>鍖椾含RC</controllingFieldValue>
<controllingFieldValue>鍖椾含</controllingFieldValue>
<controllingFieldValue>鍖椾含閰掍粰妗�</controllingFieldValue>
<controllingFieldValue>鍖椾含鐭虫櫙灞�</controllingFieldValue>
- <controllingFieldValue>鍖椾含RC</controllingFieldValue>
+ <controllingFieldValue>SORC</controllingFieldValue>
<valueName>鍖椾含</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>骞垮窞澶囧搧涓績</controllingFieldValue>
- <controllingFieldValue>骞垮窞</controllingFieldValue>
<controllingFieldValue>娣卞湷</controllingFieldValue>
<controllingFieldValue>骞垮窞RC</controllingFieldValue>
+ <controllingFieldValue>骞垮窞</controllingFieldValue>
+ <controllingFieldValue>骞垮窞澶囧搧涓績</controllingFieldValue>
<valueName>骞夸笢</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>娌堥槼</controllingFieldValue>
+ <controllingFieldValue>澶ц繛</controllingFieldValue>
+ <controllingFieldValue>娌堥槼RC</controllingFieldValue>
+ <valueName>杈藉畞</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鐭冲搴�</controllingFieldValue>
+ <valueName>娌冲寳</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>澶師</controllingFieldValue>
+ <valueName>灞辫タ</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>澶╂触</controllingFieldValue>
+ <valueName>澶╂触</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>涔岄瞾鏈ㄩ綈</controllingFieldValue>
+ <controllingFieldValue>鍛煎拰娴╃壒</controllingFieldValue>
+ <valueName>鍐呰挋</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>姝︽眽</controllingFieldValue>
+ <valueName>婀栧寳</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>璐甸槼</controllingFieldValue>
<valueName>璐靛窞</valueName>
</valueSettings>
<valueSettings>
+ <controllingFieldValue>瑗垮畨</controllingFieldValue>
+ <valueName>闄曡タ</valueName>
+ </valueSettings>
+ <valueSettings>
<controllingFieldValue>鍝堝皵婊�</controllingFieldValue>
<valueName>榛戦緳姹�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>瑗垮畞</controllingFieldValue>
+ <valueName>闈掓捣</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>鏉窞</controllingFieldValue>
<valueName>娴欐睙</valueName>
</valueSettings>
<valueSettings>
+ <controllingFieldValue>閾跺窛</controllingFieldValue>
+ <valueName>瀹佸</valueName>
+ </valueSettings>
+ <valueSettings>
<controllingFieldValue>鍚堣偉</controllingFieldValue>
<valueName>瀹夊窘</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鍛煎拰娴╃壒</controllingFieldValue>
- <controllingFieldValue>涔岄瞾鏈ㄩ綈</controllingFieldValue>
- <valueName>鍐呰挋</valueName>
+ <controllingFieldValue>閮戝窞</controllingFieldValue>
+ <valueName>娌冲崡</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>閲嶅簡</controllingFieldValue>
+ <valueName>閲嶅簡</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>娴庡崡</controllingFieldValue>
@@ -223,6 +272,10 @@
<valueName>姹熻タ</valueName>
</valueSettings>
<valueSettings>
+ <controllingFieldValue>鍗椾含</controllingFieldValue>
+ <valueName>姹熻嫃</valueName>
+ </valueSettings>
+ <valueSettings>
<controllingFieldValue>闀挎槬</controllingFieldValue>
<valueName>鍚夋灄</valueName>
</valueSettings>
@@ -235,65 +288,12 @@
<valueName>鍥涘窛</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>澶ц繛</controllingFieldValue>
- <controllingFieldValue>娌堥槼</controllingFieldValue>
- <controllingFieldValue>娌堥槼RC</controllingFieldValue>
- <valueName>杈藉畞</valueName>
- </valueSettings>
- <valueSettings>
<controllingFieldValue>绂忓窞</controllingFieldValue>
<valueName>绂忓缓</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鍗椾含</controllingFieldValue>
- <valueName>姹熻嫃</valueName>
- </valueSettings>
- <valueSettings>
<controllingFieldValue>鍗楀畞</controllingFieldValue>
<valueName>骞胯タ</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>涓婃捣</controllingFieldValue>
- <controllingFieldValue>涓婃捣澶囧搧涓績</controllingFieldValue>
- <controllingFieldValue>涓婃捣寮犳睙</controllingFieldValue>
- <controllingFieldValue>涓婃捣RC</controllingFieldValue>
- <valueName>涓婃捣</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鐭冲搴�</controllingFieldValue>
- <valueName>娌冲寳</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>澶師</controllingFieldValue>
- <valueName>灞辫タ</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>澶╂触</controllingFieldValue>
- <valueName>澶╂触</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>姝︽眽</controllingFieldValue>
- <valueName>婀栧寳</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>瑗垮畨</controllingFieldValue>
- <valueName>闄曡タ</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>瑗垮畞</controllingFieldValue>
- <valueName>闈掓捣</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>閾跺窛</controllingFieldValue>
- <valueName>瀹佸</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>閮戝窞</controllingFieldValue>
- <valueName>娌冲崡</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>閲嶅簡</controllingFieldValue>
- <valueName>閲嶅簡</valueName>
</valueSettings>
</valueSet>
</CustomField>
diff --git a/force-app/main/default/objects/Repair__c/fields/Request_repair__c.field-meta.xml b/force-app/main/default/objects/Repair__c/fields/Request_repair__c.field-meta.xml
index 8d10f96..9b4c1cb 100644
--- a/force-app/main/default/objects/Repair__c/fields/Request_repair__c.field-meta.xml
+++ b/force-app/main/default/objects/Repair__c/fields/Request_repair__c.field-meta.xml
@@ -3,7 +3,7 @@
<fullName>Request_repair__c</fullName>
<defaultValue>false</defaultValue>
<externalId>false</externalId>
- <inlineHelpText>If SFDC number is wrong, please select (</inlineHelpText>
+ <inlineHelpText>濡傛灉SFDC鍙风爜鍐欓敊浜嗭紝璇烽�夋嫨涓�涓嬨��(绯荤粺鎶婇偖浠惰嚜鍔ㄥ彂閫佺粰淇悊绐楀彛浜�)</inlineHelpText>
<label>鐢宠鍒犻櫎淇悊璁板綍</label>
<trackFeedHistory>false</trackFeedHistory>
<trackHistory>false</trackHistory>
diff --git a/force-app/main/default/objects/Repair__c/fields/work_location_select__c.field-meta.xml b/force-app/main/default/objects/Repair__c/fields/work_location_select__c.field-meta.xml
index c7ad719..96d9740 100644
--- a/force-app/main/default/objects/Repair__c/fields/work_location_select__c.field-meta.xml
+++ b/force-app/main/default/objects/Repair__c/fields/work_location_select__c.field-meta.xml
@@ -210,221 +210,221 @@
</value>
</valueSetDefinition>
<valueSettings>
+ <controllingFieldValue>鐜板満淇悊</controllingFieldValue>
+ <controllingFieldValue>鐩撮�丱GZ淇悊</controllingFieldValue>
<controllingFieldValue>RC淇悊</controllingFieldValue>
<controllingFieldValue>鐩撮�丼ORC淇悊</controllingFieldValue>
- <controllingFieldValue>鐩撮�丱GZ淇悊</controllingFieldValue>
- <controllingFieldValue>鐜板満淇悊</controllingFieldValue>
<valueName>鍖椾含鍔炰簨澶�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>RC淇悊</controllingFieldValue>
- <controllingFieldValue>鐩撮�丼ORC淇悊</controllingFieldValue>
- <controllingFieldValue>鐩撮�丱GZ淇悊</controllingFieldValue>
- <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<controllingFieldValue>鐜板満淇悊</controllingFieldValue>
- <valueName>娌堥槼鍔炰簨澶�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>RC淇悊</controllingFieldValue>
- <controllingFieldValue>鐩撮�丼ORC淇悊</controllingFieldValue>
- <controllingFieldValue>鐩撮�丱GZ淇悊</controllingFieldValue>
<controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
- <controllingFieldValue>鐜板満淇悊</controllingFieldValue>
- <valueName>涓婃捣鍔炰簨澶�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>RC淇悊</controllingFieldValue>
- <controllingFieldValue>鐩撮�丼ORC淇悊</controllingFieldValue>
- <controllingFieldValue>鐩撮�丱GZ淇悊</controllingFieldValue>
- <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
- <controllingFieldValue>鐜板満淇悊</controllingFieldValue>
- <valueName>骞夸笢鍔炰簨澶�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>RC淇悊</controllingFieldValue>
- <controllingFieldValue>鐩撮�丼ORC淇悊</controllingFieldValue>
- <controllingFieldValue>鐩撮�丱GZ淇悊</controllingFieldValue>
- <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
- <controllingFieldValue>鐜板満淇悊</controllingFieldValue>
- <valueName>鏉窞鍔炰簨澶�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>RC淇悊</controllingFieldValue>
- <controllingFieldValue>鐩撮�丼ORC淇悊</controllingFieldValue>
- <controllingFieldValue>鐩撮�丱GZ淇悊</controllingFieldValue>
- <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
- <controllingFieldValue>鐜板満淇悊</controllingFieldValue>
- <valueName>鏉窞鍏遍�氬姙浜嬪</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>RC淇悊</controllingFieldValue>
- <controllingFieldValue>鐩撮�丼ORC淇悊</controllingFieldValue>
- <controllingFieldValue>鐩撮�丱GZ淇悊</controllingFieldValue>
- <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
- <controllingFieldValue>鐜板満淇悊</controllingFieldValue>
- <valueName>瑗垮畨鍔炰簨澶�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>RC淇悊</controllingFieldValue>
- <controllingFieldValue>鐩撮�丼ORC淇悊</controllingFieldValue>
- <controllingFieldValue>鐩撮�丱GZ淇悊</controllingFieldValue>
- <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
- <controllingFieldValue>鐜板満淇悊</controllingFieldValue>
- <valueName>瑗垮畨鍏遍�氬姙浜嬪</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>RC淇悊</controllingFieldValue>
- <controllingFieldValue>鐩撮�丼ORC淇悊</controllingFieldValue>
- <controllingFieldValue>鐩撮�丱GZ淇悊</controllingFieldValue>
- <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
- <controllingFieldValue>鐜板満淇悊</controllingFieldValue>
- <valueName>鎴愰兘鍔炰簨澶�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>RC淇悊</controllingFieldValue>
- <controllingFieldValue>鐩撮�丼ORC淇悊</controllingFieldValue>
- <controllingFieldValue>鐩撮�丱GZ淇悊</controllingFieldValue>
- <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
- <controllingFieldValue>鐜板満淇悊</controllingFieldValue>
- <valueName>鎴愰兘鍏遍�氬姙浜嬪</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>RC淇悊</controllingFieldValue>
- <controllingFieldValue>鐩撮�丼ORC淇悊</controllingFieldValue>
- <controllingFieldValue>鐩撮�丱GZ淇悊</controllingFieldValue>
- <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
- <controllingFieldValue>鐜板満淇悊</controllingFieldValue>
- <valueName>鍏遍�氬姙浜嬪</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
- <controllingFieldValue>鐜板満淇悊</controllingFieldValue>
<valueName>澶╂触鍔炰簨澶�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<controllingFieldValue>鐜板満淇悊</controllingFieldValue>
+ <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<valueName>娌冲寳鍔炰簨澶�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<controllingFieldValue>鐜板満淇悊</controllingFieldValue>
+ <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<valueName>娴庡崡鍔炰簨澶�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<controllingFieldValue>鐜板満淇悊</controllingFieldValue>
+ <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<valueName>闈掑矝鍔炰簨澶�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<controllingFieldValue>鐜板満淇悊</controllingFieldValue>
+ <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<valueName>鍐呰挋鍔炰簨澶�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<controllingFieldValue>鐜板満淇悊</controllingFieldValue>
+ <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<valueName>榛戦緳姹熷姙浜嬪</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<controllingFieldValue>鐜板満淇悊</controllingFieldValue>
+ <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<valueName>鍚夋灄鍔炰簨澶�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<controllingFieldValue>鐜板満淇悊</controllingFieldValue>
+ <controllingFieldValue>鐩撮�丱GZ淇悊</controllingFieldValue>
+ <controllingFieldValue>RC淇悊</controllingFieldValue>
+ <controllingFieldValue>鐩撮�丼ORC淇悊</controllingFieldValue>
+ <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
+ <valueName>娌堥槼鍔炰簨澶�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鐜板満淇悊</controllingFieldValue>
+ <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<valueName>澶ц繛鍔炰簨澶�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<controllingFieldValue>鐜板満淇悊</controllingFieldValue>
+ <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<valueName>闈掓捣鍔炰簨澶�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<controllingFieldValue>鐜板満淇悊</controllingFieldValue>
+ <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<valueName>瀹佸鍔炰簨澶�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<controllingFieldValue>鐜板満淇悊</controllingFieldValue>
+ <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<valueName>鐢樿們鍔炰簨澶�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<controllingFieldValue>鐜板満淇悊</controllingFieldValue>
+ <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<valueName>鏂扮枂鍔炰簨澶�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<controllingFieldValue>鐜板満淇悊</controllingFieldValue>
+ <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<valueName>灞辫タ鍔炰簨澶�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<controllingFieldValue>鐜板満淇悊</controllingFieldValue>
+ <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<valueName>娌冲崡鍔炰簨澶�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<controllingFieldValue>鐜板満淇悊</controllingFieldValue>
+ <controllingFieldValue>鐩撮�丱GZ淇悊</controllingFieldValue>
+ <controllingFieldValue>RC淇悊</controllingFieldValue>
+ <controllingFieldValue>鐩撮�丼ORC淇悊</controllingFieldValue>
+ <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
+ <valueName>涓婃捣鍔炰簨澶�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鐜板満淇悊</controllingFieldValue>
+ <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<valueName>姹熻嫃鍔炰簨澶�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<controllingFieldValue>鐜板満淇悊</controllingFieldValue>
+ <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<valueName>姹熻タ鍔炰簨澶�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<controllingFieldValue>鐜板満淇悊</controllingFieldValue>
+ <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<valueName>娴欐睙鍔炰簨澶�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<controllingFieldValue>鐜板満淇悊</controllingFieldValue>
+ <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<valueName>瀹夊窘鍔炰簨澶�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<controllingFieldValue>鐜板満淇悊</controllingFieldValue>
+ <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<valueName>绂忓缓鍔炰簨澶�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<controllingFieldValue>鐜板満淇悊</controllingFieldValue>
+ <controllingFieldValue>鐩撮�丱GZ淇悊</controllingFieldValue>
+ <controllingFieldValue>RC淇悊</controllingFieldValue>
+ <controllingFieldValue>鐩撮�丼ORC淇悊</controllingFieldValue>
+ <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
+ <valueName>骞夸笢鍔炰簨澶�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鐜板満淇悊</controllingFieldValue>
+ <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<valueName>娣卞湷鍔炰簨澶�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<controllingFieldValue>鐜板満淇悊</controllingFieldValue>
+ <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<valueName>骞胯タ鍔炰簨澶�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<controllingFieldValue>鐜板満淇悊</controllingFieldValue>
+ <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<valueName>婀栧寳鍔炰簨澶�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<controllingFieldValue>鐜板満淇悊</controllingFieldValue>
+ <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<valueName>婀栧崡鍔炰簨澶�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<controllingFieldValue>鐜板満淇悊</controllingFieldValue>
+ <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<valueName>浜戝崡鍔炰簨澶�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<controllingFieldValue>鐜板満淇悊</controllingFieldValue>
+ <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<valueName>璐靛窞鍔炰簨澶�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<controllingFieldValue>鐜板満淇悊</controllingFieldValue>
+ <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
<valueName>閲嶅簡鍔炰簨澶�</valueName>
</valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鐜板満淇悊</controllingFieldValue>
+ <controllingFieldValue>鐩撮�丱GZ淇悊</controllingFieldValue>
+ <controllingFieldValue>RC淇悊</controllingFieldValue>
+ <controllingFieldValue>鐩撮�丼ORC淇悊</controllingFieldValue>
+ <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
+ <valueName>鏉窞鍔炰簨澶�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鐜板満淇悊</controllingFieldValue>
+ <controllingFieldValue>鐩撮�丱GZ淇悊</controllingFieldValue>
+ <controllingFieldValue>RC淇悊</controllingFieldValue>
+ <controllingFieldValue>鐩撮�丼ORC淇悊</controllingFieldValue>
+ <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
+ <valueName>鏉窞鍏遍�氬姙浜嬪</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鐜板満淇悊</controllingFieldValue>
+ <controllingFieldValue>鐩撮�丱GZ淇悊</controllingFieldValue>
+ <controllingFieldValue>RC淇悊</controllingFieldValue>
+ <controllingFieldValue>鐩撮�丼ORC淇悊</controllingFieldValue>
+ <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
+ <valueName>瑗垮畨鍔炰簨澶�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鐜板満淇悊</controllingFieldValue>
+ <controllingFieldValue>鐩撮�丱GZ淇悊</controllingFieldValue>
+ <controllingFieldValue>RC淇悊</controllingFieldValue>
+ <controllingFieldValue>鐩撮�丼ORC淇悊</controllingFieldValue>
+ <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
+ <valueName>瑗垮畨鍏遍�氬姙浜嬪</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鐜板満淇悊</controllingFieldValue>
+ <controllingFieldValue>鐩撮�丱GZ淇悊</controllingFieldValue>
+ <controllingFieldValue>RC淇悊</controllingFieldValue>
+ <controllingFieldValue>鐩撮�丼ORC淇悊</controllingFieldValue>
+ <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
+ <valueName>鎴愰兘鍔炰簨澶�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鐜板満淇悊</controllingFieldValue>
+ <controllingFieldValue>鐩撮�丱GZ淇悊</controllingFieldValue>
+ <controllingFieldValue>RC淇悊</controllingFieldValue>
+ <controllingFieldValue>鐩撮�丼ORC淇悊</controllingFieldValue>
+ <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
+ <valueName>鎴愰兘鍏遍�氬姙浜嬪</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鐜板満淇悊</controllingFieldValue>
+ <controllingFieldValue>鐩撮�丱GZ淇悊</controllingFieldValue>
+ <controllingFieldValue>RC淇悊</controllingFieldValue>
+ <controllingFieldValue>鐩撮�丼ORC淇悊</controllingFieldValue>
+ <controllingFieldValue>鍔炰簨澶勪慨鐞�</controllingFieldValue>
+ <valueName>鍏遍�氬姙浜嬪</valueName>
+ </valueSettings>
</valueSet>
</CustomField>
diff --git a/force-app/main/default/objects/Repair__c/listViews/All.listView-meta.xml b/force-app/main/default/objects/Repair__c/listViews/All.listView-meta.xml
index 3f77316..37f1501 100644
--- a/force-app/main/default/objects/Repair__c/listViews/All.listView-meta.xml
+++ b/force-app/main/default/objects/Repair__c/listViews/All.listView-meta.xml
@@ -15,5 +15,4 @@
<columns>TransferApplyDetail_Id__c</columns>
<filterScope>Everything</filterScope>
<label>閫夋嫨鎵�鏈�</label>
- <language>ja</language>
</ListView>
diff --git a/force-app/main/default/objects/Repair__c/listViews/All2.listView-meta.xml b/force-app/main/default/objects/Repair__c/listViews/All2.listView-meta.xml
index 38bcd48..a9f22c3 100644
--- a/force-app/main/default/objects/Repair__c/listViews/All2.listView-meta.xml
+++ b/force-app/main/default/objects/Repair__c/listViews/All2.listView-meta.xml
@@ -21,5 +21,11 @@
<operation>notContain</operation>
<value>瀹屾瘯,鍒犻櫎,鍙栨秷</value>
</filters>
+ <filters>
+ <field>CREATEDBY_USER</field>
+ <operation>notContain</operation>
+ <value>SB</value>
+ </filters>
<label>00.鎴戠殑杩涜涓殑淇悊(All)</label>
+ <language>ja</language>
</ListView>
diff --git a/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_AfterFailureInformation.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_AfterFailureInformation.validationRule-meta.xml
index 4dbb212..50414a0 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_AfterFailureInformation.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_AfterFailureInformation.validationRule-meta.xml
@@ -4,21 +4,21 @@
<active>true</active>
<errorConditionFormula>$Profile.Id != '00e10000000dzzG' /* GPI_绯荤粺绠＄悊鍛楴ew 涓嶆姤閿� */
&&
-$Profile.Id != '00eC600000003SX'/* GPI_绯荤粺绠＄悊鍛� 涓嶆姤閿� */
+$Profile.Id != '00e10000000dEQx'/* GPI_绯荤粺绠＄悊鍛� 涓嶆姤閿� */
&&
-$Profile.Id != '00eC800000005Cb' /* 绯荤粺绠＄悊鍛� 涓嶆姤閿� */
+$Profile.Id != '00e10000000Y3o5' /* 绯荤粺绠＄悊鍛� 涓嶆姤閿� */
&&
-$User.Id != '005C60000001UFN' /* Batch User 涓嶆姤閿� */
+$User.Id != '00510000000fSYI' /* Batch User 涓嶆姤閿� */
&&
-$Profile.Id != '00eC600000004OI' /* 118_NMPA锛堣川閲忔硶瑙勬湰閮級鎷呭綋 涓嶆姤閿� */
+$Profile.Id != '00e10000000eFwF' /* 118_NMPA锛堣川閲忔硶瑙勬湰閮級鎷呭綋 涓嶆姤閿� */
&&
-$Profile.Id != '00eC600000004OJ' /* 118_NMPA锛堣川閲忔硶瑙勬湰閮級绐楀彛 涓嶆姤閿� */
+$Profile.Id != '00e10000000dCrn' /* 118_NMPA锛堣川閲忔硶瑙勬湰閮級绐楀彛 涓嶆姤閿� */
&&
-$User.Id != '005C60000001UyK' /* 鑳� 鐜夋垚 涓嶆姤閿� */
+$User.Id != '0051000000AKgzv' /* 鑳� 鐜夋垚 涓嶆姤閿� */
&&
-$User.Id != '005C60000001UyL' /* 鏉� 鐞竻 涓嶆姤閿� */
+$User.Id != '0051000000AKh05' /* 鏉� 鐞竻 涓嶆姤閿� */
&&
-$User.Id != '005C60000001UcA' /* 閮� 娲� 涓嶆姤閿� */
+$User.Id != '00510000004q1ed' /* 閮� 娲� 涓嶆姤閿� */
&&
OR(
Text(Status__c)='1.鍙楃悊瀹屾瘯',
diff --git a/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_BreakORFallOff.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_BreakORFallOff.validationRule-meta.xml
index 4d8ab4d..9c16b19 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_BreakORFallOff.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_BreakORFallOff.validationRule-meta.xml
@@ -2,23 +2,23 @@
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>ApplyMust_BreakORFallOff</fullName>
<active>true</active>
- <errorConditionFormula>$Profile.Id != '00e10000000dzzG' /* GPI_绯荤粺绠＄悊鍛楴ew 涓嶆姤閿� */
+ <errorConditionFormula>$Profile.Id != '00e10000000dzzG' /* GPI_绯荤粺绠＄悊鍛楴ew 涓嶆姤閿� */
&&
-$Profile.Id != '00eC600000003SX'/* GPI_绯荤粺绠＄悊鍛� 涓嶆姤閿� */
+$Profile.Id != '00e10000000dEQx'/* GPI_绯荤粺绠＄悊鍛� 涓嶆姤閿� */
&&
-$Profile.Id != '00eC800000005Cb' /* 绯荤粺绠＄悊鍛� 涓嶆姤閿� */
+$Profile.Id != '00e10000000Y3o5' /* 绯荤粺绠＄悊鍛� 涓嶆姤閿� */
&&
-$User.Id != '005C60000001UFN' /* Batch User 涓嶆姤閿� */
+$User.Id != '00510000000fSYI' /* Batch User 涓嶆姤閿� */
&&
-$Profile.Id != '00eC600000004OI' /* 118_NMPA锛堣川閲忔硶瑙勬湰閮級鎷呭綋 涓嶆姤閿� */
+$Profile.Id != '00e10000000eFwF' /* 118_NMPA锛堣川閲忔硶瑙勬湰閮級鎷呭綋 涓嶆姤閿� */
&&
-$Profile.Id != '00eC600000004OJ' /* 118_NMPA锛堣川閲忔硶瑙勬湰閮級绐楀彛 涓嶆姤閿� */
+$Profile.Id != '00e10000000dCrn' /* 118_NMPA锛堣川閲忔硶瑙勬湰閮級绐楀彛 涓嶆姤閿� */
&&
-$User.Id != '005C60000001UyK' /* 鑳� 鐜夋垚 涓嶆姤閿� */
+$User.Id != '0051000000AKgzv' /* 鑳� 鐜夋垚 涓嶆姤閿� */
&&
-$User.Id != '005C60000001UyL' /* 鏉� 鐞竻 涓嶆姤閿� */
+$User.Id != '0051000000AKh05' /* 鏉� 鐞竻 涓嶆姤閿� */
&&
-$User.Id != '005C60000001UcA' /* 閮� 娲� 涓嶆姤閿� */
+$User.Id != '00510000004q1ed' /* 閮� 娲� 涓嶆姤閿� */
&&
OR(
Text(Status__c)='1.鍙楃悊瀹屾瘯',
diff --git a/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_DateReceiptQuestions.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_DateReceiptQuestions.validationRule-meta.xml
index bd3541e..6cb31e8 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_DateReceiptQuestions.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_DateReceiptQuestions.validationRule-meta.xml
@@ -3,23 +3,23 @@
<fullName>ApplyMust_DateReceiptQuestions</fullName>
<active>true</active>
<description>鐢宠淇悊鏃讹紝蹇呴』濉啓闂鑱旂粶鏀跺埌鏃�</description>
- <errorConditionFormula>$Profile.Id != '00e10000000dzzG' /* GPI_绯荤粺绠＄悊鍛楴ew 涓嶆姤閿� */
+ <errorConditionFormula>$Profile.Id != '00e10000000dzzG' /* GPI_绯荤粺绠＄悊鍛楴ew 涓嶆姤閿� */
&&
-$Profile.Id != '00eC600000003SX'/* GPI_绯荤粺绠＄悊鍛� 涓嶆姤閿� */
+$Profile.Id != '00e10000000dEQx'/* GPI_绯荤粺绠＄悊鍛� 涓嶆姤閿� */
&&
-$Profile.Id != '00eC800000005Cb' /* 绯荤粺绠＄悊鍛� 涓嶆姤閿� */
+$Profile.Id != '00e10000000Y3o5' /* 绯荤粺绠＄悊鍛� 涓嶆姤閿� */
&&
-$User.Id != '005C60000001UFN' /* Batch User 涓嶆姤閿� */
+$User.Id != '00510000000fSYI' /* Batch User 涓嶆姤閿� */
&&
-$Profile.Id != '00eC600000004OI' /* 118_NMPA锛堣川閲忔硶瑙勬湰閮級鎷呭綋 涓嶆姤閿� */
+$Profile.Id != '00e10000000eFwF' /* 118_NMPA锛堣川閲忔硶瑙勬湰閮級鎷呭綋 涓嶆姤閿� */
&&
-$Profile.Id != '00eC600000004OJ' /* 118_NMPA锛堣川閲忔硶瑙勬湰閮級绐楀彛 涓嶆姤閿� */
+$Profile.Id != '00e10000000dCrn' /* 118_NMPA锛堣川閲忔硶瑙勬湰閮級绐楀彛 涓嶆姤閿� */
&&
-$User.Id != '005C60000001UyK' /* 鑳� 鐜夋垚 涓嶆姤閿� */
+$User.Id != '0051000000AKgzv' /* 鑳� 鐜夋垚 涓嶆姤閿� */
&&
-$User.Id != '005C60000001UyL' /* 鏉� 鐞竻 涓嶆姤閿� */
+$User.Id != '0051000000AKh05' /* 鏉� 鐞竻 涓嶆姤閿� */
&&
-$User.Id != '005C60000001UcA' /* 閮� 娲� 涓嶆姤閿� */
+$User.Id != '00510000004q1ed' /* 閮� 娲� 涓嶆姤閿� */
&&
OR(
Text(Status__c)='1.鍙楃悊瀹屾瘯',
diff --git a/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_Delay15Min.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_Delay15Min.validationRule-meta.xml
index a57f87f..dd0f3ab 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_Delay15Min.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_Delay15Min.validationRule-meta.xml
@@ -2,23 +2,23 @@
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>ApplyMust_Delay15Min</fullName>
<active>true</active>
- <errorConditionFormula>$Profile.Id != '00e10000000dzzG' /* GPI_绯荤粺绠＄悊鍛楴ew 涓嶆姤閿� */
+ <errorConditionFormula>$Profile.Id != '00e10000000dzzG' /* GPI_绯荤粺绠＄悊鍛楴ew 涓嶆姤閿� */
&&
-$Profile.Id != '00eC600000003SX'/* GPI_绯荤粺绠＄悊鍛� 涓嶆姤閿� */
+$Profile.Id != '00e10000000dEQx'/* GPI_绯荤粺绠＄悊鍛� 涓嶆姤閿� */
&&
-$Profile.Id != '00eC800000005Cb' /* 绯荤粺绠＄悊鍛� 涓嶆姤閿� */
+$Profile.Id != '00e10000000Y3o5' /* 绯荤粺绠＄悊鍛� 涓嶆姤閿� */
&&
-$User.Id != '005C60000001UFN' /* Batch User 涓嶆姤閿� */
+$User.Id != '00510000000fSYI' /* Batch User 涓嶆姤閿� */
&&
-$Profile.Id != '00eC600000004OI' /* 118_NMPA锛堣川閲忔硶瑙勬湰閮級鎷呭綋 涓嶆姤閿� */
+$Profile.Id != '00e10000000eFwF' /* 118_NMPA锛堣川閲忔硶瑙勬湰閮級鎷呭綋 涓嶆姤閿� */
&&
-$Profile.Id != '00eC600000004OJ' /* 118_NMPA锛堣川閲忔硶瑙勬湰閮級绐楀彛 涓嶆姤閿� */
+$Profile.Id != '00e10000000dCrn' /* 118_NMPA锛堣川閲忔硶瑙勬湰閮級绐楀彛 涓嶆姤閿� */
&&
-$User.Id != '005C60000001UyK' /* 鑳� 鐜夋垚 涓嶆姤閿� */
+$User.Id != '0051000000AKgzv' /* 鑳� 鐜夋垚 涓嶆姤閿� */
&&
-$User.Id != '005C60000001UyL' /* 鏉� 鐞竻 涓嶆姤閿� */
+$User.Id != '0051000000AKh05' /* 鏉� 鐞竻 涓嶆姤閿� */
&&
-$User.Id != '005C60000001UcA' /* 閮� 娲� 涓嶆姤閿� */
+$User.Id != '00510000004q1ed' /* 閮� 娲� 涓嶆姤閿� */
&&
OR(
Text(Status__c)='1.鍙楃悊瀹屾瘯',
diff --git a/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_FailureQInHospital.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_FailureQInHospital.validationRule-meta.xml
index 31067a2..86c44a6 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_FailureQInHospital.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_FailureQInHospital.validationRule-meta.xml
@@ -2,23 +2,23 @@
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>ApplyMust_FailureQInHospital</fullName>
<active>true</active>
- <errorConditionFormula>$Profile.Id != '00e10000000dzzG' /* GPI_绯荤粺绠＄悊鍛楴ew 涓嶆姤閿� */
+ <errorConditionFormula>$Profile.Id != '00e10000000dzzG' /* GPI_绯荤粺绠＄悊鍛楴ew 涓嶆姤閿� */
&&
-$Profile.Id != '00eC600000003SX'/* GPI_绯荤粺绠＄悊鍛� 涓嶆姤閿� */
+$Profile.Id != '00e10000000dEQx'/* GPI_绯荤粺绠＄悊鍛� 涓嶆姤閿� */
&&
-$Profile.Id != '00eC800000005Cb' /* 绯荤粺绠＄悊鍛� 涓嶆姤閿� */
+$Profile.Id != '00e10000000Y3o5' /* 绯荤粺绠＄悊鍛� 涓嶆姤閿� */
&&
-$User.Id != '005C60000001UFN' /* Batch User 涓嶆姤閿� */
+$User.Id != '00510000000fSYI' /* Batch User 涓嶆姤閿� */
&&
-$Profile.Id != '00eC600000004OI' /* 118_NMPA锛堣川閲忔硶瑙勬湰閮級鎷呭綋 涓嶆姤閿� */
+$Profile.Id != '00e10000000eFwF' /* 118_NMPA锛堣川閲忔硶瑙勬湰閮級鎷呭綋 涓嶆姤閿� */
&&
-$Profile.Id != '00eC600000004OJ' /* 118_NMPA锛堣川閲忔硶瑙勬湰閮級绐楀彛 涓嶆姤閿� */
+$Profile.Id != '00e10000000dCrn' /* 118_NMPA锛堣川閲忔硶瑙勬湰閮級绐楀彛 涓嶆姤閿� */
&&
-$User.Id != '005C60000001UyK' /* 鑳� 鐜夋垚 涓嶆姤閿� */
+$User.Id != '0051000000AKgzv' /* 鑳� 鐜夋垚 涓嶆姤閿� */
&&
-$User.Id != '005C60000001UyL' /* 鏉� 鐞竻 涓嶆姤閿� */
+$User.Id != '0051000000AKh05' /* 鏉� 鐞竻 涓嶆姤閿� */
&&
-$User.Id != '005C60000001UcA' /* 閮� 娲� 涓嶆姤閿� */
+$User.Id != '00510000004q1ed' /* 閮� 娲� 涓嶆姤閿� */
&&
OR(
Text(Status__c)='1.鍙楃悊瀹屾瘯',
diff --git a/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_InformationFrom.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_InformationFrom.validationRule-meta.xml
index 781cd65..01050d9 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_InformationFrom.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_InformationFrom.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>ApplyMust_InformationFrom</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>$Profile.Id != '00e10000000dzzG' /* GPI_绯荤粺绠＄悊鍛楴ew 涓嶆姤閿� */
&&
$Profile.Id != '00e10000000dEQx'/* GPI_绯荤粺绠＄悊鍛� 涓嶆姤閿� */
diff --git a/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_OperationOrExaminationName.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_OperationOrExaminationName.validationRule-meta.xml
index 058397b..4965c3b 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_OperationOrExaminationName.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_OperationOrExaminationName.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>ApplyMust_OperationOrExaminationName</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>$Profile.Id != '00e10000000dzzG' /* GPI_绯荤粺绠＄悊鍛楴ew 涓嶆姤閿� */
&&
$Profile.Id != '00e10000000dEQx'/* GPI_绯荤粺绠＄悊鍛� 涓嶆姤閿� */
diff --git a/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_ProblemOccurred.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_ProblemOccurred.validationRule-meta.xml
index 2f82ec4..31452a1 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_ProblemOccurred.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_ProblemOccurred.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>ApplyMust_ProblemOccurred</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>$Profile.Id != '00e10000000dzzG' /* GPI_绯荤粺绠＄悊鍛楴ew 涓嶆姤閿� */
&&
$Profile.Id != '00e10000000dEQx'/* GPI_绯荤粺绠＄悊鍛� 涓嶆姤閿� */
diff --git a/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_ProblemOccurredOther.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_ProblemOccurredOther.validationRule-meta.xml
index cad7c61..dd049ce 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_ProblemOccurredOther.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_ProblemOccurredOther.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>ApplyMust_ProblemOccurredOther</fullName>
- <active>false</active>
+ <active>true</active>
<description>闂鍙戠敓鏃堕棿鎯呭喌 鍏朵粬</description>
<errorConditionFormula>( ISNEW()||DATEVALUE(CreatedDate) >= DATE(2021,06,30)) && text(ProblemOccurred__c )='鍏朵粬' && ISBLANK(ProblemOccurredSelect__c)</errorConditionFormula>
<errorDisplayField>ProblemOccurred__c</errorDisplayField>
diff --git a/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_ProductFailureRelated.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_ProductFailureRelated.validationRule-meta.xml
index a18c407..8c5d4b6 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_ProductFailureRelated.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_ProductFailureRelated.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>ApplyMust_ProductFailureRelated</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>$Profile.Id != '00e10000000dzzG' /* GPI_绯荤粺绠＄悊鍛楴ew 涓嶆姤閿� */
&&
$Profile.Id != '00e10000000dEQx'/* GPI_绯荤粺绠＄悊鍛� 涓嶆姤閿� */
diff --git a/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_ReportAdverseEvents.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_ReportAdverseEvents.validationRule-meta.xml
index f64889a..ef7aee6 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_ReportAdverseEvents.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_ReportAdverseEvents.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>ApplyMust_ReportAdverseEvents</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>$Profile.Id != '00e10000000dzzG' /* GPI_绯荤粺绠＄悊鍛楴ew 涓嶆姤閿� */
&&
$Profile.Id != '00e10000000dEQx'/* GPI_绯荤粺绠＄悊鍛� 涓嶆姤閿� */
diff --git a/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_SubOrderCompleteDate_Same.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_SubOrderCompleteDate_Same.validationRule-meta.xml
index ac612dc..c4025ee 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_SubOrderCompleteDate_Same.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_SubOrderCompleteDate_Same.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>ApplyMust_SubOrderCompleteDate_Same</fullName>
- <active>false</active>
+ <active>true</active>
<description>鈥滈棶棰樿仈缁滄敹鍒版棩鈥濋粯璁ゅ拰鈥滅Щ鍔ㄧ鐢宠淇悊鏃モ�濈殑鏃ユ湡涓�鑷达紝濡傛灉瀹㈡埛淇敼浜嗛棶棰樿仈缁滄棩锛屼繚瀛樹慨鐞嗗崟鏃舵牎楠屸�滈棶棰樿仈缁滄敹鍒版棩鈥濆拰鈥滅Щ鍔ㄧ鐢宠淇悊鏃モ�濅笉涓�鑷存椂SFDC涓嶅厑璁镐繚瀛�</description>
<errorConditionFormula>TEXT(Repair_Source__c)=='浠庢姤淇瓙鍗�' &&DateReceiptQuestions__c!= SubOrderCompleteDate__c&& OR( ISNEW() ,DATEVALUE(CreatedDate) > DATEVALUE('2022-08-08'))
&&
diff --git a/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_SupportingProducts.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_SupportingProducts.validationRule-meta.xml
index 86c7cac..c5b7822 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_SupportingProducts.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_SupportingProducts.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>ApplyMust_SupportingProducts</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>$Profile.Id != '00e10000000dzzG' /* GPI_绯荤粺绠＄悊鍛楴ew 涓嶆姤閿� */
&&
$Profile.Id != '00e10000000dEQx'/* GPI_绯荤粺绠＄悊鍛� 涓嶆姤閿� */
diff --git a/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_UseFailProductFinish.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_UseFailProductFinish.validationRule-meta.xml
index 61d9c5c..11f9dbd 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_UseFailProductFinish.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_UseFailProductFinish.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>ApplyMust_UseFailProductFinish</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>$Profile.Id != '00e10000000dzzG' /* GPI_绯荤粺绠＄悊鍛楴ew 涓嶆姤閿� */
&&
$Profile.Id != '00e10000000dEQx'/* GPI_绯荤粺绠＄悊鍛� 涓嶆姤閿� */
diff --git a/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_WhatProject.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_WhatProject.validationRule-meta.xml
index 3797983..a121a84 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_WhatProject.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_WhatProject.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>ApplyMust_WhatProject</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>$Profile.Id != '00e10000000dzzG' /* GPI_绯荤粺绠＄悊鍛楴ew 涓嶆姤閿� */
&&
$Profile.Id != '00e10000000dEQx'/* GPI_绯荤粺绠＄悊鍛� 涓嶆姤閿� */
diff --git a/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_ifDeadHurt.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_ifDeadHurt.validationRule-meta.xml
index 36d2173..87794c1 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_ifDeadHurt.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_ifDeadHurt.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>ApplyMust_ifDeadHurt</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>$Profile.Id != '00e10000000dzzG' /* GPI_绯荤粺绠＄悊鍛楴ew 涓嶆姤閿� */
&&
$Profile.Id != '00e10000000dEQx'/* GPI_绯荤粺绠＄悊鍛� 涓嶆姤閿� */
diff --git a/force-app/main/default/objects/Repair__c/validationRules/Aset_AMM_Repair_chk.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/Aset_AMM_Repair_chk.validationRule-meta.xml
index 9972d7e..8a85f21 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/Aset_AMM_Repair_chk.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/Aset_AMM_Repair_chk.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Aset_AMM_Repair_chk</fullName>
- <active>false</active>
+ <active>true</active>
<description>闈濷LY缁翠慨瀵硅薄锛圧C閫佷慨锛夎璺宠繃缁翠慨涓績锛屼笖缁翠慨涓績鍙兘閫夊寳涓婂箍娌�</description>
<errorConditionFormula>TEXT(Delivered_Product__r.Product2.Can_Repair__c) ='RC閫佷慨'&& OR(Exc_work_location__c=false,AND(TEXT(work_location_select__c) != '鍖椾含鍔炰簨澶�',TEXT(work_location_select__c) != '涓婃捣鍔炰簨澶�',TEXT(work_location_select__c) != '娌堥槼鍔炰簨澶�',TEXT(work_location_select__c) != '骞夸笢鍔炰簨澶�'))&& ($User.Batch_User__c <>TRUE)</errorConditionFormula>
<errorDisplayField>work_location_select__c</errorDisplayField>
diff --git a/force-app/main/default/objects/Repair__c/validationRules/Aset_SORC_Repair_chk.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/Aset_SORC_Repair_chk.validationRule-meta.xml
index cfc7397..398b044 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/Aset_SORC_Repair_chk.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/Aset_SORC_Repair_chk.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Aset_SORC_Repair_chk</fullName>
- <active>false</active>
+ <active>true</active>
<description>Delivered_Product__r.sorc__c
&& (TEXT(On_site_repair__c) != '鐩撮�丼ORC淇悊'
&& TEXT(On_site_repair__c) != '鐩撮�丱GZ淇悊')</description>
diff --git a/force-app/main/default/objects/Repair__c/validationRules/Check_Return_Without_Repair.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/Check_Return_Without_Repair.validationRule-meta.xml
index dcdddc0..c061220 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/Check_Return_Without_Repair.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/Check_Return_Without_Repair.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Check_Return_Without_Repair</fullName>
- <active>false</active>
+ <active>true</active>
<description>褰撴湭淇悊褰掕繕FLAG(IF) 涓虹湡 鏃朵笉鍏佽鎷呭綋鍋氬彇娑堚�滄湭淇悊褰掕繕鐢宠鈥濆嬀鍜屽噺浠风敵璇风殑鎿嶄綔</description>
<errorConditionFormula>AND ( ISCHANGED(Return_Without_Repair__c) , Return_Without_Repair__c=false , Return_Without_Repair_IF__c
=true)</errorConditionFormula>
diff --git a/force-app/main/default/objects/Repair__c/validationRules/DateReceiptQuestionsAndFailureDate.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/DateReceiptQuestionsAndFailureDate.validationRule-meta.xml
index d22f415..8910dfb 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/DateReceiptQuestionsAndFailureDate.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/DateReceiptQuestionsAndFailureDate.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>DateReceiptQuestionsAndFailureDate</fullName>
- <active>false</active>
+ <active>true</active>
<description>闂鑱旂粶鏀跺埌鏃ュ皬浜庢晠闅滃彂鐢熸棩锛岃纭</description>
<errorConditionFormula>$Profile.Id != '00e10000000dEQx' /* GPI_绯荤粺绠＄悊鍛� 涓嶆姤閿� */
&&
diff --git a/force-app/main/default/objects/Repair__c/validationRules/Direct_Delivery_Logic_OGZ.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/Direct_Delivery_Logic_OGZ.validationRule-meta.xml
index 7cf67b2..505b498 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/Direct_Delivery_Logic_OGZ.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/Direct_Delivery_Logic_OGZ.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Direct_Delivery_Logic_OGZ</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>$Profile.Id != '00e10000000dEQx' /* GPI_绯荤粺绠＄悊鍛� 涓嶆姤閿� */
&& $Profile.Id != '00e10000000Y3o5' /*绯荤粺绠＄悊鍛� 涓嶆姤閿� */
&& $User.Id != '00510000000fSYI' /* Batch User 涓嶆姤閿� */
diff --git a/force-app/main/default/objects/Repair__c/validationRules/Direct_Delivery_Logic_OGZ_CLVS200IR.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/Direct_Delivery_Logic_OGZ_CLVS200IR.validationRule-meta.xml
index 1b01b11..cbcf708 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/Direct_Delivery_Logic_OGZ_CLVS200IR.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/Direct_Delivery_Logic_OGZ_CLVS200IR.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Direct_Delivery_Logic_OGZ_CLVS200IR</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>$Profile.Id != '00e10000000dEQx' /* GPI_绯荤粺绠＄悊鍛� 涓嶆姤閿� */
/*&& $Profile.Id != '00e10000000Y3o5' 绯荤粺绠＄悊鍛� 涓嶆姤閿� */
&& $User.Id != '00510000000fSYI' /* Batch User 涓嶆姤閿� */
diff --git a/force-app/main/default/objects/Repair__c/validationRules/Direct_Delivery_Logic_Only_SORC.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/Direct_Delivery_Logic_Only_SORC.validationRule-meta.xml
index a8da6a8..6e4103d 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/Direct_Delivery_Logic_Only_SORC.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/Direct_Delivery_Logic_Only_SORC.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Direct_Delivery_Logic_Only_SORC</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>$Profile.Id != '00e10000000dEQx' /* GPI_绯荤粺绠＄悊鍛� 涓嶆姤閿� */
&& $Profile.Id != '00e10000000Y3o5' /*绯荤粺绠＄悊鍛� 涓嶆姤閿� */
&& $User.Id != '00510000000fSYI' /* Batch User 涓嶆姤閿� */
diff --git a/force-app/main/default/objects/Repair__c/validationRules/Direct_Delivery_Logic_SORC.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/Direct_Delivery_Logic_SORC.validationRule-meta.xml
index 8eba258..b27027f 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/Direct_Delivery_Logic_SORC.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/Direct_Delivery_Logic_SORC.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Direct_Delivery_Logic_SORC</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>$Profile.Id != '00e10000000dEQx' /* GPI_绯荤粺绠＄悊鍛� 涓嶆姤閿� */
&& $Profile.Id != '00e10000000Y3o5' /*绯荤粺绠＄悊鍛� 涓嶆姤閿� */
&& $User.Id != '00510000000fSYI' /* Batch User 涓嶆姤閿� */
diff --git a/force-app/main/default/objects/Repair__c/validationRules/Direct_Delivery_Logic_SORC_CLVS200IR.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/Direct_Delivery_Logic_SORC_CLVS200IR.validationRule-meta.xml
index e0724f4..fe51257 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/Direct_Delivery_Logic_SORC_CLVS200IR.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/Direct_Delivery_Logic_SORC_CLVS200IR.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Direct_Delivery_Logic_SORC_CLVS200IR</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>$Profile.Id != '00e10000000dEQx' /* GPI_绯荤粺绠＄悊鍛� 涓嶆姤閿� */
/*&& $Profile.Id != '00e10000000Y3o5' 绯荤粺绠＄悊鍛� 涓嶆姤閿� */
&& $User.Id != '00510000000fSYI' /* Batch User 涓嶆姤閿� */
diff --git a/force-app/main/default/objects/Repair__c/validationRules/Edit_Disabled_When_Finished.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/Edit_Disabled_When_Finished.validationRule-meta.xml
index 03ff3c2..8320ba3 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/Edit_Disabled_When_Finished.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/Edit_Disabled_When_Finished.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Edit_Disabled_When_Finished</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>OR(not(isnull( RepairOrder_Complete_Day__c )), Status1__c ='5.瀹屾瘯')&&
(ISCHANGED(Return_Without_Repair__c) ||
ISCHANGED(Return_Without_Repair_Reason__c)
diff --git a/force-app/main/default/objects/Repair__c/validationRules/Incharge_Staff_Changed.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/Incharge_Staff_Changed.validationRule-meta.xml
index b8ca146..cf6ca72 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/Incharge_Staff_Changed.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/Incharge_Staff_Changed.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Incharge_Staff_Changed</fullName>
- <active>false</active>
+ <active>true</active>
<description>淇悊涓绘媴褰撱倰鍏ュ姏銇椼仧銇傘倠銇勩伅鍊ゃ倰澶夋洿銇椼仧鍫村悎銉併偋銉冦偗</description>
<errorConditionFormula>(Isnew() || Ischanged(Incharge_Staff__c))
&&
diff --git a/force-app/main/default/objects/Repair__c/validationRules/Incharge_Staff_invalid.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/Incharge_Staff_invalid.validationRule-meta.xml
index 9f11ac2..e1dc092 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/Incharge_Staff_invalid.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/Incharge_Staff_invalid.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Incharge_Staff_invalid</fullName>
- <active>false</active>
+ <active>true</active>
<description>鎶ヤ慨瀛愬崟鍒涘缓鐨勪慨鐞� 淇悊濮旀墭鑰�(FSE) 涓嶈兘鏄凡绂昏亴鎴栨湭鍚敤</description>
<errorConditionFormula>(Isnew() || Ischanged(Incharge_Staff__c))
&& Not(Isblank(RepairSubOrder__c))
diff --git a/force-app/main/default/objects/Repair__c/validationRules/Is_Active_Department_Class.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/Is_Active_Department_Class.validationRule-meta.xml
index 25a6fc8..a108a2f 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/Is_Active_Department_Class.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/Is_Active_Department_Class.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Is_Active_Department_Class</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>Isnew() && OR (
/* 鐪嬬埗璁板綍锛屾槸鍖婚櫌锛屾病鏈夐�夌浉搴旂殑鎴樼暐绉戝 ==> 鎶ラ敊 */
AND(Account__r.Parent.Parent.RecordTypeId = "01210000000QemG",
diff --git a/force-app/main/default/objects/Repair__c/validationRules/Is_Same_Hospital.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/Is_Same_Hospital.validationRule-meta.xml
index 2c21ebb..32bd3c7 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/Is_Same_Hospital.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/Is_Same_Hospital.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Is_Same_Hospital</fullName>
- <active>false</active>
+ <active>true</active>
<description>璇烽�夋嫨鍜屼慨鐞嗘槸鍚屼竴鍖婚櫌鐨勮澶�</description>
<errorConditionFormula>(Isnew() || Ischanged(Delivered_Product__c)) && Delivered_Product__r.Hospital__c <> Hospital__c</errorConditionFormula>
<errorDisplayField>Delivered_Product__c</errorDisplayField>
diff --git a/force-app/main/default/objects/Repair__c/validationRules/MaintenancePredictionVerification.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/MaintenancePredictionVerification.validationRule-meta.xml
index ccd2ae6..9e361d0 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/MaintenancePredictionVerification.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/MaintenancePredictionVerification.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>MaintenancePredictionVerification</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>IF(AND(MAINITIAL__c, NOT(CONTAINS( 'BF,BF鎵囨壂,CF,CF鏈烘鐜壂,CHF,CYF,ENF,GF鐢靛瓙鐜壂,GF鏈烘鐜壂,GF鎵囨壂,GIF,HYF,JF,LF,LTF,MAF,SIF',category4__c) )) ,true, false)
&&
$User.Username !='buli@deloitte.com.cn'</errorConditionFormula>
diff --git a/force-app/main/default/objects/Repair__c/validationRules/Must_Be_Dept_Check.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/Must_Be_Dept_Check.validationRule-meta.xml
index 0afd42f..58efd5d 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/Must_Be_Dept_Check.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/Must_Be_Dept_Check.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Must_Be_Dept_Check</fullName>
- <active>false</active>
+ <active>true</active>
<description>蹇呴』鏄叿浣撶殑绉戝</description>
<errorConditionFormula>$Profile.Id != '00e10000000Y3o5' /* 绯荤粺绠＄悊鍛� 涓嶆姤閿� */
&&
diff --git a/force-app/main/default/objects/Repair__c/validationRules/Must_input_SAPTransfer_time_Chk.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/Must_input_SAPTransfer_time_Chk.validationRule-meta.xml
index 2385dd9..1f96ec8 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/Must_input_SAPTransfer_time_Chk.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/Must_input_SAPTransfer_time_Chk.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Must_input_SAPTransfer_time_Chk</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>$User.ProfileId<>'00e10000000Y3o5' && NOT(CONTAINS($Label.ProfileId_EquCenCheckAndDepot,$User.ProfileId)) && NOT(CONTAINS($Label.ProfileId_EquCenAdmin,$User.ProfileId)) && NOT($User.Batch_User__c) &&( ISBLANK( SAP_Transfer_time__c ) && NOT(ISBLANK( Repair_Returned_To_HP_Date__c )) && (ISCHANGED(Repair_Returned_To_HP_Date__c ) || ISNEW()
))</errorConditionFormula>
<errorMessage>SAP鐢宠鏃堕棿涓虹┖,涓嶅彲濉啓淇悊鍝佺敤鎴疯繑閫佹棩</errorMessage>
diff --git a/force-app/main/default/objects/Repair__c/validationRules/No_ChangeIF_After_Draf.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/No_ChangeIF_After_Draf.validationRule-meta.xml
index e3dba99..a21af7f 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/No_ChangeIF_After_Draf.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/No_ChangeIF_After_Draf.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>No_ChangeIF_After_Draf</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>/** TODO RepairOrderStatusCode__c = 'A95'銇牬鍚堛�佸鏇村彲鑳斤紵**/
/*(TEXT(Status__c) != "鑽夋涓�" && TEXT(Status__c) != '1.鍙楃悊瀹屾瘯(SAP寰呭彂閫�)' && TEXT(Status__c) != "4.淇悊鍝佽繑閫侀樁娈�")&&*/
diff --git a/force-app/main/default/objects/Repair__c/validationRules/NotAllowedRepairReason.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/NotAllowedRepairReason.validationRule-meta.xml
index f0e86fd..a41609c 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/NotAllowedRepairReason.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/NotAllowedRepairReason.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>NotAllowedRepairReason</fullName>
- <active>false</active>
+ <active>true</active>
<description>涓嶅彲杩涜淇悊鐨勭悊鐢�</description>
<errorConditionFormula>ISBLANK(NotAllowedReason__c)&& Text(if_Repair_Allowed__c)='涓嶅彲缁翠慨'</errorConditionFormula>
<errorDisplayField>NotAllowedReason__c</errorDisplayField>
diff --git a/force-app/main/default/objects/Repair__c/validationRules/Not_Update_Asset.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/Not_Update_Asset.validationRule-meta.xml
index aa42e07..1c05396 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/Not_Update_Asset.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/Not_Update_Asset.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Not_Update_Asset</fullName>
- <active>false</active>
+ <active>true</active>
<description>鍠舵キ(鑿澅鍚個)銇磵鍏ユ鍣ㄣ倰澶夋洿銇с亶銇亜銆�
澶夋洿鍓�
diff --git a/force-app/main/default/objects/Repair__c/validationRules/QIS_repair_check.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/QIS_repair_check.validationRule-meta.xml
index b8cca96..dfd7dee 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/QIS_repair_check.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/QIS_repair_check.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>QIS_repair_check</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>NOT(ISBLANK(QIS_ID__c)) &&
(
QIS_ID__r.RecordType_ID__c='01210000000RLWc' || QIS_ID__r.RecordType_ID__c='01210000000RLWh' ||
diff --git a/force-app/main/default/objects/Repair__c/validationRules/Rental_Apply_Cannot_Modify_Model.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/Rental_Apply_Cannot_Modify_Model.validationRule-meta.xml
index 84a538f..33548b7 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/Rental_Apply_Cannot_Modify_Model.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/Rental_Apply_Cannot_Modify_Model.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Rental_Apply_Cannot_Modify_Model</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>NOT(ISBLANK(Rental_Apply_Equipment_Set_Detail__c)) && RepairSource__c = '澶囧搧淇悊' &&
Ischanged(Delivered_Product__c)</errorConditionFormula>
<errorDisplayField>Delivered_Product__c</errorDisplayField>
diff --git a/force-app/main/default/objects/Repair__c/validationRules/Repair_Allowed_Check.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/Repair_Allowed_Check.validationRule-meta.xml
index 46eb010..df5aac5 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/Repair_Allowed_Check.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/Repair_Allowed_Check.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Repair_Allowed_Check</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>text(if_Repair_Allowed__c ) = '涓嶅彲缁翠慨' && Not(ISBLANK( SAP_Transfer_day__c ) )</errorConditionFormula>
<errorDisplayField>if_Repair_Allowed__c</errorDisplayField>
<errorMessage>鏄惁鍙繘琛屼慨鐞嗙殑鍒ゅ畾鏄�滀笉鍙淮淇�濇椂锛屼笉鍏佽SAP鐢宠銆�</errorMessage>
diff --git a/force-app/main/default/objects/Repair__c/validationRules/Repair_Product_Input_Day.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/Repair_Product_Input_Day.validationRule-meta.xml
index d33152c..c8bb62d 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/Repair_Product_Input_Day.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/Repair_Product_Input_Day.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Repair_Product_Input_Day</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>$Profile.Id != '00e10000000Y3o5' /* 绯荤粺绠＄悊鍛� 涓嶆姤閿� */
&&
$Profile.Id != '00e10000000dEQx' /* GPI 绯荤粺绠＄悊鍛� 涓嶆姤閿� */
diff --git a/force-app/main/default/objects/Repair__c/validationRules/Repair_SalesOfficeCode.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/Repair_SalesOfficeCode.validationRule-meta.xml
index 7c78a76..d51c436 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/Repair_SalesOfficeCode.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/Repair_SalesOfficeCode.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Repair_SalesOfficeCode</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>OR($User.Id<>'00510000005sEEM',$User.Id<>'00510000000gT2R') && Delivered_Product__r.Product2.CanRepairAccsessary__c = True &&
Isblank(CompanyCodeOfEquipment__c)
&& Isblank(Delivered_Product__r.CompanyCodeOfEquipment__c) && TEXT(Status__c) = '鑽夋涓�'</errorConditionFormula>
diff --git a/force-app/main/default/objects/Repair__c/validationRules/Request_input_collect_money_date.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/Request_input_collect_money_date.validationRule-meta.xml
index 81c67a8..adf3da9 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/Request_input_collect_money_date.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/Request_input_collect_money_date.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Request_input_collect_money_date</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>AND(ISBLANK(Received_money_day_finacial_dapt__c),Confirmed_Collect_money__c=TRUE)</errorConditionFormula>
<errorMessage>璇疯緭鍏ュ埌娆炬棩</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Repair__c/validationRules/Request_input_mating_date.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/Request_input_mating_date.validationRule-meta.xml
index 4a14e50..d2030e2 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/Request_input_mating_date.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/Request_input_mating_date.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Request_input_mating_date</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>AND(ISBLANK(Recipt_mating_result__c),Confirmed_received_document__c=TRUE)</errorConditionFormula>
<errorMessage>璇疯緭鍏ュ崟鎹牳瀵圭粨鏋滄棩</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Repair__c/validationRules/RequireAWSDataId.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/RequireAWSDataId.validationRule-meta.xml
index 5d89b4b..e1677a9 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/RequireAWSDataId.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/RequireAWSDataId.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>RequireAWSDataId</fullName>
- <active>false</active>
+ <active>true</active>
<description>娌℃湁AWS_Data_Id__c鐨勬柊寤哄拰鏇存柊闇�瑕佹姤閿欙紝闃叉鏁版嵁娉勬紡</description>
<errorConditionFormula>ISBLANK(AWS_Data_Id__c) && ISNEW()</errorConditionFormula>
<errorMessage>娌℃湁AWS_Data_Id__c,淇悊闇�瑕佺粡杩嘝IPL鏀归�狅紝璇烽�氱煡绠＄悊鍛�</errorMessage>
diff --git a/force-app/main/default/objects/Repair__c/validationRules/RequireInternalAssetInfo.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/RequireInternalAssetInfo.validationRule-meta.xml
index b31516d..afa2869 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/RequireInternalAssetInfo.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/RequireInternalAssetInfo.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>RequireInternalAssetInfo</fullName>
- <active>false</active>
+ <active>true</active>
<description>淇悊鍙兘娑堣�楀搧鍌欏搧浠ュ銇�佹秷鑰楀搧鍌欏搧淇悊浠ュ銇�佸浐瀹氳祫浜х紪鍙凤紝韬彿锛屽鍝佹墍灞炲叕鍙革紝澶囧搧璧勪骇绠＄悊璐熻矗鐪併亴蹇呴爤</description>
<errorConditionFormula>$Profile.Id != '00e10000000dEQx' /* GPI_绯荤粺绠＄悊鍛� 涓嶆姤閿� */
&&
diff --git a/force-app/main/default/objects/Repair__c/validationRules/Return_without_Repair_Check.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/Return_without_Repair_Check.validationRule-meta.xml
index 096a7e5..06b6d27 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/Return_without_Repair_Check.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/Return_without_Repair_Check.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Return_without_Repair_Check</fullName>
- <active>false</active>
+ <active>true</active>
<description>鏈慨鐞嗚繑鍗淬伀銉併偋銉冦偗銈兂銇牬鍚堛伅銆佹湭淇悊杩斿嵈鐞嗙敱銇叆鍔涖亴蹇呴爤</description>
<errorConditionFormula>And(Return_Without_Repair__c = True, Len(Text(Return_Without_Repair_Reason__c )) = 0)</errorConditionFormula>
<errorMessage>鏈慨鐞嗚繑鍗寸悊鐢便倰閬告姙銇椼仸銇忋仩銇曘亜銆�</errorMessage>
diff --git a/force-app/main/default/objects/Repair__c/validationRules/Send_NFM103_Chk1.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/Send_NFM103_Chk1.validationRule-meta.xml
index d211b27..ac45f2e 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/Send_NFM103_Chk1.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/Send_NFM103_Chk1.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Send_NFM103_Chk1</fullName>
- <active>false</active>
+ <active>true</active>
<description>鐢宠淇悊鏃讹紝蹇呴』濉啓鏁呴殰鍙戠敓鎯呭喌 鍘熸潵鐨勬彁绀�20200331</description>
<errorConditionFormula>OR(
Text(Status__c)='1.鍙楃悊瀹屾瘯',
diff --git a/force-app/main/default/objects/Repair__c/validationRules/When_NFM103_Required.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/When_NFM103_Required.validationRule-meta.xml
index 2b33044..527b2a3 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/When_NFM103_Required.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/When_NFM103_Required.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>When_NFM103_Required</fullName>
- <active>false</active>
+ <active>true</active>
<description>NFM103閫佷俊鏅傘儊銈с儍銈�</description>
<errorConditionFormula>AND(OR(
Text(Status__c)='1.鍙楃悊瀹屾瘯',
diff --git a/force-app/main/default/objects/Repair__c/validationRules/When_NFM103_With_Repairing.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/When_NFM103_With_Repairing.validationRule-meta.xml
index c24c655..dc102e2 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/When_NFM103_With_Repairing.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/When_NFM103_With_Repairing.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>When_NFM103_With_Repairing</fullName>
- <active>false</active>
+ <active>true</active>
<description>2016/11/10 add condition
NOT(Delivered_Product__r.Product2.CanRepairAccsessary__c = true
&& text(Delivered_Product__r.Asset_Owner__c) <> "Olympus"
diff --git a/force-app/main/default/objects/Repair__c/validationRules/cannot_send_yanshoudan_before_return_ass.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/cannot_send_yanshoudan_before_return_ass.validationRule-meta.xml
index 300d55c..aa47e11 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/cannot_send_yanshoudan_before_return_ass.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/cannot_send_yanshoudan_before_return_ass.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>cannot_send_yanshoudan_before_return_ass</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>AND(
ISBLANK(Repair_Shipped_Date__c),
Request_yanshoudan_PDF__c = true)</errorConditionFormula>
diff --git a/force-app/main/default/objects/Repair__c/validationRules/date123_order_chk.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/date123_order_chk.validationRule-meta.xml
index b662390..dee89bb 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/date123_order_chk.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/date123_order_chk.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>date123_order_chk</fullName>
- <active>false</active>
+ <active>true</active>
<description>1.鏁呴殰鍙戠敓鏃�<=2.鏁呴殰鍝佹帴鏀舵棩<=3.淇悊鍝丷C棰勮瀵勯�佹棩</description>
<errorConditionFormula>$Profile.Id != '00e10000000dEQx' /* GPI_绯荤粺绠＄悊鍛� 涓嶆姤閿� */
&&
diff --git a/force-app/main/default/objects/Repair__c/validationRules/deleate_request.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/deleate_request.validationRule-meta.xml
index 24c4149..50be1ab 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/deleate_request.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/deleate_request.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>deleate_request</fullName>
- <active>false</active>
+ <active>true</active>
<description>璇疯緭鍏ュ垹闄ょ悊鐢�</description>
<errorConditionFormula>And(Request_repair__c = True, Len(deleate_reason__c) = 0)</errorConditionFormula>
<errorDisplayField>deleate_reason__c</errorDisplayField>
diff --git a/force-app/main/default/objects/Repair__c/validationRules/isCelon.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/isCelon.validationRule-meta.xml
index 9ea22f7..b03c5eb 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/isCelon.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/isCelon.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>isCelon</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>!ISBLANK( TEXT(Delivered_Product__r.Product2.Celon_Product__c))
&&
$User.Username !='buli@deloitte.com.cn'</errorConditionFormula>
diff --git a/force-app/main/default/objects/Repair__c/validationRules/work_location_Limit.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/work_location_Limit.validationRule-meta.xml
index 29b73a9..8daea8c 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/work_location_Limit.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/work_location_Limit.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>work_location_Limit</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>OR($User.Id<>'00510000005sEEM',$User.Id<>'00510000000gT2R') &&TEXT(work_location_select__c) = '鍖椾含鍔炰簨澶�' && TEXT(SalesOfficeCode_selection__c) ='鍖椾含鍏遍�氬姙浜嬪'</errorConditionFormula>
<errorMessage>缁翠慨涓績閫� 鈥滃寳浜姙浜嬪鈥濇椂锛屼慨鐞嗗搧杩旈�佸湴涓嶅彲浠ラ�� 鈥滃寳浜叡閫氬姙浜嬪鈥�</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Repair__c/validationRules/work_location_select_beipin.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/work_location_select_beipin.validationRule-meta.xml
index 78da246..43b6022 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/work_location_select_beipin.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/work_location_select_beipin.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>work_location_select_beipin</fullName>
- <active>false</active>
+ <active>true</active>
<description>澶囧搧缁翠慨鎵嶈兘閫夌ぞ鍐呭憳宸ヤ綔涓哄鎵樿��</description>
<errorConditionFormula>/* 涓嶆槸澶囧搧 浣嗘槸 鏈夊�� */
Not(Delivered_Product__r.RecordTypeId='01210000000kOPR')
diff --git a/force-app/main/default/objects/Repair__c/validationRules/work_location_select_self_or_4RC.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/work_location_select_self_or_4RC.validationRule-meta.xml
index c6cd28a..036be8f 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/work_location_select_self_or_4RC.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/work_location_select_self_or_4RC.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>work_location_select_self_or_4RC</fullName>
- <active>false</active>
+ <active>true</active>
<description>鍙楃悊鍔炰簨澶勫彧鑳介�夎嚜宸辩渷鍐呯殑鍔炰簨澶� 鎴� 鍥涘ぇRC</description>
<errorConditionFormula>$Profile.Id != '00e10000000dEQx' /* GPI_绯荤粺绠＄悊鍛� 涓嶆姤閿� */
&&
diff --git a/force-app/main/default/objects/Report__c/Report__c.object-meta.xml b/force-app/main/default/objects/Report__c/Report__c.object-meta.xml
index ed68f13..e1f3118 100644
--- a/force-app/main/default/objects/Report__c/Report__c.object-meta.xml
+++ b/force-app/main/default/objects/Report__c/Report__c.object-meta.xml
@@ -58,11 +58,13 @@
</actionOverrides>
<actionOverrides>
<actionName>Edit</actionName>
- <type>Default</type>
+ <content>LexReportPIPLAura</content>
+ <formFactor>Large</formFactor>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>LightningComponent</type>
</actionOverrides>
<actionOverrides>
<actionName>Edit</actionName>
- <formFactor>Large</formFactor>
<type>Default</type>
</actionOverrides>
<actionOverrides>
@@ -86,11 +88,13 @@
</actionOverrides>
<actionOverrides>
<actionName>New</actionName>
- <type>Default</type>
+ <content>LexReportPIPLAura</content>
+ <formFactor>Large</formFactor>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>LightningComponent</type>
</actionOverrides>
<actionOverrides>
<actionName>New</actionName>
- <formFactor>Large</formFactor>
<type>Default</type>
</actionOverrides>
<actionOverrides>
@@ -129,7 +133,7 @@
<actionOverrides>
<actionName>View</actionName>
<comment>Action override created by Lightning App Builder during activation.</comment>
- <content>FlexiPage11213345</content>
+ <content>FlexiPage10</content>
<formFactor>Large</formFactor>
<skipRecordTypeSelect>false</skipRecordTypeSelect>
<type>Flexipage</type>
@@ -137,7 +141,7 @@
<actionOverrides>
<actionName>View</actionName>
<comment>Action override created by Lightning App Builder during activation.</comment>
- <content>FlexiPage11213345</content>
+ <content>FlexiPage10</content>
<formFactor>Small</formFactor>
<skipRecordTypeSelect>false</skipRecordTypeSelect>
<type>Flexipage</type>
diff --git a/force-app/main/default/objects/Report__c/fields/HospitalAcceptancePerson__c.field-meta.xml b/force-app/main/default/objects/Report__c/fields/HospitalAcceptancePerson__c.field-meta.xml
index 5a0dbc6..3dbfe95 100644
--- a/force-app/main/default/objects/Report__c/fields/HospitalAcceptancePerson__c.field-meta.xml
+++ b/force-app/main/default/objects/Report__c/fields/HospitalAcceptancePerson__c.field-meta.xml
@@ -4,15 +4,6 @@
<deleteConstraint>SetNull</deleteConstraint>
<externalId>false</externalId>
<label>鍖婚櫌楠屾敹浜�</label>
- <lookupFilter>
- <active>true</active>
- <filterItems>
- <field>$Source.Hospital_Department__c</field>
- <operation>equals</operation>
- <valueField>Contact.Account.Id</valueField>
- </filterItems>
- <isOptional>true</isOptional>
- </lookupFilter>
<referenceTo>Contact</referenceTo>
<relationshipLabel>鎶ュ憡涔� (鍖婚櫌楠屾敹浜�)</relationshipLabel>
<relationshipName>HospitalAcceptancePerson</relationshipName>
diff --git a/force-app/main/default/objects/Report__c/fields/Hospital_Reference__c.field-meta.xml b/force-app/main/default/objects/Report__c/fields/Hospital_Reference__c.field-meta.xml
index 726986d..c28f015 100644
--- a/force-app/main/default/objects/Report__c/fields/Hospital_Reference__c.field-meta.xml
+++ b/force-app/main/default/objects/Report__c/fields/Hospital_Reference__c.field-meta.xml
@@ -9,7 +9,7 @@
<filterItems>
<field>Account.RecordType.Id</field>
<operation>equals</operation>
- <value>012C600000003HF,012C600000003HZ</value>
+ <value>01210000000Qem1,01210000000QemG</value>
</filterItems>
<isOptional>false</isOptional>
</lookupFilter>
diff --git a/force-app/main/default/objects/Report__c/fields/Loaner_request_no1__c.field-meta.xml b/force-app/main/default/objects/Report__c/fields/Loaner_request_no1__c.field-meta.xml
index fd22eed..f17b8b1 100644
--- a/force-app/main/default/objects/Report__c/fields/Loaner_request_no1__c.field-meta.xml
+++ b/force-app/main/default/objects/Report__c/fields/Loaner_request_no1__c.field-meta.xml
@@ -5,7 +5,7 @@
<externalId>false</externalId>
<label>鍊熷嚭澶囧搧鐢宠No1</label>
<lookupFilter>
- <active>false</active>
+ <active>true</active>
<filterItems>
<field>Rental_Apply__c.Bollow_Date__c</field>
<operation>notEqual</operation>
diff --git a/force-app/main/default/objects/Report__c/fields/Manual_Name__c.field-meta.xml b/force-app/main/default/objects/Report__c/fields/Manual_Name__c.field-meta.xml
index 9ae4caf..db9c6c0 100644
--- a/force-app/main/default/objects/Report__c/fields/Manual_Name__c.field-meta.xml
+++ b/force-app/main/default/objects/Report__c/fields/Manual_Name__c.field-meta.xml
@@ -2,7 +2,7 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Manual_Name__c</fullName>
<externalId>false</externalId>
- <inlineHelpText>If you have no customer access permissio</inlineHelpText>
+ <inlineHelpText>濡傛灉娌℃湁瀹㈡埛鏉冮檺鐨勮瘽锛岃杈撳叆涓�涓嬪尰闄�/绉戝鐨勫悕瀛�</inlineHelpText>
<label>鍖婚櫌/绉戝/缁忛攢鍟�(鎵嬪啓)</label>
<required>false</required>
<trackFeedHistory>false</trackFeedHistory>
diff --git a/force-app/main/default/objects/Report__c/fields/Submit_report_day__c.field-meta.xml b/force-app/main/default/objects/Report__c/fields/Submit_report_day__c.field-meta.xml
index 53b03d1..d84c718 100644
--- a/force-app/main/default/objects/Report__c/fields/Submit_report_day__c.field-meta.xml
+++ b/force-app/main/default/objects/Report__c/fields/Submit_report_day__c.field-meta.xml
@@ -2,7 +2,7 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Submit_report_day__c</fullName>
<externalId>false</externalId>
- <inlineHelpText>Last submission date</inlineHelpText>
+ <inlineHelpText>鏈�鍚庢彁浜ゆ棩鏈�</inlineHelpText>
<label>鎶ュ憡涔�-鎻愪氦鏃�</label>
<required>false</required>
<trackFeedHistory>false</trackFeedHistory>
diff --git a/force-app/main/default/objects/Report__c/fields/Technical_Category2__c.field-meta.xml b/force-app/main/default/objects/Report__c/fields/Technical_Category2__c.field-meta.xml
index 3545bab..c3f0e8d 100644
--- a/force-app/main/default/objects/Report__c/fields/Technical_Category2__c.field-meta.xml
+++ b/force-app/main/default/objects/Report__c/fields/Technical_Category2__c.field-meta.xml
@@ -1414,203 +1414,6 @@
</value>
</valueSetDefinition>
<valueSettings>
- <controllingFieldValue>鑳嗛亾闀滄鏌�</controllingFieldValue>
- <valueName>缁忕毊鑳嗛亾闀滄鏌�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鑳嗛亾闀滄不鐤�</controllingFieldValue>
- <valueName>鑳嗙鐙獎璇婃柇/娌荤枟</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鑳嗛亾闀滄不鐤�</controllingFieldValue>
- <valueName>鑳嗙鑲跨槫璇婃柇/娌荤枟</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鑳嗛亾闀滄不鐤�</controllingFieldValue>
- <valueName>鑳嗛亾铔旇櫕璇婃柇鍜屾不鐤�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鐢靛垏闀滄不鐤�</controllingFieldValue>
- <valueName>缁忓翱閬撹唨鑳遍鍒囧紑鏈�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鐢靛垏闀滄不鐤�</controllingFieldValue>
- <valueName>缁忓翱閬撳翱閬撳垏寮�鏈�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鐢靛垏闀滄不鐤�</controllingFieldValue>
- <valueName>缁忓翱閬撹唨鑳辫偪鐦ゅ垏闄ゆ湳</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鐢靛垏闀滄不鐤�</controllingFieldValue>
- <valueName>鎺ヨЕ寮忔縺鍏夎唨鑳辫偪鐦ゅ垏闄ゆ湳</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鐢靛垏闀滄不鐤�</controllingFieldValue>
- <valueName>缁忓翱閬撹唨鑳辩櫧鏂戝垏闄ゆ湳</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鐢靛垏闀滄不鐤�</controllingFieldValue>
- <valueName>缁忓翱閬撹吅鎬ц唨鑳辩値鍒囬櫎鏈�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鐢靛垏闀滄不鐤�</controllingFieldValue>
- <valueName>缁忓翱閬撹緭灏跨鍙ｈ啫鍑哄垏闄ゆ湳</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鐢靛垏闀滄不鐤�</controllingFieldValue>
- <valueName>缁忓翱閬撹唨鑳辩粨鐭崇鐭虫湳</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鐢靛垏闀滄不鐤�</controllingFieldValue>
- <valueName>缁忓翱閬撳墠鍒楄吅鐢靛垏鏈�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鐢靛垏闀滄不鐤�</controllingFieldValue>
- <valueName>缁忓翱閬撳墠鍒楄吅鐢垫苯鍖栧垏闄ゆ湳</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鐢靛垏闀滄不鐤�</controllingFieldValue>
- <valueName>缁忓翱閬撳墠鍒楄吅婵�鍏夊垏闄ゆ湳</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鐢靛垏闀滄不鐤�</controllingFieldValue>
- <valueName>缁忓翱閬撳墠鍒楄吅鍓滈櫎鏈�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鐢靛垏闀滄不鐤�</controllingFieldValue>
- <valueName>鍓嶅垪鑵烘敮鏋舵鍏ユ湳</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鑶�鑳遍暅妫�鏌�</controllingFieldValue>
- <valueName>鏅�氳唨鑳遍暅妫�鏌�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鑶�鑳遍暅妫�鏌�</controllingFieldValue>
- <valueName>鑶�鑳辫偪鐦ゃ�佺粨鐭炽�佸紓鐗╄瘖鏂�/娌荤枟</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鑶�鑳遍暅妫�鏌�</controllingFieldValue>
- <valueName>灏块亾鑲跨槫銆佺粨鐭炽�佸紓鐗╄瘖鏂�/娌荤枟</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鑶�鑳遍暅妫�鏌�</controllingFieldValue>
- <valueName>涓婂翱璺柧鐥呰瘖鏂�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>杈撳翱绠￠暅娌荤枟</controllingFieldValue>
- <valueName>杈撳翱绠￠暅纰庣煶鎵嬫湳</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>杈撳翱绠￠暅娌荤枟</controllingFieldValue>
- <valueName>杈撳翱绠″唴鍒囧紑鏈�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>杈撳翱绠￠暅娌荤枟</controllingFieldValue>
- <valueName>杈撳翱绠″紓鐗╁彇鍑烘湳</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>缁忕毊鑲鹃暅娌荤枟</controllingFieldValue>
- <valueName>缁忕毊鑲鹃暅纰庣煶鎵嬫湳</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鍏朵粬锛堟硨灏匡級</controllingFieldValue>
- <valueName>缁撶煶娌荤枟鍏朵粬</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鍏朵粬锛堟硨灏匡級</controllingFieldValue>
- <valueName>鍐峰喕娑堣瀺鎶�鏈�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鍏朵粬锛堟硨灏匡級</controllingFieldValue>
- <valueName>灏勯娑堣瀺鎶�鏈�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鍏朵粬锛堟硨灏匡級</controllingFieldValue>
- <valueName>鑶�鑳遍�犵槝</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鍏朵粬锛堟硨灏匡級</controllingFieldValue>
- <valueName>楂樺己搴﹁仛闆嗚秴澹�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鍏朵粬锛堟硨灏匡級</controllingFieldValue>
- <valueName>鏀惧皠绮掑瓙缃叆娌荤枟鍓嶅垪鑵虹檶</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鍏朵粬锛堟硨灏匡級</controllingFieldValue>
- <valueName>鍏朵粬</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>瀹厰闀滄不鐤�</controllingFieldValue>
- <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
- <valueName>瀹�佽吂鑵旈暅杈撳嵉绠℃彃绠�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>瀹厰闀滄不鐤�</controllingFieldValue>
- <valueName>瀹厰闀滃瓙瀹唴鑶滃垏锛堝幓锛夐櫎鏈�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>瀹厰闀滄不鐤�</controllingFieldValue>
- <valueName>瀹厰闀滃瓙瀹矘鑶滀笅鑲岀槫鍒囬櫎鏈�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>瀹厰闀滄不鐤�</controllingFieldValue>
- <valueName>瀹厰闀滃唴鑶滄伅鑲夊垏闄ゆ湳</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>瀹厰闀滄不鐤�</controllingFieldValue>
- <valueName>瀹厰闀滃瓙瀹旱闅斿垏闄ゆ湳</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>瀹厰闀滄不鐤�</controllingFieldValue>
- <valueName>瀹厰闀滃鑵旂矘杩炲垏闄ゆ湳</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>瀹厰闀滄不鐤�</controllingFieldValue>
- <valueName>瀹厰闀滃瓙瀹紓鐗╁彇鍑烘湳</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>瀹厰闀滄不鐤�</controllingFieldValue>
- <valueName>瀹厰闀滃瓙瀹厰鍒囧紑鏈�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>瀹厰闀滄不鐤�</controllingFieldValue>
- <valueName>瀹厰闀滃瓙瀹娲绘鏈�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>瀹厰闀滄不鐤�</controllingFieldValue>
- <valueName>瀹厰闀滃棰堢梾鍙樺垏闄ゆ湳</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>瀹厰闀滄不鐤�</controllingFieldValue>
- <valueName>瀹厰闀滅壒娈婃不鐤�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>瀹厰闀滆瘖鏂�</controllingFieldValue>
- <valueName>瀹厰闀滄鏌�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>瀹厰闀滆瘖鏂�</controllingFieldValue>
- <valueName>瀹厰闀滃紓甯稿瓙瀹嚭琛�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>瀹厰闀滆瘖鏂�</controllingFieldValue>
- <valueName>瀹厰闀滀笉瀛曠棁</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>瀹厰闀滆瘖鏂�</controllingFieldValue>
- <valueName>瀹厰闀滃瓙瀹暩褰�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>瀹厰闀滆瘖鏂�</controllingFieldValue>
- <valueName>瀹厰闀滃鑵斿唴寮傜墿</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>瀹厰闀滆瘖鏂�</controllingFieldValue>
- <valueName>瀹厰闀滃瓙瀹唴鑶滅檶</valueName>
- </valueSettings>
- <valueSettings>
<controllingFieldValue>闃撮亾闀滄鏌�</controllingFieldValue>
<valueName>闃撮亾闀滃棰堢硿鐑�</valueName>
</valueSettings>
@@ -1629,26 +1432,6 @@
<valueSettings>
<controllingFieldValue>闃撮亾闀滄鏌�</controllingFieldValue>
<valueName>闃撮亾闀滃棰堢檶绛涙煡</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鏀皵绠￠暅涓嬫椿妫�鎶�鏈�</controllingFieldValue>
- <valueName>鐩存帴閽冲彇</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鏀皵绠￠暅涓嬫椿妫�鎶�鏈�</controllingFieldValue>
- <valueName>TBLB</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鏀皵绠￠暅涓嬫椿妫�鎶�鏈�</controllingFieldValue>
- <valueName>閽堝惛娲绘锛圱BNA锛�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鏀皵绠￠暅涓嬫椿妫�鎶�鏈�</controllingFieldValue>
- <valueName>鐩存帴姣涘埛</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鏀皵绠￠暅涓嬫椿妫�鎶�鏈�</controllingFieldValue>
- <valueName>PSB</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>闃村紡鎵嬫湳</controllingFieldValue>
@@ -1679,78 +1462,6 @@
<valueName>闃村紡瀛愬娆″叏鍒囬櫎</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鏀皵绠￠暅涓嬫不鐤楁妧鏈�</controllingFieldValue>
- <valueName>鏀皵绠￠暅涓嬫伅鑲夊垏闄�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鏀皵绠￠暅涓嬫不鐤楁妧鏈�</controllingFieldValue>
- <valueName>鏀皵绠￠暅涓嬮珮棰戠數鐑ф湳</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鏀皵绠￠暅涓嬫不鐤楁妧鏈�</controllingFieldValue>
- <valueName>鏀皵绠￠暅涓嬪喎鍐绘湳</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鏀皵绠￠暅涓嬫不鐤楁妧鏈�</controllingFieldValue>
- <valueName>鏀皵绠￠暅涓嬬悆鍥婃墿寮犳湳</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鏀皵绠￠暅涓嬫不鐤楁妧鏈�</controllingFieldValue>
- <valueName>鏀皵绠￠暅涓嬩粙鍏ユ皵閬撹厰鍐呭悗瑁呮斁鐤�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鏀皵绠￠暅涓嬫不鐤楁妧鏈�</controllingFieldValue>
- <valueName>鏀皵绠￠暅涓嬫敮鏋剁疆鍏ユ湳</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鏀皵绠￠暅涓嬫不鐤楁妧鏈�</controllingFieldValue>
- <valueName>鏀皵绠￠暅鑲烘场鐏屾礂鏈紙BAL锛�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鏀皵绠￠暅涓嬫不鐤楁妧鏈�</controllingFieldValue>
- <valueName>鏀皵绠￠暅涓嬫縺鍏�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鏀皵绠￠暅涓嬫不鐤楁妧鏈�</controllingFieldValue>
- <valueName>鏀皵绠￠暅涓嬪紓鐗╁彇鍑�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鏀皵绠￠暅涓嬫不鐤楁妧鏈�</controllingFieldValue>
- <valueName>鏀皵绠￠暅涓嬬壒娈婂叾浠栨不鐤�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鏀皵绠￠暅涓嬫不鐤楁妧鏈�</controllingFieldValue>
- <valueName>鏀皵绠＄儹鏁村舰鏈�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鍏朵粬锛堝绉戯級</controllingFieldValue>
- <valueName>鏃犲紶鍔涢槾閬撳悐甯︽湳(TVT锛�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鍏朵粬锛堝绉戯級</controllingFieldValue>
- <valueName>缁忛棴瀛旂粡闃撮亾鏃犲紶鍔涘翱閬撲腑娈垫偓鍚婃湳(TVT-O)</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鏀皵绠￠暅涓嬫琛�</controllingFieldValue>
- <valueName>鏀皵绠￠暅涓嬫癌绛夌瀛愪綋鍑濆浐鏈�(APC)</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鏀皵绠￠暅涓嬫琛�</controllingFieldValue>
- <valueName>鍐扮洂姘寸亴娉�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鏀皵绠￠暅涓嬫琛�</controllingFieldValue>
- <valueName>鑲句笂鑵虹礌灞�閮ㄥ簲鐢�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鏀皵绠￠暅涓嬫琛�</controllingFieldValue>
- <valueName>鍑濊閰�/绔嬫琛�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鏀皵绠￠暅涓嬫琛�</controllingFieldValue>
- <valueName>鍙岃厰鐞冨泭鍘嬭揩姝㈣</valueName>
- </valueSettings>
- <valueSettings>
<controllingFieldValue>鑰抽蓟鍠夋鏌�</controllingFieldValue>
<valueName>榧诲捊鍠夐暅妫�鏌�</valueName>
</valueSettings>
@@ -1771,56 +1482,52 @@
<valueName>姘旂鎻掔</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鐗规畩鏀皵绠￠暅鎶�鏈�</controllingFieldValue>
- <valueName>鑽у厜鏀皵绠￠暅AFI</valueName>
+ <controllingFieldValue>娑堝寲閬撴鏌�</controllingFieldValue>
+ <valueName>鏅�氳儍闀滄鏌�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鐗规畩鏀皵绠￠暅鎶�鏈�</controllingFieldValue>
- <valueName>绐勫甫鎴愬儚鏀皵绠￠暅锛圢BI锛�</valueName>
+ <controllingFieldValue>娑堝寲閬撴鏌�</controllingFieldValue>
+ <valueName>NBI鑳冮暅妫�鏌�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鐗规畩鏀皵绠￠暅鎶�鏈�</controllingFieldValue>
- <valueName>瓒呭０鏀皵绠￠暅(EBUS-TBNA)</valueName>
+ <controllingFieldValue>娑堝寲閬撴鏌�</controllingFieldValue>
+ <valueName>缁忛蓟鑳冮暅妫�鏌�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鐗规畩鏀皵绠￠暅鎶�鏈�</controllingFieldValue>
- <valueName>EBUS-GS</valueName>
+ <controllingFieldValue>娑堝寲閬撴鏌�</controllingFieldValue>
+ <valueName>鏅�氬崄浜岃偁闀滄鏌�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鐗规畩鏀皵绠￠暅鎶�鏈�</controllingFieldValue>
- <valueName>鏃犵棝鏀皵绠￠暅妫�鏌�</valueName>
+ <controllingFieldValue>娑堝寲閬撴鏌�</controllingFieldValue>
+ <valueName>鏅�氳偁闀滄鏌�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鐗规畩鏀皵绠￠暅鎶�鏈�</controllingFieldValue>
- <valueName>鏀皵绠￠暅涓嬫皵绠℃彃绠�</valueName>
+ <controllingFieldValue>娑堝寲閬撴鏌�</controllingFieldValue>
+ <valueName>NBI鑲犻暅妫�鏌�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鑰抽蓟鍠夋不鐤�</controllingFieldValue>
- <valueName>榧绘伅鑲夊垏闄�</valueName>
+ <controllingFieldValue>灏忚偁閬撴妧鏈�</controllingFieldValue>
+ <valueName>鍙屾皵鍥婂皬鑲犻暅鎿嶄綔</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鑰抽蓟鍠夋不鐤�</controllingFieldValue>
- <valueName>榧讳腑闅旂煫姝�</valueName>
+ <controllingFieldValue>灏忚偁閬撴妧鏈�</controllingFieldValue>
+ <valueName>鍗曟皵鍥婂皬鑲犻暅鎿嶄綔</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鑰抽蓟鍠夋不鐤�</controllingFieldValue>
- <valueName>榧诲捊鍠夐暅涓嬪紓鐗╁彇鍑烘湳</valueName>
+ <controllingFieldValue>灏忚偁閬撴妧鏈�</controllingFieldValue>
+ <valueName>鍐呴暅涓嬪皬鑲犺惀鍏荤鏀剧疆</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鑰抽蓟鍠夋不鐤�</controllingFieldValue>
- <valueName>鍏朵粬榧诲捊鍠夋不鐤�</valueName>
+ <controllingFieldValue>鏀皵绠￠暅妫�鏌�</controllingFieldValue>
+ <valueName>鏀皵绠￠暅妫�鏌�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鍐呯鑳歌厰闀滄鏌�</controllingFieldValue>
- <valueName>鍐呯鑳歌厰闀滄鏌�</valueName>
+ <controllingFieldValue>鏀皵绠￠暅妫�鏌�</controllingFieldValue>
+ <valueName>鏀皵绠￠暅NBI妫�鏌�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鍐呯鑳歌厰闀滄鏌�</controllingFieldValue>
- <valueName>鑳歌啘娲绘</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鍐呯鑳歌厰闀滄鏌�</controllingFieldValue>
- <valueName>鑳歌啘绮樿繛鏈�</valueName>
+ <controllingFieldValue>鏀皵绠￠暅妫�鏌�</controllingFieldValue>
+ <valueName>鏀皵绠￠暅AFI妫�鏌�</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>鑳歌厰闀滄不鐤�</controllingFieldValue>
@@ -1837,6 +1544,26 @@
<valueSettings>
<controllingFieldValue>鑳歌厰闀滄不鐤�</controllingFieldValue>
<valueName>鑳歌厰闀滄墜鏈叾浠�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鑳嗛亾闀滄鏌�</controllingFieldValue>
+ <valueName>缁忕毊鑳嗛亾闀滄鏌�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鑰抽蓟鍠夋不鐤�</controllingFieldValue>
+ <valueName>榧绘伅鑲夊垏闄�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鑰抽蓟鍠夋不鐤�</controllingFieldValue>
+ <valueName>榧讳腑闅旂煫姝�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鑰抽蓟鍠夋不鐤�</controllingFieldValue>
+ <valueName>榧诲捊鍠夐暅涓嬪紓鐗╁彇鍑烘湳</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鑰抽蓟鍠夋不鐤�</controllingFieldValue>
+ <valueName>鍏朵粬榧诲捊鍠夋不鐤�</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>寮�鑵规墜鏈不鐤楋紙鏅锛�</controllingFieldValue>
@@ -1936,128 +1663,60 @@
<valueName>鑵硅啘鍚庢穻宸寸粨娓呮壂鏈�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
- <valueName>绮剧储闈欒剦鏇插紶楂樹綅缁撴墡鏈�</valueName>
+ <controllingFieldValue>鏀皵绠￠暅涓嬫琛�</controllingFieldValue>
+ <valueName>鏀皵绠￠暅涓嬫癌绛夌瀛愪綋鍑濆浐鏈�(APC)</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
- <valueName>鑲惧泭鑲垮幓椤舵湳</valueName>
+ <controllingFieldValue>鏀皵绠￠暅涓嬫琛�</controllingFieldValue>
+ <valueName>鍐扮洂姘寸亴娉�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
- <valueName>鍗曠函鑲惧垏闄ゆ湳</valueName>
+ <controllingFieldValue>鏀皵绠￠暅涓嬫琛�</controllingFieldValue>
+ <valueName>鑲句笂鑵虹礌灞�閮ㄥ簲鐢�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
- <valueName>鑲剧檶鏍规不鏈�</valueName>
+ <controllingFieldValue>鏀皵绠￠暅涓嬫琛�</controllingFieldValue>
+ <valueName>鍑濊閰�/绔嬫琛�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
- <valueName>鑲鹃儴鍒嗗垏闄ゆ湳</valueName>
+ <controllingFieldValue>鏀皵绠￠暅涓嬫琛�</controllingFieldValue>
+ <valueName>鍙岃厰鐞冨泭鍘嬭揩姝㈣</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
- <valueName>杈撳翱绠″垏寮�鍙栫煶鏈�</valueName>
+ <controllingFieldValue>鐗规畩鏀皵绠￠暅鎶�鏈�</controllingFieldValue>
+ <valueName>鑽у厜鏀皵绠￠暅AFI</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
- <valueName>鑲剧泜鎴愬舰鏈�</valueName>
+ <controllingFieldValue>鐗规畩鏀皵绠￠暅鎶�鏈�</controllingFieldValue>
+ <valueName>绐勫甫鎴愬儚鏀皵绠￠暅锛圢BI锛�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
- <valueName>鏍规不鎬ц偩銆佽緭灏跨鍏ㄩ暱鍒囬櫎鏈�</valueName>
+ <controllingFieldValue>鐗规畩鏀皵绠￠暅鎶�鏈�</controllingFieldValue>
+ <valueName>瓒呭０鏀皵绠￠暅(EBUS-TBNA)</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
- <valueName>鑲句笂鑵鸿偪鐗╁垏闄ゆ湳</valueName>
+ <controllingFieldValue>鐗规畩鏀皵绠￠暅鎶�鏈�</controllingFieldValue>
+ <valueName>EBUS-GS</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
- <valueName>鏍规不鎬у墠鍒楄吅鐧屽垏闄ゆ湳</valueName>
+ <controllingFieldValue>鐗规畩鏀皵绠￠暅鎶�鏈�</controllingFieldValue>
+ <valueName>鏃犵棝鏀皵绠￠暅妫�鏌�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
- <valueName>鏍规不鎬ц唨鑳卞叏鍒囥�佸洖鑲犺唨鑳辨湳</valueName>
+ <controllingFieldValue>鐗规畩鏀皵绠￠暅鎶�鏈�</controllingFieldValue>
+ <valueName>鏀皵绠￠暅涓嬫皵绠℃彃绠�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
- <valueName>闅愮澗鎺㈡煡鏈�</valueName>
+ <controllingFieldValue>鍐呯鑳歌厰闀滄鏌�</controllingFieldValue>
+ <valueName>鍐呯鑳歌厰闀滄鏌�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
- <valueName>娲讳綋渚涜偩鍒囧彇鏈�</valueName>
+ <controllingFieldValue>鍐呯鑳歌厰闀滄鏌�</controllingFieldValue>
+ <valueName>鑳歌啘娲绘</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
- <valueName>鑲炬敮鏋剁疆鍏ユ湳</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
- <valueName>鐩嗚厰娣嬪反缁撴椿妫�/娓呮壂鏈�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
- <valueName>杈撳嵉绠″惢鍚堟湳</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
- <valueName>鐩嗚厰鑴撹偪鎵嬫湳</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
- <valueName>鍗靛发鍥婅偪鍓ラ櫎</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
- <valueName>瀛愬鑲岀槫鍓旈櫎鏈�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
- <valueName>娆″叏瀛愬鍒囬櫎鏈�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
- <valueName>绛嬭啘鍐呭瓙瀹垏闄�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
- <valueName>鍏ㄥ瓙瀹垏闄ゆ湳</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
- <valueName>淇濈暀琛�绠″瓙瀹垏闄ゆ湳</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
- <valueName>骞挎硾鍏ㄥ瓙瀹垏闄�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
- <valueName>鐩嗚厰娣嬪反鍒囬櫎鏈�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
- <valueName>鑵逛富鍔ㄨ剦鏃佹穻宸寸粨鍒囨湳</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
- <valueName>涓嬮槾閬撳欢闀挎湳</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
- <valueName>鍗靛发绉讳綅</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
- <valueName>瀛愬绾甸殧鍒囧紑鏈�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
- <valueName>瀛愬鍐呰啘寮備綅鐥�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
- <valueName>瀛愬闄勪欢鍒囬櫎鏈�</valueName>
+ <controllingFieldValue>鍐呯鑳歌厰闀滄鏌�</controllingFieldValue>
+ <valueName>鑳歌啘绮樿繛鏈�</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙鏅锛�</controllingFieldValue>
@@ -2188,28 +1847,409 @@
<valueName>NOTES</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>娑堝寲閬撴鏌�</controllingFieldValue>
- <valueName>鏅�氳儍闀滄鏌�</valueName>
+ <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
+ <valueName>绮剧储闈欒剦鏇插紶楂樹綅缁撴墡鏈�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>娑堝寲閬撴鏌�</controllingFieldValue>
- <valueName>NBI鑳冮暅妫�鏌�</valueName>
+ <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
+ <valueName>鑲惧泭鑲垮幓椤舵湳</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>娑堝寲閬撴鏌�</controllingFieldValue>
- <valueName>缁忛蓟鑳冮暅妫�鏌�</valueName>
+ <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
+ <valueName>鍗曠函鑲惧垏闄ゆ湳</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>娑堝寲閬撴鏌�</controllingFieldValue>
- <valueName>鏅�氬崄浜岃偁闀滄鏌�</valueName>
+ <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
+ <valueName>鑲剧檶鏍规不鏈�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>娑堝寲閬撴鏌�</controllingFieldValue>
- <valueName>鏅�氳偁闀滄鏌�</valueName>
+ <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
+ <valueName>鑲鹃儴鍒嗗垏闄ゆ湳</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>娑堝寲閬撴鏌�</controllingFieldValue>
- <valueName>NBI鑲犻暅妫�鏌�</valueName>
+ <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
+ <valueName>杈撳翱绠″垏寮�鍙栫煶鏈�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
+ <valueName>鑲剧泜鎴愬舰鏈�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
+ <valueName>鏍规不鎬ц偩銆佽緭灏跨鍏ㄩ暱鍒囬櫎鏈�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
+ <valueName>鑲句笂鑵鸿偪鐗╁垏闄ゆ湳</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
+ <valueName>鏍规不鎬у墠鍒楄吅鐧屽垏闄ゆ湳</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
+ <valueName>鏍规不鎬ц唨鑳卞叏鍒囥�佸洖鑲犺唨鑳辨湳</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
+ <valueName>闅愮澗鎺㈡煡鏈�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
+ <valueName>娲讳綋渚涜偩鍒囧彇鏈�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
+ <valueName>鑲炬敮鏋剁疆鍏ユ湳</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鑳嗛亾闀滄不鐤�</controllingFieldValue>
+ <valueName>鑳嗙鐙獎璇婃柇/娌荤枟</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鑳嗛亾闀滄不鐤�</controllingFieldValue>
+ <valueName>鑳嗙鑲跨槫璇婃柇/娌荤枟</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鑳嗛亾闀滄不鐤�</controllingFieldValue>
+ <valueName>鑳嗛亾铔旇櫕璇婃柇鍜屾不鐤�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
+ <valueName>鐩嗚厰娣嬪反缁撴椿妫�/娓呮壂鏈�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
+ <valueName>杈撳嵉绠″惢鍚堟湳</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
+ <valueName>鐩嗚厰鑴撹偪鎵嬫湳</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
+ <valueName>鍗靛发鍥婅偪鍓ラ櫎</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
+ <valueName>瀛愬鑲岀槫鍓旈櫎鏈�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
+ <valueName>娆″叏瀛愬鍒囬櫎鏈�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
+ <valueName>绛嬭啘鍐呭瓙瀹垏闄�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
+ <valueName>鍏ㄥ瓙瀹垏闄ゆ湳</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
+ <valueName>淇濈暀琛�绠″瓙瀹垏闄ゆ湳</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
+ <valueName>骞挎硾鍏ㄥ瓙瀹垏闄�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
+ <valueName>鐩嗚厰娣嬪反鍒囬櫎鏈�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
+ <valueName>鑵逛富鍔ㄨ剦鏃佹穻宸寸粨鍒囨湳</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
+ <valueName>涓嬮槾閬撳欢闀挎湳</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
+ <valueName>鍗靛发绉讳綅</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
+ <valueName>瀛愬绾甸殧鍒囧紑鏈�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
+ <valueName>瀛愬鍐呰啘寮備綅鐥�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>寮�鑵规墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
+ <valueName>瀛愬闄勪欢鍒囬櫎鏈�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鐢靛垏闀滄不鐤�</controllingFieldValue>
+ <valueName>缁忓翱閬撹唨鑳遍鍒囧紑鏈�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鐢靛垏闀滄不鐤�</controllingFieldValue>
+ <valueName>缁忓翱閬撳翱閬撳垏寮�鏈�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鐢靛垏闀滄不鐤�</controllingFieldValue>
+ <valueName>缁忓翱閬撹唨鑳辫偪鐦ゅ垏闄ゆ湳</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鐢靛垏闀滄不鐤�</controllingFieldValue>
+ <valueName>鎺ヨЕ寮忔縺鍏夎唨鑳辫偪鐦ゅ垏闄ゆ湳</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鐢靛垏闀滄不鐤�</controllingFieldValue>
+ <valueName>缁忓翱閬撹唨鑳辩櫧鏂戝垏闄ゆ湳</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鐢靛垏闀滄不鐤�</controllingFieldValue>
+ <valueName>缁忓翱閬撹吅鎬ц唨鑳辩値鍒囬櫎鏈�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鐢靛垏闀滄不鐤�</controllingFieldValue>
+ <valueName>缁忓翱閬撹緭灏跨鍙ｈ啫鍑哄垏闄ゆ湳</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鐢靛垏闀滄不鐤�</controllingFieldValue>
+ <valueName>缁忓翱閬撹唨鑳辩粨鐭崇鐭虫湳</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鐢靛垏闀滄不鐤�</controllingFieldValue>
+ <valueName>缁忓翱閬撳墠鍒楄吅鐢靛垏鏈�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鐢靛垏闀滄不鐤�</controllingFieldValue>
+ <valueName>缁忓翱閬撳墠鍒楄吅鐢垫苯鍖栧垏闄ゆ湳</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鐢靛垏闀滄不鐤�</controllingFieldValue>
+ <valueName>缁忓翱閬撳墠鍒楄吅婵�鍏夊垏闄ゆ湳</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鐢靛垏闀滄不鐤�</controllingFieldValue>
+ <valueName>缁忓翱閬撳墠鍒楄吅鍓滈櫎鏈�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鐢靛垏闀滄不鐤�</controllingFieldValue>
+ <valueName>鍓嶅垪鑵烘敮鏋舵鍏ユ湳</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
+ <valueName>鑵硅厰闀滀笅鑲惧泭鑲垮幓椤舵湳</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
+ <valueName>鑵硅厰闀滀笅鍗曠函鑲惧垏闄ゆ湳</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
+ <valueName>鑵硅厰闀滀笅鑲剧檶鏍规不鏈�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
+ <valueName>鑵硅厰闀滀笅鑲鹃儴鍒嗗垏闄ゆ湳</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
+ <valueName>鑵硅厰闀滀笅杈撳翱绠″垏寮�鍙栫煶鏈�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
+ <valueName>鑵硅厰闀滀笅鑲剧泜鎴愬舰鏈�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
+ <valueName>鑵硅厰闀滀笅鏍规不鎬ц偩銆佽緭灏跨鍏ㄩ暱鍒囬櫎鏈�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
+ <valueName>鑵硅厰闀滀笅鑲句笂鑵鸿偪鐗╁垏闄ゆ湳</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
+ <valueName>鑵硅厰闀滀笅鏍规不鎬у墠鍒楄吅鐧屽垏闄ゆ湳</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
+ <valueName>鑵硅厰闀滀笅鏍规不鎬ц唨鑳卞叏鍒囥�佸洖鑲犺唨鑳辨湳</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
+ <valueName>鑵硅厰闀滀笅闅愮澗鎺㈡煡鏈�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
+ <valueName>鑵硅厰闀滀笅鑲炬敮鏋剁疆鍏ユ湳</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
+ <valueName>鑵硅厰闀滀笅娲讳綋渚涜偩鍒囧彇鏈�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
+ <valueName>鑵硅厰闀滀笅鑵硅啘鍚庢穻宸寸粨娓呮壂鏈�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
+ <valueName>鑵硅厰闀滀笅鐩嗚厰娣嬪反缁撴椿妫�/娓呮壂鏈�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
+ <valueName>娉屽翱鑵硅厰闀滃叾浠�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鑶�鑳遍暅妫�鏌�</controllingFieldValue>
+ <valueName>鏅�氳唨鑳遍暅妫�鏌�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鑶�鑳遍暅妫�鏌�</controllingFieldValue>
+ <valueName>鑶�鑳辫偪鐦ゃ�佺粨鐭炽�佸紓鐗╄瘖鏂�/娌荤枟</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鑶�鑳遍暅妫�鏌�</controllingFieldValue>
+ <valueName>灏块亾鑲跨槫銆佺粨鐭炽�佸紓鐗╄瘖鏂�/娌荤枟</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鑶�鑳遍暅妫�鏌�</controllingFieldValue>
+ <valueName>涓婂翱璺柧鐥呰瘖鏂�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
+ <controllingFieldValue>瀹厰闀滄不鐤�</controllingFieldValue>
+ <valueName>瀹�佽吂鑵旈暅杈撳嵉绠℃彃绠�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
+ <valueName>鑵硅厰闀滆緭鍗电鍚诲悎鏈�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
+ <valueName>鑵硅厰闀滅泦鑵旇創鑲挎墜鏈�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
+ <valueName>寮備綅濡婂</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
+ <valueName>鑵硅厰闀滃嵉宸㈠泭鑲垮墺闄�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
+ <valueName>鑵硅厰闀滃瓙瀹倢鐦ゅ墧闄ゆ湳</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
+ <valueName>鑵硅厰闀滄鍏ㄥ瓙瀹垏闄ゆ湳</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
+ <valueName>鑵硅厰闀滅瓔鑶滃唴瀛愬鍒囬櫎</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
+ <valueName>鑵硅厰闀滃叏瀛愬鍒囬櫎鏈�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
+ <valueName>鑵硅厰闀滀繚鐣欒绠″瓙瀹垏闄ゆ湳</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
+ <valueName>鑵硅厰闀滃箍娉涘叏瀛愬鍒囬櫎</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
+ <valueName>鑵硅厰闀滅泦鑵旀穻宸村垏闄ゆ湳</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
+ <valueName>鑵硅厰闀滆吂涓诲姩鑴夋梺娣嬪反缁撳垏鏈�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
+ <valueName>鑵硅厰闀滀笅闃撮亾寤堕暱鏈�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
+ <valueName>鑵硅厰闀滃嵉宸㈢Щ浣�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
+ <valueName>鑵硅厰闀滄帰鏌ユ湳</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
+ <valueName>濡囩鑵硅厰闀滃叾浠�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
+ <valueName>鑵硅厰闀滃瓙瀹旱闅斿垏寮�鏈�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
+ <valueName>鑵硅厰闀滃瓙瀹唴鑶滃紓浣嶇棁</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
+ <valueName>鑵硅厰闀滃瓙瀹檮浠跺垏闄ゆ湳</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
+ <valueName>鍙岄暅鑱斿悎鑵硅厰闀滄墜鏈紙濡囩锛�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>杈撳翱绠￠暅娌荤枟</controllingFieldValue>
+ <valueName>杈撳翱绠￠暅纰庣煶鎵嬫湳</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>杈撳翱绠￠暅娌荤枟</controllingFieldValue>
+ <valueName>杈撳翱绠″唴鍒囧紑鏈�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>杈撳翱绠￠暅娌荤枟</controllingFieldValue>
+ <valueName>杈撳翱绠″紓鐗╁彇鍑烘湳</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鍏朵粬锛堝绉戯級</controllingFieldValue>
+ <valueName>鏃犲紶鍔涢槾閬撳悐甯︽湳(TVT锛�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鍏朵粬锛堝绉戯級</controllingFieldValue>
+ <valueName>缁忛棴瀛旂粡闃撮亾鏃犲紶鍔涘翱閬撲腑娈垫偓鍚婃湳(TVT-O)</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>缁忕毊鑲鹃暅娌荤枟</controllingFieldValue>
+ <valueName>缁忕毊鑲鹃暅纰庣煶鎵嬫湳</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鍏朵粬锛堟硨灏匡級</controllingFieldValue>
+ <valueName>缁撶煶娌荤枟鍏朵粬</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鍏朵粬锛堟硨灏匡級</controllingFieldValue>
+ <valueName>鍐峰喕娑堣瀺鎶�鏈�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鍏朵粬锛堟硨灏匡級</controllingFieldValue>
+ <valueName>灏勯娑堣瀺鎶�鏈�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鍏朵粬锛堟硨灏匡級</controllingFieldValue>
+ <valueName>鑶�鑳遍�犵槝</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鍏朵粬锛堟硨灏匡級</controllingFieldValue>
+ <valueName>楂樺己搴﹁仛闆嗚秴澹�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鍏朵粬锛堟硨灏匡級</controllingFieldValue>
+ <valueName>鏀惧皠绮掑瓙缃叆娌荤枟鍓嶅垪鑵虹檶</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>鍏朵粬锛堟硨灏匡級</controllingFieldValue>
+ <valueName>鍏朵粬</valueName>
</valueSettings>
<valueSettings>
<controllingFieldValue>娑堝寲閬撴不鐤�</controllingFieldValue>
@@ -2292,18 +2332,6 @@
<valueName>鍐呴暅涓嬫秷鍖栭亾鏀灦缃叆鏈�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>灏忚偁閬撴妧鏈�</controllingFieldValue>
- <valueName>鍙屾皵鍥婂皬鑲犻暅鎿嶄綔</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>灏忚偁閬撴妧鏈�</controllingFieldValue>
- <valueName>鍗曟皵鍥婂皬鑲犻暅鎿嶄綔</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>灏忚偁閬撴妧鏈�</controllingFieldValue>
- <valueName>鍐呴暅涓嬪皬鑲犺惀鍏荤鏀剧疆</valueName>
- </valueSettings>
- <valueSettings>
<controllingFieldValue>鑳拌儐绯荤粺娌荤枟(ERCP)</controllingFieldValue>
<valueName>鑳拌儐绠￠�嗚閫犲奖ERCP</valueName>
</valueSettings>
@@ -2364,160 +2392,132 @@
<valueName>鑳拌儐绠¤秴澹� IDUS</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鏀皵绠￠暅妫�鏌�</controllingFieldValue>
- <valueName>鏀皵绠￠暅妫�鏌�</valueName>
+ <controllingFieldValue>鏀皵绠￠暅涓嬫椿妫�鎶�鏈�</controllingFieldValue>
+ <valueName>鐩存帴閽冲彇</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鏀皵绠￠暅妫�鏌�</controllingFieldValue>
- <valueName>鏀皵绠￠暅NBI妫�鏌�</valueName>
+ <controllingFieldValue>鏀皵绠￠暅涓嬫椿妫�鎶�鏈�</controllingFieldValue>
+ <valueName>TBLB</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鏀皵绠￠暅妫�鏌�</controllingFieldValue>
- <valueName>鏀皵绠￠暅AFI妫�鏌�</valueName>
+ <controllingFieldValue>鏀皵绠￠暅涓嬫椿妫�鎶�鏈�</controllingFieldValue>
+ <valueName>閽堝惛娲绘锛圱BNA锛�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
- <valueName>鑵硅厰闀滀笅鑲惧泭鑲垮幓椤舵湳</valueName>
+ <controllingFieldValue>鏀皵绠￠暅涓嬫椿妫�鎶�鏈�</controllingFieldValue>
+ <valueName>鐩存帴姣涘埛</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
- <valueName>鑵硅厰闀滀笅鍗曠函鑲惧垏闄ゆ湳</valueName>
+ <controllingFieldValue>鏀皵绠￠暅涓嬫椿妫�鎶�鏈�</controllingFieldValue>
+ <valueName>PSB</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
- <valueName>鑵硅厰闀滀笅鑲剧檶鏍规不鏈�</valueName>
+ <controllingFieldValue>鏀皵绠￠暅涓嬫不鐤楁妧鏈�</controllingFieldValue>
+ <valueName>鏀皵绠￠暅涓嬫伅鑲夊垏闄�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
- <valueName>鑵硅厰闀滀笅鑲鹃儴鍒嗗垏闄ゆ湳</valueName>
+ <controllingFieldValue>鏀皵绠￠暅涓嬫不鐤楁妧鏈�</controllingFieldValue>
+ <valueName>鏀皵绠￠暅涓嬮珮棰戠數鐑ф湳</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
- <valueName>鑵硅厰闀滀笅杈撳翱绠″垏寮�鍙栫煶鏈�</valueName>
+ <controllingFieldValue>鏀皵绠￠暅涓嬫不鐤楁妧鏈�</controllingFieldValue>
+ <valueName>鏀皵绠￠暅涓嬪喎鍐绘湳</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
- <valueName>鑵硅厰闀滀笅鑲剧泜鎴愬舰鏈�</valueName>
+ <controllingFieldValue>鏀皵绠￠暅涓嬫不鐤楁妧鏈�</controllingFieldValue>
+ <valueName>鏀皵绠￠暅涓嬬悆鍥婃墿寮犳湳</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
- <valueName>鑵硅厰闀滀笅鏍规不鎬ц偩銆佽緭灏跨鍏ㄩ暱鍒囬櫎鏈�</valueName>
+ <controllingFieldValue>鏀皵绠￠暅涓嬫不鐤楁妧鏈�</controllingFieldValue>
+ <valueName>鏀皵绠￠暅涓嬩粙鍏ユ皵閬撹厰鍐呭悗瑁呮斁鐤�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
- <valueName>鑵硅厰闀滀笅鑲句笂鑵鸿偪鐗╁垏闄ゆ湳</valueName>
+ <controllingFieldValue>鏀皵绠￠暅涓嬫不鐤楁妧鏈�</controllingFieldValue>
+ <valueName>鏀皵绠￠暅涓嬫敮鏋剁疆鍏ユ湳</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
- <valueName>鑵硅厰闀滀笅鏍规不鎬у墠鍒楄吅鐧屽垏闄ゆ湳</valueName>
+ <controllingFieldValue>鏀皵绠￠暅涓嬫不鐤楁妧鏈�</controllingFieldValue>
+ <valueName>鏀皵绠￠暅鑲烘场鐏屾礂鏈紙BAL锛�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
- <valueName>鑵硅厰闀滀笅鏍规不鎬ц唨鑳卞叏鍒囥�佸洖鑲犺唨鑳辨湳</valueName>
+ <controllingFieldValue>鏀皵绠￠暅涓嬫不鐤楁妧鏈�</controllingFieldValue>
+ <valueName>鏀皵绠￠暅涓嬫縺鍏�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
- <valueName>鑵硅厰闀滀笅闅愮澗鎺㈡煡鏈�</valueName>
+ <controllingFieldValue>鏀皵绠￠暅涓嬫不鐤楁妧鏈�</controllingFieldValue>
+ <valueName>鏀皵绠￠暅涓嬪紓鐗╁彇鍑�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
- <valueName>鑵硅厰闀滀笅鑲炬敮鏋剁疆鍏ユ湳</valueName>
+ <controllingFieldValue>鏀皵绠￠暅涓嬫不鐤楁妧鏈�</controllingFieldValue>
+ <valueName>鏀皵绠￠暅涓嬬壒娈婂叾浠栨不鐤�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
- <valueName>鑵硅厰闀滀笅娲讳綋渚涜偩鍒囧彇鏈�</valueName>
+ <controllingFieldValue>鏀皵绠￠暅涓嬫不鐤楁妧鏈�</controllingFieldValue>
+ <valueName>鏀皵绠＄儹鏁村舰鏈�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
- <valueName>鑵硅厰闀滀笅鑵硅啘鍚庢穻宸寸粨娓呮壂鏈�</valueName>
+ <controllingFieldValue>瀹厰闀滄不鐤�</controllingFieldValue>
+ <valueName>瀹厰闀滃瓙瀹唴鑶滃垏锛堝幓锛夐櫎鏈�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
- <valueName>鑵硅厰闀滀笅鐩嗚厰娣嬪反缁撴椿妫�/娓呮壂鏈�</valueName>
+ <controllingFieldValue>瀹厰闀滄不鐤�</controllingFieldValue>
+ <valueName>瀹厰闀滃瓙瀹矘鑶滀笅鑲岀槫鍒囬櫎鏈�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙娉屽翱锛�</controllingFieldValue>
- <valueName>娉屽翱鑵硅厰闀滃叾浠�</valueName>
+ <controllingFieldValue>瀹厰闀滄不鐤�</controllingFieldValue>
+ <valueName>瀹厰闀滃唴鑶滄伅鑲夊垏闄ゆ湳</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
- <valueName>鑵硅厰闀滆緭鍗电鍚诲悎鏈�</valueName>
+ <controllingFieldValue>瀹厰闀滄不鐤�</controllingFieldValue>
+ <valueName>瀹厰闀滃瓙瀹旱闅斿垏闄ゆ湳</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
- <valueName>鑵硅厰闀滅泦鑵旇創鑲挎墜鏈�</valueName>
+ <controllingFieldValue>瀹厰闀滄不鐤�</controllingFieldValue>
+ <valueName>瀹厰闀滃鑵旂矘杩炲垏闄ゆ湳</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
- <valueName>寮備綅濡婂</valueName>
+ <controllingFieldValue>瀹厰闀滄不鐤�</controllingFieldValue>
+ <valueName>瀹厰闀滃瓙瀹紓鐗╁彇鍑烘湳</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
- <valueName>鑵硅厰闀滃嵉宸㈠泭鑲垮墺闄�</valueName>
+ <controllingFieldValue>瀹厰闀滄不鐤�</controllingFieldValue>
+ <valueName>瀹厰闀滃瓙瀹厰鍒囧紑鏈�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
- <valueName>鑵硅厰闀滃瓙瀹倢鐦ゅ墧闄ゆ湳</valueName>
+ <controllingFieldValue>瀹厰闀滄不鐤�</controllingFieldValue>
+ <valueName>瀹厰闀滃瓙瀹娲绘鏈�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
- <valueName>鑵硅厰闀滄鍏ㄥ瓙瀹垏闄ゆ湳</valueName>
+ <controllingFieldValue>瀹厰闀滄不鐤�</controllingFieldValue>
+ <valueName>瀹厰闀滃棰堢梾鍙樺垏闄ゆ湳</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
- <valueName>鑵硅厰闀滅瓔鑶滃唴瀛愬鍒囬櫎</valueName>
+ <controllingFieldValue>瀹厰闀滄不鐤�</controllingFieldValue>
+ <valueName>瀹厰闀滅壒娈婃不鐤�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
- <valueName>鑵硅厰闀滃叏瀛愬鍒囬櫎鏈�</valueName>
+ <controllingFieldValue>瀹厰闀滆瘖鏂�</controllingFieldValue>
+ <valueName>瀹厰闀滄鏌�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
- <valueName>鑵硅厰闀滀繚鐣欒绠″瓙瀹垏闄ゆ湳</valueName>
+ <controllingFieldValue>瀹厰闀滆瘖鏂�</controllingFieldValue>
+ <valueName>瀹厰闀滃紓甯稿瓙瀹嚭琛�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
- <valueName>鑵硅厰闀滃箍娉涘叏瀛愬鍒囬櫎</valueName>
+ <controllingFieldValue>瀹厰闀滆瘖鏂�</controllingFieldValue>
+ <valueName>瀹厰闀滀笉瀛曠棁</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
- <valueName>鑵硅厰闀滅泦鑵旀穻宸村垏闄ゆ湳</valueName>
+ <controllingFieldValue>瀹厰闀滆瘖鏂�</controllingFieldValue>
+ <valueName>瀹厰闀滃瓙瀹暩褰�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
- <valueName>鑵硅厰闀滆吂涓诲姩鑴夋梺娣嬪反缁撳垏鏈�</valueName>
+ <controllingFieldValue>瀹厰闀滆瘖鏂�</controllingFieldValue>
+ <valueName>瀹厰闀滃鑵斿唴寮傜墿</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
- <valueName>鑵硅厰闀滀笅闃撮亾寤堕暱鏈�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
- <valueName>鑵硅厰闀滃嵉宸㈢Щ浣�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
- <valueName>鑵硅厰闀滄帰鏌ユ湳</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
- <valueName>濡囩鑵硅厰闀滃叾浠�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
- <valueName>鑵硅厰闀滃瓙瀹旱闅斿垏寮�鏈�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
- <valueName>鑵硅厰闀滃瓙瀹唴鑶滃紓浣嶇棁</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
- <valueName>鑵硅厰闀滃瓙瀹檮浠跺垏闄ゆ湳</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>鑵硅厰闀滄墜鏈不鐤楋紙濡囩锛�</controllingFieldValue>
- <valueName>鍙岄暅鑱斿悎鑵硅厰闀滄墜鏈紙濡囩锛�</valueName>
+ <controllingFieldValue>瀹厰闀滆瘖鏂�</controllingFieldValue>
+ <valueName>瀹厰闀滃瓙瀹唴鑶滅檶</valueName>
</valueSettings>
</valueSet>
</CustomField>
diff --git a/force-app/main/default/objects/Report__c/listViews/All_NTC.listView-meta.xml b/force-app/main/default/objects/Report__c/listViews/All_NTC.listView-meta.xml
index ce26d5e..4705270 100644
--- a/force-app/main/default/objects/Report__c/listViews/All_NTC.listView-meta.xml
+++ b/force-app/main/default/objects/Report__c/listViews/All_NTC.listView-meta.xml
@@ -17,8 +17,7 @@
<filters>
<field>RECORDTYPE</field>
<operation>equals</operation>
- <value>Report__c.NTC</value>
+ <value>Report__c.NTC,Report__c.OPD,Report__c.FaultPreventionTraining,Report__c.NewInstallTarin</value>
</filters>
<label>2 鎵�鏈塏TC鎶ュ憡涔�</label>
- <language>zh_CN</language>
</ListView>
diff --git a/force-app/main/default/objects/Report__c/listViews/All_NTC_146P.listView-meta.xml b/force-app/main/default/objects/Report__c/listViews/All_NTC_146P.listView-meta.xml
index ed0e5a4..644f897 100644
--- a/force-app/main/default/objects/Report__c/listViews/All_NTC_146P.listView-meta.xml
+++ b/force-app/main/default/objects/Report__c/listViews/All_NTC_146P.listView-meta.xml
@@ -17,7 +17,7 @@
<filters>
<field>RECORDTYPE</field>
<operation>equals</operation>
- <value>Report__c.NTC</value>
+ <value>Report__c.NTC,Report__c.OPD,Report__c.FaultPreventionTraining,Report__c.NewInstallTarin</value>
</filters>
<filters>
<field>Date__c</field>
@@ -25,5 +25,4 @@
<value>4/1/2014</value>
</filters>
<label>2 NTC 147P</label>
- <language>zh_CN</language>
</ListView>
diff --git a/force-app/main/default/objects/Report__c/validationRules/ApplyMust_VOCcrectedCheck.validationRule-meta.xml b/force-app/main/default/objects/Report__c/validationRules/ApplyMust_VOCcrectedCheck.validationRule-meta.xml
index f1f777a..10d0ea0 100644
--- a/force-app/main/default/objects/Report__c/validationRules/ApplyMust_VOCcrectedCheck.validationRule-meta.xml
+++ b/force-app/main/default/objects/Report__c/validationRules/ApplyMust_VOCcrectedCheck.validationRule-meta.xml
@@ -4,10 +4,10 @@
<active>true</active>
<errorConditionFormula>$Profile.Id != '00e10000000dzzG' /* GPI_绯荤粺绠＄悊鍛楴ew 涓嶆姤閿� */
&&
-$Profile.Id != '00eC800000005Cb' /* 绯荤粺绠＄悊鍛� 涓嶆姤閿� */
+$Profile.Id != '00e10000000Y3o5' /* 绯荤粺绠＄悊鍛� 涓嶆姤閿� */
&&
-$User.Id != '005C60000001UFN' /* Batch User 涓嶆姤閿� */
-&& AND(Create_date__c > DATE(2022,7,8) , RecordTypeId = '012C600000003KE',
+$User.Id != '00510000000fSYI' /* Batch User 涓嶆姤閿� */
+&& AND(Create_date__c > DATE(2022,7,8) , RecordTypeId = '01210000000Qeky',
Text( Status__c)='鑽夋涓�',OR(TEXT(Damage_For_Doc_Or_Pat__c)='',Model_No__c='',Product_Serial_No__c='', ISBLANK(Occur_Date__c) ))</errorConditionFormula>
<errorDisplayField>Damage_For_Doc_Or_Pat__c</errorDisplayField>
<errorMessage>璇疯緭鍏ユ槸鍚﹂�犳垚浜鸿韩浼ゅ銆佹満韬彿銆佷骇鍝佸瀷鍙枫�佸彂鐢熸棩绛変俊鎭��</errorMessage>
diff --git a/force-app/main/default/objects/Report__c/validationRules/Date_Validation.validationRule-meta.xml b/force-app/main/default/objects/Report__c/validationRules/Date_Validation.validationRule-meta.xml
index d7d2491..477aef3 100644
--- a/force-app/main/default/objects/Report__c/validationRules/Date_Validation.validationRule-meta.xml
+++ b/force-app/main/default/objects/Report__c/validationRules/Date_Validation.validationRule-meta.xml
@@ -4,7 +4,7 @@
<active>true</active>
<description>OPD/SIS/NTC瀹炴柦鏃ュ彧鑳藉皬浜庝粖澶�
//2021-11-08 mzy SWAG-C899Q7 鐢� 瀹炴柦鏃ヤ笉鑳藉ぇ浜庣瓑浜庝粖澶╋紝璋冩暣涓轰笉鑳藉ぇ浜庝粖澶╋紝鍙栨秷绛変簬浠婂ぉ鐨勯檺鍒躲��</description>
- <errorConditionFormula>((Loaner_request_no1__c !=null && ( ISBLANK(Asset_return_day2__c) || ISBLANK(Bollow_Date__c) )) || (RecordTypeId = '012C600000003KK' || RecordTypeId = '012C600000003KL'))&& ((ISNEW() || ISCHANGED(Date__c)) && Date__c> TODAY())</errorConditionFormula>
+ <errorConditionFormula>((Loaner_request_no1__c !=null && ( ISBLANK(Asset_return_day2__c) || ISBLANK(Bollow_Date__c) )) || (RecordTypeId = '01210000000NPDp' || RecordTypeId = '01210000000NPDz'))&& ((ISNEW() || ISCHANGED(Date__c)) && Date__c> TODAY())</errorConditionFormula>
<errorDisplayField>Date__c</errorDisplayField>
<errorMessage>OPD/SIS/NTC瀹炴柦鏃ヤ笉鑳藉ぇ浜庝粖澶�</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Report__c/validationRules/Date_Validation1.validationRule-meta.xml b/force-app/main/default/objects/Report__c/validationRules/Date_Validation1.validationRule-meta.xml
index 61fcf9f..aa2d95e 100644
--- a/force-app/main/default/objects/Report__c/validationRules/Date_Validation1.validationRule-meta.xml
+++ b/force-app/main/default/objects/Report__c/validationRules/Date_Validation1.validationRule-meta.xml
@@ -3,7 +3,7 @@
<fullName>Date_Validation1</fullName>
<active>true</active>
<description>OPD/SIS/NTC瀹炴柦鏃ュぇ浜庣瓑浜庡鍝佷腑蹇冨嚭搴撴棩锛屽皬浜庣瓑浜庡洖瀵勬棩</description>
- <errorConditionFormula>(ISNEW() || ISCHANGED(Date__c)) && Loaner_request_no1__c !=null && !ISBLANK(Asset_return_day2__c ) && !ISBLANK(Bollow_Date__c ) && (Date__c < Bollow_Date__c || Date__c > Asset_return_day2__c) && !(RecordTypeId = '012C600000003KK' || RecordTypeId = '012C600000003KL')</errorConditionFormula>
+ <errorConditionFormula>(ISNEW() || ISCHANGED(Date__c)) && Loaner_request_no1__c !=null && !ISBLANK(Asset_return_day2__c ) && !ISBLANK(Bollow_Date__c ) && (Date__c < Bollow_Date__c || Date__c > Asset_return_day2__c) && !(RecordTypeId = '01210000000NPDp' || RecordTypeId = '01210000000NPDz')</errorConditionFormula>
<errorDisplayField>Date__c</errorDisplayField>
<errorMessage>OPD/SIS/NTC瀹炴柦鏃ュ繀椤诲湪澶囧搧涓績鍑哄簱鏃ュ拰鍥炲瘎鏃ヤ箣闂�</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Report__c/validationRules/Input_comment_before_share_with_MKE.validationRule-meta.xml b/force-app/main/default/objects/Report__c/validationRules/Input_comment_before_share_with_MKE.validationRule-meta.xml
index 47e3309..d223d80 100644
--- a/force-app/main/default/objects/Report__c/validationRules/Input_comment_before_share_with_MKE.validationRule-meta.xml
+++ b/force-app/main/default/objects/Report__c/validationRules/Input_comment_before_share_with_MKE.validationRule-meta.xml
@@ -12,13 +12,13 @@
ISBLANK(Request_comment__c),
ISBLANK(Responsible_Person__c)))</description>
<errorConditionFormula>AND(
- RecordTypeId ="012C600000003KE",
+ RecordTypeId ="01210000000Qeky",
AND(ISPICKVAL(Status__c,"璺熻繘涓�"),ISPICKVAL(IsVOC__c,"VOC")),
OR(
ISBLANK(text(VOC_category__c)),
ISBLANK(text(VOC_category2__c)),
ISBLANK(Request_comment__c),
ISBLANK(Responsible_Person__c)))</errorConditionFormula>
- <errorDisplayField>VOC_category2__c</errorDisplayField>
+ <errorDisplayField>AWS_Data_Id__c</errorDisplayField>
<errorMessage>濡傛灉鍒ゆ柇鏄疺OC锛岃濉啓銆孷OC绋嬪害銆�,銆孷OC鍒嗙被銆�,銆孷OC瀵瑰簲鑰呫��,銆屽鎵樺唴瀹广��</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Report__c/validationRules/Input_confirm_before_VOC_finish.validationRule-meta.xml b/force-app/main/default/objects/Report__c/validationRules/Input_confirm_before_VOC_finish.validationRule-meta.xml
index 0e29970..a879f58 100644
--- a/force-app/main/default/objects/Report__c/validationRules/Input_confirm_before_VOC_finish.validationRule-meta.xml
+++ b/force-app/main/default/objects/Report__c/validationRules/Input_confirm_before_VOC_finish.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Input_confirm_before_VOC_finish</fullName>
- <active>true</active>
+ <active>false</active>
<errorConditionFormula>AND(
RecordTypeId ="01210000000Qeky",
ISPICKVAL(Status__c,"瀹屾瘯"),
diff --git a/force-app/main/default/objects/Report__c/validationRules/IsVOC_chk.validationRule-meta.xml b/force-app/main/default/objects/Report__c/validationRules/IsVOC_chk.validationRule-meta.xml
index e387bc9..c114374 100644
--- a/force-app/main/default/objects/Report__c/validationRules/IsVOC_chk.validationRule-meta.xml
+++ b/force-app/main/default/objects/Report__c/validationRules/IsVOC_chk.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>IsVOC_chk</fullName>
- <active>true</active>
+ <active>false</active>
<description>2016/8/16鏃犳晥鍖�</description>
<errorConditionFormula>RecordTypeId = "01210000000Qeky"
&& TEXT(IsVOC__c) = "VOC"
diff --git a/force-app/main/default/objects/Report__c/validationRules/Need_to_input_all_field_before_submit.validationRule-meta.xml b/force-app/main/default/objects/Report__c/validationRules/Need_to_input_all_field_before_submit.validationRule-meta.xml
index cffa207..b1a3d7d 100644
--- a/force-app/main/default/objects/Report__c/validationRules/Need_to_input_all_field_before_submit.validationRule-meta.xml
+++ b/force-app/main/default/objects/Report__c/validationRules/Need_to_input_all_field_before_submit.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Need_to_input_all_field_before_submit</fullName>
- <active>true</active>
+ <active>false</active>
<errorConditionFormula>AND(
RecordTypeId="01210000000Qekj",
text(Status__c)="鐢宠珛涓�",
diff --git a/force-app/main/default/objects/Report__c/validationRules/NotVOC_chk.validationRule-meta.xml b/force-app/main/default/objects/Report__c/validationRules/NotVOC_chk.validationRule-meta.xml
index eba7235..5e4313b 100644
--- a/force-app/main/default/objects/Report__c/validationRules/NotVOC_chk.validationRule-meta.xml
+++ b/force-app/main/default/objects/Report__c/validationRules/NotVOC_chk.validationRule-meta.xml
@@ -2,7 +2,7 @@
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>NotVOC_chk</fullName>
<active>true</active>
- <errorConditionFormula>RecordTypeId = "012C600000003KE"
+ <errorConditionFormula>RecordTypeId = "01210000000Qeky"
&& TEXT(IsVOC__c) = "鍏朵粬"
&& NotVOC_Reason__c = null</errorConditionFormula>
<errorDisplayField>NotVOC_Reason__c</errorDisplayField>
diff --git a/force-app/main/default/objects/Report__c/validationRules/OPD_Report_need_to_Submit_within_7_days.validationRule-meta.xml b/force-app/main/default/objects/Report__c/validationRules/OPD_Report_need_to_Submit_within_7_days.validationRule-meta.xml
index 4f10e8f..db4d8bd 100644
--- a/force-app/main/default/objects/Report__c/validationRules/OPD_Report_need_to_Submit_within_7_days.validationRule-meta.xml
+++ b/force-app/main/default/objects/Report__c/validationRules/OPD_Report_need_to_Submit_within_7_days.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>OPD_Report_need_to_Submit_within_7_days</fullName>
- <active>true</active>
+ <active>false</active>
<errorConditionFormula>(Text(Status__c) = '鑽夋涓�' &&
(RecordTypeId = '01210000000Qekj' || RecordTypeId = '01210000000Qeko' ) &&
Submit_deadline__c < today()
diff --git a/force-app/main/default/objects/Report__c/validationRules/Only_OPDtoSIS.validationRule-meta.xml b/force-app/main/default/objects/Report__c/validationRules/Only_OPDtoSIS.validationRule-meta.xml
index 5d5f667..c87e412 100644
--- a/force-app/main/default/objects/Report__c/validationRules/Only_OPDtoSIS.validationRule-meta.xml
+++ b/force-app/main/default/objects/Report__c/validationRules/Only_OPDtoSIS.validationRule-meta.xml
@@ -6,22 +6,22 @@
<errorConditionFormula>ISCHANGED(RecordTypeId) &&
(
/**OPD鎴朣IS鍙樺埌闈濷PDSIS**/
- ((PRIORVALUE(RecordTypeId) = "012C600000003KJ"
+ ((PRIORVALUE(RecordTypeId) = "01210000000RLTi"
||
- PRIORVALUE(RecordTypeId) = "012C600000003KG")
+ PRIORVALUE(RecordTypeId) = "01210000000Qekj")
&&
- (RecordTypeId <> "012C600000003KJ"
+ (RecordTypeId <> "01210000000RLTi"
&&
- RecordTypeId <> "012C600000003KG"))
+ RecordTypeId <> "01210000000Qekj"))
||
/**闈濷PDSIS鍙樺埌OPD鎴朣IS**/
- ((PRIORVALUE(RecordTypeId) <> "012C600000003KJ"
+ ((PRIORVALUE(RecordTypeId) <> "01210000000RLTi"
&&
- PRIORVALUE(RecordTypeId) <> "012C600000003KG")
+ PRIORVALUE(RecordTypeId) <> "01210000000Qekj")
&&
- (RecordTypeId = "012C600000003KJ"
+ (RecordTypeId = "01210000000RLTi"
||
- RecordTypeId = "012C600000003KG"))
+ RecordTypeId = "01210000000Qekj"))
)</errorConditionFormula>
<errorDisplayField>AWS_Data_Id__c</errorDisplayField>
<errorMessage>鍙兘鍦∣PD鎶ュ憡涔﹀拰SIS鎶ュ憡涔︾殑绫诲瀷涔嬮棿鐩镐簰鍙樻崲</errorMessage>
diff --git a/force-app/main/default/objects/Report__c/validationRules/Request_dairy_report_no.validationRule-meta.xml b/force-app/main/default/objects/Report__c/validationRules/Request_dairy_report_no.validationRule-meta.xml
index 94f4d26..bccdb98 100644
--- a/force-app/main/default/objects/Report__c/validationRules/Request_dairy_report_no.validationRule-meta.xml
+++ b/force-app/main/default/objects/Report__c/validationRules/Request_dairy_report_no.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Request_dairy_report_no</fullName>
- <active>true</active>
+ <active>false</active>
<errorConditionFormula>Text(Status__c) = '鐢宠珛涓�' && (
/* OPD銉昏窡鍙� */
(RecordTypeId = '01210000000Qekj' && Isblank(Daily_Report__c))
diff --git a/force-app/main/default/objects/Report__c/validationRules/Required_Date.validationRule-meta.xml b/force-app/main/default/objects/Report__c/validationRules/Required_Date.validationRule-meta.xml
index 67c9aa8..8c68885 100644
--- a/force-app/main/default/objects/Report__c/validationRules/Required_Date.validationRule-meta.xml
+++ b/force-app/main/default/objects/Report__c/validationRules/Required_Date.validationRule-meta.xml
@@ -2,7 +2,11 @@
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Required_Date</fullName>
<active>true</active>
- <errorConditionFormula>Text(Status__c) = '鐢宠珛涓�' && Isnull(Date__c)</errorConditionFormula>
+ <errorConditionFormula>Text(Status__c) = '鐢宠珛涓�' && Isnull(Date__c) &&
+(
+RecordTypeId != '01210000000RkuM' &&
+RecordTypeId != '01210000000RkuR' &&
+RecordTypeId != '01210000000Qekj')</errorConditionFormula>
<errorDisplayField>Date__c</errorDisplayField>
<errorMessage>鏃ユ湡蹇呭～</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Report__c/validationRules/Required_VOC_solution_category.validationRule-meta.xml b/force-app/main/default/objects/Report__c/validationRules/Required_VOC_solution_category.validationRule-meta.xml
index 8219471..2f7df0a 100644
--- a/force-app/main/default/objects/Report__c/validationRules/Required_VOC_solution_category.validationRule-meta.xml
+++ b/force-app/main/default/objects/Report__c/validationRules/Required_VOC_solution_category.validationRule-meta.xml
@@ -4,7 +4,7 @@
<active>true</active>
<errorConditionFormula>Text(Status__c) = '瀹屾瘯' && (
/* VOC */
-(RecordTypeId = '012C600000003KE' && Isblank(Text(VOC_solution_category__c)))
+(RecordTypeId = '01210000000Qeky' && Isblank(Text(VOC_solution_category__c)))
)</errorConditionFormula>
<errorDisplayField>VOC_solution_category__c</errorDisplayField>
<errorMessage>瀵瑰簲缁撴灉鍒嗙被蹇呭～</errorMessage>
diff --git a/force-app/main/default/objects/Report__c/validationRules/SIS_Required_OPD_ProductCategory1.validationRule-meta.xml b/force-app/main/default/objects/Report__c/validationRules/SIS_Required_OPD_ProductCategory1.validationRule-meta.xml
index 72ca7aa..83acee7 100644
--- a/force-app/main/default/objects/Report__c/validationRules/SIS_Required_OPD_ProductCategory1.validationRule-meta.xml
+++ b/force-app/main/default/objects/Report__c/validationRules/SIS_Required_OPD_ProductCategory1.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>SIS_Required_OPD_ProductCategory1</fullName>
- <active>true</active>
+ <active>false</active>
<errorConditionFormula>Text(Status__c) = '鐢宠珛涓�' && Isnull(Text(OPD_ProductCategory1__c)) && RecordTypeId = '01210000000RLTi'</errorConditionFormula>
<errorDisplayField>OPD_ProductCategory1__c</errorDisplayField>
<errorMessage>鎻愪氦鏃跺繀濉�</errorMessage>
diff --git a/force-app/main/default/objects/Report__c/validationRules/SIS_Required_OPD_Summarize.validationRule-meta.xml b/force-app/main/default/objects/Report__c/validationRules/SIS_Required_OPD_Summarize.validationRule-meta.xml
index 72d4d48..5de45a1 100644
--- a/force-app/main/default/objects/Report__c/validationRules/SIS_Required_OPD_Summarize.validationRule-meta.xml
+++ b/force-app/main/default/objects/Report__c/validationRules/SIS_Required_OPD_Summarize.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>SIS_Required_OPD_Summarize</fullName>
- <active>true</active>
+ <active>false</active>
<errorConditionFormula>Text(Status__c) = '鐢宠珛涓�' && (Isnull(This_OPD_Summarize__c)||Isblank(This_OPD_Summarize__c)) && RecordTypeId = '01210000000RLTi'</errorConditionFormula>
<errorDisplayField>This_OPD_Summarize__c</errorDisplayField>
<errorMessage>鎻愪氦鏃跺繀濉�</errorMessage>
diff --git a/force-app/main/default/objects/Report__c/validationRules/SIS_Required_Operation_From.validationRule-meta.xml b/force-app/main/default/objects/Report__c/validationRules/SIS_Required_Operation_From.validationRule-meta.xml
index 79184d6..f73e148 100644
--- a/force-app/main/default/objects/Report__c/validationRules/SIS_Required_Operation_From.validationRule-meta.xml
+++ b/force-app/main/default/objects/Report__c/validationRules/SIS_Required_Operation_From.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>SIS_Required_Operation_From</fullName>
- <active>true</active>
+ <active>false</active>
<description>椤甸潰甯冨眬璁剧疆鎴愬繀濉紝鎵�浠ュ彇娑堥獙璇�</description>
<errorConditionFormula>Text(Status__c) = '鐢宠珛涓�' && Isnull(Operation_From1__c) && RecordTypeId = '01210000000RLTi'</errorConditionFormula>
<errorDisplayField>Operation_From1__c</errorDisplayField>
diff --git a/force-app/main/default/objects/Report__c/validationRules/SIS_Required_Operation_To.validationRule-meta.xml b/force-app/main/default/objects/Report__c/validationRules/SIS_Required_Operation_To.validationRule-meta.xml
index 1f17be2..6867ba7 100644
--- a/force-app/main/default/objects/Report__c/validationRules/SIS_Required_Operation_To.validationRule-meta.xml
+++ b/force-app/main/default/objects/Report__c/validationRules/SIS_Required_Operation_To.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>SIS_Required_Operation_To</fullName>
- <active>true</active>
+ <active>false</active>
<description>椤甸潰甯冨眬璁剧疆鎴愬繀濉紝鎵�浠ュ彇娑堥獙璇�</description>
<errorConditionFormula>Text(Status__c) = '鐢宠珛涓�' && Isnull(Operation_To1__c) && RecordTypeId = '01210000000RLTi'</errorConditionFormula>
<errorDisplayField>Operation_To1__c</errorDisplayField>
diff --git a/force-app/main/default/objects/Report__c/validationRules/VOC_answer_chk1.validationRule-meta.xml b/force-app/main/default/objects/Report__c/validationRules/VOC_answer_chk1.validationRule-meta.xml
index 3b68dc7..47efd65 100644
--- a/force-app/main/default/objects/Report__c/validationRules/VOC_answer_chk1.validationRule-meta.xml
+++ b/force-app/main/default/objects/Report__c/validationRules/VOC_answer_chk1.validationRule-meta.xml
@@ -2,13 +2,13 @@
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>VOC_answer_chk1</fullName>
<active>true</active>
- <errorConditionFormula>RecordTypeId = "012C600000003KE"
+ <errorConditionFormula>RecordTypeId = "01210000000Qeky"
&& TEXT(Status__c) = "鍥炵瓟瀹屾瘯"
&&
(
VOC_follow_up_result__c = null
|| ISBLANK(TEXT(VOC_solution_category__c))
)</errorConditionFormula>
- <errorDisplayField>VOC_follow_up_result__c</errorDisplayField>
+ <errorDisplayField>AWS_Data_Id__c</errorDisplayField>
<errorMessage>鍥炵瓟鏃讹紝蹇呴』濉啓鈥滃搴旂粨鏋溾�濆拰鈥滃搴旂粨鏋滃垎绫烩��</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Report__c/validationRules/VOC_finish_chk.validationRule-meta.xml b/force-app/main/default/objects/Report__c/validationRules/VOC_finish_chk.validationRule-meta.xml
index dd1b3b8..8d86ea9 100644
--- a/force-app/main/default/objects/Report__c/validationRules/VOC_finish_chk.validationRule-meta.xml
+++ b/force-app/main/default/objects/Report__c/validationRules/VOC_finish_chk.validationRule-meta.xml
@@ -2,7 +2,7 @@
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>VOC_finish_chk</fullName>
<active>true</active>
- <errorConditionFormula>RecordTypeId = "012C600000003KE"
+ <errorConditionFormula>RecordTypeId = "01210000000Qeky"
&& (TEXT(Status__c) = "瀹屾瘯" || TEXT(Status__c) = "缁撴灉纭瀹屾瘯") && Text(IsVOC__c) <> '鍏朵粬'
&&
(ISCHANGED(Comment__c)
diff --git a/force-app/main/default/objects/Report__c/validationRules/VOC_follow_chk1.validationRule-meta.xml b/force-app/main/default/objects/Report__c/validationRules/VOC_follow_chk1.validationRule-meta.xml
index 9199005..83caf6c 100644
--- a/force-app/main/default/objects/Report__c/validationRules/VOC_follow_chk1.validationRule-meta.xml
+++ b/force-app/main/default/objects/Report__c/validationRules/VOC_follow_chk1.validationRule-meta.xml
@@ -2,11 +2,11 @@
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>VOC_follow_chk1</fullName>
<active>true</active>
- <errorConditionFormula>RecordTypeId = "012C600000003KE"
+ <errorConditionFormula>RecordTypeId = "01210000000Qeky"
&& TEXT(Status__c) = "璺熻繘涓�"
-&& $User.Id != "005C60000001ULY"
-&& $User.Id != "005C60000001Ucp"
-&& $Profile.Id != "00eC800000005Cb"
-&& (ISNEW() || ISCLONE())</errorConditionFormula>
+&& $User.Id != "00510000000gWAE"
+&& $User.Id != "00510000004reg2"
+&& $Profile.Id != "00e10000000Y3o5"</errorConditionFormula>
+ <errorDisplayField>AWS_Data_Id__c</errorDisplayField>
<errorMessage>浣犳病鏈夌紪杈戔�滆窡杩涗腑鈥濇姤鍛婁功鐨勬潈闄�</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Report__c/validationRules/WhetherInstallTarining.validationRule-meta.xml b/force-app/main/default/objects/Report__c/validationRules/WhetherInstallTarining.validationRule-meta.xml
index e31da04..1efe901 100644
--- a/force-app/main/default/objects/Report__c/validationRules/WhetherInstallTarining.validationRule-meta.xml
+++ b/force-app/main/default/objects/Report__c/validationRules/WhetherInstallTarining.validationRule-meta.xml
@@ -13,7 +13,7 @@
ISBLANK(Content__c) ||
DetailedReport_InstallTarin__c =='' )
&&
- RecordTypeId == '012C600000005sY'</errorConditionFormula>
+ RecordTypeId == '01210000000RkuM'</errorConditionFormula>
<errorDisplayField>WhetherInstallationTraining__c</errorDisplayField>
<errorMessage>鏄惁杩涜瀹夎鍩硅涓衡�樻槸鈥欐椂锛屽煿璁湴鐐广�佸煿璁疄鏂芥棩鏈熴�佸煿璁疄鏂戒汉鍛樼被鍨嬨�侀櫌鏂硅礋璐ｄ汉銆佽仈绯荤數璇濅负蹇呭～瀛楁</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Report__c/validationRules/WhetherInstallTarining2.validationRule-meta.xml b/force-app/main/default/objects/Report__c/validationRules/WhetherInstallTarining2.validationRule-meta.xml
index e334a41..dad5a6c 100644
--- a/force-app/main/default/objects/Report__c/validationRules/WhetherInstallTarining2.validationRule-meta.xml
+++ b/force-app/main/default/objects/Report__c/validationRules/WhetherInstallTarining2.validationRule-meta.xml
@@ -7,7 +7,7 @@
&&
( NotInstallTrainReason__c == '' )
&&
- RecordTypeId == '012C600000005sY'</errorConditionFormula>
+ RecordTypeId == '01210000000RkuM'</errorConditionFormula>
<errorDisplayField>WhetherInstallationTraining__c</errorDisplayField>
<errorMessage>涓哄惁鏃讹紝涓嶅疄鏂藉畨瑁呭煿璁殑鍘熷洜蹇呭～锛�</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Report__c/validationRules/WhetherRunningFollow.validationRule-meta.xml b/force-app/main/default/objects/Report__c/validationRules/WhetherRunningFollow.validationRule-meta.xml
index d5cca1c..68f038f 100644
--- a/force-app/main/default/objects/Report__c/validationRules/WhetherRunningFollow.validationRule-meta.xml
+++ b/force-app/main/default/objects/Report__c/validationRules/WhetherRunningFollow.validationRule-meta.xml
@@ -10,7 +10,7 @@
DepartmentHead__c == '' ||
DetailedReport_Follow__c == '')
&&
-RecordTypeId == '012C600000005sY'</errorConditionFormula>
+RecordTypeId == '01210000000RkuM'</errorConditionFormula>
<errorDisplayField>WhetherFollow__c</errorDisplayField>
<errorMessage>涓烘槸鏃讹紝璺熷彴瀹炴柦鏃ユ湡銆佺瀹よ礋璐ｄ汉銆佽窡鍙板疄鏂戒汉鍛樼被鍨嬨�佽缁嗘姤鍛婏紙璺熷彴锛夊繀濉紒</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Report__c/validationRules/WhetherRunningFollow2.validationRule-meta.xml b/force-app/main/default/objects/Report__c/validationRules/WhetherRunningFollow2.validationRule-meta.xml
index 4d32980..e07e427 100644
--- a/force-app/main/default/objects/Report__c/validationRules/WhetherRunningFollow2.validationRule-meta.xml
+++ b/force-app/main/default/objects/Report__c/validationRules/WhetherRunningFollow2.validationRule-meta.xml
@@ -7,7 +7,7 @@
&&
(NotInstallNewProductReason__c == '')
&&
-RecordTypeId == '012C600000005sY'</errorConditionFormula>
+RecordTypeId == '01210000000RkuM'</errorConditionFormula>
<errorDisplayField>WhetherFollow__c</errorDisplayField>
<errorMessage>涓哄惁鏃讹紝涓嶅疄鏂芥柊鍝佽鏈鸿窡鍙扮殑鍘熷洜蹇呭～锛�</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/Request_tedner_doc__c/fields/Bid_distributor__c.field-meta.xml b/force-app/main/default/objects/Request_tedner_doc__c/fields/Bid_distributor__c.field-meta.xml
index 80946ba..ab53dc2 100644
--- a/force-app/main/default/objects/Request_tedner_doc__c/fields/Bid_distributor__c.field-meta.xml
+++ b/force-app/main/default/objects/Request_tedner_doc__c/fields/Bid_distributor__c.field-meta.xml
@@ -9,7 +9,7 @@
<filterItems>
<field>Account.RecordType.Id</field>
<operation>equals</operation>
- <value>012C600000003HF</value>
+ <value>01210000000Qem1</value>
</filterItems>
<isOptional>false</isOptional>
</lookupFilter>
diff --git a/force-app/main/default/objects/Request_tedner_doc__c/validationRules/Request_information_before_submit.validationRule-meta.xml b/force-app/main/default/objects/Request_tedner_doc__c/validationRules/Request_information_before_submit.validationRule-meta.xml
index a98b437..d1cd6f0 100644
--- a/force-app/main/default/objects/Request_tedner_doc__c/validationRules/Request_information_before_submit.validationRule-meta.xml
+++ b/force-app/main/default/objects/Request_tedner_doc__c/validationRules/Request_information_before_submit.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Request_information_before_submit</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>AND(
Submit_check_flag__c = true,
OR(
diff --git a/force-app/main/default/objects/Request_tedner_doc__c/validationRules/Request_input_reason_for_no_tender_numbe.validationRule-meta.xml b/force-app/main/default/objects/Request_tedner_doc__c/validationRules/Request_input_reason_for_no_tender_numbe.validationRule-meta.xml
index 7f8ab88..57b5894 100644
--- a/force-app/main/default/objects/Request_tedner_doc__c/validationRules/Request_input_reason_for_no_tender_numbe.validationRule-meta.xml
+++ b/force-app/main/default/objects/Request_tedner_doc__c/validationRules/Request_input_reason_for_no_tender_numbe.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Request_input_reason_for_no_tender_numbe</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>AND(
Submit_check_flag__c = true,
ISBLANK(No_tender_number_reason__c),
diff --git a/force-app/main/default/objects/Request_tedner_doc__c/validationRules/Request_staff_blank.validationRule-meta.xml b/force-app/main/default/objects/Request_tedner_doc__c/validationRules/Request_staff_blank.validationRule-meta.xml
index a7d18f7..584c46d 100644
--- a/force-app/main/default/objects/Request_tedner_doc__c/validationRules/Request_staff_blank.validationRule-meta.xml
+++ b/force-app/main/default/objects/Request_tedner_doc__c/validationRules/Request_staff_blank.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Request_staff_blank</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>AND(
ISBLANK(Request_target__c),
Submit_check_flag__c =true)</errorConditionFormula>
diff --git a/force-app/main/default/objects/SMARM__c/validationRules/Need_FinalComment.validationRule-meta.xml b/force-app/main/default/objects/SMARM__c/validationRules/Need_FinalComment.validationRule-meta.xml
index 4e0b0ec..303473b 100644
--- a/force-app/main/default/objects/SMARM__c/validationRules/Need_FinalComment.validationRule-meta.xml
+++ b/force-app/main/default/objects/SMARM__c/validationRules/Need_FinalComment.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Need_FinalComment</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>TEXT(Status__c) = "濉啓瀹屾瘯" && ISBLANK( FinalComment__c )</errorConditionFormula>
<errorDisplayField>FinalComment__c</errorDisplayField>
<errorMessage>鎻愬嚭鐢宠鏃讹紝蹇呴』濉啓鎬讳綋鍙嶉</errorMessage>
diff --git a/force-app/main/default/objects/SS_OPDPlan__c/fields/OPDLendSortBefore__c.field-meta.xml b/force-app/main/default/objects/SS_OPDPlan__c/fields/OPDLendSortBefore__c.field-meta.xml
index 5ea7845..fa2fec1 100644
--- a/force-app/main/default/objects/SS_OPDPlan__c/fields/OPDLendSortBefore__c.field-meta.xml
+++ b/force-app/main/default/objects/SS_OPDPlan__c/fields/OPDLendSortBefore__c.field-meta.xml
@@ -3,7 +3,7 @@
<fullName>OPDLendSortBefore__c</fullName>
<externalId>false</externalId>
<formula>SSOPDPlan__r.OPDLendSortBefore__c</formula>
- <label>澶囧搧鍑哄�熶紭鍏堝害锛堜笂鏈堬級</label>
+ <label>OPD浼樺厛搴︼紙涓婃湀锛�</label>
<precision>18</precision>
<required>false</required>
<scale>0</scale>
diff --git a/force-app/main/default/objects/SS_OPDPlan__c/fields/SSOPDLendSortDraft__c.field-meta.xml b/force-app/main/default/objects/SS_OPDPlan__c/fields/SSOPDLendSortDraft__c.field-meta.xml
index f341b0d..57f4fff 100644
--- a/force-app/main/default/objects/SS_OPDPlan__c/fields/SSOPDLendSortDraft__c.field-meta.xml
+++ b/force-app/main/default/objects/SS_OPDPlan__c/fields/SSOPDLendSortDraft__c.field-meta.xml
@@ -2,7 +2,7 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>SSOPDLendSortDraft__c</fullName>
<externalId>false</externalId>
- <label>澶囧搧鍑哄�熶紭鍏堝害鑽夋涓�</label>
+ <label>OPD浼樺厛搴﹁崏妗堜腑</label>
<precision>18</precision>
<required>false</required>
<scale>0</scale>
diff --git a/force-app/main/default/objects/SS_OPDPlan__c/fields/SSOPDLendSort__c.field-meta.xml b/force-app/main/default/objects/SS_OPDPlan__c/fields/SSOPDLendSort__c.field-meta.xml
index faad3a0..69aadcf 100644
--- a/force-app/main/default/objects/SS_OPDPlan__c/fields/SSOPDLendSort__c.field-meta.xml
+++ b/force-app/main/default/objects/SS_OPDPlan__c/fields/SSOPDLendSort__c.field-meta.xml
@@ -2,7 +2,7 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>SSOPDLendSort__c</fullName>
<externalId>false</externalId>
- <label>澶囧搧鍑哄�熶紭鍏堝害</label>
+ <label>OPD浼樺厛搴�</label>
<precision>18</precision>
<required>false</required>
<scale>0</scale>
diff --git a/force-app/main/default/objects/SS_Prospect_5days_list__c/fields/InquiryAdvanceRate__c.field-meta.xml b/force-app/main/default/objects/SS_Prospect_5days_list__c/fields/InquiryAdvanceRate__c.field-meta.xml
index bd58ef9..b5e1563 100644
--- a/force-app/main/default/objects/SS_Prospect_5days_list__c/fields/InquiryAdvanceRate__c.field-meta.xml
+++ b/force-app/main/default/objects/SS_Prospect_5days_list__c/fields/InquiryAdvanceRate__c.field-meta.xml
@@ -4,7 +4,7 @@
<externalId>false</externalId>
<formula>if(OR(StageNameDeal__c==1,Statge2Deal__c==1,RankRise__c==1),1,0)</formula>
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
- <label>璇环鏄惁鎺ㄨ繘</label>
+ <label>鎺ㄨ繘鏁�</label>
<precision>18</precision>
<required>false</required>
<scale>0</scale>
diff --git a/force-app/main/default/objects/SS_Prospect_5days_list__c/fields/StageNameDeal__c.field-meta.xml b/force-app/main/default/objects/SS_Prospect_5days_list__c/fields/StageNameDeal__c.field-meta.xml
index 739a639..4097b9d 100644
--- a/force-app/main/default/objects/SS_Prospect_5days_list__c/fields/StageNameDeal__c.field-meta.xml
+++ b/force-app/main/default/objects/SS_Prospect_5days_list__c/fields/StageNameDeal__c.field-meta.xml
@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>StageNameDeal__c</fullName>
+ <description>20231020BK
+if(StageNameDiff__c == '鎴愪氦',1,0)</description>
<externalId>false</externalId>
- <formula>if(StageNameDiff__c == '鎴愪氦',1,0)</formula>
+ <formula>if(Or(StageNameDiff__c == '鎴愪氦',StageNameDiff__c == '鏂板鎴愪氦'),1,0)</formula>
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
<label>鐘舵��1鏄惁鎴愪氦</label>
<precision>18</precision>
diff --git a/force-app/main/default/objects/SS_Prospect_5days_list__c/fields/StageNameDiff__c.field-meta.xml b/force-app/main/default/objects/SS_Prospect_5days_list__c/fields/StageNameDiff__c.field-meta.xml
index 22e1088..e8a296a 100644
--- a/force-app/main/default/objects/SS_Prospect_5days_list__c/fields/StageNameDiff__c.field-meta.xml
+++ b/force-app/main/default/objects/SS_Prospect_5days_list__c/fields/StageNameDiff__c.field-meta.xml
@@ -1,12 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>StageNameDiff__c</fullName>
- <externalId>false</externalId>
- <formula>if(OR(StageName__c == '娉ㄦ畫',StageName__c == '鍙戣揣',StageName__c == '瀹屾瘯') && StageNameLastM__c == '璇环','鎴愪氦',
+ <description>20231020bk
+if(OR(StageName__c == '娉ㄦ畫',StageName__c == '鍙戣揣',StageName__c == '瀹屾瘯') && StageNameLastM__c == '璇环','鎴愪氦',
if(StageName__c == '鍙栨秷' && StageNameLastM__c != '鍙栨秷','鍙栨秷',
if(StageName__c == '澶卞崟' && StageNameLastM__c != '澶卞崟','澶卞崟',
if(StageName__c == StageNameLastM__c,'鏃犲彉鍖�',
-if(AND(StageNameLastM__c == '',StageName__c != ''),'鏂板','-')))))</formula>
+if(AND(StageNameLastM__c == '',StageName__c != ''),'鏂板','-')))))</description>
+ <externalId>false</externalId>
+ <formula>if(OR(StageName__c == '娉ㄦ畫',StageName__c == '鍑鸿嵎',StageName__c == '瀹屼簡') && StageNameLastM__c == '璇环','鎴愪氦',
+if(OR(StageName__c == '娉ㄦ畫',StageName__c == '鍑鸿嵎',StageName__c == '瀹屼簡') && StageNameLastM__c == '','鏂板鎴愪氦',
+if(StageName__c == '鍓婇櫎' && StageNameLastM__c != '鍙栨秷','鍙栨秷',
+if(StageName__c == '鏁楁垿' && StageNameLastM__c != '澶卞崟','澶卞崟',
+if(AND(StageNameLastM__c == '',StageName__c != ''),'鏂板',
+if(StageName__c == '寮曞悎' && OR(StageNameLastM__c == '娉ㄦ畫',StageNameLastM__c == '鍙戣揣',StageNameLastM__c == '瀹屼簡'),'鍥為��',
+'鏃犲彉鍖�'))))))</formula>
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
<label>鐘舵��1鍙樺寲</label>
<required>false</required>
diff --git a/force-app/main/default/objects/SolutionProjectRequirements__c/SolutionProjectRequirements__c.object-meta.xml b/force-app/main/default/objects/SolutionProjectRequirements__c/SolutionProjectRequirements__c.object-meta.xml
index 9a97f82..fe617e0 100644
--- a/force-app/main/default/objects/SolutionProjectRequirements__c/SolutionProjectRequirements__c.object-meta.xml
+++ b/force-app/main/default/objects/SolutionProjectRequirements__c/SolutionProjectRequirements__c.object-meta.xml
@@ -132,14 +132,11 @@
</actionOverrides>
<actionOverrides>
<actionName>View</actionName>
- <comment>Action override created by Lightning App Builder during activation.</comment>
- <content>Solution_Record_Page</content>
- <formFactor>Large</formFactor>
- <skipRecordTypeSelect>false</skipRecordTypeSelect>
- <type>Flexipage</type>
+ <type>Default</type>
</actionOverrides>
<actionOverrides>
<actionName>View</actionName>
+ <formFactor>Large</formFactor>
<type>Default</type>
</actionOverrides>
<actionOverrides>
@@ -167,13 +164,13 @@
<type>Text</type>
</nameField>
<searchLayouts>
- <excludedStandardButtons>Accept</excludedStandardButtons>
- <excludedStandardButtons>PrintableListView</excludedStandardButtons>
- <excludedStandardButtons>Import</excludedStandardButtons>
- <excludedStandardButtons>NewFromDocument</excludedStandardButtons>
- <excludedStandardButtons>ChangeOwner</excludedStandardButtons>
<excludedStandardButtons>OpenListInQuip</excludedStandardButtons>
+ <excludedStandardButtons>NewFromDocument</excludedStandardButtons>
+ <excludedStandardButtons>Accept</excludedStandardButtons>
+ <excludedStandardButtons>ChangeOwner</excludedStandardButtons>
+ <excludedStandardButtons>Import</excludedStandardButtons>
<excludedStandardButtons>MassChangeOwner</excludedStandardButtons>
+ <excludedStandardButtons>PrintableListView</excludedStandardButtons>
</searchLayouts>
<sharingModel>Private</sharingModel>
<visibility>Public</visibility>
diff --git a/force-app/main/default/objects/SolutionProjectRequirements__c/validationRules/ProposalPurposeOtherRequire.validationRule-meta.xml b/force-app/main/default/objects/SolutionProjectRequirements__c/validationRules/ProposalPurposeOtherRequire.validationRule-meta.xml
index 743eaca..5116f4e 100644
--- a/force-app/main/default/objects/SolutionProjectRequirements__c/validationRules/ProposalPurposeOtherRequire.validationRule-meta.xml
+++ b/force-app/main/default/objects/SolutionProjectRequirements__c/validationRules/ProposalPurposeOtherRequire.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>ProposalPurposeOtherRequire</fullName>
- <active>false</active>
+ <active>true</active>
<description>鎻愭鐩殑閫夋嫨鍏朵粬锛屽叾浠栧瓧娈靛繀濉�</description>
<errorConditionFormula>INCLUDES(Purpose_Proposal__c ,'鍏朵粬') && Other__c = ''</errorConditionFormula>
<errorDisplayField>Other__c</errorDisplayField>
diff --git a/force-app/main/default/objects/Solution_Programme__c/Solution_Programme__c.object-meta.xml b/force-app/main/default/objects/Solution_Programme__c/Solution_Programme__c.object-meta.xml
index 37ddae5..361fe2f 100644
--- a/force-app/main/default/objects/Solution_Programme__c/Solution_Programme__c.object-meta.xml
+++ b/force-app/main/default/objects/Solution_Programme__c/Solution_Programme__c.object-meta.xml
@@ -133,15 +133,7 @@
<actionOverrides>
<actionName>View</actionName>
<comment>Action override created by Lightning App Builder during activation.</comment>
- <content>Solution1</content>
- <formFactor>Small</formFactor>
- <skipRecordTypeSelect>false</skipRecordTypeSelect>
- <type>Flexipage</type>
- </actionOverrides>
- <actionOverrides>
- <actionName>View</actionName>
- <comment>Action override created by Lightning App Builder during activation.</comment>
- <content>Solution1</content>
+ <content>Solution</content>
<formFactor>Large</formFactor>
<skipRecordTypeSelect>false</skipRecordTypeSelect>
<type>Flexipage</type>
@@ -150,6 +142,11 @@
<actionName>View</actionName>
<type>Default</type>
</actionOverrides>
+ <actionOverrides>
+ <actionName>View</actionName>
+ <formFactor>Small</formFactor>
+ <type>Default</type>
+ </actionOverrides>
<allowInChatterGroups>false</allowInChatterGroups>
<compactLayoutAssignment>SYSTEM</compactLayoutAssignment>
<deploymentStatus>Deployed</deploymentStatus>
diff --git a/force-app/main/default/objects/Statu_Achievements_DN_details__c/fields/SerialNoorLotNo_Raw__c.field-meta.xml b/force-app/main/default/objects/Statu_Achievements_DN_details__c/fields/SerialNoorLotNo_Raw__c.field-meta.xml
index 3b19533..d7f40bf 100644
--- a/force-app/main/default/objects/Statu_Achievements_DN_details__c/fields/SerialNoorLotNo_Raw__c.field-meta.xml
+++ b/force-app/main/default/objects/Statu_Achievements_DN_details__c/fields/SerialNoorLotNo_Raw__c.field-meta.xml
@@ -2,7 +2,7 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>SerialNoorLotNo_Raw__c</fullName>
<externalId>false</externalId>
- <label>SerialNoorLotNo锛堜笉浣跨敤锛�</label>
+ <label>SerialNoorLotNo</label>
<length>255</length>
<required>false</required>
<trackTrending>false</trackTrending>
diff --git a/force-app/main/default/objects/Statu_Achievements__c/fields/Backorder_Comment__c.field-meta.xml b/force-app/main/default/objects/Statu_Achievements__c/fields/Backorder_Comment__c.field-meta.xml
index c6135b7..feff1e0 100644
--- a/force-app/main/default/objects/Statu_Achievements__c/fields/Backorder_Comment__c.field-meta.xml
+++ b/force-app/main/default/objects/Statu_Achievements__c/fields/Backorder_Comment__c.field-meta.xml
@@ -11,7 +11,7 @@
&Id
,"鈻�")</formula>
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
- <inlineHelpText>Create back order description</inlineHelpText>
+ <inlineHelpText>鏂板缓娉ㄦ畫璇存槑</inlineHelpText>
<label>璇存槑</label>
<required>false</required>
<trackHistory>false</trackHistory>
diff --git a/force-app/main/default/objects/Statu_Achievements__c/fields/Monthly_ship_target__c.field-meta.xml b/force-app/main/default/objects/Statu_Achievements__c/fields/Monthly_ship_target__c.field-meta.xml
index 8bc57e3..95d3a1a 100644
--- a/force-app/main/default/objects/Statu_Achievements__c/fields/Monthly_ship_target__c.field-meta.xml
+++ b/force-app/main/default/objects/Statu_Achievements__c/fields/Monthly_ship_target__c.field-meta.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Monthly_ship_target__c</fullName>
- <description>DATE(YEAR(today()),MONTH(Today())+1,01)-1
-銇仺銇撱倣銈掍慨姝�</description>
- <externalId>false</externalId>
- <formula>IF(AND(
+ <description>IF(AND(
Valid_Statu_Achievements__c = 1,
OR(DeliveryStatus__c="閮ㄥ垎浜よ揣",DeliveryStatus__c="鏈氦浠�",DeliveryStatus__c="閮ㄥ垎浜や粯"),
IF(ISBLANK(Shipping_Scheduled_Date__c),
@@ -22,6 +19,20 @@
)
)
+,True,False)</description>
+ <externalId>false</externalId>
+ <formula>IF(AND(
+Valid_Statu_Achievements__c = 1,
+OR(DeliveryStatus__c="閮ㄥ垎浜よ揣",DeliveryStatus__c="鏈氦浠�",DeliveryStatus__c="閮ㄥ垎浜や粯"),
+
+Shipping_Scheduled_Date_For_Report__c <=
+IF( MONTH(today()) = 12,
+DATE(YEAR(today()), 12, 31),
+DATE(YEAR(today()), MONTH(today()) + 1, 1) - 1
+)
+
+
+)
,True,False)</formula>
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
<label>棰勬祴瀵硅薄 : 鍗曟湀鍙戣揣棰勬祴(鍏紡)</label>
diff --git a/force-app/main/default/objects/Statu_Achievements__c/fields/NextMonthly_ship_target__c.field-meta.xml b/force-app/main/default/objects/Statu_Achievements__c/fields/NextMonthly_ship_target__c.field-meta.xml
index 7fdfd2b..aff1c1d 100644
--- a/force-app/main/default/objects/Statu_Achievements__c/fields/NextMonthly_ship_target__c.field-meta.xml
+++ b/force-app/main/default/objects/Statu_Achievements__c/fields/NextMonthly_ship_target__c.field-meta.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>NextMonthly_ship_target__c</fullName>
- <externalId>false</externalId>
- <formula>IF(AND(
+ <description>IF(AND(
Valid_Statu_Achievements__c = 1,
OR(DeliveryStatus__c="閮ㄥ垎浜よ揣",DeliveryStatus__c="鏈氦浠�",DeliveryStatus__c="閮ㄥ垎浜や粯"),
IF(ISBLANK(Shipping_Scheduled_Date__c),
@@ -31,6 +30,25 @@
)
)
+,True,False)</description>
+ <externalId>false</externalId>
+ <formula>IF(AND(
+Valid_Statu_Achievements__c = 1,
+OR(DeliveryStatus__c="閮ㄥ垎浜よ揣",DeliveryStatus__c="鏈氦浠�",DeliveryStatus__c="閮ㄥ垎浜や粯"),
+
+AND(
+Shipping_Scheduled_Date_For_Report__c > IF(
+MONTH(today()) = 12,
+DATE(YEAR(today()), 12, 31),
+DATE(YEAR(today()), MONTH(today()) + 1, 1) - 1 ),
+Shipping_Scheduled_Date_For_Report__c <= IF(
+MONTH( today() ) = 11,
+DATE( YEAR( today() ), 12, 31 ),IF(
+MONTH( today() ) = 12,
+DATE( YEAR( today() ) + 1, 01, 31 ),
+DATE( YEAR( today() ), MONTH ( today() ) + 2, 1 ) - 1 )))
+
+)
,True,False)</formula>
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
<label>棰勬祴瀵硅薄 : 娆℃湀鍙戣揣棰勬祴(鍏紡)</label>
diff --git a/force-app/main/default/objects/Statu_Achievements__c/fields/Reason_for_uncollect_install_document__c.field-meta.xml b/force-app/main/default/objects/Statu_Achievements__c/fields/Reason_for_uncollect_install_document__c.field-meta.xml
index 6afdc60..618172e 100644
--- a/force-app/main/default/objects/Statu_Achievements__c/fields/Reason_for_uncollect_install_document__c.field-meta.xml
+++ b/force-app/main/default/objects/Statu_Achievements__c/fields/Reason_for_uncollect_install_document__c.field-meta.xml
@@ -2,7 +2,7 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Reason_for_uncollect_install_document__c</fullName>
<externalId>false</externalId>
- <inlineHelpText>Please input reason for not collecting i</inlineHelpText>
+ <inlineHelpText>璇疯緭鍏ュ畨瑁呯‘璁や功杩樻病鍥炴敹鐨勫師鍥�</inlineHelpText>
<label>鏈洖鏀跺師鍥�(瀹夎纭涔�)</label>
<length>255</length>
<required>false</required>
diff --git a/force-app/main/default/objects/Statu_Achievements__c/listViews/All_Backorder_FirstApprovalunship1.listView-meta.xml b/force-app/main/default/objects/Statu_Achievements__c/listViews/All_Backorder_FirstApprovalunship1.listView-meta.xml
index fab454c..de56cfd 100644
--- a/force-app/main/default/objects/Statu_Achievements__c/listViews/All_Backorder_FirstApprovalunship1.listView-meta.xml
+++ b/force-app/main/default/objects/Statu_Achievements__c/listViews/All_Backorder_FirstApprovalunship1.listView-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ListView xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>All_Backorder_FirstApprovalunship1</fullName>
- <booleanFilter>1 AND 2 AND 3 AND (4 OR 5) AND 6</booleanFilter>
+ <booleanFilter>1 AND 2 AND 3 AND 4 AND 5</booleanFilter>
<columns>NAME</columns>
<columns>Opp_Hospital__c</columns>
<columns>Opp_Department_Name__c</columns>
@@ -33,15 +33,9 @@
<operation>equals</operation>
</filters>
<filters>
- <field>Shipping_Scheduled_Date__c</field>
- <operation>lessThan</operation>
- <value>TODAY</value>
- </filters>
- <filters>
<field>Status_1__c</field>
<operation>equals</operation>
<value>娉ㄦ畫</value>
</filters>
<label>01-1. 闇�瑕佹洿鏂伴娴嬪彂璐ф棩(鍔╃悊鏇存柊鐢�)</label>
- <language>ja</language>
</ListView>
diff --git a/force-app/main/default/objects/Statu_Achievements__c/listViews/All_Backorder_OrderCompleted.listView-meta.xml b/force-app/main/default/objects/Statu_Achievements__c/listViews/All_Backorder_OrderCompleted.listView-meta.xml
index f27233d..a55446e 100644
--- a/force-app/main/default/objects/Statu_Achievements__c/listViews/All_Backorder_OrderCompleted.listView-meta.xml
+++ b/force-app/main/default/objects/Statu_Achievements__c/listViews/All_Backorder_OrderCompleted.listView-meta.xml
@@ -11,10 +11,15 @@
<columns>Owner__c</columns>
<filterScope>Everything</filterScope>
<filters>
- <field>Status_1__c</field>
- <operation>contains</operation>
- <value>瀹屾垚,缁撴潫,瀹屾瘯</value>
+ <field>UnshippedAmount_without_tax_Thousand_DN__c</field>
+ <operation>notEqual</operation>
+ <value>0</value>
</filters>
- <label>03. 娉ㄦ畫-璁㈠崟瀹屾垚</label>
+ <filters>
+ <field>Shipping_Scheduled_Date_For_Report__c</field>
+ <operation>greaterOrEqual</operation>
+ <value>4/1/2023</value>
+ </filters>
+ <label>03. 娉ㄦ畫-鏈储骞�</label>
<language>ja</language>
</ListView>
diff --git a/force-app/main/default/objects/Statu_Achievements__c/listViews/All_Backorder_stop.listView-meta.xml b/force-app/main/default/objects/Statu_Achievements__c/listViews/All_Backorder_stop.listView-meta.xml
index 5f852dd..e426a10 100644
--- a/force-app/main/default/objects/Statu_Achievements__c/listViews/All_Backorder_stop.listView-meta.xml
+++ b/force-app/main/default/objects/Statu_Achievements__c/listViews/All_Backorder_stop.listView-meta.xml
@@ -5,6 +5,7 @@
<columns>NAME</columns>
<columns>Opportunity__c</columns>
<columns>Opp_Hospital__c</columns>
+ <columns>OverviewStatus__c</columns>
<columns>Opp_Department_Name__c</columns>
<columns>SAP_Transfer_past_day__c</columns>
<columns>Agency1_Name_F__c</columns>
diff --git a/force-app/main/default/objects/Statu_Achievements__c/listViews/All_Shipwithoutpay.listView-meta.xml b/force-app/main/default/objects/Statu_Achievements__c/listViews/All_Shipwithoutpay.listView-meta.xml
index 2003f3f..9efbc2f 100644
--- a/force-app/main/default/objects/Statu_Achievements__c/listViews/All_Shipwithoutpay.listView-meta.xml
+++ b/force-app/main/default/objects/Statu_Achievements__c/listViews/All_Shipwithoutpay.listView-meta.xml
@@ -30,6 +30,11 @@
<operation>notContain</operation>
<value>涓嶉渶浠樻</value>
</filters>
+ <filters>
+ <field>DeliveryDate__c</field>
+ <operation>greaterOrEqual</operation>
+ <value>4/1/2023</value>
+ </filters>
<label>02-2. 宸插彂璐ф湭鏀舵</label>
<language>ja</language>
</ListView>
diff --git a/force-app/main/default/objects/Statu_Achievements__c/listViews/All_return.listView-meta.xml b/force-app/main/default/objects/Statu_Achievements__c/listViews/All_return.listView-meta.xml
index e683d0c..e10dca9 100644
--- a/force-app/main/default/objects/Statu_Achievements__c/listViews/All_return.listView-meta.xml
+++ b/force-app/main/default/objects/Statu_Achievements__c/listViews/All_return.listView-meta.xml
@@ -15,6 +15,11 @@
<operation>contains</operation>
<value>閫�璐�</value>
</filters>
- <label>03. 娉ㄦ畫-閫�璐ц鍗�</label>
+ <filters>
+ <field>DeliveryDate__c</field>
+ <operation>greaterOrEqual</operation>
+ <value>4/1/2023</value>
+ </filters>
+ <label>03. 娉ㄦ畫-閫�璐ц鍗曪紙鏈储骞达級</label>
<language>ja</language>
</ListView>
diff --git a/force-app/main/default/objects/Statu_Achievements__c/validationRules/ShippingScheduleDateNeedGreatethantoday.validationRule-meta.xml b/force-app/main/default/objects/Statu_Achievements__c/validationRules/ShippingScheduleDateNeedGreatethantoday.validationRule-meta.xml
index bcb4444..f2e4f88 100644
--- a/force-app/main/default/objects/Statu_Achievements__c/validationRules/ShippingScheduleDateNeedGreatethantoday.validationRule-meta.xml
+++ b/force-app/main/default/objects/Statu_Achievements__c/validationRules/ShippingScheduleDateNeedGreatethantoday.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>ShippingScheduleDateNeedGreatethantoday</fullName>
- <active>false</active>
+ <active>true</active>
<description>棰勬祴鍙戣揣鏃ヤ慨鏀规椂瑕佸ぇ浜庝粖鏃�</description>
<errorConditionFormula>ISCHANGED(Shipping_Scheduled_Date__c) &&
NOT(ISBLANK(Shipping_Scheduled_Date__c)) &&
diff --git a/force-app/main/default/objects/SubAuthorized__c/validationRules/cannotChangeAfterApprovalSubAuthorized.validationRule-meta.xml b/force-app/main/default/objects/SubAuthorized__c/validationRules/cannotChangeAfterApprovalSubAuthorized.validationRule-meta.xml
index 103faa0..7a35460 100644
--- a/force-app/main/default/objects/SubAuthorized__c/validationRules/cannotChangeAfterApprovalSubAuthorized.validationRule-meta.xml
+++ b/force-app/main/default/objects/SubAuthorized__c/validationRules/cannotChangeAfterApprovalSubAuthorized.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>cannotChangeAfterApprovalSubAuthorized</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>ISPICKVAL(Status__c, '宸叉壒鍑�') && ( ISCHANGED(AuthorizedStartDate__c) || ISCHANGED(AuthorizedEndDate__c) ||
ISCHANGED(Authorizer__c) ||
ISCHANGED(Authorizee__c) )</errorConditionFormula>
diff --git a/force-app/main/default/objects/SurveyQuestionResponse__c/SurveyQuestionResponse__c.object-meta.xml b/force-app/main/default/objects/SurveyQuestionResponse__c/SurveyQuestionResponse__c.object-meta.xml
index e416f15..d950284 100644
--- a/force-app/main/default/objects/SurveyQuestionResponse__c/SurveyQuestionResponse__c.object-meta.xml
+++ b/force-app/main/default/objects/SurveyQuestionResponse__c/SurveyQuestionResponse__c.object-meta.xml
@@ -160,6 +160,7 @@
<label>Response ID</label>
<type>AutoNumber</type>
</nameField>
+ <pluralLabel>Survey Question Responses</pluralLabel>
<searchLayouts></searchLayouts>
<sharingModel>ControlledByParent</sharingModel>
<visibility>Public</visibility>
diff --git a/force-app/main/default/objects/SurveyTaker__c/SurveyTaker__c.object-meta.xml b/force-app/main/default/objects/SurveyTaker__c/SurveyTaker__c.object-meta.xml
index e784bca..d60df17 100644
--- a/force-app/main/default/objects/SurveyTaker__c/SurveyTaker__c.object-meta.xml
+++ b/force-app/main/default/objects/SurveyTaker__c/SurveyTaker__c.object-meta.xml
@@ -160,6 +160,7 @@
<label>ID</label>
<type>AutoNumber</type>
</nameField>
+ <pluralLabel>Surveys Taken</pluralLabel>
<searchLayouts>
<customTabListAdditionalFields>Survey__c</customTabListAdditionalFields>
<customTabListAdditionalFields>CREATEDBY_USER.ALIAS</customTabListAdditionalFields>
diff --git a/force-app/main/default/objects/Survey_Question__c/Survey_Question__c.object-meta.xml b/force-app/main/default/objects/Survey_Question__c/Survey_Question__c.object-meta.xml
index bf2ae60..cc5e566 100644
--- a/force-app/main/default/objects/Survey_Question__c/Survey_Question__c.object-meta.xml
+++ b/force-app/main/default/objects/Survey_Question__c/Survey_Question__c.object-meta.xml
@@ -159,6 +159,7 @@
<label>Name</label>
<type>Text</type>
</nameField>
+ <pluralLabel>Survey Questions</pluralLabel>
<searchLayouts></searchLayouts>
<sharingModel>ControlledByParent</sharingModel>
<visibility>Public</visibility>
diff --git a/force-app/main/default/objects/Survey__c/Survey__c.object-meta.xml b/force-app/main/default/objects/Survey__c/Survey__c.object-meta.xml
index a14fc53..6c8b259 100644
--- a/force-app/main/default/objects/Survey__c/Survey__c.object-meta.xml
+++ b/force-app/main/default/objects/Survey__c/Survey__c.object-meta.xml
@@ -165,6 +165,7 @@
<label>Survey Name</label>
<type>Text</type>
</nameField>
+ <pluralLabel>Surveys</pluralLabel>
<searchLayouts>
<customTabListAdditionalFields>Survey_Header__c</customTabListAdditionalFields>
<customTabListAdditionalFields>Survey_Container_CSS__c</customTabListAdditionalFields>
diff --git a/force-app/main/default/objects/TemporaryFileBox__c/validationRules/Is_Active_Department_Class.validationRule-meta.xml b/force-app/main/default/objects/TemporaryFileBox__c/validationRules/Is_Active_Department_Class.validationRule-meta.xml
index 19c2002..99e9bf0 100644
--- a/force-app/main/default/objects/TemporaryFileBox__c/validationRules/Is_Active_Department_Class.validationRule-meta.xml
+++ b/force-app/main/default/objects/TemporaryFileBox__c/validationRules/Is_Active_Department_Class.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Is_Active_Department_Class</fullName>
- <active>false</active>
+ <active>true</active>
<description>鐪嬬埗璁板綍锛屾槸鍖婚櫌锛屾病鏈夐�夌浉搴旂殑鎴樼暐绉戝 ==> 鎶ラ敊</description>
<errorConditionFormula>AND(Text(Attached_category__c) = '瀹㈡埛鎻愭',OR(Account_dept__r.Parent.RecordType_DeveloperName__c != "HP" , Account_dept__r.ParentId != Hospital__r.Id))</errorConditionFormula>
<errorDisplayField>Account_dept__c</errorDisplayField>
diff --git a/force-app/main/default/objects/Tender_Opportunity_Link__c/fields/IsLeakage_New__c.field-meta.xml b/force-app/main/default/objects/Tender_Opportunity_Link__c/fields/IsLeakage_New__c.field-meta.xml
index 8ed9a54..a8e2e90 100644
--- a/force-app/main/default/objects/Tender_Opportunity_Link__c/fields/IsLeakage_New__c.field-meta.xml
+++ b/force-app/main/default/objects/Tender_Opportunity_Link__c/fields/IsLeakage_New__c.field-meta.xml
@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>IsLeakage_New__c</fullName>
+ <description>//20231213 lt update 鍒涘缓鏃�-锛堥」鐩細鎷涙爣鏃�-60澶�)>0
+IF(AND(!ISBLANK(Tender_information__r.publicDate__c),Opportunity__r.Created_Day__c > Tender_information__r.publicDate__c-60),true,false)</description>
<externalId>false</externalId>
- <formula>IF(AND(!ISBLANK(Tender_information__r.publicDate__c),Opportunity__r.Created_Day__c > Tender_information__r.publicDate__c-60),true,false)</formula>
+ <formula>IF(AND(!ISBLANK(Opportunity__r.TenderBeginDate_New__c),Opportunity__r.Created_Day__c > Opportunity__r.TenderBeginDate_New__c-60),true,false)</formula>
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
<label>鏄惁婕忓崟(鏂�)</label>
<trackHistory>false</trackHistory>
diff --git a/force-app/main/default/objects/Tender_information__c/Tender_information__c.object-meta.xml b/force-app/main/default/objects/Tender_information__c/Tender_information__c.object-meta.xml
index 2483078..4c41bd3 100644
--- a/force-app/main/default/objects/Tender_information__c/Tender_information__c.object-meta.xml
+++ b/force-app/main/default/objects/Tender_information__c/Tender_information__c.object-meta.xml
@@ -58,11 +58,13 @@
</actionOverrides>
<actionOverrides>
<actionName>Edit</actionName>
- <type>Default</type>
+ <content>lexTenderinformationPIPLAura</content>
+ <formFactor>Large</formFactor>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>LightningComponent</type>
</actionOverrides>
<actionOverrides>
<actionName>Edit</actionName>
- <formFactor>Large</formFactor>
<type>Default</type>
</actionOverrides>
<actionOverrides>
@@ -86,11 +88,13 @@
</actionOverrides>
<actionOverrides>
<actionName>New</actionName>
- <type>Default</type>
+ <content>lexTenderinformationPIPLAura</content>
+ <formFactor>Large</formFactor>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>LightningComponent</type>
</actionOverrides>
<actionOverrides>
<actionName>New</actionName>
- <formFactor>Large</formFactor>
<type>Default</type>
</actionOverrides>
<actionOverrides>
@@ -129,7 +133,7 @@
<actionOverrides>
<actionName>View</actionName>
<comment>Action override created by Lightning App Builder during activation.</comment>
- <content>FlexiPage11213320</content>
+ <content>FlexiPage11213321</content>
<formFactor>Large</formFactor>
<skipRecordTypeSelect>false</skipRecordTypeSelect>
<type>Flexipage</type>
@@ -137,7 +141,7 @@
<actionOverrides>
<actionName>View</actionName>
<comment>Action override created by Lightning App Builder during activation.</comment>
- <content>FlexiPage11213320</content>
+ <content>FlexiPage11213321</content>
<formFactor>Small</formFactor>
<skipRecordTypeSelect>false</skipRecordTypeSelect>
<type>Flexipage</type>
diff --git a/force-app/main/default/objects/Tender_information__c/fields/OBSAP_WinnerAmount__c.field-meta.xml b/force-app/main/default/objects/Tender_information__c/fields/OBSAP_WinnerAmount__c.field-meta.xml
index 8541316..b10cc53 100644
--- a/force-app/main/default/objects/Tender_information__c/fields/OBSAP_WinnerAmount__c.field-meta.xml
+++ b/force-app/main/default/objects/Tender_information__c/fields/OBSAP_WinnerAmount__c.field-meta.xml
@@ -6,7 +6,7 @@
<precision>18</precision>
<required>false</required>
<scale>2</scale>
- <trackHistory>true</trackHistory>
+ <trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Number</type>
<unique>false</unique>
diff --git a/force-app/main/default/objects/Tender_information__c/fields/Spot_Check_Result_Op__c.field-meta.xml b/force-app/main/default/objects/Tender_information__c/fields/Spot_Check_Result_Op__c.field-meta.xml
index 8fb8410..fc38a6f 100644
--- a/force-app/main/default/objects/Tender_information__c/fields/Spot_Check_Result_Op__c.field-meta.xml
+++ b/force-app/main/default/objects/Tender_information__c/fields/Spot_Check_Result_Op__c.field-meta.xml
@@ -4,7 +4,7 @@
<externalId>false</externalId>
<label>鎶芥煡缁撴灉</label>
<required>false</required>
- <trackHistory>false</trackHistory>
+ <trackHistory>true</trackHistory>
<trackTrending>false</trackTrending>
<type>Picklist</type>
<valueSet>
diff --git a/force-app/main/default/objects/Tender_information__c/fields/Strategic_department_Opp__c.field-meta.xml b/force-app/main/default/objects/Tender_information__c/fields/Strategic_department_Opp__c.field-meta.xml
index e02962d..dae206a 100644
--- a/force-app/main/default/objects/Tender_information__c/fields/Strategic_department_Opp__c.field-meta.xml
+++ b/force-app/main/default/objects/Tender_information__c/fields/Strategic_department_Opp__c.field-meta.xml
@@ -46,30 +46,6 @@
<default>false</default>
<label>鍏朵粬</label>
</value>
- <value>
- <fullName>(鍘熷崡浜搧閬撳尰瀛﹂櫌闄勫睘鍖婚櫌)</fullName>
- <default>false</default>
- <isActive>false</isActive>
- <label>(鍘熷崡浜搧閬撳尰瀛﹂櫌闄勫睘鍖婚櫌)</label>
- </value>
- <value>
- <fullName>鍗椾含鍖荤澶у闄勫睘鑴戠鍖婚櫌</fullName>
- <default>false</default>
- <isActive>false</isActive>
- <label>鍗椾含鍖荤澶у闄勫睘鑴戠鍖婚櫌</label>
- </value>
- <value>
- <fullName>澶╂触鍖荤澶у绗竴闄勫睘鍖婚櫌</fullName>
- <default>false</default>
- <isActive>false</isActive>
- <label>澶╂触鍖荤澶у绗竴闄勫睘鍖婚櫌</label>
- </value>
- <value>
- <fullName>瀹滄槍甯傝偪鐦ゅ尰闄�</fullName>
- <default>false</default>
- <isActive>false</isActive>
- <label>瀹滄槍甯傝偪鐦ゅ尰闄�</label>
- </value>
</valueSetDefinition>
</valueSet>
<visibleLines>4</visibleLines>
diff --git a/force-app/main/default/objects/Tender_information__c/fields/TenderDate__c.field-meta.xml b/force-app/main/default/objects/Tender_information__c/fields/TenderDate__c.field-meta.xml
index 8a3a81e..566d40a 100644
--- a/force-app/main/default/objects/Tender_information__c/fields/TenderDate__c.field-meta.xml
+++ b/force-app/main/default/objects/Tender_information__c/fields/TenderDate__c.field-meta.xml
@@ -4,7 +4,7 @@
<externalId>false</externalId>
<label>鎷涙爣鏃ワ紙OBSAP锛�</label>
<required>false</required>
- <trackHistory>true</trackHistory>
+ <trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Date</type>
</CustomField>
diff --git a/force-app/main/default/objects/Tender_information__c/fields/ViewBidConfirm__c.field-meta.xml b/force-app/main/default/objects/Tender_information__c/fields/ViewBidConfirm__c.field-meta.xml
index e6555de..cd7541f 100644
--- a/force-app/main/default/objects/Tender_information__c/fields/ViewBidConfirm__c.field-meta.xml
+++ b/force-app/main/default/objects/Tender_information__c/fields/ViewBidConfirm__c.field-meta.xml
@@ -3,10 +3,10 @@
<fullName>ViewBidConfirm__c</fullName>
<description>鐢ㄦ潵鎺掗櫎2s6,2s7,2s8,2s9鍔╃悊鐨勬彁閱�</description>
<externalId>false</externalId>
- <formula>IF( (($User.ProfileId = '00eC600000004yD')|| ($User.ProfileId = '00eC600000004Tn')
-|| ($User.ProfileId = '00eC600000004yE')
-|| ($User.ProfileId = '00eC600000004Tp') || ($User.ProfileId = '00eC600000004Tr')
-|| ($User.ProfileId = '00eC600000004Tq'))&&Logical_delete__c=false
+ <formula>IF( (($User.ProfileId = '00e10000000xnp2')|| ($User.ProfileId = '00e10000000xzQ0')
+|| ($User.ProfileId = '00e10000000xnp7') || ($User.ProfileId = '00e10000001220i')
+|| ($User.ProfileId = '00e10000000xnpH') || ($User.ProfileId = '00e10000000xzQA')
+|| ($User.ProfileId = '00e10000000hkas'))&&Logical_delete__c=false
,true,false)</formula>
<label>鏌ョ湅搴旀爣椤圭洰锛堝悗鍙扮敤锛�</label>
<trackHistory>false</trackHistory>
diff --git a/force-app/main/default/objects/Tender_information__c/fields/ViewRelatedOpp__c.field-meta.xml b/force-app/main/default/objects/Tender_information__c/fields/ViewRelatedOpp__c.field-meta.xml
index f77443d..b7b80cd 100644
--- a/force-app/main/default/objects/Tender_information__c/fields/ViewRelatedOpp__c.field-meta.xml
+++ b/force-app/main/default/objects/Tender_information__c/fields/ViewRelatedOpp__c.field-meta.xml
@@ -22,17 +22,17 @@
<externalId>false</externalId>
<formula>(
-($User.ProfileId = '00eC600000004yD')||($User.ProfileId = '00eC600000004Tn')||
+($User.ProfileId = '00e10000000xnp2')||($User.ProfileId = '00e10000000xzQ0')||
-($User.ProfileId = '00eC600000004yE') ||
+($User.ProfileId = '00e10000000xnp7')||($User.ProfileId = '00e10000001220i') ||
-($User.ProfileId = '00eC600000004Tp')||($User.ProfileId = '00eC600000004Tr') ||
+($User.ProfileId = '00e10000000xnpH')||($User.ProfileId = '00e10000000xzQA') ||
-($User.ProfileId = '00eC600000004Tq') ||
+($User.ProfileId = '00e10000000hkas') ||
-($User.ProfileId = '00eC600000004Tw')||($User.ProfileId = '00eC600000004Tu')
-||($User.ProfileId = '00eC600000004Tx') || ($User.ProfileId = '00eC600000004Tk'))&&Logical_delete__c=false
+($User.ProfileId = '00e10000000xnpR')||($User.ProfileId = '00e10000000xyK6')
+||($User.ProfileId = '00e10000000xnpW') || ($User.ProfileId = '00e10000000Nb7i'))&&Logical_delete__c=false
&& ViewRelatedOppAlert__c</formula>
<label>鏌ョ湅鍏宠仈璇环椤圭洰</label>
<trackHistory>false</trackHistory>
diff --git a/force-app/main/default/objects/Tender_information__c/fields/ViewWaitConfirm__c.field-meta.xml b/force-app/main/default/objects/Tender_information__c/fields/ViewWaitConfirm__c.field-meta.xml
index e677468..1f3c4b9 100644
--- a/force-app/main/default/objects/Tender_information__c/fields/ViewWaitConfirm__c.field-meta.xml
+++ b/force-app/main/default/objects/Tender_information__c/fields/ViewWaitConfirm__c.field-meta.xml
@@ -4,11 +4,11 @@
<description>瀵逛簬2S1,2S2,2S4,2S6,2S8,2S9寮�澶寸殑绠�妗ｇ敤鎴�,瀵逛簬鍙互鐪嬪埌鐨勫緟纭鐨勬嫑鎶曟爣椤圭洰,閮芥彁閱�
2022-03-15 澧炲姞OBA1_鎷涙爣绠＄悊</description>
<externalId>false</externalId>
- <formula>IF( (($User.ProfileId = '00eC600000004yD')||($User.ProfileId = '00eC600000004Tn')
-|| ($User.ProfileId = '00eC600000004yE')
-||($User.ProfileId = '00eC600000004Tp')||($User.ProfileId = '00eC600000004Tr') ||($User.ProfileId = '00eC600000004Tq')
-||($User.ProfileId = '00eC600000004Tw')||($User.ProfileId = '00eC600000004Tu')
-||($User.ProfileId = '00eC600000004Ty')||($User.ProfileId = '00eC600000004Tz')||($User.ProfileId = '00eC600000004U0') || ($User.ProfileId = '00eC600000004UD'))&&Logical_delete__c=false
+ <formula>IF( (($User.ProfileId = '00e10000000xnp2')||($User.ProfileId = '00e10000000xzQ0')
+|| ($User.ProfileId = '00e10000000xnp7')
+||($User.ProfileId = '00e10000000xnpH')||($User.ProfileId = '00e10000000xzQA') ||($User.ProfileId = '00e10000000hkas')
+||($User.ProfileId = '00e10000000xnpR')||($User.ProfileId = '00e10000000xyK6')
+||($User.ProfileId = '00e10000000xnpb')||($User.ProfileId = '00e10000000xyKB')||($User.ProfileId = '00e10000000a7NY') || ($User.ProfileId = '00e10000000s2fZ') || ($User.ProfileId = '00e10000000s3Jp') || ($User.ProfileId = '00e10000000ebji'))&&Logical_delete__c=false
,true,false)</formula>
<label>鏌ョ湅寰呯‘璁ら」鐩�</label>
<trackHistory>false</trackHistory>
diff --git a/force-app/main/default/objects/Tender_information__c/fields/WinnerAmount1__c.field-meta.xml b/force-app/main/default/objects/Tender_information__c/fields/WinnerAmount1__c.field-meta.xml
index bee4983..15812be 100644
--- a/force-app/main/default/objects/Tender_information__c/fields/WinnerAmount1__c.field-meta.xml
+++ b/force-app/main/default/objects/Tender_information__c/fields/WinnerAmount1__c.field-meta.xml
@@ -5,7 +5,7 @@
<label>涓爣閲戦1</label>
<length>255</length>
<required>false</required>
- <trackHistory>false</trackHistory>
+ <trackHistory>true</trackHistory>
<trackTrending>false</trackTrending>
<type>Text</type>
<unique>false</unique>
diff --git a/force-app/main/default/objects/Tender_information__c/fields/department_selection__c.field-meta.xml b/force-app/main/default/objects/Tender_information__c/fields/department_selection__c.field-meta.xml
index f3cd700..f11d2d7 100644
--- a/force-app/main/default/objects/Tender_information__c/fields/department_selection__c.field-meta.xml
+++ b/force-app/main/default/objects/Tender_information__c/fields/department_selection__c.field-meta.xml
@@ -4,7 +4,7 @@
<externalId>false</externalId>
<label>鍏宠仈鎴樼暐绉戝</label>
<required>false</required>
- <trackHistory>false</trackHistory>
+ <trackHistory>true</trackHistory>
<trackTrending>false</trackTrending>
<type>MultiselectPicklist</type>
<valueSet>
@@ -12,32 +12,32 @@
<valueSetDefinition>
<sorted>false</sorted>
<value>
- <fullName>012C600000003HNIAY</fullName>
+ <fullName>01210000000QemLAAS</fullName>
<default>false</default>
<label>娑堝寲绉�</label>
</value>
<value>
- <fullName>012C600000003HKIAY</fullName>
+ <fullName>01210000000QezZAAS</fullName>
<default>false</default>
<label>鍛煎惛绉�</label>
</value>
<value>
- <fullName>012C600000003HOIAY</fullName>
+ <fullName>01210000000QezeAAC</fullName>
<default>false</default>
<label>鏅绉�</label>
</value>
<value>
- <fullName>012C600000003HRIAY</fullName>
+ <fullName>01210000000QezjAAC</fullName>
<default>false</default>
<label>娉屽翱绉�</label>
</value>
<value>
- <fullName>012C600000003HPIAY</fullName>
+ <fullName>01210000000QezoAAC</fullName>
<default>false</default>
<label>濡囩</label>
</value>
<value>
- <fullName>012C600000003HLIAY</fullName>
+ <fullName>01210000000QeztAAC</fullName>
<default>false</default>
<label>鑰抽蓟鍠夌</label>
</value>
diff --git a/force-app/main/default/objects/Tender_information__c/fields/irresponsibleReason__c.field-meta.xml b/force-app/main/default/objects/Tender_information__c/fields/irresponsibleReason__c.field-meta.xml
index 742f650..ee428c3 100644
--- a/force-app/main/default/objects/Tender_information__c/fields/irresponsibleReason__c.field-meta.xml
+++ b/force-app/main/default/objects/Tender_information__c/fields/irresponsibleReason__c.field-meta.xml
@@ -9,10 +9,11 @@
<trackTrending>false</trackTrending>
<type>Picklist</type>
<valueSet>
+ <restricted>true</restricted>
<valueSetDefinition>
<sorted>false</sorted>
<value>
- <fullName>椤圭洰閲嶅</fullName>
+ <fullName>1 椤圭洰閲嶅</fullName>
<default>false</default>
<label>1 椤圭洰閲嶅</label>
</value>
@@ -32,7 +33,7 @@
<label>4 闄愬埗杩涘彛浜у搧</label>
</value>
<value>
- <fullName>鏃堕棿澶揣鏉ヤ笉鍙婂簲鏍�</fullName>
+ <fullName>5 鏉ヤ笉鍙婂簲鏍�</fullName>
<default>false</default>
<label>5 鏉ヤ笉鍙婂簲鏍�</label>
</value>
@@ -47,14 +48,41 @@
<label>7 鍗曚竴鏉ユ簮</label>
</value>
<value>
- <fullName>鍏朵粬锛堝彲鎵嬪姩濉啓锛�</fullName>
+ <fullName>8 鍗曠嫭閲囪喘瓒呭０鎺㈠ご</fullName>
<default>false</default>
- <label>8 鍏朵粬(鎵嬪啓)</label>
+ <label>8 鍗曠嫭閲囪喘瓒呭０鎺㈠ご</label>
</value>
<value>
- <fullName>9 闆嗛噰椤圭洰鏆傛棤鏈�缁堢敤鎴�</fullName>
+ <fullName>9 鍗曠嫭閲囪喘澶栫闀滃瓙</fullName>
<default>false</default>
- <label>9 闆嗛噰椤圭洰鏆傛棤鏈�缁堢敤鎴�</label>
+ <label>9 鍗曠嫭閲囪喘澶栫闀滃瓙</label>
+ </value>
+ <value>
+ <fullName>10 浣庨绠楃數鍒�/瓒呭０鍒�涓绘満</fullName>
+ <default>false</default>
+ <label>10 浣庨绠楀浗浜ц兘閲忎富鏈�</label>
+ </value>
+ <value>
+ <fullName>11 闆嗛噰椤圭洰鏆傛棤鏈�缁堢敤鎴�</fullName>
+ <default>false</default>
+ <label>11 闆嗛噰椤圭洰鏆傛棤鏈�缁堢敤鎴�</label>
+ </value>
+ <value>
+ <fullName>鍏朵粬锛堝彲鎵嬪姩濉啓锛�</fullName>
+ <default>false</default>
+ <label>12 鍏朵粬(鎵嬪啓)</label>
+ </value>
+ <value>
+ <fullName>宸叉湁璇环澶卞崟锛堥渶濉啓璇环锛�</fullName>
+ <default>false</default>
+ <isActive>false</isActive>
+ <label>宸叉湁璇环澶卞崟锛堥渶濉啓璇环锛�</label>
+ </value>
+ <value>
+ <fullName>鏃犱俊鎭け鍗�</fullName>
+ <default>false</default>
+ <isActive>false</isActive>
+ <label>鏃犱俊鎭け鍗�</label>
</value>
</valueSetDefinition>
</valueSet>
diff --git a/force-app/main/default/objects/Tender_information__c/fields/subInfoType__c.field-meta.xml b/force-app/main/default/objects/Tender_information__c/fields/subInfoType__c.field-meta.xml
index d2315b8..cf35947 100644
--- a/force-app/main/default/objects/Tender_information__c/fields/subInfoType__c.field-meta.xml
+++ b/force-app/main/default/objects/Tender_information__c/fields/subInfoType__c.field-meta.xml
@@ -128,14 +128,6 @@
<valueName>3-6锛氬悎鍚屽叕鍛�</valueName>
</valueSettings>
<valueSettings>
- <controllingFieldValue>4锛氬彉鏇�</controllingFieldValue>
- <valueName>4-1锛氫俊鎭彉鏇�</valueName>
- </valueSettings>
- <valueSettings>
- <controllingFieldValue>4锛氬彉鏇�</controllingFieldValue>
- <valueName>4-2锛氱瓟鐤戝叕鍛�</valueName>
- </valueSettings>
- <valueSettings>
<controllingFieldValue>5锛氬叾浠�</controllingFieldValue>
<valueName>5-1锛氶獙鏀跺悎鍚�</valueName>
</valueSettings>
@@ -147,5 +139,13 @@
<controllingFieldValue>5锛氬叾浠�</controllingFieldValue>
<valueName>5-3锛氬叾浠栧叕鍛�</valueName>
</valueSettings>
+ <valueSettings>
+ <controllingFieldValue>4锛氬彉鏇�</controllingFieldValue>
+ <valueName>4-1锛氫俊鎭彉鏇�</valueName>
+ </valueSettings>
+ <valueSettings>
+ <controllingFieldValue>4锛氬彉鏇�</controllingFieldValue>
+ <valueName>4-2锛氱瓟鐤戝叕鍛�</valueName>
+ </valueSettings>
</valueSet>
</CustomField>
diff --git a/force-app/main/default/objects/Tender_information__c/listViews/All_011.listView-meta.xml b/force-app/main/default/objects/Tender_information__c/listViews/All_011.listView-meta.xml
index eef8dd1..6f2fff1 100644
--- a/force-app/main/default/objects/Tender_information__c/listViews/All_011.listView-meta.xml
+++ b/force-app/main/default/objects/Tender_information__c/listViews/All_011.listView-meta.xml
@@ -5,6 +5,7 @@
<columns>NAME</columns>
<columns>CREATED_DATE</columns>
<columns>ZhaoBiaoUnit1__c</columns>
+ <columns>Bid_Winning_Date__c</columns>
<columns>InfoType__c</columns>
<columns>Salesdepartment_SAP__c</columns>
<columns>OCSMProvince__c</columns>
@@ -35,5 +36,4 @@
<value>Tender_information__c.ZC</value>
</filters>
<label>1. 浼楁垚寰呯‘璁ゆ槸鍚︾浉鍏崇殑椤圭洰</label>
- <language>zh_CN</language>
</ListView>
diff --git a/force-app/main/default/objects/Tender_information__c/listViews/All_xin.listView-meta.xml b/force-app/main/default/objects/Tender_information__c/listViews/All_xin.listView-meta.xml
index f92dfcd..4ae2603 100644
--- a/force-app/main/default/objects/Tender_information__c/listViews/All_xin.listView-meta.xml
+++ b/force-app/main/default/objects/Tender_information__c/listViews/All_xin.listView-meta.xml
@@ -8,13 +8,13 @@
<columns>Hospital__c</columns>
<columns>department_selection__c</columns>
<columns>Strategic_department_Opp__c</columns>
- <columns>InfoType__c</columns>
+ <columns>OpportunityNum__c</columns>
+ <columns>status__c</columns>
+ <columns>RECORDTYPE</columns>
<columns>Salesdepartment_SAP__c</columns>
<columns>OCSMProvince__c</columns>
- <columns>BudgetAmount__c</columns>
- <columns>BiddingType__c</columns>
- <columns>TenderBeginTime__c</columns>
- <columns>BidingEndTime__c</columns>
+ <columns>InfoType__c</columns>
+ <columns>OWNER.ALIAS</columns>
<columns>ZhongBiaoUnit1__c</columns>
<columns>WinnerAmount__c</columns>
<filterScope>Everything</filterScope>
@@ -32,6 +32,6 @@
<operation>equals</operation>
<value>1</value>
</filters>
- <label>2. 寰呭叧鑱旇浠风殑椤圭洰锛堟柊锛�</label>
+ <label>2. 寰呭叧鑱旂殑璇环椤圭洰(鏂�)</label>
<language>zh_CN</language>
</ListView>
diff --git a/force-app/main/default/objects/Tender_information__c/listViews/View25.listView-meta.xml b/force-app/main/default/objects/Tender_information__c/listViews/View25.listView-meta.xml
index 57fe241..f082b2d 100644
--- a/force-app/main/default/objects/Tender_information__c/listViews/View25.listView-meta.xml
+++ b/force-app/main/default/objects/Tender_information__c/listViews/View25.listView-meta.xml
@@ -29,7 +29,12 @@
<operation>contains</operation>
<value>,3锛氱粨鏋�</value>
</filters>
- <label>鎷涙爣椤圭洰缁撴灉闃舵</label>
+ <filters>
+ <field>Logical_delete__c</field>
+ <operation>equals</operation>
+ <value>0</value>
+ </filters>
+ <label>9-3.鍙戝竷缁撴灉闃舵鐨勬嫑鏍囬」鐩�</label>
<language>zh_CN</language>
<sharedTo>
<role>Sasu_bidding</role>
diff --git a/force-app/main/default/objects/Tender_information__c/recordTypes/Mannual.recordType-meta.xml b/force-app/main/default/objects/Tender_information__c/recordTypes/Mannual.recordType-meta.xml
index fe78a6b..2009ebd 100644
--- a/force-app/main/default/objects/Tender_information__c/recordTypes/Mannual.recordType-meta.xml
+++ b/force-app/main/default/objects/Tender_information__c/recordTypes/Mannual.recordType-meta.xml
@@ -234,27 +234,27 @@
<picklistValues>
<picklist>department_selection__c</picklist>
<values>
- <fullName>012C600000003HKIAY</fullName>
+ <fullName>01210000000QemLAAS</fullName>
<default>false</default>
</values>
<values>
- <fullName>012C600000003HLIAY</fullName>
+ <fullName>01210000000QezZAAS</fullName>
<default>false</default>
</values>
<values>
- <fullName>012C600000003HNIAY</fullName>
+ <fullName>01210000000QezeAAC</fullName>
<default>false</default>
</values>
<values>
- <fullName>012C600000003HOIAY</fullName>
+ <fullName>01210000000QezjAAC</fullName>
<default>false</default>
</values>
<values>
- <fullName>012C600000003HPIAY</fullName>
+ <fullName>01210000000QezoAAC</fullName>
<default>false</default>
</values>
<values>
- <fullName>012C600000003HRIAY</fullName>
+ <fullName>01210000000QeztAAC</fullName>
<default>false</default>
</values>
</picklistValues>
@@ -296,11 +296,27 @@
<picklistValues>
<picklist>irresponsibleReason__c</picklist>
<values>
+ <fullName>1 椤圭洰閲嶅</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>10 浣庨绠楃數鍒�%2F瓒呭０鍒�涓绘満</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>11 闆嗛噰椤圭洰鏆傛棤鏈�缁堢敤鎴�</fullName>
+ <default>false</default>
+ </values>
+ <values>
<fullName>3 棰勭畻杩囦綆</fullName>
<default>false</default>
</values>
<values>
<fullName>4 闄愬埗杩涘彛浜у搧</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>5 鏉ヤ笉鍙婂簲鏍�</fullName>
<default>false</default>
</values>
<values>
@@ -312,7 +328,11 @@
<default>false</default>
</values>
<values>
- <fullName>9 闆嗛噰椤圭洰鏆傛棤鏈�缁堢敤鎴�</fullName>
+ <fullName>8 鍗曠嫭閲囪喘瓒呭０鎺㈠ご</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>9 鍗曠嫭閲囪喘澶栫闀滃瓙</fullName>
<default>false</default>
</values>
<values>
@@ -321,14 +341,6 @@
</values>
<values>
<fullName>鎷涙爣浜у搧涓庢垜鍙镐笉鍖归厤</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鏃堕棿澶揣鏉ヤ笉鍙婂簲鏍�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>椤圭洰閲嶅</fullName>
<default>false</default>
</values>
</picklistValues>
@@ -350,10 +362,22 @@
<picklistValues>
<picklist>proInvolvedManual__c</picklist>
<values>
+ <fullName>BF绾ょ淮闀�</fullName>
+ <default>false</default>
+ </values>
+ <values>
<fullName>涓�娆℃�у唴闀�</fullName>
<default>false</default>
</values>
<values>
+ <fullName>涓�娆℃�ф敮姘旂闀�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>渚挎惡寮忔敮姘旂闀�</fullName>
+ <default>false</default>
+ </values>
+ <values>
<fullName>鍏宠妭闀�</fullName>
<default>false</default>
</values>
diff --git a/force-app/main/default/objects/Tender_information__c/recordTypes/QLM.recordType-meta.xml b/force-app/main/default/objects/Tender_information__c/recordTypes/QLM.recordType-meta.xml
index bcd48ce..fe1ee72 100644
--- a/force-app/main/default/objects/Tender_information__c/recordTypes/QLM.recordType-meta.xml
+++ b/force-app/main/default/objects/Tender_information__c/recordTypes/QLM.recordType-meta.xml
@@ -238,27 +238,27 @@
<picklistValues>
<picklist>department_selection__c</picklist>
<values>
- <fullName>012C600000003HKIAY</fullName>
+ <fullName>01210000000QemLAAS</fullName>
<default>false</default>
</values>
<values>
- <fullName>012C600000003HLIAY</fullName>
+ <fullName>01210000000QezZAAS</fullName>
<default>false</default>
</values>
<values>
- <fullName>012C600000003HNIAY</fullName>
+ <fullName>01210000000QezeAAC</fullName>
<default>false</default>
</values>
<values>
- <fullName>012C600000003HOIAY</fullName>
+ <fullName>01210000000QezjAAC</fullName>
<default>false</default>
</values>
<values>
- <fullName>012C600000003HPIAY</fullName>
+ <fullName>01210000000QezoAAC</fullName>
<default>false</default>
</values>
<values>
- <fullName>012C600000003HRIAY</fullName>
+ <fullName>01210000000QeztAAC</fullName>
<default>false</default>
</values>
</picklistValues>
@@ -300,11 +300,27 @@
<picklistValues>
<picklist>irresponsibleReason__c</picklist>
<values>
+ <fullName>1 椤圭洰閲嶅</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>10 浣庨绠楃數鍒�%2F瓒呭０鍒�涓绘満</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>11 闆嗛噰椤圭洰鏆傛棤鏈�缁堢敤鎴�</fullName>
+ <default>false</default>
+ </values>
+ <values>
<fullName>3 棰勭畻杩囦綆</fullName>
<default>false</default>
</values>
<values>
<fullName>4 闄愬埗杩涘彛浜у搧</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>5 鏉ヤ笉鍙婂簲鏍�</fullName>
<default>false</default>
</values>
<values>
@@ -316,7 +332,11 @@
<default>false</default>
</values>
<values>
- <fullName>9 闆嗛噰椤圭洰鏆傛棤鏈�缁堢敤鎴�</fullName>
+ <fullName>8 鍗曠嫭閲囪喘瓒呭０鎺㈠ご</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>9 鍗曠嫭閲囪喘澶栫闀滃瓙</fullName>
<default>false</default>
</values>
<values>
@@ -325,14 +345,6 @@
</values>
<values>
<fullName>鎷涙爣浜у搧涓庢垜鍙镐笉鍖归厤</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鏃堕棿澶揣鏉ヤ笉鍙婂簲鏍�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>椤圭洰閲嶅</fullName>
<default>false</default>
</values>
</picklistValues>
@@ -354,10 +366,22 @@
<picklistValues>
<picklist>proInvolvedManual__c</picklist>
<values>
+ <fullName>BF绾ょ淮闀�</fullName>
+ <default>false</default>
+ </values>
+ <values>
<fullName>涓�娆℃�у唴闀�</fullName>
<default>false</default>
</values>
<values>
+ <fullName>涓�娆℃�ф敮姘旂闀�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>渚挎惡寮忔敮姘旂闀�</fullName>
+ <default>false</default>
+ </values>
+ <values>
<fullName>鍏宠妭闀�</fullName>
<default>false</default>
</values>
diff --git a/force-app/main/default/objects/Tender_information__c/recordTypes/ZC.recordType-meta.xml b/force-app/main/default/objects/Tender_information__c/recordTypes/ZC.recordType-meta.xml
index 0be8beb..6a881b8 100644
--- a/force-app/main/default/objects/Tender_information__c/recordTypes/ZC.recordType-meta.xml
+++ b/force-app/main/default/objects/Tender_information__c/recordTypes/ZC.recordType-meta.xml
@@ -242,27 +242,27 @@
<picklistValues>
<picklist>department_selection__c</picklist>
<values>
- <fullName>012C600000003HKIAY</fullName>
+ <fullName>01210000000QemLAAS</fullName>
<default>false</default>
</values>
<values>
- <fullName>012C600000003HLIAY</fullName>
+ <fullName>01210000000QezZAAS</fullName>
<default>false</default>
</values>
<values>
- <fullName>012C600000003HNIAY</fullName>
+ <fullName>01210000000QezeAAC</fullName>
<default>false</default>
</values>
<values>
- <fullName>012C600000003HOIAY</fullName>
+ <fullName>01210000000QezjAAC</fullName>
<default>false</default>
</values>
<values>
- <fullName>012C600000003HPIAY</fullName>
+ <fullName>01210000000QezoAAC</fullName>
<default>false</default>
</values>
<values>
- <fullName>012C600000003HRIAY</fullName>
+ <fullName>01210000000QeztAAC</fullName>
<default>false</default>
</values>
</picklistValues>
@@ -304,11 +304,27 @@
<picklistValues>
<picklist>irresponsibleReason__c</picklist>
<values>
+ <fullName>1 椤圭洰閲嶅</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>10 浣庨绠楃數鍒�%2F瓒呭０鍒�涓绘満</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>11 闆嗛噰椤圭洰鏆傛棤鏈�缁堢敤鎴�</fullName>
+ <default>false</default>
+ </values>
+ <values>
<fullName>3 棰勭畻杩囦綆</fullName>
<default>false</default>
</values>
<values>
<fullName>4 闄愬埗杩涘彛浜у搧</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>5 鏉ヤ笉鍙婂簲鏍�</fullName>
<default>false</default>
</values>
<values>
@@ -320,7 +336,11 @@
<default>false</default>
</values>
<values>
- <fullName>9 闆嗛噰椤圭洰鏆傛棤鏈�缁堢敤鎴�</fullName>
+ <fullName>8 鍗曠嫭閲囪喘瓒呭０鎺㈠ご</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>9 鍗曠嫭閲囪喘澶栫闀滃瓙</fullName>
<default>false</default>
</values>
<values>
@@ -329,14 +349,6 @@
</values>
<values>
<fullName>鎷涙爣浜у搧涓庢垜鍙镐笉鍖归厤</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>鏃堕棿澶揣鏉ヤ笉鍙婂簲鏍�</fullName>
- <default>false</default>
- </values>
- <values>
- <fullName>椤圭洰閲嶅</fullName>
<default>false</default>
</values>
</picklistValues>
@@ -358,10 +370,22 @@
<picklistValues>
<picklist>proInvolvedManual__c</picklist>
<values>
+ <fullName>BF绾ょ淮闀�</fullName>
+ <default>false</default>
+ </values>
+ <values>
<fullName>涓�娆℃�у唴闀�</fullName>
<default>false</default>
</values>
<values>
+ <fullName>涓�娆℃�ф敮姘旂闀�</fullName>
+ <default>false</default>
+ </values>
+ <values>
+ <fullName>渚挎惡寮忔敮姘旂闀�</fullName>
+ <default>false</default>
+ </values>
+ <values>
<fullName>鍏宠妭闀�</fullName>
<default>false</default>
</values>
diff --git a/force-app/main/default/objects/Tender_information__c/validationRules/InfoType_select_resultdate_check.validationRule-meta.xml b/force-app/main/default/objects/Tender_information__c/validationRules/InfoType_select_resultdate_check.validationRule-meta.xml
index 1a98ea6..8a565b4 100644
--- a/force-app/main/default/objects/Tender_information__c/validationRules/InfoType_select_resultdate_check.validationRule-meta.xml
+++ b/force-app/main/default/objects/Tender_information__c/validationRules/InfoType_select_resultdate_check.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>InfoType_select_resultdate_check</fullName>
- <active>false</active>
+ <active>true</active>
<description>椤圭洰闃舵閫夋嫨3锛氱粨鏋滐紝缁撴灉璁板綍鏃ヤ笉鑳戒负绌�</description>
<errorConditionFormula>Text(InfoType__c) = "3锛氱粨鏋�" && Text(subInfoType__c) != "3-1锛氬簾鏍囧叕鍛�" && Text(subInfoType__c) != "3-2锛氭祦鏍囧叕鍛�"
&& ISBLANK( ResultDate__c) && $Profile.Id != '00e10000000Y3o5'</errorConditionFormula>
diff --git a/force-app/main/default/objects/Tender_information_details__c/fields/Price_N__c.field-meta.xml b/force-app/main/default/objects/Tender_information_details__c/fields/Price_N__c.field-meta.xml
index 715910f..4f2a94c 100644
--- a/force-app/main/default/objects/Tender_information_details__c/fields/Price_N__c.field-meta.xml
+++ b/force-app/main/default/objects/Tender_information_details__c/fields/Price_N__c.field-meta.xml
@@ -6,10 +6,10 @@
if(isnumber(Price__c), VALUE(Price__c),
if(CONTAINS(Price__c, ','), VALUE(SUBSTITUTE(Price__c, ',', '')), 0)
))</formula>
- <label>鍗曚环(鏁板瓧)</label>
+ <label>鍗曚环(鍏�)</label>
<precision>18</precision>
<required>false</required>
- <scale>2</scale>
+ <scale>0</scale>
<trackTrending>false</trackTrending>
<type>Number</type>
<unique>false</unique>
diff --git a/force-app/main/default/objects/Tender_information_details__c/fields/TotalPrice_N__c.field-meta.xml b/force-app/main/default/objects/Tender_information_details__c/fields/TotalPrice_N__c.field-meta.xml
index 9eddb76..70a5d1e 100644
--- a/force-app/main/default/objects/Tender_information_details__c/fields/TotalPrice_N__c.field-meta.xml
+++ b/force-app/main/default/objects/Tender_information_details__c/fields/TotalPrice_N__c.field-meta.xml
@@ -2,14 +2,16 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>TotalPrice_N__c</fullName>
<externalId>false</externalId>
- <formula>if(isblank(TotalPrice__c), 0,
+ <formula>if(isblank(TotalPrice__c) && isblank(TotalPriceUnit__c), 0,
if(isnumber(TotalPrice__c), VALUE(TotalPrice__c),
-if(CONTAINS(TotalPrice__c, ','), VALUE(SUBSTITUTE(TotalPrice__c, ',', '')), 0)
+if(CONTAINS(TotalPrice__c, ','), VALUE(SUBSTITUTE(TotalPrice__c, ',', '')),
+if(isnumber(TotalPriceUnit__c), VALUE(TotalPriceUnit__c),
+if(CONTAINS(TotalPriceUnit__c, ','), VALUE(SUBSTITUTE(TotalPriceUnit__c, ',', '')), 0)))
))</formula>
<label>鏈」閲戦(鏁板瓧)</label>
<precision>18</precision>
<required>false</required>
- <scale>2</scale>
+ <scale>0</scale>
<trackTrending>false</trackTrending>
<type>Number</type>
<unique>false</unique>
diff --git a/force-app/main/default/objects/TrackConsumableSalesForecast__c/TrackConsumableSalesForecast__c.object-meta.xml b/force-app/main/default/objects/TrackConsumableSalesForecast__c/TrackConsumableSalesForecast__c.object-meta.xml
index 9dd6e7e..1c3ab68 100644
--- a/force-app/main/default/objects/TrackConsumableSalesForecast__c/TrackConsumableSalesForecast__c.object-meta.xml
+++ b/force-app/main/default/objects/TrackConsumableSalesForecast__c/TrackConsumableSalesForecast__c.object-meta.xml
@@ -172,10 +172,10 @@
<customTabListAdditionalFields>SaleStatus2__c</customTabListAdditionalFields>
<customTabListAdditionalFields>BillLostWarning__c</customTabListAdditionalFields>
<customTabListAdditionalFields>CREATED_DATE</customTabListAdditionalFields>
- <excludedStandardButtons>New</excludedStandardButtons>
- <excludedStandardButtons>MassChangeOwner</excludedStandardButtons>
<excludedStandardButtons>Import</excludedStandardButtons>
+ <excludedStandardButtons>MassChangeOwner</excludedStandardButtons>
<excludedStandardButtons>OpenListInQuip</excludedStandardButtons>
+ <excludedStandardButtons>New</excludedStandardButtons>
<searchResultsAdditionalFields>Hospital__c</searchResultsAdditionalFields>
<searchResultsAdditionalFields>Management_Code__c</searchResultsAdditionalFields>
<searchResultsAdditionalFields>ProductModel__c</searchResultsAdditionalFields>
diff --git a/force-app/main/default/objects/TrackConsumableSalesForecast__c/fields/Consumable_Category3__c.field-meta.xml b/force-app/main/default/objects/TrackConsumableSalesForecast__c/fields/Consumable_Category3__c.field-meta.xml
index 5a179f5..4934153 100644
--- a/force-app/main/default/objects/TrackConsumableSalesForecast__c/fields/Consumable_Category3__c.field-meta.xml
+++ b/force-app/main/default/objects/TrackConsumableSalesForecast__c/fields/Consumable_Category3__c.field-meta.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Consumable_Category3__c</fullName>
- <description>鍘熷悕鈥滆�楁潗鍒嗙被3鈥�</description>
+ <description>鏇剧敤鍚嶁�滆�楁潗鍒嗙被3鈥濃�滅洰鏍嘐T鈥�</description>
<externalId>false</externalId>
- <label>鐩爣ET</label>
+ <label>鐩爣鑰楁潗</label>
<length>255</length>
<required>false</required>
<trackHistory>false</trackHistory>
diff --git a/force-app/main/default/objects/TrackConsumableSalesForecast__c/fields/Packing_list_manual__c.field-meta.xml b/force-app/main/default/objects/TrackConsumableSalesForecast__c/fields/Packing_list_manual__c.field-meta.xml
new file mode 100644
index 0000000..066b57a
--- /dev/null
+++ b/force-app/main/default/objects/TrackConsumableSalesForecast__c/fields/Packing_list_manual__c.field-meta.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>Packing_list_manual__c</fullName>
+ <externalId>false</externalId>
+ <label>瑙勬牸</label>
+ <precision>3</precision>
+ <required>false</required>
+ <scale>0</scale>
+ <trackHistory>false</trackHistory>
+ <trackTrending>false</trackTrending>
+ <type>Number</type>
+ <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/TrackConsumableSalesForecast__c/listViews/All001.listView-meta.xml b/force-app/main/default/objects/TrackConsumableSalesForecast__c/listViews/All001.listView-meta.xml
index 19585f9..196a366 100644
--- a/force-app/main/default/objects/TrackConsumableSalesForecast__c/listViews/All001.listView-meta.xml
+++ b/force-app/main/default/objects/TrackConsumableSalesForecast__c/listViews/All001.listView-meta.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<ListView xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>All001</fullName>
+ <columns>NAME</columns>
<columns>Salesdepartment_HP__c</columns>
<columns>Province__c</columns>
<columns>Hospital__c</columns>
<columns>Management_Code__c</columns>
<columns>OCSM_Category__c</columns>
- <columns>Grade__c</columns>
<columns>ProductModel__c</columns>
<columns>SaleStatus1__c</columns>
<columns>SaleStatus2__c</columns>
@@ -33,5 +33,4 @@
<value>1</value>
</filters>
<label>澶卞崟棰勮</label>
- <language>zh_CN</language>
</ListView>
diff --git a/force-app/main/default/objects/TrackConsumableSalesForecast__c/listViews/All002.listView-meta.xml b/force-app/main/default/objects/TrackConsumableSalesForecast__c/listViews/All002.listView-meta.xml
index 673b9dc..7a3f45b 100644
--- a/force-app/main/default/objects/TrackConsumableSalesForecast__c/listViews/All002.listView-meta.xml
+++ b/force-app/main/default/objects/TrackConsumableSalesForecast__c/listViews/All002.listView-meta.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<ListView xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>All002</fullName>
+ <columns>NAME</columns>
<columns>Salesdepartment_HP__c</columns>
<columns>Province__c</columns>
<columns>Hospital__c</columns>
<columns>Management_Code__c</columns>
<columns>OCSM_Category__c</columns>
- <columns>Grade__c</columns>
<columns>ProductModel__c</columns>
<columns>SaleStatus1__c</columns>
<columns>SaleStatus2__c</columns>
@@ -26,6 +26,10 @@
<operation>equals</operation>
<value>鏂板紑</value>
</filters>
+ <filters>
+ <field>Province__c</field>
+ <operation>contains</operation>
+ <value>鍖椾含</value>
+ </filters>
<label>鏂板紑瀹㈡埛</label>
- <language>zh_CN</language>
</ListView>
diff --git a/force-app/main/default/objects/TrackConsumableSalesForecast__c/listViews/All003.listView-meta.xml b/force-app/main/default/objects/TrackConsumableSalesForecast__c/listViews/All003.listView-meta.xml
index 2efa182..51fffaf 100644
--- a/force-app/main/default/objects/TrackConsumableSalesForecast__c/listViews/All003.listView-meta.xml
+++ b/force-app/main/default/objects/TrackConsumableSalesForecast__c/listViews/All003.listView-meta.xml
@@ -1,20 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<ListView xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>All003</fullName>
+ <columns>NAME</columns>
<columns>Salesdepartment_HP__c</columns>
<columns>Province__c</columns>
<columns>Hospital__c</columns>
<columns>Management_Code__c</columns>
<columns>OCSM_Category__c</columns>
- <columns>Grade__c</columns>
+ <columns>Key_hospital__c</columns>
<columns>ProductModel__c</columns>
- <columns>SaleStatus1__c</columns>
+ <columns>LastShipmentDate__c</columns>
<columns>SaleStatus2__c</columns>
- <columns>LastMonthDeliveryNumber__c</columns>
- <columns>ThisMonthDeliveryNumber__c</columns>
<columns>LastSixMonthsAverage__c</columns>
<columns>Consumable_Category1__c</columns>
- <columns>Consumable_Category2__c</columns>
+ <columns>Consumable_Category3__c</columns>
<filterScope>Everything</filterScope>
<filters>
<field>SnapshotMonth__c</field>
@@ -27,5 +26,4 @@
<value>涓㈠崟</value>
</filters>
<label>涓㈠崟瀹㈡埛</label>
- <language>zh_CN</language>
</ListView>
diff --git a/force-app/main/default/objects/TrackConsumableSalesForecast__c/listViews/All007.listView-meta.xml b/force-app/main/default/objects/TrackConsumableSalesForecast__c/listViews/All007.listView-meta.xml
index 2151fef..6afe1f8 100644
--- a/force-app/main/default/objects/TrackConsumableSalesForecast__c/listViews/All007.listView-meta.xml
+++ b/force-app/main/default/objects/TrackConsumableSalesForecast__c/listViews/All007.listView-meta.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<ListView xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>All007</fullName>
+ <columns>NAME</columns>
<columns>Salesdepartment_HP__c</columns>
<columns>Province__c</columns>
<columns>Hospital__c</columns>
<columns>Management_Code__c</columns>
<columns>OCSM_Category__c</columns>
- <columns>Grade__c</columns>
<columns>ProductModel__c</columns>
<columns>SaleStatus1__c</columns>
<columns>SaleStatus2__c</columns>
@@ -28,5 +28,4 @@
<value>瀛橀噺</value>
</filters>
<label>瀛橀噺瀹㈡埛</label>
- <language>zh_CN</language>
</ListView>
diff --git a/force-app/main/default/objects/Training_test_Result__c/fields/campaign__c.field-meta.xml b/force-app/main/default/objects/Training_test_Result__c/fields/campaign__c.field-meta.xml
index b09f910..479b9d9 100644
--- a/force-app/main/default/objects/Training_test_Result__c/fields/campaign__c.field-meta.xml
+++ b/force-app/main/default/objects/Training_test_Result__c/fields/campaign__c.field-meta.xml
@@ -5,7 +5,7 @@
<externalId>false</externalId>
<label>瀛︿細銉诲煿璁�</label>
<lookupFilter>
- <active>false</active>
+ <active>true</active>
<filterItems>
<field>Campaign.RecordType.DeveloperName</field>
<operation>equals</operation>
diff --git a/force-app/main/default/objects/TransferApplyDetail__c/fields/OneToOneAsset__c.field-meta.xml b/force-app/main/default/objects/TransferApplyDetail__c/fields/OneToOneAsset__c.field-meta.xml
index 4f27d62..305e7d2 100644
--- a/force-app/main/default/objects/TransferApplyDetail__c/fields/OneToOneAsset__c.field-meta.xml
+++ b/force-app/main/default/objects/TransferApplyDetail__c/fields/OneToOneAsset__c.field-meta.xml
@@ -5,7 +5,7 @@
<externalId>false</externalId>
<label>涓�瀵逛竴涓讳綋淇濇湁璁惧</label>
<lookupFilter>
- <active>false</active>
+ <active>true</active>
<errorMessage>璇烽�夋嫨鍚堥�傜殑涓讳綋</errorMessage>
<filterItems>
<field>Asset.Asset_Owner__c</field>
diff --git a/force-app/main/default/objects/TransferApplyDetail__c/fields/Repair_Status_F__c.field-meta.xml b/force-app/main/default/objects/TransferApplyDetail__c/fields/Repair_Status_F__c.field-meta.xml
index ce4b9fa..2f789b1 100644
--- a/force-app/main/default/objects/TransferApplyDetail__c/fields/Repair_Status_F__c.field-meta.xml
+++ b/force-app/main/default/objects/TransferApplyDetail__c/fields/Repair_Status_F__c.field-meta.xml
@@ -2,7 +2,16 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Repair_Status_F__c</fullName>
<externalId>false</externalId>
- <formula>TEXT(123)</formula>
+ <formula>IF (OR(Inspection_result_after_NG_F__c == '缁翠慨', ISPICKVAL(Inspection_result_ng__c, '缁翠慨')),
+ IF (NOT( ISBLANK(Repair__c)),
+ CASE(TEXT(Repair__r.Status__c),
+ '4.淇悊鍝佽繑閫侀樁娈�', '淇悊瀹屾瘯',
+ '5.瀹屾瘯', '淇悊瀹屾瘯',
+ '0.鍙栨秷', '淇悊瀹屾瘯',
+ '0.鍒犻櫎', '淇悊瀹屾瘯',
+ '淇悊涓�'),
+ IF(Repair_Finished__c == true, '淇悊瀹屾瘯', '寰呬慨鐞�')),""
+)</formula>
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
<label>淇悊鐘舵��(Sys)</label>
<required>false</required>
diff --git a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/CanNotSetRDeliverySlipWhenConfirmLost.validationRule-meta.xml b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/CanNotSetRDeliverySlipWhenConfirmLost.validationRule-meta.xml
index c16593f..55c3b62 100644
--- a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/CanNotSetRDeliverySlipWhenConfirmLost.validationRule-meta.xml
+++ b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/CanNotSetRDeliverySlipWhenConfirmLost.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>CanNotSetRDeliverySlipWhenConfirmLost</fullName>
- <active>false</active>
+ <active>true</active>
<description>纭閬楀け鍚庯紝涓嶈兘璁剧疆鍥炲瘎鍗曘�傝鍏堝彇娑堢‘璁ら仐澶�</description>
<errorConditionFormula>NOT(ISBLANK(Confirm_Lost_Date__c))
&& NOT(ISBLANK( Return_DeliverySlip__c))</errorConditionFormula>
diff --git a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Can_Not_Create_Detail.validationRule-meta.xml b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Can_Not_Create_Detail.validationRule-meta.xml
index 677ff13..be7273a 100644
--- a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Can_Not_Create_Detail.validationRule-meta.xml
+++ b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Can_Not_Create_Detail.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Can_Not_Create_Detail</fullName>
- <active>false</active>
+ <active>true</active>
<description>鍔營SBLANK(Canceled_Id__c)鏄负浜嗚В鍐筹紝杩藉姞闄勫睘鍝佹槸鐢宠涓紝杩欎釜鏄惁鍑哄簱鍓嶇偣妫�NG鏃讹紝杩欎釜鍏ュ姏瑙勫垯鐨刢heck</description>
<errorConditionFormula>OR(Text(TransferApply__r.Status__c) = '鐢宠涓�', Text(TransferApply__r.Add_Approval_Status__c) = '鐢宠涓�')
&& ISNEW()</errorConditionFormula>
diff --git a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Can_Not_Create_Detail_Return.validationRule-meta.xml b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Can_Not_Create_Detail_Return.validationRule-meta.xml
index 13c6ccc..04e070b 100644
--- a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Can_Not_Create_Detail_Return.validationRule-meta.xml
+++ b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Can_Not_Create_Detail_Return.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Can_Not_Create_Detail_Return</fullName>
- <active>false</active>
+ <active>true</active>
<description>宸插洖瀵勭姸鎬佷笉鑳借拷鍔犻檮灞炲搧</description>
<errorConditionFormula>ISNEW()
&& TransferApplySummary__r.Wei_Return__c = 0
diff --git a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Can_Not_Select_Cancel_Reason_Zhu.validationRule-meta.xml b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Can_Not_Select_Cancel_Reason_Zhu.validationRule-meta.xml
index 83f6472..6eca938 100644
--- a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Can_Not_Select_Cancel_Reason_Zhu.validationRule-meta.xml
+++ b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Can_Not_Select_Cancel_Reason_Zhu.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Can_Not_Select_Cancel_Reason_Zhu</fullName>
- <active>false</active>
+ <active>true</active>
<description>蹇呴』杈撳叆鍙栨秷鐞嗙敱</description>
<errorConditionFormula>LEFT($User.ProfileId, 15) != LEFT($Label.ProfileId_SystemAdmin, 15)
&& LEFT($User.ProfileId, 15) != LEFT($Label.ProfileId_EquipmentCenter, 15)
diff --git a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Can_not_Delivery_By_Main_Error.validationRule-meta.xml b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Can_not_Delivery_By_Main_Error.validationRule-meta.xml
index 6fde77a..4198ee6 100644
--- a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Can_not_Delivery_By_Main_Error.validationRule-meta.xml
+++ b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Can_not_Delivery_By_Main_Error.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Can_not_Delivery_By_Main_Error</fullName>
- <active>false</active>
+ <active>true</active>
<description>From 澶囧搧Set</description>
<errorConditionFormula>(Check_lost_Item_F__c =='娆犲搧' || Inspection_result_after_NG_F__c='NG')
&& IsChanged(Shipment_request_time2__c)
diff --git a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Cancel_reason_not_null.validationRule-meta.xml b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Cancel_reason_not_null.validationRule-meta.xml
index 52e3721..785c107 100644
--- a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Cancel_reason_not_null.validationRule-meta.xml
+++ b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Cancel_reason_not_null.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Cancel_reason_not_null</fullName>
- <active>false</active>
+ <active>true</active>
<description>璇疯緭鍏ュ彇娑堢悊鐢�</description>
<errorConditionFormula>Cancel_Select__c &&
ISBLANK(Cancel_Reason__c)</errorConditionFormula>
diff --git a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Cannot_ChangeLost_When_Inspection.validationRule-meta.xml b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Cannot_ChangeLost_When_Inspection.validationRule-meta.xml
index 7148a46..42ee14a 100644
--- a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Cannot_ChangeLost_When_Inspection.validationRule-meta.xml
+++ b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Cannot_ChangeLost_When_Inspection.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Cannot_ChangeLost_When_Inspection</fullName>
- <active>false</active>
+ <active>true</active>
<description>鍋氫簡鏀惰揣妫�娴嬬殑鍊熷嚭澶囧搧閰嶅涓�瑙堟槑缁嗕笉鑳戒慨鏀规瑺鍝佺‘璁や俊鎭�</description>
<errorConditionFormula>ISNEW() == false
&& NOT(ISBLANK(After_Inspection_time_F__c))
diff --git a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Cannot_Change_Asset.validationRule-meta.xml b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Cannot_Change_Asset.validationRule-meta.xml
index 278a709..618de4b 100644
--- a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Cannot_Change_Asset.validationRule-meta.xml
+++ b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Cannot_Change_Asset.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Cannot_Change_Asset</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>StockDown__c
&& RecordType_F__c != 'AgencyToCenter'
&&(Asset__c == null || ISCHANGED(Asset__c)) &&
diff --git a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Cannot_Change_CancelANDCancelR.validationRule-meta.xml b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Cannot_Change_CancelANDCancelR.validationRule-meta.xml
index 3b54d57..ac0293a 100644
--- a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Cannot_Change_CancelANDCancelR.validationRule-meta.xml
+++ b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Cannot_Change_CancelANDCancelR.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Cannot_Change_CancelANDCancelR</fullName>
- <active>false</active>
+ <active>true</active>
<description>鍙栨秷鐞嗙敱鍜屽彇娑堝垎閰岶lag璁剧疆瀹屼簡鍚庯紝涓嶈兘淇敼銆�</description>
<errorConditionFormula>PRIORVALUE(Cancel_Select__c) && !ISBLANK(PRIORVALUE(Cancel_Reason__c))
&&
diff --git a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Cannot_Change_When_Cancel.validationRule-meta.xml b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Cannot_Change_When_Cancel.validationRule-meta.xml
index ac207f1..3d59d91 100644
--- a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Cannot_Change_When_Cancel.validationRule-meta.xml
+++ b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Cannot_Change_When_Cancel.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Cannot_Change_When_Cancel</fullName>
- <active>false</active>
+ <active>true</active>
<description>宸茬粡鍙栨秷鐨勬槑缁嗕笉鍙互鏇存柊锛岃閲嶆柊鍒锋柊鐢婚潰鍐嶆搷浣溿��</description>
<errorConditionFormula>ISCHANGED(Cancel_Select__c) == false
&& Cancel_Select__c = true
diff --git a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Cannot_Update_When_Finish.validationRule-meta.xml b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Cannot_Update_When_Finish.validationRule-meta.xml
index 1b32eda..6373c76 100644
--- a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Cannot_Update_When_Finish.validationRule-meta.xml
+++ b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Cannot_Update_When_Finish.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Cannot_Update_When_Finish</fullName>
- <active>false</active>
+ <active>true</active>
<description>宸插畬鎴愮殑璋冩嫧澶囧搧閰嶅涓�瑙堟槑缁嗕笉鍙互鍐嶅仛鏇存柊
鐢变簬DB202302510251 淇敼鏁版嵁鍏堝仠鐢ㄥ悗鍚敤</description>
<errorConditionFormula>ISNEW() == false
diff --git a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Cannot_check_when_no_cds.validationRule-meta.xml b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Cannot_check_when_no_cds.validationRule-meta.xml
index 9ecc2df..43e7ecf 100644
--- a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Cannot_check_when_no_cds.validationRule-meta.xml
+++ b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Cannot_check_when_no_cds.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Cannot_check_when_no_cds</fullName>
- <active>false</active>
+ <active>true</active>
<description>鍥炲簱妫�鏌ュ墠锛屽繀椤诲厛杩涜CDS</description>
<errorConditionFormula>(Not(IsBlank(Shippment_loaner_time_F__c)))
&& (CDS_complete__c = false && Not(IsBlank(After_Inspection_time_F__c))) && ($User.ProfileId <>'00e10000000Y3o5')</errorConditionFormula>
diff --git a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Cannot_stock_when_ng.validationRule-meta.xml b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Cannot_stock_when_ng.validationRule-meta.xml
index 13c69e5..0beb901 100644
--- a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Cannot_stock_when_ng.validationRule-meta.xml
+++ b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Cannot_stock_when_ng.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Cannot_stock_when_ng</fullName>
- <active>false</active>
+ <active>true</active>
<description>鍥炴敹鍚庣‘璁ょ粨鏋滀笉鏄疧K鐨勮瘽锛屼笉鑳藉洖搴�</description>
<errorConditionFormula>(Shippment_loaner_time_F__c!=null)
&& Inspection_result_after_F__c != 'OK' && ISCHANGED(Arrival_wh_time__c)
diff --git a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Check_NG_For_Un_Delivery.validationRule-meta.xml b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Check_NG_For_Un_Delivery.validationRule-meta.xml
index 98fc715..6f8ac0c 100644
--- a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Check_NG_For_Un_Delivery.validationRule-meta.xml
+++ b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Check_NG_For_Un_Delivery.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Check_NG_For_Un_Delivery</fullName>
- <active>false</active>
+ <active>true</active>
<description>鍙戣揣鍓嶆娴嬬粨鏋淣G锛屼笉鑳戒笂鏋�</description>
<errorConditionFormula>NOT( ISPICKVAL(Inspection_result_ng__c, '搴熷純'))
&& (Inspection_result_after_NG_F__c != '搴熷純')
diff --git a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Check_UnCDS_For_UpLoad.validationRule-meta.xml b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Check_UnCDS_For_UpLoad.validationRule-meta.xml
index 48456dc..6a6ca0b 100644
--- a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Check_UnCDS_For_UpLoad.validationRule-meta.xml
+++ b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Check_UnCDS_For_UpLoad.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Check_UnCDS_For_UpLoad</fullName>
- <active>false</active>
+ <active>true</active>
<description>娌℃湁杩涜CDS锛屼笉鑳戒笂鏋�</description>
<errorConditionFormula>OnStock_By_Cancel__c = false
&& IsBlank(CDS_complete_time__c)
diff --git a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Delivery_Before_Repair_Aborted.validationRule-meta.xml b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Delivery_Before_Repair_Aborted.validationRule-meta.xml
index b1164b1..1dd3ec9 100644
--- a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Delivery_Before_Repair_Aborted.validationRule-meta.xml
+++ b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Delivery_Before_Repair_Aborted.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Delivery_Before_Repair_Aborted</fullName>
- <active>false</active>
+ <active>true</active>
<description>鍙戣揣鍓峃G蹇呴』閫夋嫨缁翠慨鎴栬�呭簾寮�</description>
<errorConditionFormula>IsPickval(Inspection_result__c, 'NG')
&& IsBlank(Text(Inspection_result_ng__c))</errorConditionFormula>
diff --git a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Final_arrival_check.validationRule-meta.xml b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Final_arrival_check.validationRule-meta.xml
index 0b46c24..dc59e98 100644
--- a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Final_arrival_check.validationRule-meta.xml
+++ b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Final_arrival_check.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Final_arrival_check</fullName>
- <active>false</active>
+ <active>true</active>
<description>璇疯緭鍏�"鍥炴敹鍚�-妫�娴嬬粨鏋�"鐨勭粨鏋�</description>
<errorConditionFormula>OnStock_By_Cancel__c = false
&& Not(IsBlank(Shippment_loaner_time_F__c))
diff --git a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Fixture_Cannot_Repair_Without_NG.validationRule-meta.xml b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Fixture_Cannot_Repair_Without_NG.validationRule-meta.xml
index 7d41a78..2c73af5 100644
--- a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Fixture_Cannot_Repair_Without_NG.validationRule-meta.xml
+++ b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Fixture_Cannot_Repair_Without_NG.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Fixture_Cannot_Repair_Without_NG</fullName>
- <active>false</active>
+ <active>true</active>
<description>娌℃湁鐧诲綍妫�鏌G, 涓嶈兘寤轰慨鐞�</description>
<errorConditionFormula>Not(IsBlank(Repair__c))
&&
diff --git a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Inspection_After_NG_Aborted_Comment.validationRule-meta.xml b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Inspection_After_NG_Aborted_Comment.validationRule-meta.xml
index eaba499..1c68830 100644
--- a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Inspection_After_NG_Aborted_Comment.validationRule-meta.xml
+++ b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Inspection_After_NG_Aborted_Comment.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Inspection_After_NG_Aborted_Comment</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>IsPickval(Pre_NG_abord_reason__c,'鍏朵粬')
&& IsBlank(Pre_Inspection_Comment__c)</errorConditionFormula>
<errorDisplayField>Pre_Inspection_Comment__c</errorDisplayField>
diff --git a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Inspection_result_notOK_cannot_Shippment.validationRule-meta.xml b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Inspection_result_notOK_cannot_Shippment.validationRule-meta.xml
index f868510..a0d34a9 100644
--- a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Inspection_result_notOK_cannot_Shippment.validationRule-meta.xml
+++ b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Inspection_result_notOK_cannot_Shippment.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Inspection_result_notOK_cannot_Shippment</fullName>
- <active>false</active>
+ <active>true</active>
<description>鍙戣揣鍓�-妫�娴嬬粨鏋滀笉鍚堟牸锛屼笉鑳藉嚭搴撱��</description>
<errorConditionFormula>Not($User.Batch_User__c)
&& (IsBlank(Text(Inspection_result__c)) || IsPickval(Inspection_result__c, 'NG') || IsBlank(StockDown_time__c))
diff --git a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/IsBodyOrIsAccessory.validationRule-meta.xml b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/IsBodyOrIsAccessory.validationRule-meta.xml
index d343d07..ece08f1 100644
--- a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/IsBodyOrIsAccessory.validationRule-meta.xml
+++ b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/IsBodyOrIsAccessory.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>IsBodyOrIsAccessory</fullName>
- <active>false</active>
+ <active>true</active>
<description>闈炰竴瀵逛竴涓讳綋涓嶅彲浠ヨ皟鎷�
Not(Loaner_accsessary__c) && Not(Main_OneToOne__c), 20210517 1834</description>
<errorConditionFormula>NOT(ISBLANK(Asset__c))
diff --git a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Lost_For_Grounding.validationRule-meta.xml b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Lost_For_Grounding.validationRule-meta.xml
index 6844ca9..7cce4a5 100644
--- a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Lost_For_Grounding.validationRule-meta.xml
+++ b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Lost_For_Grounding.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Lost_For_Grounding</fullName>
- <active>false</active>
+ <active>true</active>
<description>涓绘満鏈夋瑺鍝侊紝涓嶈兘涓婃灦</description>
<errorConditionFormula>IsBlank(Shippment_loaner_time_F__c)
&& Check_lost_Item_F__c == '娆犲搧'
diff --git a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Must_Set_Both.validationRule-meta.xml b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Must_Set_Both.validationRule-meta.xml
index fc550f2..f6d0156 100644
--- a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Must_Set_Both.validationRule-meta.xml
+++ b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Must_Set_Both.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Must_Set_Both</fullName>
- <active>false</active>
+ <active>true</active>
<description>CDS鎷呭綋/CDS鏂瑰紡鏈夊�兼椂锛孋DS鏂瑰紡/CDS鎷呭綋涓嶈兘涓虹┖銆�</description>
<errorConditionFormula>ISBLANK(Text(CDSChargement__c)) != ISBLANK(Text(CDSType__c))</errorConditionFormula>
<errorMessage>CDS鎷呭綋/CDS鏂瑰紡鏈夊�兼椂锛孋DS鏂瑰紡/CDS鎷呭綋涓嶈兘涓虹┖銆�</errorMessage>
diff --git a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Need_Shippment_info_before_receive.validationRule-meta.xml b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Need_Shippment_info_before_receive.validationRule-meta.xml
index 62e53cc..d855b63 100644
--- a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Need_Shippment_info_before_receive.validationRule-meta.xml
+++ b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Need_Shippment_info_before_receive.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Need_Shippment_info_before_receive</fullName>
- <active>false</active>
+ <active>true</active>
<description>娌℃湁鍙戣揣璁板綍鐨勬儏鍐典笅锛屼笉鍙互鍥炴敹</description>
<errorConditionFormula>ISBLANK(DeliverySlip__c)
&& NOT(ISBLANK(Return_DeliverySlip__c))</errorConditionFormula>
diff --git a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Need_shipment_request_before_logistic.validationRule-meta.xml b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Need_shipment_request_before_logistic.validationRule-meta.xml
index 941346c..17a5e39 100644
--- a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Need_shipment_request_before_logistic.validationRule-meta.xml
+++ b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Need_shipment_request_before_logistic.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Need_shipment_request_before_logistic</fullName>
- <active>false</active>
+ <active>true</active>
<description>娌℃湁鍑哄簱鎸囩ず涔嬪墠锛屼笉鍙互鍙戣揣</description>
<errorConditionFormula>IsBlank(Shipment_request_time2__c)
&& ISCHANGED(DeliverySlip__c)
diff --git a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/NotStockDown_cannot_Shippment.validationRule-meta.xml b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/NotStockDown_cannot_Shippment.validationRule-meta.xml
index c3db236..5ecf7d3 100644
--- a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/NotStockDown_cannot_Shippment.validationRule-meta.xml
+++ b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/NotStockDown_cannot_Shippment.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>NotStockDown_cannot_Shippment</fullName>
- <active>false</active>
+ <active>true</active>
<description>鏈笅鏋讹紝涓嶈兘鍑哄簱銆�</description>
<errorConditionFormula>Not($User.Batch_User__c)
&& IsBlank(StockDown_time__c)
diff --git a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Only_Can_Select_Same_asset_location.validationRule-meta.xml b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Only_Can_Select_Same_asset_location.validationRule-meta.xml
index e307663..8bf468c 100644
--- a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Only_Can_Select_Same_asset_location.validationRule-meta.xml
+++ b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Only_Can_Select_Same_asset_location.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Only_Can_Select_Same_asset_location</fullName>
- <active>false</active>
+ <active>true</active>
<description>鍙兘鍒嗛厤鍜岀敵璇蜂功鐩稿悓澶囧搧瀛樻斁鍦扮殑淇濇湁璁惧</description>
<errorConditionFormula>LEFT($User.ProfileId, 15) = LEFT($Label.ProfileId_EquipmentCenter, 15)
&& ISCHANGED(Asset__c)
diff --git a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Receive_After_NG_Aborted.validationRule-meta.xml b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Receive_After_NG_Aborted.validationRule-meta.xml
index afda996..441ba4d 100644
--- a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Receive_After_NG_Aborted.validationRule-meta.xml
+++ b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Receive_After_NG_Aborted.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Receive_After_NG_Aborted</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>(IsPickval(Inspection_result_after_NG_Final__c, '搴熷純') ||
IsPickval(Inspection_result_after_ng__c, '搴熷純'))
&& IsBlank(Text(Inspection_NG_abord_reason__c))
diff --git a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Receive_After_NG_Aborted_Comment.validationRule-meta.xml b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Receive_After_NG_Aborted_Comment.validationRule-meta.xml
index caeccc8..53780ea 100644
--- a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Receive_After_NG_Aborted_Comment.validationRule-meta.xml
+++ b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Receive_After_NG_Aborted_Comment.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Receive_After_NG_Aborted_Comment</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>(TransferApply__r.RecordType.DeveloperName != 'CenterToAgency' || NOT(ISBLANK(Asset_return_time__c)))
&& IsPickval(Inspection_NG_abord_reason__c, '鍏朵粬')
&& IsBlank(Inspection_Comment__c)</errorConditionFormula>
diff --git a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Receive_After_Repair_Aborted.validationRule-meta.xml b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Receive_After_Repair_Aborted.validationRule-meta.xml
index 6dda7b8..e8c2b7f 100644
--- a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Receive_After_Repair_Aborted.validationRule-meta.xml
+++ b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Receive_After_Repair_Aborted.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Receive_After_Repair_Aborted</fullName>
- <active>false</active>
+ <active>true</active>
<description>鍥炴敹鍚嶯G蹇呴』閫夋嫨缁翠慨鎴栬�呭簾寮�</description>
<errorConditionFormula>IsPickval(Inspection_result_after__c, 'NG')
&& IsBlank(Text(Inspection_result_after_ng__c))
diff --git a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Receive_After_Repair_Aborted_Final.validationRule-meta.xml b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Receive_After_Repair_Aborted_Final.validationRule-meta.xml
index b84e4f9..a10fdf2 100644
--- a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Receive_After_Repair_Aborted_Final.validationRule-meta.xml
+++ b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Receive_After_Repair_Aborted_Final.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Receive_After_Repair_Aborted_Final</fullName>
- <active>false</active>
+ <active>true</active>
<description>鍥炴敹鍚嶯G蹇呴』閫夋嫨缁翠慨鎴栬�呭簾寮�</description>
<errorConditionFormula>IsPickval(Inspection_result_after_Final__c, 'NG')
&& IsBlank(Text(Inspection_result_after_NG_Final__c))
diff --git a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Repair_For_Main_Cant_Reload.validationRule-meta.xml b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Repair_For_Main_Cant_Reload.validationRule-meta.xml
index 4529243..30004c9 100644
--- a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Repair_For_Main_Cant_Reload.validationRule-meta.xml
+++ b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Repair_For_Main_Cant_Reload.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Repair_For_Main_Cant_Reload</fullName>
- <active>false</active>
+ <active>true</active>
<description>缁翠慨涓紝涓嶅彲浠ヤ笂鏋�</description>
<errorConditionFormula>Asset__r.Last_Reserve_TAES_Detail__c == Id
&& OR(Asset__r.Asset_situation__c == '淇悊鑽夋涓�', Asset__r.Asset_situation__c == '淇悊涓�', Asset__r.Asset_situation__c == '杩樻病褰掕繕')
diff --git a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Request_Return_Logistic_Number.validationRule-meta.xml b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Request_Return_Logistic_Number.validationRule-meta.xml
index 1808739..b0a01f1 100644
--- a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Request_Return_Logistic_Number.validationRule-meta.xml
+++ b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/Request_Return_Logistic_Number.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Request_Return_Logistic_Number</fullName>
- <active>false</active>
+ <active>true</active>
<description>鏈緭鍏ャ�愬洖瀵�-鍙戣揣杩愯緭鍗曞彿銆戯紝涓嶅彲浠ヨ繘琛屽叆搴撲笂鏋�</description>
<errorConditionFormula>OnStock_By_Cancel__c = false
&& Not(IsBlank(Shippment_loaner_time_F__c))
diff --git a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/repair_can_not_Shipment.validationRule-meta.xml b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/repair_can_not_Shipment.validationRule-meta.xml
index 577ce76..496e0b4 100644
--- a/force-app/main/default/objects/TransferApplyDetail__c/validationRules/repair_can_not_Shipment.validationRule-meta.xml
+++ b/force-app/main/default/objects/TransferApplyDetail__c/validationRules/repair_can_not_Shipment.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>repair_can_not_Shipment</fullName>
- <active>false</active>
+ <active>true</active>
<description>淇悊涓殑澶囧搧涓嶈兘鍑哄簱</description>
<errorConditionFormula>Asset__r.Last_Reserve_TAES_Detail__c == Id
&& OR(Asset__r.Asset_situation__c == '淇悊鑽夋涓�', Asset__r.Asset_situation__c == '淇悊涓�', Asset__r.Asset_situation__c == '杩樻病褰掕繕')
diff --git a/force-app/main/default/objects/TransferApplySummary__c/validationRules/Can_Not_Cancel_When_Have_Shipment.validationRule-meta.xml b/force-app/main/default/objects/TransferApplySummary__c/validationRules/Can_Not_Cancel_When_Have_Shipment.validationRule-meta.xml
index 04dffe7..c361b61 100644
--- a/force-app/main/default/objects/TransferApplySummary__c/validationRules/Can_Not_Cancel_When_Have_Shipment.validationRule-meta.xml
+++ b/force-app/main/default/objects/TransferApplySummary__c/validationRules/Can_Not_Cancel_When_Have_Shipment.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Can_Not_Cancel_When_Have_Shipment</fullName>
- <active>false</active>
+ <active>true</active>
<description>鏈夊嚭搴撴槑缁嗙殑涓�瑙堜笉鑳藉彇娑�</description>
<errorConditionFormula>Yi_loaner_arranged__c > 0 &&
Cancel_Select__c &&
diff --git a/force-app/main/default/objects/TransferApplySummary__c/validationRules/Cancel_reason_not_null.validationRule-meta.xml b/force-app/main/default/objects/TransferApplySummary__c/validationRules/Cancel_reason_not_null.validationRule-meta.xml
index 3d965e0..6fed56d 100644
--- a/force-app/main/default/objects/TransferApplySummary__c/validationRules/Cancel_reason_not_null.validationRule-meta.xml
+++ b/force-app/main/default/objects/TransferApplySummary__c/validationRules/Cancel_reason_not_null.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Cancel_reason_not_null</fullName>
- <active>false</active>
+ <active>true</active>
<description>璇疯緭鍏ュ彇娑堢悊鐢�</description>
<errorConditionFormula>Cancel_Select__c &&
NOT(Text(Received_Confirm__c) == 'NG') &&
diff --git a/force-app/main/default/objects/TransferApplySummary__c/validationRules/First_RAESD_Cannot_Canceled.validationRule-meta.xml b/force-app/main/default/objects/TransferApplySummary__c/validationRules/First_RAESD_Cannot_Canceled.validationRule-meta.xml
index 8d5658f..d9dfab6 100644
--- a/force-app/main/default/objects/TransferApplySummary__c/validationRules/First_RAESD_Cannot_Canceled.validationRule-meta.xml
+++ b/force-app/main/default/objects/TransferApplySummary__c/validationRules/First_RAESD_Cannot_Canceled.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>First_RAESD_Cannot_Canceled</fullName>
- <active>false</active>
+ <active>true</active>
<description>璇烽噸鏂板埛鏂拌鐢婚潰銆�</description>
<errorConditionFormula>ISCHANGED(First_TAD__c)
&& First_TAD__r.Cancel_Select__c</errorConditionFormula>
diff --git a/force-app/main/default/objects/TransferApplySummary__c/validationRules/Need_detail_when_confirm_ng.validationRule-meta.xml b/force-app/main/default/objects/TransferApplySummary__c/validationRules/Need_detail_when_confirm_ng.validationRule-meta.xml
index 48a71da..afeac17 100644
--- a/force-app/main/default/objects/TransferApplySummary__c/validationRules/Need_detail_when_confirm_ng.validationRule-meta.xml
+++ b/force-app/main/default/objects/TransferApplySummary__c/validationRules/Need_detail_when_confirm_ng.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Need_detail_when_confirm_ng</fullName>
- <active>false</active>
+ <active>true</active>
<description>纭缁撴灉NG鐨勬椂鍊欙紝蹇呴』濉啓璇︾粏鐨勫紓甯稿唴瀹�</description>
<errorConditionFormula>TEXT(Received_Confirm__c) = 'NG' && Received_ng_detail__c = null</errorConditionFormula>
<errorMessage>纭缁撴灉NG鐨勬椂鍊欙紝蹇呴』濉啓璇︾粏鐨勫紓甯稿唴瀹�</errorMessage>
diff --git a/force-app/main/default/objects/TransferApply__c/TransferApply__c.object-meta.xml b/force-app/main/default/objects/TransferApply__c/TransferApply__c.object-meta.xml
index ed2114c..598f8da 100644
--- a/force-app/main/default/objects/TransferApply__c/TransferApply__c.object-meta.xml
+++ b/force-app/main/default/objects/TransferApply__c/TransferApply__c.object-meta.xml
@@ -132,16 +132,22 @@
</actionOverrides>
<actionOverrides>
<actionName>View</actionName>
- <type>Default</type>
- </actionOverrides>
- <actionOverrides>
- <actionName>View</actionName>
+ <comment>Action override created by Lightning App Builder during activation.</comment>
+ <content>TransferApplyPage</content>
<formFactor>Large</formFactor>
- <type>Default</type>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>Flexipage</type>
</actionOverrides>
<actionOverrides>
<actionName>View</actionName>
+ <comment>Action override created by Lightning App Builder during activation.</comment>
+ <content>TransferApplyPage</content>
<formFactor>Small</formFactor>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>Flexipage</type>
+ </actionOverrides>
+ <actionOverrides>
+ <actionName>View</actionName>
<type>Default</type>
</actionOverrides>
<allowInChatterGroups>false</allowInChatterGroups>
diff --git a/force-app/main/default/objects/TransferApply__c/fields/BeiPinWindow_F__c.field-meta.xml b/force-app/main/default/objects/TransferApply__c/fields/BeiPinWindow_F__c.field-meta.xml
index ba8cefa..ae79592 100644
--- a/force-app/main/default/objects/TransferApply__c/fields/BeiPinWindow_F__c.field-meta.xml
+++ b/force-app/main/default/objects/TransferApply__c/fields/BeiPinWindow_F__c.field-meta.xml
@@ -18,23 +18,23 @@
select Id,Name from user where Alias in ('鍏宠礉濡�','璧甸潠鑻�','寮犲獩濯�','寰愭槑妤�','璧甸洴闆�','澶忎繆娲�')
*/
if(RecordType.DeveloperName = 'AgencyToCenter',
- if(ISPICKVAL(Owner:User.Dept__c, '鍖荤枟涓滃寳钀ヤ笟鏈儴'),'005C60000001UMMIA2',
- if(ISPICKVAL(Owner:User.Dept__c, '鍖荤枟鍗庡寳钀ヤ笟鏈儴'),'005C60000001UMaIAM',
- if(ISPICKVAL(Owner:User.Dept__c, '鍖荤枟瑗垮寳钀ヤ笟鏈儴'),'005C60000001UL9IAM',
- if(ISPICKVAL(Owner:User.Dept__c, '鍖荤枟鍗庝笢钀ヤ笟鏈儴'),'005C60000001UKVIA2',
- if(ISPICKVAL(Owner:User.Dept__c, '鍖荤枟瑗垮崡钀ヤ笟鏈儴'),'005C60000001UwLIAU',
- if(ISPICKVAL(Owner:User.Dept__c, '鍖荤枟鍗庡崡钀ヤ笟鏈儴'),'005C60000001UQ9IAM','')
+ if(ISPICKVAL(Owner:User.Dept__c, '鍖荤枟涓滃寳钀ヤ笟鏈儴'),'00510000001O6HoAAK',
+ if(ISPICKVAL(Owner:User.Dept__c, '鍖荤枟鍗庡寳钀ヤ笟鏈儴'),'00510000001O6I2AAK',
+ if(ISPICKVAL(Owner:User.Dept__c, '鍖荤枟瑗垮寳钀ヤ笟鏈儴'),'00510000000gW9pAAE',
+ if(ISPICKVAL(Owner:User.Dept__c, '鍖荤枟鍗庝笢钀ヤ笟鏈儴'),'00510000000gW9BAAU',
+ if(ISPICKVAL(Owner:User.Dept__c, '鍖荤枟瑗垮崡钀ヤ笟鏈儴'),'00510000008pVbWAAU',
+ if(ISPICKVAL(Owner:User.Dept__c, '鍖荤枟鍗庡崡钀ヤ笟鏈儴'),'00510000001OOMjAAO','')
)
)
)
)
),
- if(ISPICKVAL(Contact_Person__r.Dept__c, '鍖荤枟涓滃寳钀ヤ笟鏈儴'),'005C60000001UMMIA2',
- if(ISPICKVAL(Contact_Person__r.Dept__c, '鍖荤枟鍗庡寳钀ヤ笟鏈儴'),'005C60000001UMaIAM',
- if(ISPICKVAL(Contact_Person__r.Dept__c, '鍖荤枟瑗垮寳钀ヤ笟鏈儴'),'005C60000001UL9IAM',
- if(ISPICKVAL(Contact_Person__r.Dept__c, '鍖荤枟鍗庝笢钀ヤ笟鏈儴'),'005C60000001UKVIA2',
- if(ISPICKVAL(Contact_Person__r.Dept__c, '鍖荤枟瑗垮崡钀ヤ笟鏈儴'),'005C60000001UwLIAU',
- if(ISPICKVAL(Contact_Person__r.Dept__c, '鍖荤枟鍗庡崡钀ヤ笟鏈儴'),'005C60000001UQ9IAM','')
+ if(ISPICKVAL(Contact_Person__r.Dept__c, '鍖荤枟涓滃寳钀ヤ笟鏈儴'),'00510000001O6HoAAK',
+ if(ISPICKVAL(Contact_Person__r.Dept__c, '鍖荤枟鍗庡寳钀ヤ笟鏈儴'),'00510000001O6I2AAK',
+ if(ISPICKVAL(Contact_Person__r.Dept__c, '鍖荤枟瑗垮寳钀ヤ笟鏈儴'),'00510000000gW9pAAE',
+ if(ISPICKVAL(Contact_Person__r.Dept__c, '鍖荤枟鍗庝笢钀ヤ笟鏈儴'),'00510000000gW9BAAU',
+ if(ISPICKVAL(Contact_Person__r.Dept__c, '鍖荤枟瑗垮崡钀ヤ笟鏈儴'),'00510000008pVbWAAU',
+ if(ISPICKVAL(Contact_Person__r.Dept__c, '鍖荤枟鍗庡崡钀ヤ笟鏈儴'),'00510000001OOMjAAO','')
)
)
)
diff --git a/force-app/main/default/objects/TransferApply__c/fields/QRImg__c.field-meta.xml b/force-app/main/default/objects/TransferApply__c/fields/QRImg__c.field-meta.xml
index 724306e..ceaacfb 100644
--- a/force-app/main/default/objects/TransferApply__c/fields/QRImg__c.field-meta.xml
+++ b/force-app/main/default/objects/TransferApply__c/fields/QRImg__c.field-meta.xml
@@ -2,7 +2,7 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>QRImg__c</fullName>
<externalId>false</externalId>
- <formula>IMAGE("/servlet/servlet.FileDownload?file=" & QRId__c, "qrcode")</formula>
+ <formula>IMAGE("/sfc/servlet.shepherd/version/download/" & QRId__c, "qrcode")</formula>
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
<label>QRImg</label>
<required>false</required>
diff --git a/force-app/main/default/objects/Visit_Report__c/fields/Submit_report_day__c.field-meta.xml b/force-app/main/default/objects/Visit_Report__c/fields/Submit_report_day__c.field-meta.xml
index 31fa73f..77e9787 100644
--- a/force-app/main/default/objects/Visit_Report__c/fields/Submit_report_day__c.field-meta.xml
+++ b/force-app/main/default/objects/Visit_Report__c/fields/Submit_report_day__c.field-meta.xml
@@ -2,7 +2,7 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Submit_report_day__c</fullName>
<externalId>false</externalId>
- <inlineHelpText>Report Submission Date</inlineHelpText>
+ <inlineHelpText>鎶ュ憡涔︽彁浜ゆ棩</inlineHelpText>
<label>鎶ュ憡涔�-鎻愪氦鏃�</label>
<required>false</required>
<trackTrending>false</trackTrending>
diff --git a/force-app/main/default/objects/Visit_Report__c/fields/Superior__c.field-meta.xml b/force-app/main/default/objects/Visit_Report__c/fields/Superior__c.field-meta.xml
index 726eb95..3d70842 100644
--- a/force-app/main/default/objects/Visit_Report__c/fields/Superior__c.field-meta.xml
+++ b/force-app/main/default/objects/Visit_Report__c/fields/Superior__c.field-meta.xml
@@ -3,7 +3,7 @@
<fullName>Superior__c</fullName>
<deleteConstraint>SetNull</deleteConstraint>
<externalId>false</externalId>
- <inlineHelpText>Please input name of submitted object</inlineHelpText>
+ <inlineHelpText>璇疯緭鍏ユ彁浜ゅ璞＄殑鍚嶅瓧</inlineHelpText>
<label>鍫卞憡鍏�</label>
<referenceTo>User</referenceTo>
<relationshipName>Visit_Superiors</relationshipName>
diff --git a/force-app/main/default/objects/Visit_Report__c/validationRules/Require_Evaluate1.validationRule-meta.xml b/force-app/main/default/objects/Visit_Report__c/validationRules/Require_Evaluate1.validationRule-meta.xml
index 9afcbf9..19e5813 100644
--- a/force-app/main/default/objects/Visit_Report__c/validationRules/Require_Evaluate1.validationRule-meta.xml
+++ b/force-app/main/default/objects/Visit_Report__c/validationRules/Require_Evaluate1.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Require_Evaluate1</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>Text(Status__c) = '鐢宠珛涓�' && Isblank(Text(Evaluate1__c))</errorConditionFormula>
<errorDisplayField>Evaluate1__c</errorDisplayField>
<errorMessage>璇勪环椤圭洰1 浜у搧鐭ヨ瘑蹇呴��</errorMessage>
diff --git a/force-app/main/default/objects/Visit_Report__c/validationRules/Require_Evaluate2.validationRule-meta.xml b/force-app/main/default/objects/Visit_Report__c/validationRules/Require_Evaluate2.validationRule-meta.xml
index 99ce8d9..681fdad 100644
--- a/force-app/main/default/objects/Visit_Report__c/validationRules/Require_Evaluate2.validationRule-meta.xml
+++ b/force-app/main/default/objects/Visit_Report__c/validationRules/Require_Evaluate2.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Require_Evaluate2</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>Text(Status__c) = '鐢宠珛涓�' && Isblank(Text(Evaluate2__c))</errorConditionFormula>
<errorDisplayField>Evaluate2__c</errorDisplayField>
<errorMessage>璇勪环椤圭洰2 鐢ㄦ埛鍏崇郴蹇呴��</errorMessage>
diff --git a/force-app/main/default/objects/Visit_Report__c/validationRules/Require_Evaluate3.validationRule-meta.xml b/force-app/main/default/objects/Visit_Report__c/validationRules/Require_Evaluate3.validationRule-meta.xml
index 14c26ea..3fb9d2d 100644
--- a/force-app/main/default/objects/Visit_Report__c/validationRules/Require_Evaluate3.validationRule-meta.xml
+++ b/force-app/main/default/objects/Visit_Report__c/validationRules/Require_Evaluate3.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Require_Evaluate3</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>Text(Status__c) = '鐢宠珛涓�' && Isblank(Text(Evaluate3__c))</errorConditionFormula>
<errorDisplayField>Evaluate3__c</errorDisplayField>
<errorMessage>璇勪环椤圭洰3 閿�鍞妧鏈繀閫�</errorMessage>
diff --git a/force-app/main/default/objects/Visit_Report__c/validationRules/Require_Evaluate4.validationRule-meta.xml b/force-app/main/default/objects/Visit_Report__c/validationRules/Require_Evaluate4.validationRule-meta.xml
index cb55e59..3f19585 100644
--- a/force-app/main/default/objects/Visit_Report__c/validationRules/Require_Evaluate4.validationRule-meta.xml
+++ b/force-app/main/default/objects/Visit_Report__c/validationRules/Require_Evaluate4.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Require_Evaluate4</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>Text(Status__c) = '鐢宠珛涓�' && Isblank(Text(Evaluate4__c))</errorConditionFormula>
<errorDisplayField>Evaluate4__c</errorDisplayField>
<errorMessage>璇勪环椤圭洰4 鐢ㄦ埛璇鹃鎶婃彙搴﹀繀閫�</errorMessage>
diff --git a/force-app/main/default/objects/Visit_Report__c/validationRules/Require_Evaluate_And_Problem.validationRule-meta.xml b/force-app/main/default/objects/Visit_Report__c/validationRules/Require_Evaluate_And_Problem.validationRule-meta.xml
index a3ed285..fbf2f71 100644
--- a/force-app/main/default/objects/Visit_Report__c/validationRules/Require_Evaluate_And_Problem.validationRule-meta.xml
+++ b/force-app/main/default/objects/Visit_Report__c/validationRules/Require_Evaluate_And_Problem.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Require_Evaluate_And_Problem</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>Text(Status__c) = '鐢宠珛涓�' && Isblank(Evaluate_And_Problem__c)</errorConditionFormula>
<errorDisplayField>Evaluate_And_Problem__c</errorDisplayField>
<errorMessage>鎬昏瘎浠蜂互鍙婁粖鍚庤棰�(鍙嶉)蹇呭～</errorMessage>
diff --git a/force-app/main/default/objects/Visit_Report__c/validationRules/Require_Subordinate.validationRule-meta.xml b/force-app/main/default/objects/Visit_Report__c/validationRules/Require_Subordinate.validationRule-meta.xml
index 6af4042..5256cb1 100644
--- a/force-app/main/default/objects/Visit_Report__c/validationRules/Require_Subordinate.validationRule-meta.xml
+++ b/force-app/main/default/objects/Visit_Report__c/validationRules/Require_Subordinate.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Require_Subordinate</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>Text(Status__c) = '鐢宠珛涓�' && Isblank(Subordinate__c)</errorConditionFormula>
<errorDisplayField>Subordinate__c</errorDisplayField>
<errorMessage>鍚岃浜哄繀濉�</errorMessage>
diff --git a/force-app/main/default/objects/Visit_Report__c/validationRules/Require_submit_manager.validationRule-meta.xml b/force-app/main/default/objects/Visit_Report__c/validationRules/Require_submit_manager.validationRule-meta.xml
index d72d21a..197f28b 100644
--- a/force-app/main/default/objects/Visit_Report__c/validationRules/Require_submit_manager.validationRule-meta.xml
+++ b/force-app/main/default/objects/Visit_Report__c/validationRules/Require_submit_manager.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Require_submit_manager</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>Text(Status__c) = '鐢宠珛涓�' && Isblank(Superior__c)</errorConditionFormula>
<errorDisplayField>Superior__c</errorDisplayField>
<errorMessage>鎶ュ憡瀵硅薄蹇呭～</errorMessage>
diff --git a/force-app/main/default/objects/Visit_Report__c/validationRules/Required_Date.validationRule-meta.xml b/force-app/main/default/objects/Visit_Report__c/validationRules/Required_Date.validationRule-meta.xml
index 44be17a..67c9aa8 100644
--- a/force-app/main/default/objects/Visit_Report__c/validationRules/Required_Date.validationRule-meta.xml
+++ b/force-app/main/default/objects/Visit_Report__c/validationRules/Required_Date.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Required_Date</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>Text(Status__c) = '鐢宠珛涓�' && Isnull(Date__c)</errorConditionFormula>
<errorDisplayField>Date__c</errorDisplayField>
<errorMessage>鏃ユ湡蹇呭～</errorMessage>
diff --git a/force-app/main/default/objects/Visit_Report__c/validationRules/Required_Department.validationRule-meta.xml b/force-app/main/default/objects/Visit_Report__c/validationRules/Required_Department.validationRule-meta.xml
index 97b565a..caf052d 100644
--- a/force-app/main/default/objects/Visit_Report__c/validationRules/Required_Department.validationRule-meta.xml
+++ b/force-app/main/default/objects/Visit_Report__c/validationRules/Required_Department.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Required_Department</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>Text(Status__c) = '鐢宠珛涓�' && Isblank(Department__c)</errorConditionFormula>
<errorDisplayField>Department__c</errorDisplayField>
<errorMessage>绉戝蹇呭～</errorMessage>
diff --git a/force-app/main/default/objects/eSignForm__c/fields/skip_Distribution_Sign__c.field-meta.xml b/force-app/main/default/objects/eSignForm__c/fields/skip_Distribution_Sign__c.field-meta.xml
index aa556ae..6f2b658 100644
--- a/force-app/main/default/objects/eSignForm__c/fields/skip_Distribution_Sign__c.field-meta.xml
+++ b/force-app/main/default/objects/eSignForm__c/fields/skip_Distribution_Sign__c.field-meta.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>skip_Distribution_Sign__c</fullName>
- <description>缁忛攢鍟嗙鏀舵椂鍒ゆ柇</description>
+ <description>缁忛攢鍟嗙鏀舵椂鍒ゆ柇
+20230830 澧炲姞铏氭嫙绛炬敹鍗曞垽鏂�</description>
<externalId>false</externalId>
- <formula>if(SalesRootFormula__c == 'OCM鐩存帴璨╁２'||Hazardous_Chemicals__c||isFreeDelivery__c,true,false)</formula>
- <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <formula>if(SalesRootFormula__c == 'OCM鐩存帴璨╁２'||Hazardous_Chemicals__c||isFreeDelivery__c|| VirtualForm__c ,true,false)</formula>
<label>璺宠繃缁忛攢鍟嗙鏀�</label>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
diff --git a/force-app/main/default/objects/eSignForm__c/fields/skip_Hospital_Sign__c.field-meta.xml b/force-app/main/default/objects/eSignForm__c/fields/skip_Hospital_Sign__c.field-meta.xml
index b456e06..71d6c77 100644
--- a/force-app/main/default/objects/eSignForm__c/fields/skip_Hospital_Sign__c.field-meta.xml
+++ b/force-app/main/default/objects/eSignForm__c/fields/skip_Hospital_Sign__c.field-meta.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>skip_Hospital_Sign__c</fullName>
- <description>鍖婚櫌绛炬敹鏃跺垽鏂�</description>
+ <description>鍖婚櫌绛炬敹鏃跺垽鏂�
+20230830 澧炲姞铏氭嫙绛炬敹鍗曞垽鏂�</description>
<externalId>false</externalId>
- <formula>if(end_User__c == '濂戠磩',true,false)</formula>
- <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+ <formula>if(OR(end_User__c == '濂戠磩', VirtualForm__c ),true,false)</formula>
<label>璺宠繃鍖婚櫌绛炬敹</label>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
diff --git a/force-app/main/default/objects/eSignForm__c/validationRules/HPAcceptanceOrRejection.validationRule-meta.xml b/force-app/main/default/objects/eSignForm__c/validationRules/HPAcceptanceOrRejection.validationRule-meta.xml
index 6ce482c..0053ddc 100644
--- a/force-app/main/default/objects/eSignForm__c/validationRules/HPAcceptanceOrRejection.validationRule-meta.xml
+++ b/force-app/main/default/objects/eSignForm__c/validationRules/HPAcceptanceOrRejection.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>HPAcceptanceOrRejection</fullName>
- <active>false</active>
+ <active>true</active>
<description>$Profile.Id != '00e10000000dzzG'&&$Profile.Id != '00e10000000Y3o5'&&$User.Id != '00510000000fSYI'&&
(GoodCount__c-GoodCountAgency__c>0) &&ISBLANK(handleOpinionHP__c) &&PRIORVALUE(agencyAutoSignUpStatus__c)='鐢宠涓�'&&text(agencyAutoSignUpStatus__c)='宸叉壒鍑�'</description>
<errorConditionFormula>(GoodCount__c-GoodCountAgency__c>0) &&ISBLANK(handleOpinionHP__c) && text(agencyAutoSignUpStatus__c)='宸叉壒鍑�' && ISCHANGED(agencyAutoSignUpStatus__c)&&Sales_Root_Formula__c='OCM鐩存帴璨╁２'</errorConditionFormula>
diff --git a/force-app/main/default/objects/eSignForm__c/validationRules/agencyAcceptanceOrRejection.validationRule-meta.xml b/force-app/main/default/objects/eSignForm__c/validationRules/agencyAcceptanceOrRejection.validationRule-meta.xml
index f651f2f..8e2fd98 100644
--- a/force-app/main/default/objects/eSignForm__c/validationRules/agencyAcceptanceOrRejection.validationRule-meta.xml
+++ b/force-app/main/default/objects/eSignForm__c/validationRules/agencyAcceptanceOrRejection.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>agencyAcceptanceOrRejection</fullName>
- <active>false</active>
+ <active>true</active>
<description>$Profile.Id != '00e10000000dzzG'&&$Profile.Id != '00e10000000Y3o5'&&$User.Id != '00510000000fSYI'&&
(GoodCount__c-GoodCountAgency__c>0) &&ISBLANK(handleOpinionAgency__c) &&PRIORVALUE(agencyAutoSignUpStatus__c)='鐢宠涓�'&&text(agencyAutoSignUpStatus__c)='宸叉壒鍑�'</description>
<errorConditionFormula>(GoodCount__c-GoodCountAgency__c>0) &&ISBLANK(handleOpinionAgency__c) && text(agencyAutoSignUpStatus__c)='宸叉壒鍑�' && ISCHANGED(agencyAutoSignUpStatus__c)</errorConditionFormula>
diff --git a/force-app/main/default/objects/meeting_delay_apply__c/validationRules/EndDateCantLessThanStartDate.validationRule-meta.xml b/force-app/main/default/objects/meeting_delay_apply__c/validationRules/EndDateCantLessThanStartDate.validationRule-meta.xml
index 05bded5..28c60be 100644
--- a/force-app/main/default/objects/meeting_delay_apply__c/validationRules/EndDateCantLessThanStartDate.validationRule-meta.xml
+++ b/force-app/main/default/objects/meeting_delay_apply__c/validationRules/EndDateCantLessThanStartDate.validationRule-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>EndDateCantLessThanStartDate</fullName>
- <active>false</active>
+ <active>true</active>
<errorConditionFormula>meeting_end_date__c < meeting_start_date__c</errorConditionFormula>
<errorMessage>浼氳缁撴潫鏃堕棿涓嶅緱灏忎簬浼氳寮�濮嬫椂闂�</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/solutionClosingAttachment__c/fields/Solution_Programme__c.field-meta.xml b/force-app/main/default/objects/solutionClosingAttachment__c/fields/Solution_Programme__c.field-meta.xml
index 69a47f1..2b939af 100644
--- a/force-app/main/default/objects/solutionClosingAttachment__c/fields/Solution_Programme__c.field-meta.xml
+++ b/force-app/main/default/objects/solutionClosingAttachment__c/fields/Solution_Programme__c.field-meta.xml
@@ -4,7 +4,7 @@
<externalId>false</externalId>
<label>Solution鏂规</label>
<lookupFilter>
- <active>false</active>
+ <active>true</active>
<errorMessage>鍙湁缁撴鏂规鎵嶈兘鍒涘缓缁撴闄勪欢</errorMessage>
<filterItems>
<field>Solution_Programme__c.Scheme_Type__c</field>
diff --git a/force-app/main/default/objects/task__c/validationRules/CanNotAssignTasksToNonSubordinaUsers.validationRule-meta.xml b/force-app/main/default/objects/task__c/validationRules/CanNotAssignTasksToNonSubordinaUsers.validationRule-meta.xml
index e32981d..5ae54bc 100644
--- a/force-app/main/default/objects/task__c/validationRules/CanNotAssignTasksToNonSubordinaUsers.validationRule-meta.xml
+++ b/force-app/main/default/objects/task__c/validationRules/CanNotAssignTasksToNonSubordinaUsers.validationRule-meta.xml
@@ -4,11 +4,10 @@
<active>true</active>
<description>//2021-11-05 mzy 浠诲姟绠＄悊鏀瑰杽
//鏍￠獙 缁忕悊(鏈嶅姟) ,缁忕悊(鎺ㄥ箍),缁忕悊(澶囧搧),閮ㄩ暱(鎺ㄥ箍),閮ㄩ暱(鏈嶅姟),閮ㄩ暱(澶囧搧),鎬荤洃,缁熸嫭鎬荤洃
-//璺宠繃绠＄悊鍛�
-//淇敼Id涓洪樋閲岀郴缁熺鐞嗗憳绠�妗d</description>
+//璺宠繃绠＄悊鍛�</description>
<errorConditionFormula>(IsNew()|| ISCHANGED( assignee__c ) )&&Text(taskDifferent__c)='涓婄骇鍒嗛厤浠诲姟'&&(assignee__r.JingliApprovalManager__c != $User.Id && assignee__r.SalesManager__c != $User.Id && assignee__r.ManagerId != $User.Id
&& assignee__r.JingliEquipmentManager__c!= $User.Id
&& assignee__r.BuchangApprovalManagerSales__c!= $User.Id && assignee__r.BuchangApprovalManager__c!= $User.Id && assignee__r.Buzhang_Equipment_Manager__c!= $User.Id && assignee__r.ZongjianApprovalManager__c!= $User.Id && assignee__r.TongkuoZongjian__c!= $User.Id
-)&&$User.ProfileId != '00eC800000005CbIAI'</errorConditionFormula>
+)&&$User.ProfileId != '00e10000000Y3o5'</errorConditionFormula>
<errorMessage>鎮ㄥ彧鑳界粰鎮ㄧ殑涓嬪睘鍒嗛厤浠诲姟</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/task__c/validationRules/LeadAssignmentTaskIsRecordType.validationRule-meta.xml b/force-app/main/default/objects/task__c/validationRules/LeadAssignmentTaskIsRecordType.validationRule-meta.xml
index 038fc4a..1e29643 100644
--- a/force-app/main/default/objects/task__c/validationRules/LeadAssignmentTaskIsRecordType.validationRule-meta.xml
+++ b/force-app/main/default/objects/task__c/validationRules/LeadAssignmentTaskIsRecordType.validationRule-meta.xml
@@ -9,6 +9,5 @@
&&RecordType.DeveloperName !='DailyVisit'
&&RecordType.DeveloperName!='OpportunityFollow'
&&RecordType.DeveloperName!='HAccountVisit')</errorConditionFormula>
- <errorDisplayField>Task_After_3_WorkDay__c</errorDisplayField>
<errorMessage>涓婄骇鍒嗛厤浠诲姟鍙厑璁镐互涓嬭褰曠被鍨嬶細OPD锛屽叾浠栵紝鏃ュ父鎷滆锛岃浠疯窡杩涖��</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/task__c/validationRules/NotAdminCannotCreateTask.validationRule-meta.xml b/force-app/main/default/objects/task__c/validationRules/NotAdminCannotCreateTask.validationRule-meta.xml
index eebc9ed..597e253 100644
--- a/force-app/main/default/objects/task__c/validationRules/NotAdminCannotCreateTask.validationRule-meta.xml
+++ b/force-app/main/default/objects/task__c/validationRules/NotAdminCannotCreateTask.validationRule-meta.xml
@@ -3,6 +3,6 @@
<fullName>NotAdminCannotCreateTask</fullName>
<active>true</active>
<description>闈炵郴缁熺鐞嗗憳涓嶈兘鍒涘缓琚姩浠诲姟</description>
- <errorConditionFormula>ISNEW() && Text(taskDifferent__c) = '琚姩浠诲姟' && $User.ProfileId != '00eC800000005Cb' && RecordTypeId != '012C600000003Kz' && RecordTypeId != '012C600000003Kn'</errorConditionFormula>
+ <errorConditionFormula>ISNEW() && Text(taskDifferent__c) = '琚姩浠诲姟' && $User.ProfileId != '00e10000000Y3o5' && RecordTypeId != '01210000000aMAY' && RecordTypeId != '01210000000aMAX'</errorConditionFormula>
<errorMessage>闈炵郴缁熺鐞嗗憳涓嶈兘鍒涘缓琚姩浠诲姟</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/task__c/validationRules/YouCanNotEditTaskDifferent.validationRule-meta.xml b/force-app/main/default/objects/task__c/validationRules/YouCanNotEditTaskDifferent.validationRule-meta.xml
index 2f240cd..e28a127 100644
--- a/force-app/main/default/objects/task__c/validationRules/YouCanNotEditTaskDifferent.validationRule-meta.xml
+++ b/force-app/main/default/objects/task__c/validationRules/YouCanNotEditTaskDifferent.validationRule-meta.xml
@@ -4,6 +4,6 @@
<active>true</active>
<description>//2021-11-17 mzy 浠诲姟绠＄悊鏀瑰杽
LEFT($User.UserId__c,15)==LEFT( assignee__c ,15)&& ISCHANGED( taskDifferent__c )&&$User.ProfileId != '00e10000000Y3o5'</description>
- <errorConditionFormula>ISCHANGED( taskDifferent__c )&&$User.ProfileId != '00eC800000005Cb'</errorConditionFormula>
+ <errorConditionFormula>ISCHANGED( taskDifferent__c )&&$User.ProfileId != '00e10000000Y3o5'</errorConditionFormula>
<errorMessage>闈炵郴缁熺鐞嗗憳涓嶈兘淇敼浠诲姟鍖哄垎</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/task__c/validationRules/winBiddingLoseCancelListTask.validationRule-meta.xml b/force-app/main/default/objects/task__c/validationRules/winBiddingLoseCancelListTask.validationRule-meta.xml
index a1ca180..16a9ca9 100644
--- a/force-app/main/default/objects/task__c/validationRules/winBiddingLoseCancelListTask.validationRule-meta.xml
+++ b/force-app/main/default/objects/task__c/validationRules/winBiddingLoseCancelListTask.validationRule-meta.xml
@@ -3,6 +3,6 @@
<fullName>winBiddingLoseCancelListTask</fullName>
<active>true</active>
<description>涓爣/澶卞崟鎵嬪姩鍙栨秷浠诲姟鍒ゆ柇,绠＄悊鍛樻墜鍔ㄥ彇娑堜换鍔★紝鍙栨秷鐞嗙敱锛堝叾浠栵級蹇呭～锛�</description>
- <errorConditionFormula>(RecordTypeId = '012C600000003Kz'|| RecordTypeId = '012C600000003Kn') && TEXT(cancelReason__c)=='鍏朵粬' && ISBLANK(cancelReasonOther__c)</errorConditionFormula>
+ <errorConditionFormula>(RecordTypeId = '01210000000aMAY'|| RecordTypeId = '01210000000aMAX') && TEXT(cancelReason__c)=='鍏朵粬' && ISBLANK(cancelReasonOther__c)</errorConditionFormula>
<errorMessage>鍙栨秷鐞嗙敱閫夋嫨鍏朵粬鏃讹紝鍙栨秷鐞嗙敱锛堝叾浠栵級蹇呭～锛�</errorMessage>
</ValidationRule>
diff --git a/force-app/main/default/objects/waybill__c/compactLayouts/OTS.compactLayout-meta.xml b/force-app/main/default/objects/waybill__c/compactLayouts/OTS.compactLayout-meta.xml
new file mode 100644
index 0000000..db2f39c
--- /dev/null
+++ b/force-app/main/default/objects/waybill__c/compactLayouts/OTS.compactLayout-meta.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CompactLayout xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>OTS</fullName>
+ <fields>Name</fields>
+ <fields>waybill_number__c</fields>
+ <fields>waybill_status__c</fields>
+ <label>OTS鐗╂祦杩愯揣鍗�</label>
+</CompactLayout>
diff --git a/force-app/main/default/objects/waybill__c/waybill__c.object-meta.xml b/force-app/main/default/objects/waybill__c/waybill__c.object-meta.xml
index 8848084..fd2a347 100644
--- a/force-app/main/default/objects/waybill__c/waybill__c.object-meta.xml
+++ b/force-app/main/default/objects/waybill__c/waybill__c.object-meta.xml
@@ -141,7 +141,7 @@
<type>Default</type>
</actionOverrides>
<allowInChatterGroups>false</allowInChatterGroups>
- <compactLayoutAssignment>SYSTEM</compactLayoutAssignment>
+ <compactLayoutAssignment>OTS</compactLayoutAssignment>
<deploymentStatus>Deployed</deploymentStatus>
<enableActivities>false</enableActivities>
<enableBulkApi>true</enableBulkApi>
diff --git a/manifest/package.xml b/manifest/package.xml
index 23cb5ad..0348914 100644
--- a/manifest/package.xml
+++ b/manifest/package.xml
@@ -2,11 +2,201 @@
<Package xmlns="http://soap.sforce.com/2006/04/metadata">
<types>
<members>*</members>
- <name>Flow</name>
+ <name>ApexClass</name>
+ </types>
+ <types>
+ <members>*</members>
+ <name>ApexComponent</name>
+ </types>
+ <types>
+ <members>*</members>
+ <name>ApexPage</name>
+ </types>
+ <types>
+ <members>*</members>
+ <name>ApexTestSuite</name>
+ </types>
+ <types>
+ <members>*</members>
+ <name>ApexTrigger</name>
+ </types>
+ <types>
+ <members>*</members>
+ <name>AuraDefinitionBundle</name>
+ </types>
+ <types>
+ <members>*</members>
+ <name>LightningComponentBundle</name>
+ </types>
+ <types>
+ <members>*</members>
+ <name>StaticResource</name>
+ </types>
+ <types>
+ <members>*</members>
+ <name>CustomLabels</name>
+ </types>
+ <types>
+ <members>*</members>
+ <name>CustomObject</name>
+ </types>
+ <types>
+ <members>*</members>
+ <name>ApprovalProcess</name>
+ </types>
+ <types>
+ <members>*</members>
+ <name>Workflow</name>
+ </types>
+ <types>
+ <members>*</members>
+ <name>CustomTab</name>
+ </types>
+ <types>
+ <members>*</members>
+ <name>Translations</name>
</types>
<types>
+ <members>*</members>
+ <name>Network</name>
+ </types>
+ <types>
+ <members>*</members>
+ <name>CustomSite</name>
+ </types>
+ <types>
+ <members>*</members>
+ <name>SiteDotCom</name>
+ </types>
+ <types>
+ <members>*</members>
+ <name>Queue</name>
+ </types>
+ <types>
+ <members>*</members>
+ <name>Group</name>
+ </types>
+ <types>
+ <members>*</members>
+ <name>StandardValueSetTranslation</name>
+ </types>
+ <types>
+ <members>Account</members>
+ <members>Contact</members>
+ <members>Case</members>
+ <members>Asset</members>
+ <members>Product2</members>
+ <members>Order</members>
+ <name>CustomObject</name>
+ </types>
+ <types>
+ <members>Account-zh_CN</members>
+ <members>Contact-zh_CN</members>
+ <members>Case-zh_CN</members>
+ <members>Asset-zh_CN</members>
+ <members>Product2-zh_CN</members>
+ <members>Order-zh_CN</members>
+ <name>CustomObjectTranslation</name>
+ </types>
+ <types>
+ <members>CaseStatus</members>
+ <name>StandardValueSet</name>
+ </types>
+ <types>
+ <members>AccountContactMultiRoles</members>
+ <name>StandardValueSet</name>
+ </types>
+ <types>
+ <members>AccountContactRole</members>
+ <name>StandardValueSet</name>
+ </types>
+ <types>
+ <members>AccountRating</members>
+ <name>StandardValueSet</name>
+ </types>
+ <types>
+ <members>AccountType</members>
+ <name>StandardValueSet</name>
+ </types>
+ <types>
+ <members>AssetStatus</members>
+ <name>StandardValueSet</name>
+ </types>
+ <types>
+ <members>CaseContactRole</members>
+ <name>StandardValueSet</name>
+ </types>
+ <types>
+ <members>CaseOrigin</members>
+ <name>StandardValueSet</name>
+ </types>
+ <types>
+ <members>CasePriority</members>
+ <name>StandardValueSet</name>
+ </types>
+ <types>
+ <members>CaseReason</members>
+ <name>StandardValueSet</name>
+ </types>
+ <types>
+ <members>CaseOrigin</members>
+ <name>StandardValueSet</name>
+ </types>
+ <types>
+ <members>CaseStatus</members>
+ <name>StandardValueSet</name>
+ </types>
+ <types>
+ <members>CaseType</members>
+ <name>StandardValueSet</name>
+ </types>
+ <types>
+ <members>LeadSource</members>
+ <name>StandardValueSet</name>
+ </types>
+ <types>
+ <members>LeadStatus</members>
+ <name>StandardValueSet</name>
+ </types>
+ <types>
+ <members>OrderType</members>
+ <name>StandardValueSet</name>
+ </types>
+ <types>
+ <members>Product2Family</members>
+ <name>StandardValueSet</name>
+ </types>
+ <types>
+ <members>TaskPriority</members>
+ <name>StandardValueSet</name>
+ </types>
+ <types>
+ <members>TaskStatus</members>
+ <name>StandardValueSet</name>
+ </types>
+ <types>
+ <members>TaskSubject</members>
+ <name>StandardValueSet</name>
+ </types>
+ <types>
+ <members>TaskType</members>
+ <name>StandardValueSet</name>
+ </types>
+ <types>
+ <members>OrderStatus</members>
+ <name>StandardValueSet</name>
+ </types>
+ <types>
<members>*</members>
<name>Profile</name>
</types>
+ <types>
+ <members>*</members>
+ <name>PermissionSet</name>
+ </types>
+ <types>
+ <members>*</members>
+ <name>PermissionSet</name>
+ </types>
<version>59.0</version>
</Package>
\ No newline at end of file
diff --git a/manifest/packagevalidatoinrule.xml b/manifest/packagevalidatoinrule.xml
deleted file mode 100644
index 4c88f11..0000000
--- a/manifest/packagevalidatoinrule.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Package xmlns="http://soap.sforce.com/2006/04/metadata">
- <types>
- <members>*</members>
- <name>ValidationRule</name>
- </types>
- <types>
- <members>*</members>
- <name>WebLink</name>
- </types>
- <version>59.0</version>
-</Package>
\ No newline at end of file
diff --git a/manifest/packagevalidatoinruledeploy.xml b/manifest/packagevalidatoinruledeploy.xml
new file mode 100644
index 0000000..8d4abea
--- /dev/null
+++ b/manifest/packagevalidatoinruledeploy.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<Package xmlns="http://soap.sforce.com/2006/04/metadata">
+ <types>
+ <members>*</members>
+ <name>ValidationRule</name>
+ </types>
+ <version>59.0</version>
+</Package>
\ No newline at end of file
diff --git a/manifest/packagevalidatoinruleretrieve.xml b/manifest/packagevalidatoinruleretrieve.xml
new file mode 100644
index 0000000..1ef7dea
--- /dev/null
+++ b/manifest/packagevalidatoinruleretrieve.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<Package xmlns="http://soap.sforce.com/2006/04/metadata">
+ <types>
+ <members>*</members>
+ <name>CustomObject</name>
+ </types>
+ <types>
+ <members>Account</members>
+ <members>Opportunity</members>
+ <members>Contact</members>
+ <members>Case</members>
+ <members>Asset</members>
+ <members>Product2</members>
+ <members>Order</members>
+ <members>Case</members>
+ <members>CampaignMember</members>
+ <members>Quote</members>
+ <members>Lead</members>
+ <name>CustomObject</name>
+ </types>
+ <version>59.0</version>
+</Package>
\ No newline at end of file
--
Gitblit v1.9.1