| force-app/main/default/classes/ChoiceAssetController.cls | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| force-app/main/default/classes/NFM603Controller.cls | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| force-app/main/default/classes/NFM612Rest.cls | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
force-app/main/default/classes/ChoiceAssetController.cls
@@ -76,8 +76,9 @@ Order_No__c,Account.Name,Status,Department_Class__c,Hospital__r.Owner.Name, Hospital__r.Owner.Phone,Installation_Site__c,CurrentContract__c, Product2.Asset_Model_No__c,Hospital__r.Name,Department_Class__r.Name , Department_Class__r.Id,Ji_Zhong_Guan_Li_Ku_Cun__c Department_Class__r.Id,Ji_Zhong_Guan_Li_Ku_Cun__c,Account.RecordTypeId ,Account.Parent.Parent.FSE_SP_Main_Leader__r.Work_Location__c ,Account.Parent.FSE_SP_Main_Leader__r.Work_Location__c FROM Asset where Id != null AND Repairing_Count__c >= 0 AND SerialNumber like :serialNumber LIMIT 100 ]; @@ -239,8 +240,8 @@ url += joint_4 + RepairApplicantHospital_Id + joint_1 + repairSubOrder.Hospital__r.Name;//报修人医院 url += joint_4 + RepairApplicantDepartment_Id + joint_1 + repairSubOrder.Department__r.Name;//报修人科室 if (repairSubOrder.ProblemDescription__c != null) { url += joint_4 + Repair_Detail_Id + joint_1 + repairSubOrder.ProblemDescription__c; if (repairSubOrder.ResponseResultDesc__c != null) { //2022/04/07 zhangyuheng ProblemDescription__c>ResponseResultDesc__c url += joint_4 + Repair_Detail_Id + joint_1 + repairSubOrder.ResponseResultDesc__c; } url += joint_4 + guzhang + joint_1 + NFMUtil.formatDateTime2StrSprit(repairSubOrder.FaultTime__c); //add wangweipeng 2022/02/11 start @@ -257,8 +258,26 @@ url += joint_4 + shouliri + joint_1 + NFMUtil.formatDateTime2StrSprit(repairSubOrder.ReceiverTime__c); //add wangweipeng 2022/01/26 start url += joint_4 + SalesOfficeCode_selection_Id+ joint_1 + ast.Account.Parent.Parent.FSE_SP_Main_Leader__r.Work_Location__c;//修理品返送地 // url += joint_4 + SalesOfficeCode_selection_Id+ joint_1 + ast.Account.Parent.Parent.FSE_SP_Main_Leader__r.Work_Location__c;//修理品返送地 //2022/4/7 zhangyuheng 注释 //add wangweipeng 2022/01/26 end //add zhangyuheng 2022/04/07 start if (String.isNotBlank(ast.Account.RecordTypeId)) { if (ast.Account.RecordTypeId == '01210000000QemQAAS') { //战略科室 if (String.isNotBlank(ast.Account.Parent.FSE_SP_Main_Leader__r.Work_Location__c)) { url += joint_4 + SalesOfficeCode_selection_Id+ joint_1 + ast.Account.Parent.FSE_SP_Main_Leader__r.Work_Location__c;//修理品返送地 }else { // continue; } } if (ast.Account.RecordTypeId == '01210000000QfmRAAS') { //科室 if (String.isNotBlank(ast.Account.Parent.Parent.FSE_SP_Main_Leader__r.Work_Location__c)) { url += joint_4 + SalesOfficeCode_selection_Id+ joint_1 + ast.Account.Parent.Parent.FSE_SP_Main_Leader__r.Work_Location__c;//修理品返送地 }else { // continue; } } } //add zhangyuheng 2022/04/07 end url += joint_3 + Incharge_Staff_Id + joint_1 + repairSubOrder.Owner.Name; url += joint_3 + Incharge_Staff_Id + joint_2 + repairSubOrder.OwnerId; force-app/main/default/classes/NFM603Controller.cls
@@ -559,7 +559,7 @@ public static Set < Id > NFM603_Ids = new Set < Id > (); // public static Map<Id,Id> rprIdMap = new Map<Id,Id>(); public static void NFM603Trigger(List < Repair__c > newList, Map < Id, Repair__c > newMap, List < Repair__c > oldList, Map < Id, Repair__c > oldMap) { List < String > rprIds = new List < String > (); Map < Id, Id > rprIdMap = new Map < Id, Id > (); @@ -591,6 +591,38 @@ rprIdMap.put(rpr.Id, rpr.Id); } } // 2022/4/6 zhangyuheng update start //OTS订单号有值，发送AWS if ((oldrpr.OTSRepairOrder__c == null && String.isNotBlank(rpr.OTSRepairOrder__c)) || rpr.OTSRepairOrder__c != oldrpr.OTSRepairOrder__c) { if (NFM603Controller.NFM603_Ids.contains(rpr.Id) == false) { NFM603Controller.NFM603_Ids.add(rpr.Id); rprIdMap.put(rpr.Id, rpr.Id); } } // 2022/4/6 zhangyuheng update end // 2022/4/7 zhangyuheng update start //送修物流单号有值，发送AWS if ((oldrpr.DeliveryLogisticsNo__c == null && String.isNotBlank(rpr.DeliveryLogisticsNo__c)) || rpr.DeliveryLogisticsNo__c != oldrpr.DeliveryLogisticsNo__c) { if (NFM603Controller.NFM603_Ids.contains(rpr.Id) == false) { NFM603Controller.NFM603_Ids.add(rpr.Id); rprIdMap.put(rpr.Id, rpr.Id); } } //报价金额发生改变且初次报价日有值，发送AWS if (((rpr.Discount_Price_formula__c != oldrpr.Discount_Price_formula__c) || rpr.Discount_Price_formula__c != null) && rpr.Repair_Firstestimated_Date_formula__c != null) { if (NFM603Controller.NFM603_Ids.contains(rpr.Id) == false) { NFM603Controller.NFM603_Ids.add(rpr.Id); rprIdMap.put(rpr.Id, rpr.Id); } } if ((rpr.Returns_Product_waySAP__c != oldrpr.Returns_Product_waySAP__c) && rpr.Repair_Shipped_DateTime__c != null) { if (NFM603Controller.NFM603_Ids.contains(rpr.Id) == false) { NFM603Controller.NFM603_Ids.add(rpr.Id); rprIdMap.put(rpr.Id, rpr.Id); } } // 2022/4/7 zhangyuheng update end // 测试环境测试用，上线前请注掉 if (rpr.Repair_Firstestimated_Date__c != oldrpr.Repair_Firstestimated_Date__c) { if (NFM603Controller.NFM603_Ids.contains(rpr.Id) == false) { force-app/main/default/classes/NFM612Rest.cls
@@ -258,6 +258,7 @@ repair.RepairFinishDate__c = NFMUtil.parseStr2Date(ged.repairOderInfo.RepairFinishDate) ; //修理品处理完成日 repair.ApplicanterPhone__c = ged.repairOderInfo.ApplicanterPhone; //处理人电话 repair.CancelleRepairTime__c = NFMUtil.parseStr2Date(ged.repairOderInfo.CancelDate); //受理人取消报修日 repair.RepairCancelReason__c = ged.repairOderInfo.cancelReportReason; //修理取消原因 // 2022/4/6 zhangyuheng update end if ('问题已解决'.equals(ged.applyRepairInfo.processResult)) {
