From 6a471bc62a8567abd74dcef733fcddf9911b6a16 Mon Sep 17 00:00:00 2001 From: denny chen <chenbangcai@prec-tech.com> Date: 星期三, 29 三月 2023 15:47:48 +0800 Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBG --- force-app/main/default/triggers/Repair.trigger | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/force-app/main/default/triggers/Repair.trigger b/force-app/main/default/triggers/Repair.trigger index f96912e..99fd9e5 100644 --- a/force-app/main/default/triggers/Repair.trigger +++ b/force-app/main/default/triggers/Repair.trigger @@ -83,7 +83,6 @@ defaultFlag = false; } // GZW 鐗规畩澶勭悊 璺宠繃缁翠慨涓績鑷姩璧嬪�硷紝浠ユ墜閫変负鍑� start - if ((repair.Status__c == '鑽夋涓�' || String.isBlank(repair.Status__c)) == false) { // if (Trigger.isUpdate && repair.SAP_Transfer_time__c == null) { if (Trigger.isUpdate && repair.SAP_Transfer_time__c == null && repair.Exc_work_location__c == false) { @@ -164,6 +163,16 @@ } } //闄愭鍚堝悓浜у搧淇℃伅缁存姢鐩稿叧 FXK 2021/03/05 END + //涓婇檺鍚堝悓 LY 20230117 start + //濡傛灉璁板綍绫诲瀷鏄湇鍔′换鍔″苟涓旀槸涓婇檺鍚堝悓锛岄偅涔堝垽鏂秴杩囧悎鍚屼笂闄愭爣蹇� + if (middleTable.Maintenance_Contract__r.RecordType.DeveloperName == 'NewMaintenance_Contract' + && middleTable.Maintenance_Contract__r.Limit_Price__c == true) { + //鏂板缓淇悊鍗虫棤淇悊鎶ヤ环 缁翠慨鍚堝悓涓婄殑淇悊鍓╀綑閲戦濡傛灉灏忎簬绛変簬0 閭d箞銆愯秴杩囧悎鍚屼笂闄愩�戜负true + if (middleTable.Maintenance_Contract__r.Remaining_Amount__c <= 0 ) { + repair.ZFLAG_CGSX__c = true; + } + } + //涓婇檺鍚堝悓 LY 20230117 end needsetnull = false; System.debug( '-----:鑷姩甯﹀嚭缁翠慨鍚堝悓22222');//鎶婁繚鏈夎澶囦笂鐨勭淮淇悎鍚屽瓨鍒颁慨鐞嗕笂 break; @@ -406,6 +415,19 @@ } } // 2022-12-22 zyh add END + + //涓婇檺鍚堝悓 LY 20230207 start + //缁翠慨鍚堝悓涓婄殑淇悊鍓╀綑閲戦濡傛灉澶т簬0锛屼笖銆愬墿浣欓噾棰濄�戝噺鍘讳慨鐞嗘姤浠风殑璁″叆銆愬悎鍚屾秷璐圭巼鐨勪慨鐞嗛噾棰濄�戝皬浜庣瓑浜�0锛岄偅涔堛�愬埌杈句笂闄愩�戜负true + if (Trigger.isBefore && Trigger.isUpdate) { + for (Repair__c repair: Trigger.new) { + if (repair.Limit_Price__c ==true ){ + if (repair.Agreed_Date__c!=null && repair.Remaining_Amount__c >=0 &&(repair.Remaining_Amount__c-repair.Usage_Ratio_Price__c)<=0){ + repair.ZFLAG_SX__c = true; + } + } + } + } + //涓婇檺鍚堝悓 LY 20230207 end System.debug( '-----: trigger end'); } public void test(){ -- Gitblit v1.9.1