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 | 78 +++++++++++++++++++++++++++++++++++++-
1 files changed, 75 insertions(+), 3 deletions(-)
diff --git a/force-app/main/default/triggers/Repair.trigger b/force-app/main/default/triggers/Repair.trigger
index af40fcd..99fd9e5 100644
--- a/force-app/main/default/triggers/Repair.trigger
+++ b/force-app/main/default/triggers/Repair.trigger
@@ -26,6 +26,9 @@
RepairTrigger.UpdateAssert(Trigger.new, Trigger.newMap, Trigger.old, Trigger.oldMap);
// }
}
+ if( Trigger.isBefore && Trigger.isUpdate){
+
+ }
// ----------------------------------------------------------------------
// 銇撱亾銈堛倞銆佷慨鐞嗐伄銈点兗銉撱偣銈炽兂銉堛儵銈儓闋呯洰銈掕嚜鍕曠殑銇洿鏂般仚銈嬨儹銈搞儍銈�
// ----------------------------------------------------------------------
@@ -80,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) {
@@ -152,11 +154,25 @@
//濡傛灉鏈�澶уぇ淇鏁板ぇ浜�0锛屽苟涓斿凡缁忓ぇ淇鏁� 澶т簬鎴栫瓑浜� 鏈�澶уぇ淇鏁帮紝閭ｄ箞涓嶄粎涓嶈祴鍊肩淮淇悎鍚屼俊鎭紝鑰屼笖娓呯┖褰撳墠淇℃伅
if (middleTable.Series_MaxRepairCount_F__c > 0 && middleTable.Series_RepairCount_F__c >= middleTable.Series_MaxRepairCount_F__c) {
//涓嶈祴鍊肩淮淇悎鍚屼俊鎭紝鑰屼笖娓呯┖褰撳墠淇℃伅
- repair.Maintenance_Contract__c = null;
- repair.MaintenanceContractType__c = null;
+ //URF闄愭鍚堝悓2鏈� LY 20220926 start
+ // repair.Maintenance_Contract__c = null;
+ // repair.MaintenanceContractType__c = null;
+ repair.Maintenance_Contract__c = middleTable.Maintenance_Contract__c;
+ repair.MaintenanceContractType__c = middleTable.Maintenance_Contract__r.RecordType.Name;
+ //URF闄愭鍚堝悓2鏈� LY 20220926 end
}
}
//闄愭鍚堝悓浜у搧淇℃伅缁存姢鐩稿叧 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 閭ｄ箞銆愯秴杩囧悎鍚屼笂闄愩�戜负true
+ if (middleTable.Maintenance_Contract__r.Remaining_Amount__c <= 0 ) {
+ repair.ZFLAG_CGSX__c = true;
+ }
+ }
+ //涓婇檺鍚堝悓 LY 20230117 end
needsetnull = false;
System.debug( '-----:鑷姩甯﹀嚭缁翠慨鍚堝悓22222');//鎶婁繚鏈夎澶囦笂鐨勭淮淇悎鍚屽瓨鍒颁慨鐞嗕笂
break;
@@ -329,6 +345,12 @@
// 銇撱倢銈堛倞銆佸鍝佸�熷嚭鐢宠銇�屼慨鐞嗘渶缁堟娴嬫棩銆嶃倰鏇存柊銇欍倠銉偢銉冦偗锛堟洿鏂板悗瑙﹀彂WorkFlow锛�
// ----------------------------------------------------------------------
if (Trigger.isAfter && Trigger.isUpdate) {
+
+ System.debug( '-----: sendEmailByInspectionFailureCause start');
+ //銆愬鎵樸�戙�怮A閮ㄩ棬銆慖ISE澶氭鍚屾璇鹃 WLIG-CJJDAV start
+ RepairTrigger.sendEmailByInspectionFailureCause(Trigger.new, Trigger.newMap, Trigger.old, Trigger.oldMap);
+ //銆愬鎵樸�戙�怮A閮ㄩ棬銆慖ISE澶氭鍚屾璇鹃 WLIG-CJJDAV end
+
Map<String, Date> repairDateMap = new Map<String, Date>();
List<String> targetRepairList = new List<String>();
for (Repair__c repair : Trigger.New) {
@@ -355,7 +377,57 @@
// ----------------------------------------------------------------------
// 銇撱亾銇俱仹銆佸鍝佸�熷嚭鐢宠銇�屼慨鐞嗘渶缁堟娴嬫棩銆嶃倰鏇存柊銇欍倠銉偢銉冦偗
// ----------------------------------------------------------------------
+
+ // 2022-12-22 zyh add Start
+ if (Trigger.isAfter && Trigger.isUpdate) {
+ List < String > rprIds = new List < String > ();
+ Map < Id, Id > rprIdMap = new Map < Id, Id > ();
+ for (Repair__c rpr: Trigger.new) {
+ Repair__c oldrpr = Trigger.oldMap.get(rpr.Id);
+ // 淇悊鏈夋姤淇瓙鍗曞彿锛屽苟涓� 寰呭彂閫丄WS涓篺alse 鍙戦�佺粰AWS
+ if (String.isNotBlank(rpr.RepairSubOrder__c) && !rpr.AwaitToSendAWS__c) {
+ if ((rpr.DescriptionName__c != oldrpr.DescriptionName__c)
+ || (rpr.InspectionResultFlag__c != oldrpr.InspectionResultFlag__c)
+ || (rpr.RepairReasonTrigger__c != oldrpr.RepairReasonTrigger__c)) {
+ if (NFM603Controller.NFM603_Ids.contains(rpr.Id) == false) {
+ NFM603Controller.NFM603_Ids.add(rpr.Id);
+ rprIdMap.put(rpr.Id, rpr.Id);
+ System.debug('111111111111111111112222222222');
+ }
+ }
+ }
+ }
+ rprIds = rprIdMap.values();
+
+ if (rprIds.size() > 0) {
+ BatchIF_Log__c iflog = new BatchIF_Log__c();
+ iflog.Type__c = 'NFM603';
+ iflog.Log__c = 'callout start\n';
+ insert iflog;
+ // 2022-04-29 zyh update start
+ if(UserInfo.getUserId().equals(System.Label.interfaceUserID)){
+ NFM603Controller.executefuture(iflog, rprIds);
+ }else{
+ NFM603Controller.callout(iflog.Id, rprIds);
+ }
+ // 2022-04-29 zyh update end
+ }
+ }
+ // 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