From 962519811b7c4be07f30d09e791798b0ea79d3ae Mon Sep 17 00:00:00 2001
From: 黄千龙 <huangqianlong@prec-tech.com>
Date: 星期三, 08 三月 2023 09:54:02 +0800
Subject: [PATCH] 同步代码
---
force-app/main/default/classes/ChoiceAssetController.cls | 239 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 209 insertions(+), 30 deletions(-)
diff --git a/force-app/main/default/classes/ChoiceAssetController.cls b/force-app/main/default/classes/ChoiceAssetController.cls
index c599064..5b78c8a 100644
--- a/force-app/main/default/classes/ChoiceAssetController.cls
+++ b/force-app/main/default/classes/ChoiceAssetController.cls
@@ -57,6 +57,9 @@
ActualVisitTimeThird__c, ResponseResultDesc__c, ProcessResult__c, Status__c,
Department__r.Name, Department__r.Id,ActualVisitDateThird__c,
EndTimeFirst__c,RepairsReportDate__c,ActualVisitDateFirst__c,ActualVisitDateSecon__c,
+ // 2023-3-6 zyh add start
+ DateReceiptQuestions__c,IfDeadHurt__c,ProblemOccurred__c,ProblemOccurredSelect__c,ReportAdverseEvents__c,WhatProject__c,OperationOrExaminationName__c,BreakORFallOff__c,UseFailProductFinish__c,SupportingProducts__c,AfterFailureInformation__c,Delay15Min__c,InformationFrom__c,FailureQInHospital__c,DelayReportReason__c,IsProductFaultRelated__c,IsOts__c,SenderOrgCode__c,SenderCompany__c,SenderName__c,SenderMobilePhone__c,SenderAddress__c,RecepientCompany__c,RecepientName__c,RecepientMobilePhone__c,RecepientAddress__c,ReturnWayType__c,OrderNumber__c,FailureReason__c,LogisticsSendDate__c,Item0010__c,Item0020__c,Item0030__c,Item0040__c,Item0050__c,
+ // 2023-3-6 zyh add end
OwnerId,Owner.Name
FROM RepairSubOrder__c
WHERE Id =: RepairSubOrderId
@@ -72,12 +75,21 @@
//1.鍙煡鎵�100鏉′繚鏈夎澶囨暟鎹�
String fuselageNumberTrim = String.isNotBlank(FuselageNumber)?FuselageNumber.trim():'';
String serialNumber = '%' + String.escapeSingleQuotes(fuselageNumberTrim.replaceAll('%', '\\%')) + '%';
- List < Asset > assetListed = [SELECT Id,name,SerialNumber,InstallDate,Information_From__c,Asset_situation__c,
+ List < Asset > assetListed = [SELECT Id,name,SerialNumber,InstallDate,
+ // Information_From__c,// 20220927 ljh XLIU-CJN62G
+ Asset_situation__c,
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,// 20220927 ljh XLIU-CJN62G
+ Posting_Date__c,Extend_Gurantee_DateTo__c,CurrentContract_End_Date__c,// 20220927 ljh XLIU-CJN62G
+ Account.RecordTypeId
,Account.Parent.Parent.FSE_SP_Main_Leader__r.Work_Location__c
+ ,Account.Parent.FSE_SP_Main_Leader__r.Work_Location__c
+ //XLIU-CJM7Z9 銆愬鎵樸�戞柊寤轰慨鐞嗘彁绀轰俊鎭紙鍋滀骇鍙婇潪淇悊瀵硅薄鍝侊級LY 20221012 start
+ ,NoPartRiskDate_F__c
+ //XLIU-CJM7Z9 銆愬鎵樸�戞柊寤轰慨鐞嗘彁绀轰俊鎭紙鍋滀骇鍙婇潪淇悊瀵硅薄鍝侊級LY 20221012 end
FROM Asset where Id != null AND Repairing_Count__c >= 0 AND SerialNumber like :serialNumber LIMIT 100
];
@@ -85,7 +97,6 @@
for (Asset ast: assetListed) {
choiceAssetInfoRecordsview.add(new ChoiceAssetInfo(ast));
}
-
}
// 妫�绱�
@@ -126,6 +137,10 @@
if (info.check) {
ast = info.ast;
quantity += 1;
+ // if (info.ast.Ji_Zhong_Guan_Li_Ku_Cun__c <= 0){
+ // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '璁惧闆嗕腑绠＄悊搴撳瓨涓嶈冻'));
+ // return null;
+ // }
}
}
if (quantity == 0) {
@@ -135,17 +150,39 @@
ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '鍙兘閫夋嫨涓�涓繚鏈夎澶�'));
return null;
}
-
+ //XLIU-CJM7Z9 銆愬鎵樸�戞柊寤轰慨鐞嗘彁绀轰俊鎭紙鍋滀骇鍙婇潪淇悊瀵硅薄鍝侊級LY 20221012 start
+ List<Asset> ass = [select id,Product_ID__c from Asset where ID = :ast.Id];
+ List<Product2> p2 = [select id,Name,Can_Repair__c
+ from Product2 where
+ ID = :ass[0].Product_ID__c];
+ String canRepair = p2[0].Can_Repair__c;
+ if (canRepair=='绗笁鏂�'){
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '闈炴垜鍙镐慨鐞嗗璞★紝鏃犳硶鏂板缓淇悊锛屽鏈変笉鏄庤鍜ㄨCIC'));
+ return null;
+ }
+ if (canRepair=='涓�' || String.isBlank(canRepair)){
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '鏈澶囨棤娉曟柊寤轰慨鐞�'));
+ return null;
+ }
+ //XLIU-CJM7Z9 銆愬鎵樸�戞柊寤轰慨鐞嗘彁绀轰俊鎭紙鍋滀骇鍙婇潪淇悊瀵硅薄鍝侊級LY 20221012 end
return createData(ast);
}
+
public PageReference createData(Asset ast) {
String url = '/';
String joint_1 = '=';
String joint_2 = '_lkid=';
String joint_3 = '&CF';
String joint_4 = '&';
-
+ //XLIU-CJM7Z9 銆愬鎵樸�戞柊寤轰慨鐞嗘彁绀轰俊鎭紙鍋滀骇鍙婇潪淇悊瀵硅薄鍝侊級LY 20221110 start
+ List<Asset> ass = [select id,Product_ID__c from Asset where ID = :ast.Id];
+ List<Product2> p2 = [select id,Name,Can_Repair__c
+ from Product2 where
+ ID = :ass[0].Product_ID__c];
+ String canRepair = p2[0].Can_Repair__c;
+ system.debug('1111111111111111111'+canRepair);
+ //XLIU-CJM7Z9 銆愬鎵樸�戞柊寤轰慨鐞嗘彁绀轰俊鎭紙鍋滀骇鍙婇潪淇悊瀵硅薄鍝侊級LY 20221110 end
if ('Repair'.equals(dataType)) {
String Delivered_Product_Id = '00N10000002Dx1X'; //璁惧鍨嬪彿
String Account_Id = '00N10000002Dx5n'; //绉戝
@@ -177,23 +214,68 @@
String ActualVisitDateThird_Id= '';//涓夋涓婇棬鏃�
String SubOrderCompleteDate_Id= '';//鎶ヤ慨鍗曞鐞嗗畬鎴愭棩
String SubOrderCreatedDate_Id= '';//鎶ヤ慨鍗曠敵璇蜂慨鐞嗘棩
+ //LLIU-CGX5E9 LY 20220812 start
+ String DateReceiptQuestions_Id = '';//闂鑱旂粶鏀跺埌鏃�
+ //LLIU-CGX5E9 LY 20220812 end
+ //XLIU-CJM7Z9 銆愬鎵樸�戞柊寤轰慨鐞嗘彁绀轰俊鎭紙鍋滀骇鍙婇潪淇悊瀵硅薄鍝侊級LY 20221110 start
+ String Excwork_location_Id = '';//璺宠繃缁翠慨涓績
+ //XLIU-CJM7Z9 銆愬鎵樸�戞柊寤轰慨鐞嗘彁绀轰俊鎭紙鍋滀骇鍙婇潪淇悊瀵硅薄鍝侊級LY 20221110 end
+ // 2023-3-6 zyh add start
+ // String dateReceiptQuestions;宸插瓨鍦�
+ String SupportingProducts = '00N10000008rsW4';//閰嶅浣跨敤浜у搧SupportingProducts__c
+ String IfDeadHurt = '00N10000008rsW7';//鏄惁鏈夋浜°�佷激瀹炽�佹劅鏌�
+ String ProblemOccurred = '00N10000008rsVv';//闂鍙戠敓鏃堕棿鎯呭喌
+ String ProblemOccurredSelect = '00N10000009hsvI';//闂鍙戠敓鏃堕棿鎯呭喌 鍏跺畠
+ String ReportAdverseEvents = '00N10000008rsW2';//鍖婚櫌鏈夋病鏈夊悜鏀垮簻鏈哄叧鎶ュ憡涓嶈壇浜嬩欢鎴栫枒浼间笉鑹簨浠�
+ String WhatProject = '00N10000008rsW6';//鍋氱殑鏄摢涓」鐩�
+ String OperationOrExaminationName = '00N10000008rsVk';//鎵嬫湳/妫�鏌ュ悕绉�
+ String BreakORFallOff = '00N10000008rsVN';//鏄惁鏈夊彂鐢熸柇瑁傛垨鑴辫惤
+ String UseFailProductFinish = '00N10000008rsW5';//鏄惁鐢ㄨ浜у搧瀹屾垚浜嗘墜鏈�/妫�鏌�
+ // String SupportingProducts = '00N10000008rsW4';//閰嶅浣跨敤浜у搧
+ String AfterFailureInformation = '00N10000008rsVL';//鍙戠幇鏁呴殰鍚庯紝鍖婚櫌瀵规偅鑰呯殑澶勭悊鎯呭喌
+ String Delay15Min = '00N10000008rsVR';//鍙戠幇鏁呴殰鐜拌薄鍚庯紝鏈夊欢璇�15鍒嗛挓浠ヤ笂鐨勬墜鏈疄鏂界殑鎯呭喌鍙戠敓鍚�
+ String InformationFrom = '00N10000008rsVZ';//淇℃伅鏄粠鍖婚櫌鐨勮皝閭ｉ噷寰楀埌鐨�
+ String FailureQInHospital = '00N10000008rsVT';//鍦ㄥ尰闄紝鏁呴殰鍙戠敓鐨勯鐜囨槸澶氬皯
+ String DelayReportReason = '00N10000008rsVS';//瓒呮椂鎶ュ憡鐞嗙敱
+ String IsProductFaultRelated = '00N10000008rsVw';//鏄惁鍜岃繖娆＄殑浜у搧鏁呴殰鏈夊叧
+ String IsOts = '';
+ String SenderOrgCode = '';
+ String SenderCompany = '';
+ String SenderName = '';
+ String SenderMobilePhone = '';
+ String SenderAddress = '';
+ String RecepientCompany = '';
+ String RecepientName = '';
+ String RecepientMobilePhone = '';
+ String RecepientAddress = '';
+ String ReturnWayType = '';
+ String OrderNumber = '';
+ String FailureReason = '';
+ String LogisticsSendDate = '';
+ String Item0010 = '';
+ String Item0020 = '';
+ String Item0030 = '';
+ String Item0040 = '';
+ String Item0050 = '';
+ // 2023-3-6 zyh add end
String engineerSendDate_Id= '';//宸ョ▼甯堜慨鐞嗗搧瀵勯�佹棩
- if (NFMUtil.isSandbox()) { //娴嬭瘯鐜
- RepairApplicant_Id = '00N1m0000054ufW'; //鎶ヤ慨浜�
- // RepairApplicantPosition_Id = '00N1m0000054ufV'; //鎶ヤ慨浜哄矖浣�
- RepairApplicantHospital_Id = '00N1m0000054ufU'; //鎶ヤ慨浜哄尰闄�
- RepairApplicantDepartment_Id = '00N1m0000054ufT'; //鎶ヤ慨浜虹瀹�
- baoxiuzidan = '00N1m0000054ufZ'; //鎶ヤ慨瀛愬崟
- faqiri = '00N1m0000054ufa'; //鎶ヤ慨鍙戣捣鏃�
- shouliri = '00N1m0000054ufS'; //宸ョ▼甯堝彈鐞嗘棩
+ // if (NFMUtil.isSandbox()) { //娴嬭瘯鐜
+ // RepairApplicant_Id = '00N1m0000054ufW'; //鎶ヤ慨浜�
+ // // RepairApplicantPosition_Id = '00N1m0000054ufV'; //鎶ヤ慨浜哄矖浣�
+ // RepairApplicantHospital_Id = '00N1m0000054ufU'; //鎶ヤ慨浜哄尰闄�
+ // RepairApplicantDepartment_Id = '00N1m0000054ufT'; //鎶ヤ慨浜虹瀹�
+ // //baoxiuzidan = '00N1m0000054ufZ'; //鎶ヤ慨瀛愬崟
+ // baoxiuzidan = '00N10000009H1rR'; //鎶ヤ慨瀛愬崟
+ // faqiri = '00N1m0000054ufa'; //鎶ヤ慨鍙戣捣鏃�
+ // shouliri = '00N1m0000054ufS'; //宸ョ▼甯堝彈鐞嗘棩
- PlannedVisitDay_Id= '00N1m000005SRiF';//璁″垝涓婇棬鏃�
- ActualVisitDateFirst_Id= '00N1m000005SRiK';//涓�娆′笂闂ㄦ棩
- ActualVisitDateSecond_Id= '00N1m000005SRiP';//浜屾涓婇棬鏃�
- ActualVisitDateThird_Id= '00N1m000005SRiU';//涓夋涓婇棬鏃�
- SubOrderCompleteDate_Id= '00N1m000005SRmg';//鎶ヤ慨鍗曞鐞嗗畬鎴愭棩
- SubOrderCreatedDate_Id= '00N1m000005SRmW';//鎶ヤ慨鍗曠敵璇蜂慨鐞嗘棩
- } else { //姝ｅ紡鐜
+ // PlannedVisitDay_Id= '00N1m000005SRiF';//璁″垝涓婇棬鏃�
+ // ActualVisitDateFirst_Id= '00N1m000005SRiK';//涓�娆′笂闂ㄦ棩
+ // ActualVisitDateSecond_Id= '00N1m000005SRiP';//浜屾涓婇棬鏃�
+ // ActualVisitDateThird_Id= '00N1m000005SRiU';//涓夋涓婇棬鏃�
+ // SubOrderCompleteDate_Id= '00N1m000005SRmg';//鎶ヤ慨鍗曞鐞嗗畬鎴愭棩
+ // SubOrderCreatedDate_Id= '00N1m000005SRmW';//鎶ヤ慨鍗曠敵璇蜂慨鐞嗘棩
+ // } else { //姝ｅ紡鐜
RepairApplicant_Id = '00N10000009H1rQ'; //鎶ヤ慨浜�
// RepairApplicantPosition_Id = ''; //鎶ヤ慨浜哄矖浣�
RepairApplicantHospital_Id = '00N10000009H1rP'; //鎶ヤ慨浜哄尰闄�
@@ -209,9 +291,20 @@
ActualVisitDateThird_Id= '00N10000009H1r8';//涓夋涓婇棬鏃�
SubOrderCompleteDate_Id= '00N10000009H1ri';//鎶ヤ慨鍗曞鐞嗗畬鎴愭棩
SubOrderCreatedDate_Id= '00N10000009H1rj';//鎶ヤ慨鍗曠敵璇蜂慨鐞嗘棩
- }
+ //LLIU-CGX5E9 LY 20220812 start
+ DateReceiptQuestions_Id= '00N10000008rsVQ';//闂鑱旂粶鏀跺埌鏃�
+ //LLIU-CGX5E9 LY 20220812 end
+ //XLIU-CJM7Z9 銆愬鎵樸�戞柊寤轰慨鐞嗘彁绀轰俊鎭紙鍋滀骇鍙婇潪淇悊瀵硅薄鍝侊級LY 20221110 start
+ Excwork_location_Id = '00N10000009HAJl';//璺宠繃缁翠慨涓績
+ //XLIU-CJM7Z9 銆愬鎵樸�戞柊寤轰慨鐞嗘彁绀轰俊鎭紙鍋滀骇鍙婇潪淇悊瀵硅薄鍝侊級LY 20221110 end
+ //}
url += 'a0J/e?retURL=%2F';
+ //XLIU-CJM7Z9 銆愬鎵樸�戞柊寤轰慨鐞嗘彁绀轰俊鎭紙鍋滀骇鍙婇潪淇悊瀵硅薄鍝侊級LY 20221110 start
+ if (canRepair=='RC閫佷慨'){
+ url += joint_4 + Excwork_location_Id + joint_1 + true;
+ }
+ //XLIU-CJM7Z9 銆愬鎵樸�戞柊寤轰慨鐞嗘彁绀轰俊鎭紙鍋滀骇鍙婇潪淇悊瀵硅薄鍝侊級LY 20221110 end
url += joint_3 + Delivered_Product_Id + joint_1 + ast.Name;
url += joint_3 + Delivered_Product_Id + joint_2 + ast.Id;
@@ -235,8 +328,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
@@ -248,16 +341,100 @@
url += joint_4 + ActualVisitDateSecond_Id+ joint_1 + NFMUtil.formatDateTime2StrSprit(repairSubOrder.ActualVisitDateSecon__c);//浜屾涓婇棬鏃�
url += joint_4 + ActualVisitDateThird_Id+ joint_1 + NFMUtil.formatDateTime2StrSprit(repairSubOrder.ActualVisitDateThird__c);//涓夋涓婇棬鏃�
url += joint_4 + SubOrderCompleteDate_Id+ joint_1 + NFMUtil.formatDateTime2StrSprit(repairSubOrder.ApplicationTime__c);//鎶ヤ慨鍗曞鐞嗗畬鎴愭棩
+ //LLIU-CGX5E9 LY 20220812 start
+ url += joint_4 + DateReceiptQuestions_Id+ joint_1 + NFMUtil.formatDateTime2StrSprit(repairSubOrder.ApplicationTime__c);//闂鑱旂粶鏀跺埌鏃�
+ //LLIU-CGX5E9 LY 20220812 end
url += joint_4 + SubOrderCreatedDate_Id+ joint_1 + NFMUtil.formatDateTime2StrSprit(Date.today());//鎶ヤ慨鍗曠敵璇蜂慨鐞嗘棩
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' || //鎴樼暐绉戝 ET
+ ast.Account.RecordTypeId == '01210000000QemL' || //鎴樼暐绉戝 娑堝寲绉�
+ ast.Account.RecordTypeId == '01210000000Qezy' || //鎴樼暐绉戝 鍏朵粬
+ ast.Account.RecordTypeId == '01210000000Qf03' || //鎴樼暐绉戝 涓嶆槑
+ ast.Account.RecordTypeId == '01210000000QezZ' || //鎴樼暐绉戝 鍛煎惛绉�
+ ast.Account.RecordTypeId == '01210000000Qezo' || //鎴樼暐绉戝 濡囩
+ ast.Account.RecordTypeId == '01210000000Qeze' || //鎴樼暐绉戝 鏅绉�
+ ast.Account.RecordTypeId == '01210000000Qezj' || //鎴樼暐绉戝 娉屽翱绉�
+ ast.Account.RecordTypeId == '01210000000Qezt' //鎴樼暐绉戝 鑰抽蓟鍠夌
+ ) { //鎴樼暐绉戝
+ 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' || //绉戝 鍛煎惛绉�
+ ast.Account.RecordTypeId == '01210000000QfmH' || //绉戝 鏅绉�
+ ast.Account.RecordTypeId == '01210000000Qfmb' || //绉戝 鍏朵粬
+ ast.Account.RecordTypeId == '01210000000QfmM' || //绉戝 濡囩
+ ast.Account.RecordTypeId == '01210000000QfmC' || //绉戝 娉屽翱绉�
+ ast.Account.RecordTypeId == '01210000000Qfm7' || //绉戝 娑堝寲绉�
+ ast.Account.RecordTypeId == '01210000000Qfm2' //绉戝 鑰抽蓟鍠夌
+ ) { //绉戝
+ 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;
+ // 2023-3-7 zyh add start
+ if(repairSubOrder.SupportingProducts__c != null){
+ url += joint_3 + SupportingProducts + joint_2 + repairSubOrder.SupportingProducts__c;//閰嶅浣跨敤浜у搧
+ }
+ if(repairSubOrder.IfDeadHurt__c != null){
+ url += joint_3 + IfDeadHurt + joint_2 + repairSubOrder.IfDeadHurt__c;//鏄惁鏈夋浜°�佷激瀹炽�佹劅鏌�
+ }
+ if(repairSubOrder.ProblemOccurred__c != null){
+ url += joint_3 + ProblemOccurred + joint_2 + repairSubOrder.ProblemOccurred__c;//闂鍙戠敓鏃堕棿鎯呭喌
+ }
+ if(repairSubOrder.ProblemOccurredSelect__c != null){
+ url += joint_3 + ProblemOccurredSelect + joint_2 + repairSubOrder.ProblemOccurredSelect__c;//闂鍙戠敓鏃堕棿鎯呭喌 鍏跺畠
+ }
+ if(repairSubOrder.ReportAdverseEvents__c != null){
+ url += joint_3 + ReportAdverseEvents + joint_2 + repairSubOrder.ReportAdverseEvents__c;//鍖婚櫌鏈夋病鏈夊悜鏀垮簻鏈哄叧鎶ュ憡涓嶈壇浜嬩欢鎴栫枒浼间笉鑹簨浠�
+ }
+ if(repairSubOrder.WhatProject__c != null){
+ url += joint_3 + WhatProject + joint_2 + repairSubOrder.WhatProject__c;//鍋氱殑鏄摢涓」鐩�
+ }
+ if(repairSubOrder.OperationOrExaminationName__c != null){
+ url += joint_3 + OperationOrExaminationName + joint_2 + repairSubOrder.OperationOrExaminationName__c;//鎵嬫湳/妫�鏌ュ悕绉�
+ }
+ if(repairSubOrder.BreakORFallOff__c != null){
+ url += joint_3 + BreakORFallOff + joint_2 + repairSubOrder.BreakORFallOff__c;//鏄惁鏈夊彂鐢熸柇瑁傛垨鑴辫惤
+ }
+ if(repairSubOrder.UseFailProductFinish__c != null){
+ url += joint_3 + UseFailProductFinish + joint_2 + repairSubOrder.UseFailProductFinish__c;//鏄惁鐢ㄨ浜у搧瀹屾垚浜嗘墜鏈�/妫�鏌�
+ }
+ if(repairSubOrder.AfterFailureInformation__c != null){
+ url += joint_3 + AfterFailureInformation + joint_2 + repairSubOrder.AfterFailureInformation__c;//鍙戠幇鏁呴殰鍚庯紝鍖婚櫌瀵规偅鑰呯殑澶勭悊鎯呭喌
+ }
+ if(repairSubOrder.Delay15Min__c != null){
+ url += joint_3 + Delay15Min + joint_2 + repairSubOrder.Delay15Min__c;//鍙戠幇鏁呴殰鐜拌薄鍚庯紝鏈夊欢璇�15鍒嗛挓浠ヤ笂鐨勬墜鏈疄鏂界殑鎯呭喌鍙戠敓鍚�
+ }
+ if(repairSubOrder.InformationFrom__c != null){
+ url += joint_3 + InformationFrom + joint_2 + repairSubOrder.InformationFrom__c;//淇℃伅鏄粠鍖婚櫌鐨勮皝閭ｉ噷寰楀埌鐨�
+ }
+ if(repairSubOrder.FailureQInHospital__c != null){
+ url += joint_3 + FailureQInHospital + joint_2 + repairSubOrder.FailureQInHospital__c;//鍦ㄥ尰闄紝鏁呴殰鍙戠敓鐨勯鐜囨槸澶氬皯
+ }
+ if(repairSubOrder.DelayReportReason__c != null){
+ url += joint_3 + DelayReportReason + joint_2 + repairSubOrder.DelayReportReason__c;//瓒呮椂鎶ュ憡鐞嗙敱
+ }
+ if(repairSubOrder.IsProductFaultRelated__c != null){
+ url += joint_3 + IsProductFaultRelated + joint_2 + repairSubOrder.IsProductFaultRelated__c;//鏄惁鍜岃繖娆＄殑浜у搧鏁呴殰鏈夊叧
+ }
+ // 2023-3-7 zyh add start
} else if ('QIS'.equals(dataType)) {
String Delivered_Product_Id = '00N10000002FHFK'; //璁惧鍨嬪彿
@@ -272,11 +449,11 @@
String Generation_Source_Id = '00N10000002FHF6';//QIS鏉ユ簮
String Name_Id = 'Name';//QIS绠＄悊鍙风爜
- if (NFMUtil.isSandbox()) {
- baoxiuzidan = '00N1m000005STFv'; //鎶ヤ慨瀛愬崟
- } else {
+ // if (NFMUtil.isSandbox()) {
+ // baoxiuzidan = '00N1m000005STFv'; //鎶ヤ慨瀛愬崟
+ // } else {
baoxiuzidan = '00N10000009H22X'; //鎶ヤ慨瀛愬崟
- }
+ // }
url += 'a0f/e?retURL=%2Fa0f%2Fo&RecordType=01210000000RLWc&ent=01I10000000T5b1';
url += joint_3 + Delivered_Product_Id + joint_1 + ast.Name;
@@ -313,10 +490,12 @@
private String makeSoql() {
String start = '';
- String soql = 'select Id,name,SerialNumber,InstallDate,Information_From__c,Asset_situation__c,Order_No__c,Account.Name,Status,Department_Class__c, ';
+ String soql = 'select Id,name,SerialNumber,InstallDate,Asset_situation__c,Order_No__c,Account.Name,Status,Department_Class__c, ';
soql += '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,';
- soql += 'Ji_Zhong_Guan_Li_Ku_Cun__c,Account.Parent.Parent.FSE_SP_Main_Leader__r.Work_Location__c';
+ soql += 'Account.Parent.Parent.FSE_SP_Main_Leader__r.Work_Location__c,Account.RecordTypeId';
+ soql += ',Posting_Date__c,Extend_Gurantee_DateTo__c,CurrentContract_End_Date__c ';// 20220927 ljh XLIU-CJN62G
+ soql += ',NoPartRiskDate_F__c ';//XLIU-CJM7Z9 銆愬鎵樸�戞柊寤轰慨鐞嗘彁绀轰俊鎭紙鍋滀骇鍙婇潪淇悊瀵硅薄鍝侊級LY 20221012
soql += ' from Asset where Id != null AND Repairing_Count__c = 0 ';
if (String.isNotBlank(FuselageNumber) || String.isNotBlank(AssetModel) || String.isNotBlank(HospitalName)) {
soql += ' AND (';
--
Gitblit v1.9.1