From 1312ba82d4c880bdb5357d28e0d4af5b285f610f Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期四, 10 三月 2022 15:54:39 +0800
Subject: [PATCH] 最近一月修改内容
---
force-app/main/default/triggers/Repair.trigger | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/force-app/main/default/triggers/Repair.trigger b/force-app/main/default/triggers/Repair.trigger
index a4449e4..303efaa 100644
--- a/force-app/main/default/triggers/Repair.trigger
+++ b/force-app/main/default/triggers/Repair.trigger
@@ -66,8 +66,17 @@
boolean defaultFlag = true;
//add wangweipeng 2021/12/09 end
// 鑽夋涓慨鐞嗐仩銇戞洿鏂�
+ // GZW 鐗规畩澶勭悊 璺宠繃缁翠慨涓績鑷姩璧嬪�硷紝浠ユ墜閫変负鍑� start
+ // 鍒ゆ柇鏉′欢杩藉姞 && repair.Exc_work_location__c == false
+ if(repair.Exc_work_location__c){
+ 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) {
+ if (Trigger.isUpdate && repair.SAP_Transfer_time__c == null && repair.Exc_work_location__c == false) {
+
repair = RepairTrigger.updateWorkLocationSelect(repair, null);
defaultFlag = false;
}
@@ -79,7 +88,8 @@
Boolean needsetnull = true;
System.debug( '-----:鑷姩甯﹀嚭缁翠慨鍚堝悓11111' + middleTableList);
- if (middleTableList == null) {
+ // if (middleTableList == null) {
+ if (middleTableList == null && repair.Exc_work_location__c == false) {
if ((repair.NewProductGuarante_Txt__c == '2: 澶氬勾淇濅慨'
|| repair.NewProductGuarante_Txt__c == '2: 鏈嶅姟澶氬勾淇濅慨'
|| repair.NewProductGuarante_Txt__c == '8: 甯傚満澶氬勾淇濅慨')
@@ -114,7 +124,8 @@
repair.repairPlace__c = middleTable.Maintenance_Contract__r.SalesOfficeCode_selection__c;
//鏂板閫昏緫 HWAG-BKP5FB 绮剧悽绉戞妧 2020/03/19 Start
//wangweipeng 鍙戠敓鏁版嵁鍒癝AP浠ュ悗锛屼慨鐞嗙殑缁翠慨涓績涓嶈兘鍋氫慨鏀�
- if(repair.SAP_Transfer_time__c == null){
+ // if(repair.SAP_Transfer_time__c == null){
+ if(repair.SAP_Transfer_time__c == null && repair.Exc_work_location__c == false){
repair = RepairTrigger.updateWorkLocationSelect(repair, middleTable);
defaultFlag = false;
}
@@ -159,7 +170,8 @@
// Boolean needsetnull = true;
System.debug( '-----:鑷姩甯﹀嚭铏氭嫙缁翠慨鍚堝悓');
System.debug( '-----:鑷姩甯﹀嚭铏氭嫙缁翠慨鍚堝悓' + middleTableVMList);
- if (middleTableVMList == null) {
+ // if (middleTableVMList == null) {
+ if (middleTableVMList == null && repair.Exc_work_location__c == false) {
if ((repair.NewProductGuarante_Txt__c == '2: 澶氬勾淇濅慨'
|| repair.NewProductGuarante_Txt__c == '2: 鏈嶅姟澶氬勾淇濅慨'
|| repair.NewProductGuarante_Txt__c == '8: 甯傚満澶氬勾淇濅慨')
@@ -180,7 +192,8 @@
repair.VM_Maintenance_Contract__c = middleTable.Maintenance_Contract__c;
needsetnull = false;
//鏂板閫昏緫 SLIU-BMMDWK 绮剧悽绉戞妧 2020/03/17 Start
- if (repair.VM_Maintenance_Contract__c != null) {
+ // if (repair.VM_Maintenance_Contract__c != null) {
+ if (repair.VM_Maintenance_Contract__c != null && repair.Exc_work_location__c == false) {
repair = RepairTrigger.updateWorkLocationSelect(repair, middleTable);
defaultFlag = false;
}
--
Gitblit v1.9.1