From 1ce13a35baf4d4a8cd047aacfb27afaae3278073 Mon Sep 17 00:00:00 2001
From: zhangzhengmei <zhangzhengmei@prec-tech.com>
Date: 星期四, 18 五月 2023 14:06:28 +0800
Subject: [PATCH] Merge branch 'LEX_dev' into LEX_zhangzhengmei_dev
---
force-app/main/default/classes/otherButtonRepairController.cls | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/force-app/main/default/classes/otherButtonRepairController.cls b/force-app/main/default/classes/otherButtonRepairController.cls
index 2316304..1907e8d 100644
--- a/force-app/main/default/classes/otherButtonRepairController.cls
+++ b/force-app/main/default/classes/otherButtonRepairController.cls
@@ -357,7 +357,7 @@
String res='';
try {
Repair__c repair = new Repair__c();
- repair.ID = recordId;
+ repair.Id = recordId;
repair.Maintenance_Contract__c = null;
repair.MaintenanceContractType__c = null;
update repair;
@@ -371,6 +371,7 @@
//鏇存柊Repair__c涓殑璁板綍锛岃嫢鎹曡幏鍒板紓甯稿垯杩斿洖閿欒淇℃伅
@AuraEnabled
public static String updateRepair2(String recordId,User staff,Boolean DWSign,String statusc,String DOJStatus,String SAPcondition){
+ String res='';
try {
Repair__c repair = new Repair__c();
repair.Id = recordId;
@@ -397,13 +398,10 @@
repair.SAP_Transfer_time__c = Datetime.now();
}
update repair;
- return null;
} catch (Exception e) {
- String eMessage = e.getMessage();
- Integer left = eMessage.indexOf(',') + 1;
- Integer right = eMessage.length();
- return eMessage.substring(left,right);
+ res = e.getMessage();
}
+ return res;
}
// 鏌ユ壘绠�妗�
--
Gitblit v1.9.1