From 576da1e5d721a3f7f2d5a4aa7cdea6f943c29ba7 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@prec-tech.com>
Date: 星期五, 21 七月 2023 16:20:08 +0800
Subject: [PATCH] Merge branch 'LEX_dev' of http://47.92.229.245:8089/r/lightningupdate into LEX_dev
---
force-app/main/default/lwc/lexSubmitExtensionApprovalProcess/lexSubmitExtensionApprovalProcess.js | 8
force-app/main/default/classes/RentalApplyWebService.cls | 6
force-app/main/default/lwc/lexReturnDeliverySlip/lexReturnDeliverySlip.js | 18
force-app/main/default/lwc/lexEquipmentRentalPicturePDF/lexEquipmentRentalPicturePDF.js | 21
force-app/main/default/lwc/lexTenderingTerminateResponseButton/lexTenderingTerminateResponseButton.html | 5
force-app/main/default/pages/EquipmentRentalLostReport.page | 39
force-app/main/default/lwc/lexFeedbackReport/lexFeedbackReport.js | 36
force-app/main/default/classes/LexRentalApplyControllerLWT.cls | 296 +++
force-app/main/default/classes/LexTransferApplyController.cls-meta.xml | 5
force-app/main/default/classes/LexAddSubmitApprovalProcessController.cls-meta.xml | 5
force-app/main/default/pages/EquipmentRentalExtend.page | 19
force-app/main/default/classes/RentalApplyEquipmentSetWebService.cls | 1
force-app/main/default/lwc/lexEquipmentSetManage/lexEquipmentSetManage.html | 5
force-app/main/default/lwc/lexMainFixtureSelect/lexMainFixtureSelect.js | 3
force-app/main/default/lwc/lexTenderingTerminateResponseButton/lexTenderingTerminateResponseButton.js-meta.xml | 11
force-app/main/default/classes/LexEquipmentRentalPicturePDFController.cls-meta.xml | 5
force-app/main/default/classes/LexReturnDeliverySlipController.cls | 44
force-app/main/default/classes/LexTransferApplyController.cls | 11
force-app/main/default/classes/LexSubmitExtensionController.cls-meta.xml | 5
force-app/main/default/classes/NewLeadFromContact2.cls | 37
force-app/main/default/pages/RentalReportExport.page | 2
force-app/main/default/classes/lexRentalFixtureSetAssignController.cls | 8
force-app/main/default/pages/FixtureRemind.page | 2
force-app/main/default/lwc/lexAllReceivedBtns/lexAllReceivedBtns.js | 2
force-app/main/default/classes/LexLoanerArrangedEmailController.cls-meta.xml | 5
force-app/main/default/classes/lexConsumApplyController.cls | 64
force-app/main/default/lwc/lexFeedbackReport/lexFeedbackReport.html | 3
force-app/main/default/lwc/lexTransferApplySelectDetail/lexTransferApplySelectDetail.css | 22
force-app/main/default/lwc/lexEquipmentSetManage/lexEquipmentSetManage.js | 13
force-app/main/default/classes/LexRentalApplyPDFController.cls | 38
force-app/main/default/classes/lexRentalFixtureSetAssignController.cls-meta.xml | 2
force-app/main/default/lwc/lexLoanerArrangedEmailConsumApply/lexLoanerArrangedEmailConsumApply.js | 2
force-app/main/default/lwc/lexSendReport/lexSendReport.js | 41
force-app/main/default/classes/TenderingButtonController.cls | 7
force-app/main/default/classes/LexSelectSubstituteControllerLWT.cls-meta.xml | 5
force-app/main/default/lwc/lexTenderingProjectRestartButton/lexTenderingProjectRestartButton.html | 5
force-app/main/default/classes/LexSubmitExtensionController.cls | 40
force-app/main/default/lwc/lexNewLeadFromContact2/lexNewLeadFromContact2.html | 5
force-app/main/default/lwc/lexTenderingProjectRestartButton/lexTenderingProjectRestartButton.js | 64
force-app/main/default/classes/LexInventoryHeaderController.cls | 8
force-app/main/default/classes/LexNewTransferApplyController.cls-meta.xml | 5
force-app/main/default/classes/LexSelectSubstituteControllerLWT.cls | 686 +++++++
force-app/main/default/classes/LexRentalApplyFaultController.cls | 41
force-app/main/default/classes/LexAllReceivedFseController.cls-meta.xml | 5
force-app/main/default/classes/LexEquipmentRentalPicturePDFController.cls | 42
force-app/main/default/lwc/lexSelectSubstitute/lexSelectSubstitute.js | 6
force-app/main/default/classes/LexInventoryHeaderController.cls-meta.xml | 5
force-app/main/default/classes/LexNewTransferApplyController.cls | 53
force-app/main/default/lwc/lexEquipmentRentalPDF/lexEquipmentRentalPDF.js | 2
force-app/main/default/lwc/lexLoanerArrangedEmail/lexLoanerArrangedEmail.js | 4
force-app/main/default/lwc/lexTenderingProjectRestartButton/lexTenderingProjectRestartButton.js-meta.xml | 11
force-app/main/default/classes/lexConsumApplyController.cls-meta.xml | 5
force-app/main/default/classes/LexAddSubmitApprovalProcessController.cls | 154 +
force-app/main/default/lwc/lexEquipmentSetManage/lexEquipmentSetManage.js-meta.xml | 34
force-app/main/default/pages/LostReportEditAsset.page | 20
force-app/main/default/lwc/lexReturnDeliverySlipConsumApply/lexReturnDeliverySlipConsumApply.js | 12
force-app/main/default/lwc/lexTransferApplySelectDetail/lexTransferApplySelectDetail.js | 5
force-app/main/default/classes/ConsumApplyWebService.cls | 2166 -------------------------
force-app/main/default/classes/LexLoanerArrangedEmailController.cls | 99 +
force-app/main/default/lwc/lexRentalFixtureSetAssignAgency/lexRentalFixtureSetAssignAgency.js | 84
force-app/main/default/lwc/lexNewLeadFromContact2/lexNewLeadFromContact2.js | 73
force-app/main/default/classes/LexRentalApplyFaultController.cls-meta.xml | 5
force-app/main/default/classes/lexReturnDeliveryController.cls | 31
force-app/main/default/lwc/lexTenderingTerminateResponseButton/lexTenderingTerminateResponseButton.js | 79
force-app/main/default/classes/LexRentalApplyControllerLWT.cls-meta.xml | 5
force-app/main/default/classes/LexRentalApplyPDFController.cls-meta.xml | 5
force-app/main/default/lwc/lexAllReceivedFse/lexAllReceivedFse.js | 56
force-app/main/default/lwc/lexRentalApplyJump/lexRentalApplyJump.js | 8
force-app/main/default/pages/AssetMaintainDetail.page | 100
force-app/main/default/classes/NewLeadFromContact2.cls-meta.xml | 5
force-app/main/default/lwc/lexFixtureSetManage/lexFixtureSetManage.js | 19
force-app/main/default/pages/InventoryResultRecordCopy.page | 14
force-app/main/default/classes/LexReturnDeliverySlipController.cls-meta.xml | 5
force-app/main/default/pages/InventoryResultRecord.page | 14
force-app/main/default/pages/LostReportEdit.page | 7
force-app/main/default/lwc/lexNewLeadFromContact2/lexNewLeadFromContact2.js-meta.xml | 11
force-app/main/default/lwc/lexAddSubmitApprovalProcess/lexAddSubmitApprovalProcess.js | 269 +-
force-app/main/default/classes/lexReturnDeliveryController.cls-meta.xml | 5
force-app/main/default/lwc/lexNewTransferApply/lexNewTransferApply.js | 4
force-app/main/default/lwc/lexTransferApplySelectDetail/lexTransferApplySelectDetail.html | 2
force-app/main/default/classes/LexAllReceivedFseController.cls | 58
81 files changed, 2,630 insertions(+), 2,502 deletions(-)
diff --git a/force-app/main/default/classes/ConsumApplyWebService.cls b/force-app/main/default/classes/ConsumApplyWebService.cls
index 0bae5f9..4ed21c6 100644
--- a/force-app/main/default/classes/ConsumApplyWebService.cls
+++ b/force-app/main/default/classes/ConsumApplyWebService.cls
@@ -3,6 +3,7 @@
public final static Integer okStatus = 99;
// 澶囧搧鍊熷嚭鏃堕棿check
+ @AuraEnabled
WebService static String approvalCheck(String ConsumApplyId) {
try {
// check缁撴灉
@@ -292,6 +293,7 @@
}
// 鐢宠珛鏇稿崢浣�
+ @AuraEnabled
WebService static String setShipment_request(String raid) {
System.debug(raid);
return setShipment_requests(raid, null);
@@ -480,6 +482,7 @@
}
}
+ @AuraEnabled
Webservice static String all_received_fse(String caId) {
Savepoint sp = Database.setSavepoint();
try {
@@ -522,2169 +525,6 @@
@TestVisible private static void test() {
if (false == Test.isRunningTest()) return;
Integer i = 0;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
-i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
-i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
-i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
}
}
\ No newline at end of file
diff --git a/force-app/main/default/classes/LexAddSubmitApprovalProcessController.cls b/force-app/main/default/classes/LexAddSubmitApprovalProcessController.cls
new file mode 100644
index 0000000..5180b60
--- /dev/null
+++ b/force-app/main/default/classes/LexAddSubmitApprovalProcessController.cls
@@ -0,0 +1,154 @@
+/**
+ * *
+ ODescription:
+ GAuthor: sun xia
+ @Date: 2023-07-11 15:31:56
+ GIastEditors: sun xia
+ @IastEditTime: 2023-07-11 15:31:56
+ * */
+public with sharing class LexAddSubmitApprovalProcessController {
+ @AuraEnabled
+ public static InitData init(String recordId){
+ InitData res = new InitData();
+
+ try {
+ List<Rental_Apply__c> raList = [SELECT Id, Request_shipping_day__c, Add_Approval_Status__c, Repair__c,
+ Demo_purpose1__c, demo_purpose2__c, Repair__r.Repair_Estimated_date_formula__c,
+ Repair__r.Agreed_Date__c, Repair__r.NewProductGuaranteeObject__c,
+ Repair__r.Repair_Final_Inspection_Date__c, Repair__r.Repair_Shipped_Date__c,
+ Repair__r.Status1__c, Repair__r.ReRepairObject_F__c, Repair__r.Number_of_EffectiveContract__c,
+ Repair__r.Delivered_Product__r.Product2.Asset_Model_No__c, Campaign__c,
+ Campaign__r.Status, Campaign__r.Rental_Apply_Flag__c, QIS_number__c, QIS_number__r.next_action__c,
+ applyUser__r.Id, Owner.Id, Status__c,RecordTypeId from Rental_Apply__c WHERE Id = :recordId];
+
+ if(raList.size()>0){
+ Rental_Apply__c ra = raList[0];
+
+ res.rentalApplyId = ra.Id;
+ res.recordTypeId = ra.RecordTypeId;
+ res.addApprovalStatus = ra.Add_Approval_Status__c;
+ res.requestShippingDay = ra.Request_shipping_day__c;
+ res.repairId = ra.Repair__c;
+ res.demoPurpose1 = ra.Demo_purpose1__c;
+ res.demoPurpose2 = ra.demo_purpose2__c;
+ res.repairEstimatedDateFormula = ra.Repair__r.Repair_Estimated_date_formula__c;
+ res.agreedDate = ra.Repair__r.Agreed_Date__c;
+ res.newProductGuaranteeObject = ra.Repair__r.NewProductGuaranteeObject__c;
+ res.repairFinalInspectionDate = ra.Repair__r.Repair_Final_Inspection_Date__c;
+ res.repairShippedDate = ra.Repair__r.Repair_Shipped_Date__c;
+ res.status1 = ra.Repair__r.Status1__c;
+ res.reRepairObjectF = ra.Repair__r.ReRepairObject_F__c;
+ res.numberOfEffectiveContract = ra.Repair__r.Number_of_EffectiveContract__c;
+ res.assetModelNo = ra.Repair__r.Delivered_Product__r.Product2.Asset_Model_No__c;
+ res.campaignId = ra.Campaign__c;
+ res.campaignStatus = ra.Campaign__r.Status;
+ res.rentalApplyFlag = Integer.valueOf(ra.Campaign__r.Rental_Apply_Flag__c);
+ res.qISNumber = ra.QIS_number__c;
+ res.nextAction = ra.QIS_number__r.next_action__c;
+ res.applyUserId = ra.applyUser__r.Id;
+ res.ownerId = ra.OwnerId;
+ res.rentalApplyStatus = ra.Status__c;
+ res.demoRequestPastDataId = Schema.SObjectType.Rental_Apply__c.getRecordTypeInfosByDeveloperName().get('Demo_request_past_data').getRecordTypeId();
+
+ List<Rental_Apply_Equipment_Set_Detail__c> raeSet = [SELECT Id from Rental_Apply_Equipment_Set_Detail__c WHERE Rental_Apply__c = :recordId AND Draft_Appended__c=1];
+ res.detailSize = raeSet.size();
+ }
+ }
+ catch (Exception e) {
+ System.debug(LoggingLevel.INFO, '****e:' + e);
+ }
+ return res;
+ }
+
+
+ //鎻愪氦瀹℃壒
+ @AuraEnabled
+ public static String submitApproval(String recordId){
+ Savepoint sp = Database.setSavepoint();
+ try {
+ Approval.ProcessSubmitRequest req1 = new Approval.ProcessSubmitRequest();
+ req1.setObjectId(recordId);
+ Approval.ProcessResult submitResult = Approval.process(req1);
+ return 'OK';
+ }
+ catch (Exception e) {
+ Database.rollback(sp);
+ return e.getMessage();
+ }
+ }
+
+
+ //鏇存柊澶囧搧鍊熷嚭鐢宠鐨勬彁浜よ拷鍔犲緟瀹℃壒鐘舵��
+ @AuraEnabled
+ public static String changeAddApprovalStatus(String recordId, String status){
+ Savepoint sp = Database.setSavepoint();
+ try {
+ Rental_Apply__c ra = new Rental_Apply__c();
+ ra.Id = recordId;
+ ra.Add_Approval_Status__c = status;
+ Update ra;
+ return '鏇存柊鎴愬姛';
+ }
+ catch (Exception e) {
+ Database.rollback(sp);
+ return e.getMessage();
+ }
+
+ }
+
+
+ private class InitData{
+ @AuraEnabled
+ public String rentalApplyId; //澶囧搧鍊熷嚭鐢宠Id
+ @AuraEnabled
+ public String recordTypeId;
+ @AuraEnabled
+ public String addApprovalStatus; //澶囧搧鍊熷嚭鐢宠.杩藉姞澶囧搧瀹℃壒鐘舵��
+ @AuraEnabled
+ public Integer detailSize; //鏄庣粏Size
+ @AuraEnabled
+ public Date requestShippingDay; //澶囧搧鍊熷嚭鐢宠.甯屾湜鍒拌揣鏃�
+ @AuraEnabled
+ public String repairId; //淇悊Id
+ @AuraEnabled
+ public String demoPurpose1; //澶囧搧鍊熷嚭鐢宠.浣跨敤鐩殑1
+ @AuraEnabled
+ public String demoPurpose2; //澶囧搧鍊熷嚭鐢宠.浣跨敤鐩殑2
+ @AuraEnabled
+ public Date repairEstimatedDateFormula; //淇悊.6.鎶ヤ环鏃�
+ @AuraEnabled
+ public Date agreedDate; //淇悊.7.鐢ㄦ埛鍚屾剰鏃�
+ @AuraEnabled
+ public String newProductGuaranteeObject; //淇悊.鏃犲伩鍖哄埆鏍囧織
+ @AuraEnabled
+ public Date repairFinalInspectionDate; //淇悊.10.鏈�缁堟娴嬫棩
+ @AuraEnabled
+ public Date repairShippedDate; //淇悊.11.RC淇悊鍝佽繑閫佹棩
+ @AuraEnabled
+ public String status1; //淇悊.鐘舵��1
+ @AuraEnabled
+ public Boolean reRepairObjectF; //淇悊.鍐嶅彈鐞嗗璞″搧鍙傝��
+ @AuraEnabled
+ public String numberOfEffectiveContract; //淇悊.鏈夋棤缁翠慨鍚堝悓瀵硅薄(SFDC)
+ @AuraEnabled
+ public String assetModelNo; //淇悊.璧勪骇.浜у搧.浜у搧鍨嬪彿锛圡DM锛�
+ @AuraEnabled
+ public String campaignId; //澶囧搧鍊熷嚭鐢宠.瀛︿細
+ @AuraEnabled
+ public String campaignStatus; //瀛︿細.鐘舵��
+ @AuraEnabled
+ public Integer rentalApplyFlag; //瀛︿細.鎻愪氦鐢宠FLG
+ @AuraEnabled
+ public String qISNumber; //澶囧搧鍊熷嚭鐢宠.QIS
+ @AuraEnabled
+ public String nextAction; //QIS.瀵瑰簲鏂规硶
+ @AuraEnabled
+ public String applyUserId; //澶囧搧鍊熷嚭鐢宠.鎿嶄綔鑰匢d
+ @AuraEnabled
+ public String ownerId; //澶囧搧鍊熷嚭鐢宠.鎵�鏈変汉Id
+ @AuraEnabled
+ public String rentalApplyStatus; //澶囧搧鍊熷嚭鐢宠.鐘舵��
+ @AuraEnabled
+ public String demoRequestPastDataId; //澶囧搧鐢宠 杩囧幓鍘嗗彶杞ЩId
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/classes/LexAddSubmitApprovalProcessController.cls-meta.xml b/force-app/main/default/classes/LexAddSubmitApprovalProcessController.cls-meta.xml
new file mode 100644
index 0000000..9662499
--- /dev/null
+++ b/force-app/main/default/classes/LexAddSubmitApprovalProcessController.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>50.0</apiVersion>
+ <status>Active</status>
+</ApexClass>
\ No newline at end of file
diff --git a/force-app/main/default/classes/LexAllReceivedFseController.cls b/force-app/main/default/classes/LexAllReceivedFseController.cls
new file mode 100644
index 0000000..9135f04
--- /dev/null
+++ b/force-app/main/default/classes/LexAllReceivedFseController.cls
@@ -0,0 +1,58 @@
+/**
+ * *
+ ODescription:
+ GAuthor: sun xia
+ @Date: 2023-07-11 15:31:56
+ GIastEditors: sun xia
+ @IastEditTime: 2023-07-11 15:31:56
+ * */
+public with sharing class LexAllReceivedFseController {
+ @AuraEnabled
+ public static InitData init(String recordId){
+ InitData res = new InitData();
+ try{
+ List<Rental_Apply__c> raList = [SELECT Id, Loaner_received_ng_num__c from Rental_Apply__c where Id = :recordId];
+ if(raList.size()>0){
+ Rental_Apply__c ra = raList[0];
+ res.id = ra.Id;
+ res.loanerReceivedNgNum = Integer.valueOf(ra.Loaner_received_ng_num__c);
+ }
+ }catch(Exception e){
+ System.debug(LoggingLevel.INFO, '****e:' + e);
+ }
+ return res;
+ }
+
+ @AuraEnabled
+ public static String getRaeSet(String recordId){
+ List<Rental_Apply_Equipment_Set__c> raeList = [SELECT Id, RAES_Status__c, Loaner_received_time__c from Rental_Apply_Equipment_Set__c WHERE Rental_Apply__c = :recordId];
+ List<Rental_Apply_Equipment_Set__c> updateList = new List<Rental_Apply_Equipment_Set__c>();
+ for(Integer i=0; i<raeList.size(); i++){
+ if(raeList[i].Loaner_received_time__c == null && raeList[i].RAES_Status__c == '宸插嚭搴�'){
+ Rental_Apply_Equipment_Set__c tempRAE = new Rental_Apply_Equipment_Set__c();
+ tempRAE.Id = raeList[i].Id;
+ tempRAE.Received_Confirm__c = 'OK';
+ updateList.add(tempRAE);
+ }
+ }
+
+ if(updateList.size()>0){
+ try {
+ Update updateList;
+ return 'SUCCESS';
+ }
+ catch (Exception e) {
+ return e.getMessage();
+ }
+ }
+
+ return '涓嶅瓨鍦ㄦ洿鏂版槑缁�';
+ }
+
+ public Class InitData{
+ @AuraEnabled
+ public String id;
+ @AuraEnabled
+ public Integer loanerReceivedNgNum;
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/classes/LexAllReceivedFseController.cls-meta.xml b/force-app/main/default/classes/LexAllReceivedFseController.cls-meta.xml
new file mode 100644
index 0000000..9662499
--- /dev/null
+++ b/force-app/main/default/classes/LexAllReceivedFseController.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>50.0</apiVersion>
+ <status>Active</status>
+</ApexClass>
\ No newline at end of file
diff --git a/force-app/main/default/classes/LexEquipmentRentalPicturePDFController.cls b/force-app/main/default/classes/LexEquipmentRentalPicturePDFController.cls
new file mode 100644
index 0000000..295f6d7
--- /dev/null
+++ b/force-app/main/default/classes/LexEquipmentRentalPicturePDFController.cls
@@ -0,0 +1,42 @@
+/**
+ * *
+ ODescription:
+ GAuthor: sun xia
+ @Date: 2023-07-11 15:31:56
+ GIastEditors: sun xia
+ @IastEditTime: 2023-07-11 15:31:56
+ * */
+public with sharing class LexEquipmentRentalPicturePDFController {
+ @AuraEnabled
+ public static InitData init(String recordId){
+ InitData res = new InitData();
+ try {
+ List<Rental_Apply__c> raList = [SELECT Id, Shipment_requested_cnt__c from Rental_Apply__c where Id = :recordId];
+ if(raList.size()>0){
+ Rental_Apply__c ra = raList[0];
+ if(ra.Shipment_requested_cnt__c > 0){
+ List<Rental_Apply_Equipment_Set__c> raeSet = [select Id from Rental_Apply_Equipment_Set__c where Rental_Apply__c = :recordId and Yi_Shipment_request__c > 0 and RAES_Status__c != '鍙栨秷'];
+ Integer setLength = raeSet.size();
+ res.pageLength = Math.mod(setLength,10)== 0 ? setLength/10 : (setLength/10) +1 ;
+ res.raesList = raeSet;
+ }
+ res.shipmentRequestedCnt = Integer.valueOf(ra.Shipment_requested_cnt__c);
+ }
+ }
+ catch (Exception e) {
+ System.debug(LoggingLevel.INFO, '****e:' + e);
+ }
+ return res;
+ }
+
+ public class InitData{
+ @AuraEnabled
+ public String id;
+ @AuraEnabled
+ public Integer pagelength;
+ @AuraEnabled
+ public Integer shipmentRequestedCnt;
+ @AuraEnabled
+ public List<Rental_Apply_Equipment_Set__c> raesList;
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/classes/LexEquipmentRentalPicturePDFController.cls-meta.xml b/force-app/main/default/classes/LexEquipmentRentalPicturePDFController.cls-meta.xml
new file mode 100644
index 0000000..9662499
--- /dev/null
+++ b/force-app/main/default/classes/LexEquipmentRentalPicturePDFController.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>50.0</apiVersion>
+ <status>Active</status>
+</ApexClass>
\ No newline at end of file
diff --git a/force-app/main/default/classes/LexInventoryHeaderController.cls b/force-app/main/default/classes/LexInventoryHeaderController.cls
new file mode 100644
index 0000000..f1e29aa
--- /dev/null
+++ b/force-app/main/default/classes/LexInventoryHeaderController.cls
@@ -0,0 +1,8 @@
+public with sharing class LexInventoryHeaderController {
+
+ @AuraEnabled
+ public static LostReport__c init(String recordId){
+ LostReport__c lp = [SELECT Id, Asset__c from LostReport__c WHERE Id = :recordId];
+ return lp;
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/classes/LexInventoryHeaderController.cls-meta.xml b/force-app/main/default/classes/LexInventoryHeaderController.cls-meta.xml
new file mode 100644
index 0000000..541584f
--- /dev/null
+++ b/force-app/main/default/classes/LexInventoryHeaderController.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>50.0</apiVersion>
+ <status>Active</status>
+</ApexClass>
diff --git a/force-app/main/default/classes/LexLoanerArrangedEmailController.cls b/force-app/main/default/classes/LexLoanerArrangedEmailController.cls
new file mode 100644
index 0000000..a119248
--- /dev/null
+++ b/force-app/main/default/classes/LexLoanerArrangedEmailController.cls
@@ -0,0 +1,99 @@
+/**
+ * *
+ ODescription:
+ GAuthor: sun xia
+ @Date: 2023-07-11 15:31:56
+ GIastEditors: sun xia
+ @IastEditTime: 2023-07-11 15:31:56
+ * */
+public with sharing class LexLoanerArrangedEmailController {
+ @AuraEnabled
+ public static InitData init(String recordId) {
+ String statusSting = Label.StatusProcessState;
+ List<String> status = statusSting.split(',');
+ InitData res = new InitData();
+ try {
+ List<Rental_Apply__c> racList = [SELECT Id, Status__c, RA_Status__c, Campaign__c, RC_return_to_office__c, Repair_Final_Inspection_Date_F__c, Repair__c, Assigned_Not_Shipment__c, Demo_purpose1__c, Contract_pdf_updated__c, Wei_Assigned_Cnt__c from Rental_Apply__c where Id = :recordId];
+ if(racList.size()>0){
+ Rental_Apply__c rac = racList[0];
+ if( rac.Campaign__c != null ){
+ //鑾峰彇瀛︿細瀵硅薄
+ Campaign camp = [select Id, Status, Rental_Apply_Flag__c,IF_Approved__c,Approved_Status__c, Meeting_Approved_No__c from Campaign where id = :rac.Campaign__c];
+ res.campaignId = camp.Id;
+ res.campaignStatus = camp.Status;
+ res.iFApproved = camp.IF_Approved__c;
+ res.meetingApprovedNo = camp.Meeting_Approved_No__c;
+ res.approvedStatus = camp.Approved_Status__c;
+ }
+ res.id = recordId;
+ res.raStatus = rac.RA_Status__c;
+ res.weiAssignedCnt = Integer.valueOf(rac.Wei_Assigned_Cnt__c);
+ res.assignedNotShipment = Integer.valueOf(rac.Assigned_Not_Shipment__c);
+ res.demoPurpose1 = rac.Demo_purpose1__c;
+ res.contractPdfUpdated = rac.Contract_pdf_updated__c;
+ res.repairId = rac.Repair__c;
+ res.repairFinalInspectionDateF = rac.Repair_Final_Inspection_Date_F__c;
+ res.rCReturnToOffice = rac.RC_return_to_office__c;
+ res.statusList = status;
+ }
+ }
+ catch (Exception e) {
+ System.debug(LoggingLevel.INFO, '****e:' + e);
+ }
+ system.debug('res======'+res);
+ return res;
+ }
+
+
+ //鑾峰彇澶囧搧鍊熷嚭涓�鏍�
+ @AuraEnabled
+ public static Integer getRentalApplyEquipmentSet(String recordId) {
+ Rental_Apply__c tempRa = [SELECT Id, Bollow_Date__c from Rental_Apply__c where Id = :recordId];
+ List<Rental_Apply_Equipment_Set__c> tempRaEquipSetList = new List<Rental_Apply_Equipment_Set__c>();
+ Integer pageLength ;
+ if(tempRa.Bollow_Date__c != null) {
+ tempRaEquipSetList = [SELECT Id from Rental_Apply_Equipment_Set__c where Rental_Apply__c = :recordId AND Shippment_loaner_time__c != null and RAES_Status__c != '宸插垎閰�' and RAES_Status__c != '鍙栨秷鍒嗛厤'];
+ }else {
+ tempRaEquipSetList = [SELECT Id from Rental_Apply_Equipment_Set__c where Rental_Apply__c = :recordId AND RAES_Status__c != '宸插垎閰�' and RAES_Status__c != '鍙栨秷鍒嗛厤'];
+ }
+ //
+ if(tempRaEquipSetList.size()>0) {
+ Integer setLength = tempRaEquipSetList.size();
+ pageLength = Math.mod(setLength,10) == 0 ? setLength/10 : Math.round(setLength) + 1;
+ }
+ return pageLength;
+ }
+
+ public class InitData{
+ @AuraEnabled
+ public String id;
+ @AuraEnabled
+ public String campaignStatus; //瀛︿細鐘舵��
+ @AuraEnabled
+ public String campaignId; //瀛︿細Id
+ @AuraEnabled
+ public String raStatus; //澶囧搧鍊熷嚭鐢宠鐘舵��
+ @AuraEnabled
+ public Integer weiAssignedCnt; //鏈垎閰嶄欢鏁� Wei_Assigned_Cnt__c
+ @AuraEnabled
+ public Integer assignedNotShipment; //宸插垎閰嶆湭鍑哄簱鎸囩ず Assigned_Not_Shipment__c
+ @AuraEnabled
+ public String demoPurpose1; //浣跨敤鐩殑1 Demo_purpose1__c
+ @AuraEnabled
+ public Boolean contractPdfUpdated; //鍚堝悓涔﹀凡涓婁紶 Contract_pdf_updated__c
+ @AuraEnabled
+ public String repairId; //瀛︿細.淇悊Id
+ @AuraEnabled
+ public Date repairFinalInspectionDateF; //淇悊鏈�缁堟娴嬫棩F Repair_Final_Inspection_Date_F__c
+ @AuraEnabled
+ public Date rCReturnToOffice; //RC淇悊鍝佽繑閫佹棩 RC_return_to_office__c
+ @AuraEnabled
+ public Boolean iFApproved; //瀛︿細.鏄惁闇�瑕佺敵璇峰喅瑁�
+ @AuraEnabled
+ public String meetingApprovedNo; //瀛︿細.浼氳鍐宠缂栫爜
+ @AuraEnabled
+ public String approvedStatus; //瀛︿細.鍐宠鐘舵�� Approved_Status__c
+ @AuraEnabled
+ public List<String> statusList;
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/classes/LexLoanerArrangedEmailController.cls-meta.xml b/force-app/main/default/classes/LexLoanerArrangedEmailController.cls-meta.xml
new file mode 100644
index 0000000..9662499
--- /dev/null
+++ b/force-app/main/default/classes/LexLoanerArrangedEmailController.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>50.0</apiVersion>
+ <status>Active</status>
+</ApexClass>
\ No newline at end of file
diff --git a/force-app/main/default/classes/LexNewTransferApplyController.cls b/force-app/main/default/classes/LexNewTransferApplyController.cls
new file mode 100644
index 0000000..8a4824a
--- /dev/null
+++ b/force-app/main/default/classes/LexNewTransferApplyController.cls
@@ -0,0 +1,53 @@
+/**
+ * *
+ ODescription:
+ GAuthor: sun xia
+ @Date: 2023-07-11 15:31:56
+ GIastEditors: sun xia
+ @IastEditTime: 2023-07-11 15:31:56
+ * */
+public with sharing class LexNewTransferApplyController {
+ @AuraEnabled
+ public static InitData init(String recordId){
+ InitData res = new InitData();
+ try{
+ List<Rental_Apply__c> raList = [SELECT Id, Name from Rental_Apply__c where id = :recordId];
+ if(raList.size()>0){
+
+ Rental_Apply__c ra = raList[0];
+ res.raId = ra.Id;
+ res.raName = ra.Name;
+ List<Rental_Apply_Equipment_Set_Detail__c> raSet = [SELECT Id,Name,Lost_item_giveup__c,Arrival_in_wh__c,Arrival_wh_Result_Agency__c ,Rental_Apply_Equipment_Set__r.First_RAESD__r.Arrival_in_wh__c,
+ Rental_Apply__r.RecordType.DeveloperName,Lost_Item_return__c,Is_Body__c,Asset__c,Rental_Apply__c,OneToOne_Flag__c,
+ Rental_Apply_Equipment_Set__r.First_RAESD__r.Arrival_wh_Result_Agency__c,
+ Rental_Apply_Equipment_Set__r.First_RAESD__r.Lost_item_giveup__c,
+ Check_lost_Item__c,Check_lost_Item_Final__c,Rental_Apply_Equipment_Set__r.First_You_Xiao_Ku_Cun__c,
+ Rental_Apply_Equipment_Set__r.First_RAESD__r.Arrival_wh_time__c,Arrival_wh_time__c
+ FROM Rental_Apply_Equipment_Set_Detail__c WHERE Rental_Apply__c = :recordId AND Cancel_Select__c = false
+ ];
+
+ res.rae = raSet;
+ }
+ }catch(Exception e){
+ System.debug(LoggingLevel.INFO, '****e:' + e);
+ }
+
+ return res;
+ }
+
+
+ @AuraEnabled
+ public static String getRecordId(){
+ RecordType re = [SELECT Id, Name, DeveloperName, isActive FROM RecordType WHERE DeveloperName = 'AgencyToCenter' AND SobjectType = 'TransferApply__c' AND isActive = true];
+ return re.Id;
+ }
+
+ public class InitData{
+ @AuraEnabled
+ public String raId; //鍊熷嚭鐢宠Id
+ @AuraEnabled
+ public String raName; //鍊熷嚭鐢宠Name
+ @AuraEnabled
+ public List<Rental_Apply_Equipment_Set_Detail__c> rae;
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/classes/LexNewTransferApplyController.cls-meta.xml b/force-app/main/default/classes/LexNewTransferApplyController.cls-meta.xml
new file mode 100644
index 0000000..9662499
--- /dev/null
+++ b/force-app/main/default/classes/LexNewTransferApplyController.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>50.0</apiVersion>
+ <status>Active</status>
+</ApexClass>
\ No newline at end of file
diff --git a/force-app/main/default/classes/LexRentalApplyControllerLWT.cls b/force-app/main/default/classes/LexRentalApplyControllerLWT.cls
new file mode 100644
index 0000000..dea0ca8
--- /dev/null
+++ b/force-app/main/default/classes/LexRentalApplyControllerLWT.cls
@@ -0,0 +1,296 @@
+public with sharing class LexRentalApplyControllerLWT {
+ public LexRentalApplyControllerLWT() {
+
+ }
+
+ @AuraEnabled
+ public static Rental_Apply__c initFromCancelSubmitButton(String recordId){
+ InitData res = new InitData();
+ try{
+ Rental_Apply__c report=[select
+ Status__c,Yi_loaner_arranged__c,Id,RA_Status__c,
+ demo_purpose2__c,Follow_UP_Opp__c,Statu_Achievements__c,Statu_Achievements_ID__c,
+ Request_shipping_day__c,Demo_purpose1__c,Repair__c,RecordTypeId,SupplementCreated__c,
+ OPDPlan__c,Campaign__c,QIS_number__c,OwnerId,
+ // QIS_numberId__c,CampaignId__c,applyUserId__c锛�
+ Re_repair__c,
+ QIS_ID_Line__c,
+ applyUser__c
+ from Rental_Apply__c where Id= :recordId];
+ return report;
+ // res.StatusC=report.Status__c;
+ // res.Id=report.Id;
+ // res.YiLoanerArrangedC=report.Yi_loaner_arranged__c;
+ // res.RAStatusC=report.RA_Status__c;
+ // res.DemoPurpose2C=report.demo_purpose2__c;
+ // res.FollowUPOppC=report.Follow_UP_Opp__c;
+ // res.StatuAchievementsC=report.Statu_Achievements__c;
+ // res.StatuAchievementsIDC=report.Statu_Achievements_ID__c;
+ // res.RequestShippingDayC=report.Request_shipping_day__c;
+ // res.DemoPurpose1C=report.Demo_purpose1__c;
+ // res.RepairC=report.Repair__c;
+ // res.RecordTypeId=report.RecordTypeId;
+ // res.SupplementCreatedC=report.SupplementCreated__c;
+ // res.OPDPlanC=report.OPDPlan__c;
+ // res.CampaignC=report.Campaign__c;
+ // res.QISNumberC=report.QIS_number__c;
+ // res.QISNumberIdc=report.QIS_numberId__c;
+ }catch(Exception e){
+ System.debug(LoggingLevel.INFO,'Rental_Apply__c Cancel Error : ' + e);
+ }
+ return null;
+ }
+
+ @AuraEnabled
+ public static list<Rental_Apply_Equipment_Set_Detail__c> selectRentalApplyEquipmentSetDetailByRacId(String recordId){
+ InitData res = new InitData();
+ try{
+ list<Rental_Apply_Equipment_Set_Detail__c> report=[select
+ Id, Fixture_Model_No_F__c, Product_Status_Flag_F__c
+ from Rental_Apply_Equipment_Set_Detail__c where Rental_Apply__c = :recordId];
+ return report;
+ }catch(Exception e){
+ System.debug(LoggingLevel.INFO,'Rental_Apply__c Cancel Error : ' + e);
+ }
+ return null;
+ }
+
+ @AuraEnabled
+ public static list<QIS_Report__c> selectQISReportById(String recordId){
+ InitData res = new InitData();
+ try{
+ list<QIS_Report__c> report=[select
+ Id, nonyushohin__r.Product2.Fixture_Model_No_T__c
+ from QIS_Report__c
+ where id = :recordId
+ ];
+ return report;
+ }catch(Exception e){
+ System.debug(LoggingLevel.INFO,'Rental_Apply__c Cancel Error : ' + e);
+ }
+ return null;
+ }
+
+ @AuraEnabled
+ public static list<Repair__c> selectRepairById(String recordId){
+ InitData res = new InitData();
+ try{
+ list<Repair__c> report=[select Id, Repair_Rank__c, DW_Sign_Txt__c, FSE_ApplyForRepair_Day__c, Delivered_Product__r.Product2.Fixture_Model_No_T__c
+ , ReRepairObject_F__c,Status1__c,Agreed_Date__c,Repair_Estimated_date_formula__c,Repair_Ordered_Date__c
+ , IfCheckFixture__c
+ , Repair_Final_Inspection_Date__c,Repair_Shipped_Date__c,Number_of_EffectiveContract__c, NewProductGuaranteeObject__c, Delivered_Product__r.Product2.Asset_Model_No__c
+ from Repair__c where id = :recordId
+ ];
+ return report;
+ }catch(Exception e){
+ System.debug(LoggingLevel.INFO,'Rental_Apply__c Cancel Error : ' + e);
+ }
+ return null;
+ }
+
+ @AuraEnabled
+ public static list<Campaign> selectCampaignById(String recordId){
+ InitData res = new InitData();
+ try{
+ list<Campaign> report=[select
+ Status, Rental_Apply_Flag__c ,IF_Approved__c,Meeting_Approved_No__c,Approved_Status__c
+ from Campaign where id =:recordId
+
+ ];
+ return report;
+ }catch(Exception e){
+ System.debug(LoggingLevel.INFO,'Rental_Apply__c Cancel Error : ' + e);
+ }
+ return null;
+ }
+ @AuraEnabled
+ public static list<Rental_Apply_Equipment_Set__c> selectRentalApplyEquipmentSetByRacId(String recordId){
+ InitData res = new InitData();
+ try{
+ list<Rental_Apply_Equipment_Set__c> report=[select Id
+ from Rental_Apply_Equipment_Set__c
+ where RetalFSetDetail_Cnt__c = 0 AND Rental_Apply__c = :recordId
+ ];
+ return report;
+ }catch(Exception e){
+ System.debug(LoggingLevel.INFO,'Rental_Apply__c Cancel Error : ' + e);
+ }
+ return null;
+ }
+
+ @AuraEnabled
+ public static list<Rental_Apply__c> selectRentalApplyById(String recordId){
+ InitData res = new InitData();
+ try{
+ list<Rental_Apply__c> report=[select
+ id,OPDPlan__c,OPDPlan__r.SalesManager_Txt__c,OPDPlan__r.BuchangApprovalManagerSales_Txt__c
+ from Rental_Apply__c where id = :recordId
+
+ ];
+ return report;
+ }catch(Exception e){
+ System.debug(LoggingLevel.INFO,'Rental_Apply__c Cancel Error : ' + e);
+ }
+ return null;
+ }
+
+ @AuraEnabled
+ public static list<User> selectUserById(String recordId){
+ InitData res = new InitData();
+ try{
+ list<User> report=[select
+ id,JingliEquipmentManager__c,JingliEquipmentManager__r.Name,Buzhang_Equipment_Manager__c,
+ Buzhang_Equipment_Manager__r.Name
+ from User where id = :recordId
+ ];
+ return report;
+ }catch(Exception e){
+ System.debug(LoggingLevel.INFO,'Rental_Apply__c Cancel Error : ' + e);
+ }
+ return null;
+ }
+
+ @AuraEnabled
+ public static list<QIS_report__c> selectQISreportById2(String recordId){
+ InitData res = new InitData();
+ try{
+ list<QIS_report__c> report=[select id,next_action__c
+ from QIS_report__c where id =:recordId
+ ];
+ return report;
+ }catch(Exception e){
+ System.debug(LoggingLevel.INFO,'Rental_Apply__c Cancel Error : ' + e);
+ }
+ return null;
+ }
+
+
+ @AuraEnabled
+ public static String getUserId(){
+
+ return UserInfo.getUserId();
+ }
+
+ @AuraEnabled
+ public static String getProfileId(){
+ return UserInfo.getProfileId();
+ }
+
+ @AuraEnabled
+ public static String setSObjectShare(String sobjectName, String rowCause, String parentId, List<String> userAccess, String ownerId) {
+
+ try {
+ List<SObject> sObjList = new List<SObject>();
+ for (String ua : userAccess) {
+ String userid = ua.split('_')[0];
+ String access = ua.split('_')[1];
+ SObject sObj = Schema.getGlobalDescribe().get(sobjectName).newSObject();
+ if (String.isBlank(userid) == false && userid.substring(0, 15) != ownerId.substring(0, 15)) {
+ sObj.put('RowCause', rowCause);
+ sObj.put('ParentId', parentId);
+ sObj.put('UserOrGroupId', userid);
+ sObj.put('AccessLevel', access);
+ sObjList.add(sObj);
+ }
+ }
+ if (sObjList.size() > 0) insert sObjList;
+ return 'OK';
+ } catch (Exception e) {
+ return e.getMessage();
+ }
+ }
+
+ @AuraEnabled
+ public static UpdateResult updateRentalApplyC(
+ String recordId,
+ String SalesManagerSubmitC,
+ String StatusC,
+ String OPDManagerApproverC,
+ String BuchangApprovalManagerSalesSubmitC,
+ String OPDBuchangApproverC
+ ) {
+ UpdateResult result = new UpdateResult();
+ result.recordId = recordId;
+ try{
+ // 鏇存柊璁板綍骞惰幏鍙栫粨鏋�
+ if(recordId==null) return null;
+ Rental_Apply__c rac = new Rental_Apply__c( id=recordId);
+
+ if(SalesManagerSubmitC!=null&& SalesManagerSubmitC != ''){
+ rac.SalesManagerSubmit__c=SalesManagerSubmitC;
+ }
+ if(StatusC!=null&&StatusC!=''){
+ rac.Status__c=StatusC;
+ }
+ if(OPDManagerApproverC!=null&&OPDManagerApproverC!=''){
+ rac.OPDManagerApprover__c=OPDManagerApproverC;
+ }
+ if(BuchangApprovalManagerSalesSubmitC!=null&&BuchangApprovalManagerSalesSubmitC!=''){
+ rac.BuchangApprovalManagerSalesSubmit__c=BuchangApprovalManagerSalesSubmitC;
+ }
+ if(OPDBuchangApproverC!=null&&OPDBuchangApproverC!=''){
+ rac.OPDBuchangApprover__c=OPDBuchangApproverC;
+ }
+ if(rac.id==null)return null;
+ update rac;
+ result.success = true;
+ result.errors = new List<String>();
+ // 瀹氫箟瀛楃涓插垪琛紝鍏朵腑鍖呭惈鑻ュ共 sObject 鐨� API 鍚嶇О
+ //List<String> objTypeList = new List<String>{'Account', 'ExampleCustomObj__c'};
+ // 寰楀埌 Account 鍜� ExampleCustomObj__c 鐨勪俊鎭�
+ //Schema.DescribeSobjectResult[] results = Schema.describeSObjects(objTypeList);
+ return result;
+ }catch(Exception e){
+ result.success = false;
+ result.errors = new List<String>();
+ result.errors.add(e.getMessage());
+ System.debug(LoggingLevel.INFO,'Rental_Apply__c update Error : ' + e);
+ }
+ return result;
+ }
+
+ public class UpdateResult {
+ @AuraEnabled public String recordId {get;set;}
+ @AuraEnabled public Boolean success {get;set;}
+ @AuraEnabled public List<String> errors {get;set;}
+ }
+ public class InitData{
+ @AuraEnabled
+ public String StatusC;
+ @AuraEnabled
+ public Decimal YiLoanerArrangedC;
+ @AuraEnabled
+ public String Id;
+ @AuraEnabled
+ public String RAStatusC;
+
+ @AuraEnabled
+ public String DemoPurpose2C;
+ @AuraEnabled
+ public String FollowUPOppC;
+ @AuraEnabled
+ public String StatuAchievementsC;
+ @AuraEnabled
+ public String StatuAchievementsIDC;
+ @AuraEnabled
+ public Date RequestShippingDayC;
+ @AuraEnabled
+ public String DemoPurpose1C;
+ @AuraEnabled
+ public String RepairC;
+ @AuraEnabled
+ public String RecordTypeId;
+ @AuraEnabled
+ public Boolean SupplementCreatedC;
+ @AuraEnabled
+ public String OPDPlanC;
+ @AuraEnabled
+ public String CampaignC;
+ @AuraEnabled
+ public String QISNumberC;
+ @AuraEnabled
+ public String QISNumberIdc;
+ @AuraEnabled
+ public List<String> statusList;
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/classes/LexRentalApplyControllerLWT.cls-meta.xml b/force-app/main/default/classes/LexRentalApplyControllerLWT.cls-meta.xml
new file mode 100644
index 0000000..9662499
--- /dev/null
+++ b/force-app/main/default/classes/LexRentalApplyControllerLWT.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>50.0</apiVersion>
+ <status>Active</status>
+</ApexClass>
\ No newline at end of file
diff --git a/force-app/main/default/classes/LexRentalApplyFaultController.cls b/force-app/main/default/classes/LexRentalApplyFaultController.cls
new file mode 100644
index 0000000..3298d0f
--- /dev/null
+++ b/force-app/main/default/classes/LexRentalApplyFaultController.cls
@@ -0,0 +1,41 @@
+/**
+ * *
+ ODescription:
+ GAuthor: sun xia
+ @Date: 2023-07-11 15:31:56
+ GIastEditors: sun xia
+ @IastEditTime: 2023-07-17 15:31:56
+ * */
+public with sharing class LexRentalApplyFaultController {
+ @AuraEnabled
+ public static Rental_Apply_Fault__c init(String recordId){
+ try {
+ List<Rental_Apply_Fault__c> rafList = [Select Id, status__c from Rental_Apply_Fault__c where Id = :recordId];
+ if(rafList.size()>0){
+ return rafList[0];
+ }
+ }
+ catch (Exception e) {
+ System.debug(LoggingLevel.INFO, '*** e.getMessage()+e.getLineNumber(): ' + e.getMessage()+e.getLineNumber());
+
+ }
+ return null;
+ }
+
+ @AuraEnabled
+ public static String updateRentalApplyFaultStatus(String recordId, String updateStatus){
+ Savepoint sp = Database.setSavepoint();
+ try {
+ Rental_Apply_Fault__c updateRaf = new Rental_Apply_Fault__c();
+ updateRaf.Id = recordId;
+ updateRaf.status__c = updateStatus;
+ Update updateRaf;
+ return 'SUCCESS';
+ }
+ catch (Exception e) {
+ Database.rollback(sp);
+ System.debug(LoggingLevel.INFO, '*** e.getMessage()+e.getLineNumber(): ' + e.getMessage()+e.getLineNumber());
+ return e.getMessage();
+ }
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/classes/LexRentalApplyFaultController.cls-meta.xml b/force-app/main/default/classes/LexRentalApplyFaultController.cls-meta.xml
new file mode 100644
index 0000000..9662499
--- /dev/null
+++ b/force-app/main/default/classes/LexRentalApplyFaultController.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>50.0</apiVersion>
+ <status>Active</status>
+</ApexClass>
\ No newline at end of file
diff --git a/force-app/main/default/classes/LexRentalApplyPDFController.cls b/force-app/main/default/classes/LexRentalApplyPDFController.cls
new file mode 100644
index 0000000..d713de7
--- /dev/null
+++ b/force-app/main/default/classes/LexRentalApplyPDFController.cls
@@ -0,0 +1,38 @@
+/**
+ * *
+ ODescription:
+ GAuthor: sun xia
+ @Date: 2023-07-11 15:31:56
+ GIastEditors: sun xia
+ @IastEditTime: 2023-07-11 15:31:56
+ * */
+public with sharing class LexRentalApplyPDFController {
+ @AuraEnabled
+ public static InitData initJumptoPDFButton(String recordId) {
+ InitData res = new InitData();
+ try {
+ List<Rental_Apply__c> raList = [SELECT Id,Shipment_requested_cnt__c from Rental_Apply__c where Id = :recordId];
+ if(raList.size() > 0){
+ Rental_Apply__c ra = raList[0];
+ List<Rental_Apply_Equipment_Set__c> raeSet = [SELECT Id from Rental_Apply_Equipment_Set__c where Rental_Apply__c = :recordId and Yi_Shipment_request__c > 0 and RAES_Status__c != '鍙栨秷'];
+ res.shipmentRequestedCnt = Integer.valueOf(ra.Shipment_requested_cnt__c);
+ if(raeSet.size()>0){
+ Integer setLength = raeSet.size();
+ res.pageLength = Math.mod(setLength,10)== 0 ? setLength/10 : Math.round(setLength) +1 ;
+ }
+ }
+ }catch(Exception e){
+ System.debug(LoggingLevel.INFO, '****e:' + e);
+ }
+ return res;
+ }
+
+ public class InitData{
+ @AuraEnabled
+ public String id;
+ @AuraEnabled
+ public Integer pageLength;
+ @AuraEnabled
+ public Integer shipmentRequestedCnt;
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/classes/LexRentalApplyPDFController.cls-meta.xml b/force-app/main/default/classes/LexRentalApplyPDFController.cls-meta.xml
new file mode 100644
index 0000000..9662499
--- /dev/null
+++ b/force-app/main/default/classes/LexRentalApplyPDFController.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>50.0</apiVersion>
+ <status>Active</status>
+</ApexClass>
\ No newline at end of file
diff --git a/force-app/main/default/classes/LexReturnDeliverySlipController.cls b/force-app/main/default/classes/LexReturnDeliverySlipController.cls
new file mode 100644
index 0000000..2e06748
--- /dev/null
+++ b/force-app/main/default/classes/LexReturnDeliverySlipController.cls
@@ -0,0 +1,44 @@
+/**
+ * *
+ ODescription:
+ GAuthor: sun xia
+ @Date: 2023-07-11 15:31:56
+ GIastEditors: sun xia
+ @IastEditTime: 2023-07-11 15:31:56
+ * */
+public with sharing class LexReturnDeliverySlipController {
+ @AuraEnabled
+ public static InitData init(String recordId){
+ InitData res = new InitData();
+ try {
+ List<Rental_Apply__c> raList = [SELECT Id, Name, Rental_Apply_Equipment_Set_Cnt__c, Loaner_received_ng_num__c from Rental_Apply__c where Id = :recordId];
+
+ if(raList.size()>0){
+ Rental_Apply__c ra = raList[0];
+ if(ra.Rental_Apply_Equipment_Set_Cnt__c > 0){
+ List<Rental_Apply_Equipment_Set_Detail__c> raSet = [SELECT Id, Name from Rental_Apply_Equipment_Set_Detail__c WHERE Received_Confirm_F__c = 'NG' AND Cancel_Select__c = false AND Rental_Apply__c = :recordId];
+ res.raeSet = raSet;
+ }
+ res.name = ra.Name;
+ res.rentalApplyEquipmentSetCnt = Integer.valueOf(ra.Rental_Apply_Equipment_Set_Cnt__c);
+ res.loanerReceivedNgNum = Integer.valueOf(ra.Loaner_received_ng_num__c);
+ }
+
+ }
+ catch (Exception e) {
+ system.debug('INFO****' + e);
+ }
+ return res;
+ }
+
+ public class InitData{
+ @AuraEnabled
+ public Integer rentalApplyEquipmentSetCnt;
+ @AuraEnabled
+ public Integer loanerReceivedNgNum;
+ @AuraEnabled
+ public String name;
+ @AuraEnabled
+ public List<Rental_Apply_Equipment_Set_Detail__c> raeSet;
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/classes/LexReturnDeliverySlipController.cls-meta.xml b/force-app/main/default/classes/LexReturnDeliverySlipController.cls-meta.xml
new file mode 100644
index 0000000..9662499
--- /dev/null
+++ b/force-app/main/default/classes/LexReturnDeliverySlipController.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>50.0</apiVersion>
+ <status>Active</status>
+</ApexClass>
\ No newline at end of file
diff --git a/force-app/main/default/classes/LexSelectSubstituteControllerLWT.cls b/force-app/main/default/classes/LexSelectSubstituteControllerLWT.cls
new file mode 100644
index 0000000..2ff7860
--- /dev/null
+++ b/force-app/main/default/classes/LexSelectSubstituteControllerLWT.cls
@@ -0,0 +1,686 @@
+public with sharing class LexSelectSubstituteControllerLWT {
+ public LexSelectSubstituteControllerLWT() {
+
+ }
+ @AuraEnabled
+ public static InitData initFromSelectSubstituteButton(String recordId){
+ InitData res = new InitData();
+ try{
+ Rental_Apply_Equipment_Set__c report=[select
+ Id,Rental_Apply__r.Status__c,Rental_Apply__r.Id
+ from Rental_Apply_Equipment_Set__c
+ where Id= :recordId];
+ res.id=report.Id;
+ res.RentalApplyId=report.Rental_Apply__r.Id;
+ res.Status=report.Rental_Apply__r.Status__c;
+ }catch(Exception e){
+ System.debug(LoggingLevel.INFO,'Rental_Apply_Equipment_Set__c Cancel Error : ' + e);
+ }
+ return res;
+ }
+
+
+ @AuraEnabled
+ public static List<String> getStatusList(){
+ String statusSting = Label.StatusProcessState;
+ List<String> status = statusSting.split(',');
+ return status;
+ }
+
+ @AuraEnabled
+ public static List<String> getUserIdByUserName(List<String> userNameList){
+ try{
+ List<User> userList=[select id,name from user where name in :userNameList];
+ List<String> res=new List<String>();
+ for (User u:userList ) {
+ res.add(u.id);
+ }
+ return res;
+ }catch(Exception e){
+ System.debug(LoggingLevel.INFO,'Rental_Apply_Equipment_Set__c Cancel Error : ' + e);
+ }
+ return null;
+ }
+
+ @AuraEnabled
+ public static Rental_Apply_Equipment_Set__c initFromCustomSubmitButton(String recordId){
+
+ try{
+ Rental_Apply_Equipment_Set__c report=[select
+ Id,Request_extend_day__c
+ ,Extend_request_reason__c
+ ,Rental_End_Date__c,
+ Rental_Apply__c
+ from Rental_Apply_Equipment_Set__c
+ where Id= :recordId];
+
+ return report;
+ }catch(Exception e){
+ System.debug(LoggingLevel.INFO,'Rental_Apply_Equipment_Set__c Cancel Error : ' + e);
+ }
+ return null;
+ }
+
+ @AuraEnabled
+ public static InitData initFromLoanerArrangedEmailLButton(String recordId){
+ String statusSting = Label.StatusProcessState;
+ List<String> status = statusSting.split(',');
+ InitData res = new InitData();
+ try{
+ Rental_Apply_Equipment_Set__c report=[select
+ Id,Rental_Apply__r.Status__c,Rental_Apply__c,Rental_Apply__r.Wei_Assigned_Cnt__c,
+ Assigned_Not_Shipment__c,Rental_Apply__r.Bollow_Date__c
+ from Rental_Apply_Equipment_Set__c
+ where Id= :recordId];
+ res.id=report.Id;
+ res.RentalApplyC=report.Rental_Apply__c;
+ res.Status=report.Rental_Apply__r.Status__c;
+ res.WeiAssignedCntC=report.Rental_Apply__r.Wei_Assigned_Cnt__c;
+ res.BollowDateC=report.Rental_Apply__r.Bollow_Date__c;
+ res.AssignedNotShipmentC=report.Assigned_Not_Shipment__c;
+ res.statusList = status;
+ }catch(Exception e){
+ System.debug(LoggingLevel.INFO,'Rental_Apply_Equipment_Set__c Cancel Error : ' + e);
+ }
+ return res;
+ }
+
+ @AuraEnabled
+ public static InitData initClearReturnDeliverySlipButton(String recordId){
+ InitData res = new InitData();
+ try{
+ Rental_Apply_Equipment_Set__c report=[select
+ Id,Rental_Apply__r.Status__c,Rental_Apply__c,Rental_Apply__r.Wei_Assigned_Cnt__c,
+ Assigned_Not_Shipment__c,Rental_Apply__r.Bollow_Date__c
+ from Rental_Apply_Equipment_Set__c
+ where Id= :recordId];
+ res.id=report.Id;
+ res.RentalApplyC=report.Rental_Apply__c;
+ res.Status=report.Rental_Apply__r.Status__c;
+ res.WeiAssignedCntC=report.Rental_Apply__r.Wei_Assigned_Cnt__c;
+ res.BollowDateC=report.Rental_Apply__r.Bollow_Date__c;
+ res.AssignedNotShipmentC=report.Assigned_Not_Shipment__c;
+ }catch(Exception e){
+ System.debug(LoggingLevel.INFO,'Rental_Apply_Equipment_Set__c Cancel Error : ' + e);
+ }
+ return res;
+ }
+
+ @AuraEnabled
+ public static Rental_Apply_Equipment_Set__c selectRentalApplyEquipmentSetByID(String recordId){
+ try{
+ Rental_Apply_Equipment_Set__c report=[select
+ Cancel_Select__c,Irreplaceable_flag__c,RAES_Status__c,Shippment_loaner_time2__c
+ from Rental_Apply_Equipment_Set__c
+ where Id=:recordId];
+ return report;
+ }catch(Exception e){
+ System.debug(LoggingLevel.INFO,'Rental_Apply_Equipment_Set__c Cancel Error : ' + e);
+ }
+ return null;
+ }
+
+ @AuraEnabled
+ public static list<Rental_Apply_Equipment_Set_Detail__c> selectRentalApplyEquipmentSetByRACID(String recordId){
+ try{
+ list<Rental_Apply_Equipment_Set_Detail__c> report=[select Allow_Adjust_Queue_Flag__c
+ from Rental_Apply_Equipment_Set_Detail__c
+ where Rental_Apply__c = :recordId ];
+ return report;
+ }catch(Exception e){
+ System.debug(LoggingLevel.INFO,'Rental_Apply_Equipment_Set__c Cancel Error : ' + e);
+ }
+ return null;
+ }
+
+
+ @AuraEnabled
+ public static list<Rental_Apply__c> selectRentalApplyCByName(String recordId){
+ try{
+ list<Rental_Apply__c> report=[select
+ Id,Campaign__c,Repair__c,Status__c,Bollow_Date__c, Demo_purpose1__c,Contract_pdf_updated__c,Repair_Final_Inspection_Date_F__c,RC_return_to_office__c,Wei_Assigned_Cnt__c
+ from Rental_Apply__c
+ where id=:recordId ];
+ return report;
+ }catch(Exception e){
+ System.debug(LoggingLevel.INFO,'Rental_Apply_Equipment_Set__c Cancel Error : ' + e);
+ }
+ return null;
+ }
+ @AuraEnabled
+ public static list<Campaign> selectCampaignById(String recordId){
+ try{
+ list<Campaign> report=[select
+ Status, Rental_Apply_Flag__c,IF_Approved__c,Meeting_Approved_No__c,Approved_Status__c
+ from Campaign
+ where id =:recordId ];
+ return report;
+ }catch(Exception e){
+ System.debug(LoggingLevel.INFO,'Rental_Apply_Equipment_Set__c Cancel Error : ' + e);
+ }
+ return null;
+ }
+ @AuraEnabled
+ public static String getSessionId(){
+ return UserInfo.getSessionId();
+ }
+
+
+ @AuraEnabled
+ public static list<Rental_Apply_Equipment_Set__c> selectRaesById1(String recordId1){
+ try{
+ list<Rental_Apply_Equipment_Set__c> report=[select Id
+ from Rental_Apply_Equipment_Set__c
+ where Rental_Apply__c = :recordId1
+ and Shippment_loaner_time2__c != null
+ and RAES_Status__c != '宸插垎閰�'
+ and RAES_Status__c != '鍙栨秷鍒嗛厤'
+ ];
+ return report;
+ }catch(Exception e){
+ System.debug(LoggingLevel.INFO,'selectRaesById1 Error : ' + e);
+ }
+ return null;
+ }
+ @AuraEnabled
+ public static list<Rental_Apply_Equipment_Set__c> selectRaesById2(String recordId2){
+ try{
+ list<Rental_Apply_Equipment_Set__c> report=[select Id
+ from Rental_Apply_Equipment_Set__c
+ where Rental_Apply__c = :recordId2
+ and RAES_Status__c != '宸插垎閰�'
+ and RAES_Status__c != '鍙栨秷鍒嗛厤'
+ ];
+ return report;
+ }catch(Exception e){
+ System.debug(LoggingLevel.INFO,'selectRaesById1 Error : ' + e);
+ }
+ return null;
+ }
+
+ @AuraEnabled
+ public static list<Rental_Apply__c> selectRacById(String recordId){
+ try{
+ list<Rental_Apply__c> report=[SELECT
+ Id, JingliApprovalManager__c, SalesManager__c
+ , BuchangApprovalManager__c
+ , BuchangApprovalManagerSales__c
+ , ZongjianApprovalManager__c
+ FROM Rental_Apply__c
+ WHERE Id = :recordId
+ ];
+ return report;
+ }catch(Exception e){
+ System.debug(LoggingLevel.INFO,'Rental_Apply_Equipment_Set__c Cancel Error : ' + e);
+ }
+ return null;
+ }
+
+ @AuraEnabled
+ public static UpdateResult updateRaesc(
+ String recordId,
+ String JingliApprovalManagerc,
+ String SalesManagerc,
+ String BuchangApprovalManagerc,
+ String BuchangApprovalManagerSalesc,
+ String ZongjianApprovalManagerc,
+ String ExtendStatusc
+ ) {
+ UpdateResult result = new UpdateResult();
+ result.recordId = recordId;
+ try{
+ // 鏇存柊璁板綍骞惰幏鍙栫粨鏋�
+ if(recordId==null) return null;
+ Rental_Apply_Equipment_Set__c rac = new Rental_Apply_Equipment_Set__c( id=recordId);
+
+ if(JingliApprovalManagerc!=null&& JingliApprovalManagerc != ''){
+ rac.JingliApprovalManager__c=JingliApprovalManagerc;
+ }
+ if(SalesManagerc!=null&&SalesManagerc!=''){
+ rac.SalesManager__c=SalesManagerc;
+ }
+ if(BuchangApprovalManagerc!=null&&BuchangApprovalManagerc!=''){
+ rac.BuchangApprovalManager__c=BuchangApprovalManagerc;
+ }
+ if(BuchangApprovalManagerSalesc!=null&&BuchangApprovalManagerSalesc!=''){
+ rac.BuchangApprovalManagerSales__c=BuchangApprovalManagerSalesc;
+ }
+
+ if(ZongjianApprovalManagerc!=null&&ZongjianApprovalManagerc!=''){
+ rac.ZongjianApprovalManager__c=ZongjianApprovalManagerc;
+ }
+ if(ExtendStatusc!=null&&ExtendStatusc!=''){
+ rac.Extend_Status__c=ExtendStatusc;
+ }
+ if(rac.id==null)return null;
+ update rac;
+ result.success = true;
+ result.errors = new List<String>();
+ return result;
+ }catch(Exception e){
+ result.success = false;
+ result.errors = new List<String>();
+ result.errors.add(e.getMessage());
+ System.debug(LoggingLevel.INFO,'Rental_Apply__c update Error : ' + e);
+ }
+ return result;
+ }
+
+ @AuraEnabled
+ public static UpdateResult updateRaescList(
+ list<Rental_Apply_Equipment_Set_Detail__c> updateList
+ ) {
+ UpdateResult result = new UpdateResult();
+ try{
+ for(Rental_Apply_Equipment_Set_Detail__c item : updateList) {
+ item.Return_DeliverySlip__c = null;
+ item.Asset_return_time__c = null;
+ }
+ update updateList;
+ result.success = true;
+ result.errors = new List<String>();
+ return result;
+ }catch(Exception e){
+ result.success = false;
+ result.errors = new List<String>();
+ result.errors.add(e.getMessage());
+ System.debug(LoggingLevel.INFO,'Rental_Apply__c update Error : ' + e);
+ }
+ return result;
+ }
+
+ @AuraEnabled
+ public static list<Rental_Apply_Equipment_Set_Detail__c> selectRaesdcId(String recordId){
+ try{
+ list<Rental_Apply_Equipment_Set_Detail__c> report=[Select
+ Id
+ From Rental_Apply_Equipment_Set_Detail__c
+ Where Return_DeliverySlip__c != null
+ AND Check_lost_Item_F__c = null
+ AND Rental_Apply_Equipment_Set__c = :recordId AND Cancel_Select__c = false
+ ];
+ return report;
+ }catch(Exception e){
+ System.debug(LoggingLevel.INFO,'Rental_Apply_Equipment_Set__c Cancel Error : ' + e);
+ }
+ return null;
+ }
+
+ @AuraEnabled
+ public static String approvalCheck(String rentalApplyId) {
+ // check缁撴灉
+ String returnStr = '';
+
+ //1388 yc 20211021 璺ㄥ尯鍩熷垎閰嶄笉鑳藉嚭搴� start
+ String rasdid = '';
+ system.debug(rentalApplyId+'==');
+ if(String.isNotBlank(rentalApplyId) && rentalApplyId.indexOf(';') >= 0){//璇存槑鏄粠涓�瑙堜笂瑙﹀彂鐨�
+ rasdid = rentalApplyId.subString(rentalApplyId.indexOf(';') + 1);
+ rentalApplyId = rentalApplyId.subString(0, rentalApplyId.indexOf(';'));
+ }
+ //1388 yc 20211021 璺ㄥ尯鍩熷垎閰嶄笉鑳藉嚭搴� end
+ //澶囧搧鍊熷嚭鐢宠
+ Rental_Apply__c[] rentalApply = [select Id,repair__r.Repair_Final_Inspection_Date__c,Bollow_Date__c,repair__r.Return_Without_Repair_Date__c,
+ CreatedDate,Rental_Apply_Equipment_Set_Cnt__c,Prepare_Day__c,Cross_Region_Assign__c,
+ demo_purpose2__c,Follow_UP_Opp__r.Shipping_Finished_Day_Func__c,next_action__c,QIS_number__r.ReplaceDeliveryDate__c
+ from Rental_Apply__c
+ where Id = :rentalApplyId];
+ if (rentalApply.size() == 0) {
+ returnStr = '娌℃湁澶囧搧鍊熷嚭鐢宠锛岃纭銆�';
+ return returnStr;
+ }
+ Rental_Apply__c ra = rentalApply[0];
+ if (ra.Rental_Apply_Equipment_Set_Cnt__c <= 0) {
+ returnStr = '娌℃湁鍊熷嚭澶囧搧set涓�瑙堬紝璇风‘璁ゃ��';
+ return returnStr;
+ }
+ //1822 yc 20211111 start
+ if(ra.demo_purpose2__c=='宸茶喘寰呰揣' && ra.Follow_UP_Opp__r.Shipping_Finished_Day_Func__c!= null){
+ returnStr = '宸茶喘寰呰揣鐩殑锛屾柊鍝佸凡鏈夊彂璐ф棩锛屼笉鍙嚭搴撴寚绀�';
+ return returnStr;
+ }
+ if(ra.demo_purpose2__c=='绱㈣禂QIS' && ra.next_action__c=='鏃犲伩鏇存崲' && ra.QIS_number__r.ReplaceDeliveryDate__c!= null){
+ returnStr = '绱㈣禂QIS鐩殑锛孮IS宸叉湁鏂板搧鍙戣揣鏃ワ紝涓嶅彲鍑哄簱鎸囩ず';
+ return returnStr;
+ }
+ //1822 yc 20211111 end
+
+//*************************Insert 20160826 SWAG-AD59Z6 瓒欏境鑺� Start*************************//
+ if(Ra.repair__r.Repair_Final_Inspection_Date__c != null) {
+ return '淇悊鏈�缁堟娴嬫棩涓嶄负绌猴紝涓嶈兘鍋氬嚭搴撴寚绀�';
+ }
+ if(Ra.repair__c!=null&&Ra.repair__r.Return_Without_Repair_Date__c != null) {
+ return '鏈慨鐞嗗綊杩樻棩涓嶄负绌猴紝涓嶈兘鍋氬嚭搴撴寚绀�';
+ }
+//*************************Insert 20160826 SWAG-AD59Z6 瓒欏境鑺� End***************************//
+
+ //1388 yc 20211021 璺ㄥ尯鍩熷垎閰嶄笉鑳藉嚭搴� start
+ if(String.isNotBlank(ra.Cross_Region_Assign__c)){
+ String soql = 'select Id, Name,Rental_Apply__c,Internal_asset_location_before__c';
+ soql +=' from Rental_Apply_Equipment_Set_Detail__c';
+ soql +=' where Rental_Apply__c = \'' + ra.Id +'\'';
+ soql +=' and Internal_asset_location_before__c !=null and Internal_asset_location_before__c != \'' + ra.Cross_Region_Assign__c+ '\'';
+
+ if(String.isNotBlank(rasdid)){
+ soql +=' and Rental_Apply_Equipment_Set__c = :rasdid';
+ }
+ List<Rental_Apply_Equipment_Set_Detail__c> raesd = Database.query(soql);
+ if(raesd.size()>0){
+ returnStr = '鍒嗛厤鐨勫鍝佷笉鏄偍鎵�灞炲鍝佷腑蹇冪殑澶囧搧锛屼笉鑳藉仛鍑哄簱鎸囩ず';
+ return returnStr;
+ }
+
+ }
+ //1388 yc 20211021 璺ㄥ尯鍩熷垎閰嶄笉鑳藉嚭搴� end
+ // 20220211 ljh add 澶囧搧FY23璇鹃01 start
+ // AggregateResult[] resultsRas = [SELECT Rental_Start_Date__c,count(Id) cnt
+ // FROM Rental_Apply_Equipment_Set__c
+ // WHERE Rental_Apply__c = :rentalApplyId
+ // AND Cancel_Select__c = false
+ // group by Rental_Start_Date__c];
+ // If(resultsRas.size() > 1){
+ // returnStr = '鎵�鏈変竴瑙堝鍝侀璁″嚭璐ф棩搴斾竴鑷达紝涓嶄竴鑷翠笉鑳藉仛鍑哄簱鎸囩ず';
+ // return returnStr;
+ // }
+ // 20220211 ljh add 澶囧搧FY23璇鹃01 end
+
+//bp2 // 澶囧搧鍊熷嚭鍘嗗彶鍙栧緱
+// List<String> equipmentSetList = new List<String>();
+// Rental_Apply_Equipment_Set__c[] raes = [
+// select Id, Name, Equipment_Set__c, Equipment_Set__r.Name, Rental_Start_Date__c, Rental_End_Date__c, Rental_Apply__c
+// from Rental_Apply_Equipment_Set__c
+// where Rental_Apply__c = :rentalApplyId and Cancel_Select__c = false];
+// // 鏃ュ巻鑼冨洿锛屾渶灏忕殑鍊熷嚭寮�濮嬫棩鍒版渶澶х殑鍊熷嚭缁堜簡鏃�
+// Date startDate = Date.today();
+// Date endDate = Date.today();
+// for (Rental_Apply_Equipment_Set__c r : raes) {
+// equipmentSetList.add(r.Equipment_Set__c);
+// if (r.Rental_Start_Date__c != null && r.Rental_Start_Date__c < startDate) {
+// startDate = r.Rental_Start_Date__c;
+// }
+// if (r.Rental_End_Date__c != null && r.Rental_End_Date__c > endDate) {
+// endDate = r.Rental_End_Date__c;
+// }
+// }
+// Integer prepareDay = ra.Prepare_Day__c == null ? Integer.valueOf(System.Label.EquipmentRentalPrepare) : ra.Prepare_Day__c.intValue();
+// Date minDate = getWD_addday(startDate, -1 * prepareDay);
+// Date maxDate = getWD_addday(endDate, prepareDay);
+// // 鍏朵粬澶囧搧鍊熷嚭鐢宠鍘嗗彶
+// Rental_Apply_Equipment_Set__c[] others = [
+// select Id, Name, Rental_Start_Date__c, Rental_End_Date__c, Equipment_Set__c, Rental_Apply__r.Status__c ,Rental_Apply__r.Prepare_Day__c
+// from Rental_Apply_Equipment_Set__c
+// where Rental_Apply__c != :rentalApplyId
+// and Equipment_Set__c in :equipmentSetList
+// and Request_Status__c != '鍙栨秷'
+// and Request_Status__c != '鍒犻櫎'
+// and Cancel_Select__c = false
+// and ((Rental_Start_Date__c >= :minDate and Rental_Start_Date__c <= :maxDate)
+// or (Rental_End_Date__c >= :minDate and Rental_End_Date__c <= :maxDate)
+// or (Rental_Start_Date__c <= :startDate and Rental_End_Date__c >= :endDate))];
+
+// Map<String, List<Rental_Apply_Equipment_Set__c>> othersMap = new Map<String,List<Rental_Apply_Equipment_Set__c>>();
+// for (Rental_Apply_Equipment_Set__c other : others) {
+// if (othersMap.containsKey(other.Equipment_Set__c)) {
+// othersMap.get(other.Equipment_Set__c).add(other);
+// } else {
+// List<Rental_Apply_Equipment_Set__c> l = new List<Rental_Apply_Equipment_Set__c>();
+// l.add(other);
+// othersMap.put(other.Equipment_Set__c, l);
+// }
+// }
+
+// for (Rental_Apply_Equipment_Set__c r : raes) {
+
+// List<Rental_Apply_Equipment_Set__c> other = othersMap.get(r.Equipment_Set__c);
+
+// Map<Date, Map<String, String>> dateMap= new Map<Date, Map<String, String>>();
+// if (other != null) {
+// Date sdate = startDate;
+// Date edate = endDate;
+// for (Rental_Apply_Equipment_Set__c o : other) {
+// if (o.Rental_Start_Date__c != null && (sdate == null || o.Rental_Start_Date__c < sdate)) {
+// sdate = o.Rental_Start_Date__c;
+// }
+// if (o.Rental_End_Date__c != null && (edate == null || o.Rental_End_Date__c > edate)) {
+// edate = o.Rental_End_Date__c;
+// }
+// }
+// if (sdate != null && edate != null) {
+// RentalApplyWebService raws = new RentalApplyWebService();
+// dateMap = raws.getDateMap(sdate, edate, prepareDay);
+// }
+// }
+
+// if (r.Rental_Start_Date__c == null && r.Rental_End_Date__c == null) {
+// // 娓呯┖璇ュ�熷嚭鍘嗗彶鐨勫嚭搴撳拰鍥炴敹鏃堕棿
+// } else if (other == null || other.size() == 0) {
+// // 涓庡叾浠栧�熷嚭鍘嗗彶娌℃湁鍐茬獊
+// } else {
+// Date fromDate = r.Rental_Start_Date__c;
+// Date toDate = r.Rental_End_Date__c;
+// for (Rental_Apply_Equipment_Set__c o : other) {
+// if (o.Rental_Apply__r.Status__c != '鑽夋涓�' && o.Rental_Apply__r.Status__c != '鐢宠涓�' && o.Rental_Apply__r.Status__c != null) {
+// Date startD = o.Rental_Start_Date__c;
+// Date endD = o.Rental_End_Date__c;
+// Integer prepare = prepareDay; //>= o.Rental_Apply__r.Prepare_Day__c || o.Rental_Apply__r.Prepare_Day__c == null ? prepareDay : o.Rental_Apply__r.Prepare_Day__c.intValue();
+// if ((dateMap.containsKey(fromDate) && Date.valueOf(dateMap.get(fromDate).get('Next')) > startD && dateMap.containsKey(endD) && fromDate < Date.valueOf(dateMap.get(endD).get('Next'))) ||
+// (dateMap.containsKey(toDate) && Date.valueOf(dateMap.get(toDate).get('Next')) > startD && dateMap.containsKey(endD) && toDate < Date.valueOf(dateMap.get(endD).get('Next'))) ||
+// (dateMap.containsKey(fromDate) && Date.valueOf(dateMap.get(fromDate).get('Next')) <= startD && dateMap.containsKey(endD) && toDate >= Date.valueOf(dateMap.get(endD).get('Next')))) {
+// returnStr = '澶囧搧' + r.Equipment_Set__r.Name + '鐨勫�熷嚭鏃ヤ笌澶囧搧鍊熷嚭鍘嗗彶' + o.Name + '鏈夊啿绐侊紝璇风‘璁ゃ��';
+// return returnStr;
+// }
+// }
+// }
+// }
+// }
+ return '1';
+ }
+
+ @AuraEnabled
+ public static String setShipment_requests(String raid, String raesid) {
+ Savepoint sp = Database.setSavepoint();
+
+ try {
+ //涓�瑙堟儏鍐典笅妫�绱竴瑙堝搴旂殑鐢宠涔d锛宻oql瀛愭煡璇笉鑳藉拰涓绘煡璇㈡槸鍚屼竴涓〃锛屽崟鐙绱竴娆�
+ if (String.isBlank(raid)) {
+ List<Rental_Apply_Equipment_Set__c> raList = [select Id, Rental_Apply__c from Rental_Apply_Equipment_Set__c where id = :raesid];
+ if (raList.size() > 0) {
+ raid = raList[0].Rental_Apply__c;
+ } else {
+ //搴旇涓嶄細鍒拌繖閲�
+ return '娌℃湁鍙互鍑哄簱鎸囩ず鐨勪竴瑙�';
+ }
+ }
+ String soql = 'SELECT Id'
+ + ' FROM Rental_Apply_Equipment_Set__c '
+ + ' WHERE Shippment_loaner_time2__c <> null '
+ + ' AND Rental_Apply__c = :raid '
+ + ' ORDER BY Id' ;
+ List<Rental_Apply_Equipment_Set__c> shippedRaesList = Database.query(soql);
+ String raesStrShipped = '';
+ for (Rental_Apply_Equipment_Set__c raes : shippedRaesList) {
+ raesStrShipped += raes.Id;
+ }
+
+ //Srring soql = "SELECT Id FROM Rental_Apply_Equipment_Set_Detail__c WHERE Rental_Apply__c = '{!Rental_Apply__c.Id}' AND Cancel_Select__c = false AND Rental_Num__c > 0 AND Rental_Apply_Equipment_Set__r.Wei_Assigned_Cnt__c = 0 AND Rental_Apply_Equipment_Set__r.Yi_Assigned_Cnt__c > 0 AND Shipment_request__c = false";
+ soql = 'SELECT Id, Rental_Apply__c, Rental_Apply_Equipment_Set__c'
+ + ' FROM Rental_Apply_Equipment_Set_Detail__c '
+ + ' WHERE ' + (String.isNotBlank(raesid) ? 'Rental_Apply_Equipment_Set__c = :raesid ' : 'Rental_Apply__c = :raid ')
+ + ' AND Cancel_Select__c = false '
+ + ' AND Rental_Num__c > 0 '
+ + ' AND Rental_Apply_Equipment_Set__r.Wei_Assigned_Cnt__c = 0 '
+ + ' AND Rental_Apply_Equipment_Set__r.Yi_Assigned_Cnt__c > 0 '
+ + ' AND Shipment_request__c = false'
+ + ' ORDER BY Rental_Apply_Equipment_Set__c, Id';
+ List<Rental_Apply_Equipment_Set_Detail__c> raesds = Database.query(soql);
+
+ Map<Id, List<String>> rental_Asset_SerialNumberMap = new Map<Id, List<String>>();
+
+ if (raesds.size() < 1) {
+ return '娌℃湁鍙互鍑哄簱鎸囩ず鐨勪竴瑙�';
+ } else {
+ Set<Id> raesSet = new Set<Id>();
+ String raesStrRequest = '';
+ for (Rental_Apply_Equipment_Set_Detail__c raesd : raesds) {
+ if (false == raesSet.contains(raesd.Rental_Apply_Equipment_Set__c)) {
+ raesSet.add(raesd.Rental_Apply_Equipment_Set__c);
+ raesStrRequest += raesd.Rental_Apply_Equipment_Set__c;
+ }
+ raesd.Shipment_request_time2__c = Datetime.now();
+ raesd.Shipment_request__c = true;
+ }
+ // 鍑哄簱鍚�, 鍐嶆鍋氬嚭搴撴寚绀虹殑涓�瑙�, 涓�瀹氳涓嚭杩囧簱鐨勪竴瑙堜竴鏍�
+ if (false == String.isBlank(raesStrShipped) && raesStrRequest != raesStrShipped) {
+ return '涓嶈兘鍋氬嚭搴撴寚绀猴紝闇�瑕佸垎鍗曞悗鍐嶆搷浣�';
+ }
+ }
+
+ // add lc 20220927 SFDC-CJ48VE 澶囧搧棰勮鍑哄簱鏃ラ�昏緫璋冩暣 start
+ List<Rental_Apply_Equipment_Set__c> RAESRecords = [
+ SELECT Id,Rental_Start_Date__c
+ FROM Rental_Apply_Equipment_Set__c
+ WHERE Rental_Apply__c = :raid
+ AND Cancel_Select__c = False];
+
+ for (Integer i = 0; i < RAESRecords.size(); i++) {
+ // 澶囧搧棰勮鍑哄簱鏃ヤ笉涓�鑷达紝涓嶅彲鍑哄簱鎸囩ず
+ if (RAESRecords[i].Rental_Start_Date__c != RAESRecords[0].Rental_Start_Date__c) {
+ return '澶囧搧棰勮鍑鸿揣鏃ヤ笉涓�鑷达紝涓嶅彲鍑哄簱鎸囩ず';
+ }
+ }
+ // add lc 20220927 SFDC-CJ48VE 澶囧搧棰勮鍑哄簱鏃ラ�昏緫璋冩暣 end
+
+ Rental_Apply__c ra = new Rental_Apply__c(Id = raesds[0].Rental_Apply__c, Status__c = '宸插嚭搴撴寚绀�');
+ update ra;
+ Database.SaveResult[] results = Database.update(raesds);
+ Database.SaveResult dmlResult = results[0];
+ if (dmlResult.isSuccess()) {
+ //鏄庣粏鏇存柊鎴愬姛鍚庢墠鏇存柊涓�瑙堢殑Rental_Asset_SerialNumber__c
+ soql = 'SELECT Id, SerialNumber_text__c, Rental_Apply_Equipment_Set__c '
+ +'FROM Rental_Apply_Equipment_Set_Detail__c '
+ +'WHERE Rental_Apply__c = \'' + raesds[0].Rental_Apply__c + '\''
+ +'AND Shipment_request_time2__c != null '
+ +'AND Shipment_request__c = true '
+ +'AND SerialNumber_text__c != null '
+ +'ORDER BY Rental_Apply_Equipment_Set__c ';
+
+
+ List<Rental_Apply_Equipment_Set_Detail__c> raesdSerialNumbers = Database.query(soql);
+
+ for (Rental_Apply_Equipment_Set_Detail__c raesd : raesdSerialNumbers) {
+
+ if (!rental_Asset_SerialNumberMap.containsKey(raesd.Rental_Apply_Equipment_Set__c)) {
+ // Asset__r.SerialNumber + ','
+ rental_Asset_SerialNumberMap.put(raesd.Rental_Apply_Equipment_Set__c, new List<String>());
+ }
+ rental_Asset_SerialNumberMap.get(raesd.Rental_Apply_Equipment_Set__c).add(raesd.SerialNumber_text__c);
+ }
+
+ List<Rental_Apply_Equipment_Set__c> raess = new List<Rental_Apply_Equipment_Set__c>();
+ for (Id key : rental_Asset_SerialNumberMap.keySet()) {
+ raess.add(new Rental_Apply_Equipment_Set__c(Id = key,
+ Rental_Asset_SerialNumber__c = ',' + String.join(rental_Asset_SerialNumberMap.get(key), ',') + ','));
+ }
+ if (!raess.isEmpty()) {
+ update raess;
+ }
+
+ return '鐘舵�佹洿鏂板埌宸插嚭搴撴寚绀�';
+ } else {
+ Database.rollback(sp);
+ Database.Error emsg = dmlResult.getErrors()[0];
+ return 'failed to update:' + emsg.getFields() + ' ' + emsg.getMessage();
+ }
+ } catch (Exception ex) {
+ Database.rollback(sp);
+ return ex.getMessage();
+ }
+ }
+
+ @AuraEnabled
+ public static String postponeCheck(String endDate, Integer i) {
+ Date d=Date.valueOf(endDate);
+ // return 'OK1';S
+ Date selectDate;
+ if (d == Date.valueOf('4000-12-31')) {
+ selectDate=d;
+ } else if (i >= 0) {
+ List<OlympusCalendar__c> workday = [
+ select Id, Date__c, IsWorkDay__c
+ from OlympusCalendar__c
+ where Date__c >= :d
+ and IsWorkDay__c = 1
+ order by Date__c
+ limit :(i+1)];
+ selectDate = workday[i].Date__c;
+ return 'OK1';
+ // if (Date.today() > selectDate) {
+ // return System.Label.EquipmentRentalPostponeOverDeadline;
+ // }
+ } else {
+ i = Math.abs(i);
+ List<OlympusCalendar__c> workday = [
+ select Id, Date__c, IsWorkDay__c
+ from OlympusCalendar__c
+ where Date__c <= :d
+ and IsWorkDay__c = 1
+ order by Date__c desc
+ limit :(i+1)];
+ selectDate = workday[i].Date__c;
+ }
+
+ if (Date.today() > selectDate) {
+ return System.Label.EquipmentRentalPostponeOverDeadline;
+ }
+ return 'OK';
+
+ // Date before5day = getWD_addday(date.parse(endDate), d);
+ // return 'OK2';
+ // if (Date.today() > before5day) {
+ // return System.Label.EquipmentRentalPostponeOverDeadline;
+ // }
+ // return 'OK';
+ }
+
+ // public static Date getWD_addday(Date d, Integer i) {
+
+ // }
+
+ @AuraEnabled
+ public static String submitApprovalRequest(String recordId) {
+ try{
+ Approval.ProcessSubmitRequest req = new Approval.ProcessSubmitRequest();
+ req.setObjectId(recordId);
+ Approval.ProcessResult result = Approval.process(req);
+ if(result.getErrors()!=null&&result.getErrors().size()>0)return result.getErrors().get(0).getMessage();
+ }catch(Exception e){
+ System.debug(' submitApprovalRequest error: '+e.getMessage());
+ return e.getMessage();
+ }
+ return null;
+ }
+
+ public class UpdateResult {
+ @AuraEnabled public String recordId {get;set;}
+ @AuraEnabled public Boolean success {get;set;}
+ @AuraEnabled public List<String> errors {get;set;}
+ }
+ public class InitData{
+ @AuraEnabled
+ public String id;
+ @AuraEnabled
+ public String RentalApplyId;
+ @AuraEnabled
+ public String Status;
+ @AuraEnabled
+ public String RentalApplyC;
+ @AuraEnabled
+ public Decimal WeiAssignedCntC;
+ @AuraEnabled
+ public Date BollowDateC;
+ @AuraEnabled
+ public Decimal AssignedNotShipmentC;
+ @AuraEnabled
+ public List<String> statusList;
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/classes/LexSelectSubstituteControllerLWT.cls-meta.xml b/force-app/main/default/classes/LexSelectSubstituteControllerLWT.cls-meta.xml
new file mode 100644
index 0000000..9662499
--- /dev/null
+++ b/force-app/main/default/classes/LexSelectSubstituteControllerLWT.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>50.0</apiVersion>
+ <status>Active</status>
+</ApexClass>
\ No newline at end of file
diff --git a/force-app/main/default/classes/LexSubmitExtensionController.cls b/force-app/main/default/classes/LexSubmitExtensionController.cls
new file mode 100644
index 0000000..651f0e8
--- /dev/null
+++ b/force-app/main/default/classes/LexSubmitExtensionController.cls
@@ -0,0 +1,40 @@
+public with sharing class LexSubmitExtensionController {
+ @AuraEnabled
+ public static InitData init(String recordId) {
+ InitData res = new InitData();
+
+ try {
+ List<Rental_Apply__c> racList = [SELECT Id, ExtensionStatus__c, Root_Rental_Apply__c, demo_purpose2__c, AgreementBorrowingExtensionDate__c, Return_dadeline_final__c from Rental_Apply__c where Id = :recordId];
+ if(racList.size()>0){
+
+ Rental_Apply__c rac = racList[0];
+ res.id = rac.Id;
+ res.extensionStatus = rac.ExtensionStatus__c;
+ res.rootRentalApply = rac.Root_Rental_Apply__c;
+ res.demoPurpose2 = rac.demo_purpose2__c;
+ res.agreementBorrowingExtensionDate = rac.AgreementBorrowingExtensionDate__c;
+ res.returnDadelineFinal = rac.Return_dadeline_final__c;
+ }
+
+ }
+ catch (Exception e) {
+ System.debug(LoggingLevel.INFO, '****e:' + e);
+ }
+ return res;
+ }
+
+ public class InitData {
+ @AuraEnabled
+ public String id;
+ @AuraEnabled
+ public String extensionStatus;
+ @AuraEnabled
+ public String rootRentalApply;
+ @AuraEnabled
+ public String demoPurpose2;
+ @AuraEnabled
+ public Date agreementBorrowingExtensionDate;
+ @AuraEnabled
+ public Date returnDadelineFinal;
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/classes/LexSubmitExtensionController.cls-meta.xml b/force-app/main/default/classes/LexSubmitExtensionController.cls-meta.xml
new file mode 100644
index 0000000..9662499
--- /dev/null
+++ b/force-app/main/default/classes/LexSubmitExtensionController.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>50.0</apiVersion>
+ <status>Active</status>
+</ApexClass>
\ No newline at end of file
diff --git a/force-app/main/default/classes/LexTransferApplyController.cls b/force-app/main/default/classes/LexTransferApplyController.cls
new file mode 100644
index 0000000..8562cde
--- /dev/null
+++ b/force-app/main/default/classes/LexTransferApplyController.cls
@@ -0,0 +1,11 @@
+public with sharing class LexTransferApplyController {
+ public LexTransferApplyController() {
+
+ }
+
+ @AuraEnabled
+ public static TransferApply__c transferApplySelectDetail(String recordId){
+ TransferApply__c ta = [SELECT Id, TA_Status__c FROM TransferApply__c where Id = :recordId];
+ return ta;
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/classes/LexTransferApplyController.cls-meta.xml b/force-app/main/default/classes/LexTransferApplyController.cls-meta.xml
new file mode 100644
index 0000000..541584f
--- /dev/null
+++ b/force-app/main/default/classes/LexTransferApplyController.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>50.0</apiVersion>
+ <status>Active</status>
+</ApexClass>
diff --git a/force-app/main/default/classes/NewLeadFromContact2.cls b/force-app/main/default/classes/NewLeadFromContact2.cls
new file mode 100644
index 0000000..63f5460
--- /dev/null
+++ b/force-app/main/default/classes/NewLeadFromContact2.cls
@@ -0,0 +1,37 @@
+public with sharing class NewLeadFromContact2 {
+ @AuraEnabled
+ public static InitData NewLeadFromContact2(String recordId) {
+ InitData res = new initData();
+ try{
+ Contact report= [SELECT Id,Name,AccountId FROM Contact WHERE Id = :recordId LIMIT 1];
+ res.Id = report.Id;
+ res.Name = report.Name;
+ res.AccountId = report.AccountId;
+ Account acc = [SELECT Id,Name,Department_Class__c FROM Account WHERE id =: report.AccountId];
+ res.accountIds = acc.Id;
+ res.accountName = acc.Name;
+ res.accountDepartmentClass = acc.Department_Class__c;
+ res.NewDailyReport = Schema.SObjectType.Lead.getRecordTypeInfosByDeveloperName().get('NewDaily_Report').getRecordTypeId();
+ System.debug(LoggingLevel.INFO, '*** xu: ' + res);
+ }catch(Exception e){
+ System.debug(LoggingLevel.INFO, '*** xu: ' + e);
+ }
+ return res;
+ }
+ public class InitData{
+ @AuraEnabled
+ public String Id;
+ @AuraEnabled
+ public String Name;
+ @AuraEnabled
+ public String AccountId;
+ @AuraEnabled
+ public String accountIds;
+ @AuraEnabled
+ public String accountName;
+ @AuraEnabled
+ public String accountDepartmentClass;
+ @AuraEnabled
+ public String NewDailyReport;
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/classes/NewLeadFromContact2.cls-meta.xml b/force-app/main/default/classes/NewLeadFromContact2.cls-meta.xml
new file mode 100644
index 0000000..45cccbd
--- /dev/null
+++ b/force-app/main/default/classes/NewLeadFromContact2.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>57.0</apiVersion>
+ <status>Active</status>
+</ApexClass>
\ No newline at end of file
diff --git a/force-app/main/default/classes/RentalApplyEquipmentSetWebService.cls b/force-app/main/default/classes/RentalApplyEquipmentSetWebService.cls
index 56b95ea..f17333f 100644
--- a/force-app/main/default/classes/RentalApplyEquipmentSetWebService.cls
+++ b/force-app/main/default/classes/RentalApplyEquipmentSetWebService.cls
@@ -1,6 +1,7 @@
global without sharing class RentalApplyEquipmentSetWebService {
//鍊熷嚭澶囧搧涓�瑙堝崟浣嶉噸鏂板垎閰�
+ @AuraEnabled
WebService static String rentalApplyEquipmentSetReassign(Id raesID) {
Savepoint sp = Database.setSavepoint();
diff --git a/force-app/main/default/classes/RentalApplyWebService.cls b/force-app/main/default/classes/RentalApplyWebService.cls
index 63fe20e..af448ab 100644
--- a/force-app/main/default/classes/RentalApplyWebService.cls
+++ b/force-app/main/default/classes/RentalApplyWebService.cls
@@ -377,6 +377,7 @@
rasdid = rentalApplyId.subString(rentalApplyId.indexOf(';') + 1);
rentalApplyId = rentalApplyId.subString(0, rentalApplyId.indexOf(';'));
}
+ system.debug(rentalApplyId+'==aaa');
//1388 yc 20211021 璺ㄥ尯鍩熷垎閰嶄笉鑳藉嚭搴� end
//澶囧搧鍊熷嚭鐢宠
Rental_Apply__c[] rentalApply = [select Id,repair__r.Repair_Final_Inspection_Date__c,Bollow_Date__c,repair__r.Return_Without_Repair_Date__c,
@@ -384,6 +385,7 @@
demo_purpose2__c,Follow_UP_Opp__r.Shipping_Finished_Day_Func__c,next_action__c,QIS_number__r.ReplaceDeliveryDate__c
from Rental_Apply__c
where Id = :rentalApplyId];
+ system.debug(rentalApplyId+'==aaa'+rentalApply.size());
if (rentalApply.size() == 0) {
returnStr = '娌℃湁澶囧搧鍊熷嚭鐢宠锛岃纭銆�';
return returnStr;
@@ -725,13 +727,13 @@
if(raescc != null && raescc.size() > 0){
for(Rental_Apply_Equipment_Set__c rr : raescc){
if ((rr.Received_Confirm__c == 'OK' || rr.Received_Confirm__c == '榛樿绛炬敹-OK') && rr.Asset_return_time__c != null) {
- return '姝ゅ崟涓嶆弧瓒冲欢鏈熸潯浠躲��';
+ return '姝ゅ崟涓嶆弧瓒冲欢鏈熸潯浠�01銆�';
}
}
return '1';
}
}else{
- return '姝ゅ崟涓嶆弧瓒冲欢鏈熸潯浠躲��';
+ return '姝ゅ崟涓嶆弧瓒冲欢鏈熸潯浠�02銆�';
}
}else{
return '2';
diff --git a/force-app/main/default/classes/TenderingButtonController.cls b/force-app/main/default/classes/TenderingButtonController.cls
index b79d90c..f68ceeb 100644
--- a/force-app/main/default/classes/TenderingButtonController.cls
+++ b/force-app/main/default/classes/TenderingButtonController.cls
@@ -1,3 +1,10 @@
+/*
+ * @Author: zhangchunxu
+ * @Date: 2023-03-31 13:36:53
+ * @LastEditors: zhangchunxu
+ * @LastEditTime: 2023-07-21 15:09:33
+ *
+ */
public class TenderingButtonController {
@AuraEnabled
public static InitData initTenderingController(String recordId) {
diff --git a/force-app/main/default/classes/lexConsumApplyController.cls b/force-app/main/default/classes/lexConsumApplyController.cls
new file mode 100644
index 0000000..41a9c8d
--- /dev/null
+++ b/force-app/main/default/classes/lexConsumApplyController.cls
@@ -0,0 +1,64 @@
+public with sharing class lexConsumApplyController {
+
+ @AuraEnabled
+ public static InitData init(String recordId){
+ InitData res = new InitData();
+ try {
+ List<Consum_Apply__c> caList = [SELECT Id, Campaign__c, Campaign__r.Status, Wei_Assigned_Cnt__c, Status__c,
+ Assigned_Not_Shipment__c,Bollow_Date__c,Yi_loaner_arranged__c
+ FROM Consum_Apply__c WHERE Id = :recordId];
+ if(caList.size()>0){
+ Consum_Apply__c ca = caList[0];
+ if(ca.Campaign__c != null){
+ res.campaignId = ca.Campaign__c;
+ }
+ res.weiAssignedCnt = Integer.valueOf(ca.Wei_Assigned_Cnt__c);
+ res.consumApplyStatus = ca.Status__c;
+ res.campaignStatus = ca.Campaign__r.Status;
+ res.assignedNotShipment = Integer.valueOf(ca.Assigned_Not_Shipment__c);
+ res.bollowDate = ca.Bollow_Date__c;
+ res.yiLoanerArranged = Integer.valueOf(ca.Yi_loaner_arranged__c);
+ }
+ }
+ catch (Exception e) {
+ System.debug('********lexConsumApplyController*****'+e.getMessage());
+ }
+ return res;
+ }
+
+ @AuraEnabled
+ public static Integer getLength1(String recordId){
+ //AND Shippment_loaner_time__c != null
+ List<Consum_Apply_Equipment_Set__c> caeList = [SELECT Id from Consum_Apply_Equipment_Set__c WHERE Consum_Apply__c =:recordId AND RAES_Status__c != '宸插垎閰�' AND RAES_Status__c != '鍙栨秷鍒嗛厤'];
+ return caeList.size();
+ }
+
+ @AuraEnabled
+ public static Integer getLength2(String recordId){
+ List<Consum_Apply_Equipment_Set__c> caeList = [SELECT Id from Consum_Apply_Equipment_Set__c WHERE Consum_Apply__c =:recordId AND RAES_Status__c != '宸插垎閰�' AND RAES_Status__c != '鍙栨秷鍒嗛厤'];
+ return caeList.size();
+ }
+
+ @AuraEnabled
+ public static Consum_Apply_Equipment_Set__c getSet(String setId){
+ Consum_Apply_Equipment_Set__c cae = [select Id, Zan_Ding_Fen_Pei_Shu__c from Consum_Apply_Equipment_Set__c where Id= :setId];
+ return cae;
+ }
+
+ public class InitData{
+ @AuraEnabled
+ public String campaignId; //瀛︿細Id
+ @AuraEnabled
+ public String campaignStatus; //瀛︿細鐘舵��
+ @AuraEnabled
+ public Integer weiAssignedCnt; //鏈垎閰嶄欢鏁�
+ @AuraEnabled
+ public String consumApplyStatus; //鐘舵��
+ @AuraEnabled
+ public Integer assignedNotShipment; //宸插垎閰嶆湭鍑哄簱鎸囩ず
+ @AuraEnabled
+ public Date bollowDate; //澶囧搧涓績鍑哄簱鏃�
+ @AuraEnabled
+ public Integer yiLoanerArranged; //宸插嚭搴撲欢鏁�
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/classes/lexConsumApplyController.cls-meta.xml b/force-app/main/default/classes/lexConsumApplyController.cls-meta.xml
new file mode 100644
index 0000000..9662499
--- /dev/null
+++ b/force-app/main/default/classes/lexConsumApplyController.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>50.0</apiVersion>
+ <status>Active</status>
+</ApexClass>
\ No newline at end of file
diff --git a/force-app/main/default/classes/lexRentalFixtureSetAssignController.cls b/force-app/main/default/classes/lexRentalFixtureSetAssignController.cls
index 990b7bc..27adb98 100644
--- a/force-app/main/default/classes/lexRentalFixtureSetAssignController.cls
+++ b/force-app/main/default/classes/lexRentalFixtureSetAssignController.cls
@@ -1,3 +1,11 @@
+/**
+ * *
+ ODescription:
+ GAuthor: sun xia
+ @Date: 2023-07-11 15:31:56
+ GIastEditors: sun xia
+ @IastEditTime: 2023-07-11 15:31:56
+ * */
public with sharing class lexRentalFixtureSetAssignController {
@AuraEnabled
diff --git a/force-app/main/default/classes/lexRentalFixtureSetAssignController.cls-meta.xml b/force-app/main/default/classes/lexRentalFixtureSetAssignController.cls-meta.xml
index 9662499..541584f 100644
--- a/force-app/main/default/classes/lexRentalFixtureSetAssignController.cls-meta.xml
+++ b/force-app/main/default/classes/lexRentalFixtureSetAssignController.cls-meta.xml
@@ -2,4 +2,4 @@
<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
<apiVersion>50.0</apiVersion>
<status>Active</status>
-</ApexClass>
\ No newline at end of file
+</ApexClass>
diff --git a/force-app/main/default/classes/lexReturnDeliveryController.cls b/force-app/main/default/classes/lexReturnDeliveryController.cls
new file mode 100644
index 0000000..04dc82f
--- /dev/null
+++ b/force-app/main/default/classes/lexReturnDeliveryController.cls
@@ -0,0 +1,31 @@
+public with sharing class lexReturnDeliveryController {
+ @AuraEnabled
+ public static InitData init(String recordId){
+ InitData res = new InitData();
+ try {
+ res.flag = true;
+ List<Consum_Apply_Equipment_Set_Detail__c> caeList = [SELECT Asset_Center_Confirm_F__c FROM Consum_Apply_Equipment_Set_Detail__c WHERE Cancel_Select__c = false AND Consum_Apply__c = :recordId];
+ if(caeList.size()>0){
+ res.size = caeList.size();
+ for(Consum_Apply_Equipment_Set_Detail__c cae : caeList){
+ if(cae.Asset_Center_Confirm_F__c != 'OK'){
+ res.flag = false;
+ }
+ }
+ }
+
+ }
+ catch (Exception e) {
+ System.debug('********lexReturnDeliveryController*****'+e.getMessage());
+ }
+
+ return res;
+ }
+
+ public class InitData{
+ @AuraEnabled
+ public Boolean flag;
+ @AuraEnabled
+ public Integer size;
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/classes/lexReturnDeliveryController.cls-meta.xml b/force-app/main/default/classes/lexReturnDeliveryController.cls-meta.xml
new file mode 100644
index 0000000..9662499
--- /dev/null
+++ b/force-app/main/default/classes/lexReturnDeliveryController.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>50.0</apiVersion>
+ <status>Active</status>
+</ApexClass>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexAddSubmitApprovalProcess/lexAddSubmitApprovalProcess.js b/force-app/main/default/lwc/lexAddSubmitApprovalProcess/lexAddSubmitApprovalProcess.js
index 8df44b6..d48a0f1 100644
--- a/force-app/main/default/lwc/lexAddSubmitApprovalProcess/lexAddSubmitApprovalProcess.js
+++ b/force-app/main/default/lwc/lexAddSubmitApprovalProcess/lexAddSubmitApprovalProcess.js
@@ -4,10 +4,10 @@
import { CurrentPageReference,NavigationMixin } from 'lightning/navigation';
import { updateRecord } from 'lightning/uiRecordApi';
import LightningConfirm from 'lightning/confirm';
-import init from '@salesforce/apex/AddSubmitApprovalProcessController.init';
-import submitApproval from '@salesforce/apex/AddSubmitApprovalProcessController.submitApproval';
+import init from '@salesforce/apex/LexAddSubmitApprovalProcessController.init';
+import submitApproval from '@salesforce/apex/LexAddSubmitApprovalProcessController.submitApproval';
import setSObjectShare from '@salesforce/apex/ControllerUtil.setSObjectShare';
-import changeAddApprovalStatus from '@salesforce/apex/AddSubmitApprovalProcessController.changeAddApprovalStatus';
+import changeAddApprovalStatus from '@salesforce/apex/LexAddSubmitApprovalProcessController.changeAddApprovalStatus';
export default class lexAddSubmitApprovalProcess extends LightningElement {
@api recordId;
@@ -29,6 +29,12 @@
init({
recordId: this.recordId
}).then(result=>{
+ console.log('result==='+JSON.stringify(result));
+ if(JSON.stringify(result) == '{}'){
+ this.ToastShow('娌℃湁鏌ュ埌闇�瑕佺殑鏁版嵁','warning');
+ return;
+ }
+
if(result.addApprovalStatus != '鑽夋涓�' || result.detailSize == 0){
this.ToastShow('娌℃湁闇�瑕佸鎵圭殑杩藉姞闄勫睘鍝�','warning');
return;
@@ -37,143 +43,143 @@
// this.dispatchEvent(new CloseActionScreenEvent());
// return;
// }
- const SUBMIT = LightningConfirm.open({
+ LightningConfirm.open({
message: "涓�鏃︽彁浜ゆ璁板綍浠ュ緟鎵瑰噯锛屾牴鎹偍鐨勮缃偍鍙兘涓嶅啀鑳藉缂栬緫姝よ褰曟垨灏嗕粬浠庢壒鍑嗚繃绋嬩腑璋冨洖銆傛槸鍚︾户缁紵",
variant: 'headerless',
label: '鎻愮ず淇℃伅',
// setting theme would have no effect
- });
+ }).then(submit=>{
+ if(!submit){
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
+ }else{
- if(SUBMIT==false){
- this.dispatchEvent(new CloseActionScreenEvent());
- return;
- }
-
- // 甯屾湜鍒拌揣鏃ヤ笉鑳芥棭浜庣敵璇锋彁浜ゆ棩-0418杩藉姞
- //if ('{!Rental_Apply__c.Request_shipping_day__c}' < '{!TODAY()}') {
- // alert('甯屾湜鍒拌揣鏃ヤ笉鑳芥棭浜庣敵璇锋彁浜ゆ棩');
- // return;
- // }
- console.log(JSON.stringify(result));
- if(result.repairId != null){
- if(result.demoPurpose1 == '缁翠慨浠ｇ敤' && result.demoPurpose2 == '涓�鑸敤鎴�'){
- if(result.repairEstimatedDateFormula == null){
- this.ToastShow('涓�鑸淮淇棤鎶ヤ环鏃ワ紝涓嶅彲鍊熺敤澶囧搧','warning');
- return;
- }else if(result.repairEstimatedDateFormula <'2019-07-01' && result.agreedDate == null){
- this.ToastShow('鎶ヤ环鏃ュ湪2019/7/1涔嬪墠涓旀埛鍚屾剰鏃ヤ负绌猴紝涓嶅彲鍊熺敤澶囧搧','warning');
- return;
- }
- }
- //澶囧搧鐢宠 杩囧幓鍘嗗彶杞Щ
- if(result.recordTypeId != result.demoRequestPastDataId && result.newProductGuaranteeObject=='2: 鏈嶅姟澶氬勾淇濅慨' && (result.assetModelNo=='CV-V1' ||result.assetModelNo=='CV-V1(A)'||result.assetModelNo=='CV-V1(B)'||result.assetModelNo=='GIF-LV1'||result.assetModelNo=='CF-LV1L'||result.assetModelNo=='CF-LV1I'||result.assetModelNo=='MAJ-1910') &&(result.demoPurpose2=='涓�鑸敤鎴�'||result.demoPurpose2=='鍐嶄慨鐞�')){
- this.ToastShow('濂ヨ緣璁惧锛屼繚淇湡鍐呬笉鎻愪緵澶囧搧.','warning');
- return;
- }
- }
-
- if(result.campaignId!=null || result.campaignId!=''){
- if(result.campaignStatus == '鑽夋涓�'){
- this.ToastShow('瀛︿細鐘舵�佷负鑽夋涓紝涓嶈兘鎻愪氦','warning');
- return;
- }
- if(result.campaignStatus == '鐢宠涓�'){
- this.ToastShow('瀛︿細鐘舵�佷负鐢宠涓紝涓嶈兘鎻愪氦','warning');
- return;
- }
- if(result.campaignStatus == '宸茬粨鏉�'){
- this.ToastShow('瀛︿細鐘舵�佷负宸茬粨鏉燂紝涓嶈兘鎻愪氦','warning');
- return;
- }
- if(result.campaignStatus == '宸叉彁浜ゆ姤鍛�'){
- this.ToastShow('瀛︿細鐘舵�佷负宸叉彁浜ゆ姤鍛婏紝涓嶈兘鎻愪氦','warning');
- return;
- }
- if(result.campaignStatus == '鍙栨秷鐢宠涓�'){
- this.ToastShow('瀛︿細鐘舵�佷负鍙栨秷鐢宠涓紝涓嶈兘鎻愪氦','warning');
- return;
- }
- if(result.campaignStatus == '鍙栨秷'){
- this.ToastShow('瀛︿細鐘舵�佷负鍙栨秷锛屼笉鑳芥彁浜�','warning');
- return;
- }
- }
-
- if(result.qISNumber!=null || result.qISNumber!=''){
- if(result.nextAction=='閫佸洖'){
- this.ToastShow('QIS 宸查�佸洖锛屼笉鑳藉啀鐢宠澶囧搧浜�','warning');
- return;
- }
- }
-
- //share
- var userAccess = new Array();
- userAccess.push(result.applyUserId + '_Edit');
-
- //SWAG-BZMA8W 鍘绘帀 鏈嶅姟缁忕悊閮ㄩ暱鍏变韩 start
- //update lxy DLIU-BZNBG9 鍘绘帀鏈嶅姟缁忕悊閮ㄩ暱鍏变韩
- //userAccess.push('{!Rental_Apply__c.JingliApprovalManagerId__c}_Read');
- //userAccess.push('{!Rental_Apply__c.SalesManagerId__c}_Read');//20210727 ljh SFDC-C54C33 update 鍏变韩瑙﹀彂鍣ㄥ畬鎴�
- //update lxy DLIU-BZNBG9 鍘绘帀鏈嶅姟缁忕悊閮ㄩ暱鍏变韩
- //userAccess.push('{!Rental_Apply__c.BuchangApprovalManagerId__c}_Read');
- //SWAG-BZMA8W 鍘绘帀 鏈嶅姟缁忕悊閮ㄩ暱鍏变韩 end
- //userAccess.push('{!Rental_Apply__c.BuchangApprovalManagerSalesId__c}_Read');//20210727 ljh SFDC-C54C33 update 鍏变韩瑙﹀彂鍣ㄥ畬鎴�
- //userAccess.push('{!Rental_Apply__c.ZongjianApprovalManagerId__c}_Read');//20210727 ljh SFDC-C54C33 update 鍏变韩瑙﹀彂鍣ㄥ畬鎴�
- //userAccess.push('{!Rental_Apply__c.Status__c}_Read');
-
- console.log('鍙傛暟==='+result.rentalApplyId+' '+userAccess+' '+result.ownerId);
- setSObjectShare({
- sobjectName:'Rental_Apply__Share',
- rowCause:'ApplyUserShare__c',
- parentId:result.rentalApplyId,
- userAccess:userAccess,
- ownerId:result.ownerId
- }).then(res=>{
-
- if(res!='OK'){
- this.ToastShow(res,'warning');
- return;
- }else{
- console.log('setSObjectShareSuccess====OK');
- //杩藉姞澶囧搧鐢宠鐘舵�佺‘璁わ紝宸茬粡鎻愪氦杩囩殑鐢宠锛屼笉鑳介噸澶嶆彁浜tatus__c
- if (result.rentalApplyStatus != '宸叉壒鍑�' && result.rentalApplyStatus != '宸插嚭搴撴寚绀�') {
- this.ToastShow('璇峰鍝佺敵璇风姸鎬佺‘璁わ紝鐢宠鐘舵�佸凡鎵瑰噯鍚庢墠鍙互鎻愪氦杩藉姞瀹℃壒','warning');
- return;
+ // 甯屾湜鍒拌揣鏃ヤ笉鑳芥棭浜庣敵璇锋彁浜ゆ棩-0418杩藉姞
+ //if ('{!Rental_Apply__c.Request_shipping_day__c}' < '{!TODAY()}') {
+ // alert('甯屾湜鍒拌揣鏃ヤ笉鑳芥棭浜庣敵璇锋彁浜ゆ棩');
+ // return;
+ // }
+ console.log(JSON.stringify(result));
+ if(result.repairId != null){
+ if(result.demoPurpose1 == '缁翠慨浠ｇ敤' && result.demoPurpose2 == '涓�鑸敤鎴�'){
+ if(result.repairEstimatedDateFormula == null){
+ this.ToastShow('涓�鑸淮淇棤鎶ヤ环鏃ワ紝涓嶅彲鍊熺敤澶囧搧','warning');
+ return;
+ }else if(result.repairEstimatedDateFormula <'2019-07-01' && result.agreedDate == null){
+ this.ToastShow('鎶ヤ环鏃ュ湪2019/7/1涔嬪墠涓旀埛鍚屾剰鏃ヤ负绌猴紝涓嶅彲鍊熺敤澶囧搧','warning');
+ return;
+ }
+ }
+ //澶囧搧鐢宠 杩囧幓鍘嗗彶杞Щ
+ if(result.recordTypeId != result.demoRequestPastDataId && result.newProductGuaranteeObject=='2: 鏈嶅姟澶氬勾淇濅慨' && (result.assetModelNo=='CV-V1' ||result.assetModelNo=='CV-V1(A)'||result.assetModelNo=='CV-V1(B)'||result.assetModelNo=='GIF-LV1'||result.assetModelNo=='CF-LV1L'||result.assetModelNo=='CF-LV1I'||result.assetModelNo=='MAJ-1910') &&(result.demoPurpose2=='涓�鑸敤鎴�'||result.demoPurpose2=='鍐嶄慨鐞�')){
+ this.ToastShow('濂ヨ緣璁惧锛屼繚淇湡鍐呬笉鎻愪緵澶囧搧.','warning');
+ return;
+ }
}
- changeAddApprovalStatus({
- recordId: this.recordId,
- status: '濉啓瀹屾瘯'
- }).then(changeResult=>{
- if(changeResult == '鏇存柊鎴愬姛'){
- submitApproval({
- recordId: this.recordId
- }).then(submitApprovalRes=>{
- if(submitApprovalRes == 'OK'){
- this.ToastShow('鎻愪氦杩藉姞寰呭鎵�','success');
- this.updateRecordView(this.recordId);
- }else{
- this.ToastShow('杩藉姞寰呭鎵瑰け璐�','ERROR');
- }
- })
+ if(result.campaignId!=null || result.campaignId!=''){
+ if(result.campaignStatus == '鑽夋涓�'){
+ this.ToastShow('瀛︿細鐘舵�佷负鑽夋涓紝涓嶈兘鎻愪氦','warning');
+ return;
+ }
+ if(result.campaignStatus == '鐢宠涓�'){
+ this.ToastShow('瀛︿細鐘舵�佷负鐢宠涓紝涓嶈兘鎻愪氦','warning');
+ return;
+ }
+ if(result.campaignStatus == '宸茬粨鏉�'){
+ this.ToastShow('瀛︿細鐘舵�佷负宸茬粨鏉燂紝涓嶈兘鎻愪氦','warning');
+ return;
+ }
+ if(result.campaignStatus == '宸叉彁浜ゆ姤鍛�'){
+ this.ToastShow('瀛︿細鐘舵�佷负宸叉彁浜ゆ姤鍛婏紝涓嶈兘鎻愪氦','warning');
+ return;
+ }
+ if(result.campaignStatus == '鍙栨秷鐢宠涓�'){
+ this.ToastShow('瀛︿細鐘舵�佷负鍙栨秷鐢宠涓紝涓嶈兘鎻愪氦','warning');
+ return;
+ }
+ if(result.campaignStatus == '鍙栨秷'){
+ this.ToastShow('瀛︿細鐘舵�佷负鍙栨秷锛屼笉鑳芥彁浜�','warning');
+ return;
+ }
+ }
+
+ if(result.qISNumber!=null || result.qISNumber!=''){
+ if(result.nextAction=='閫佸洖'){
+ this.ToastShow('QIS 宸查�佸洖锛屼笉鑳藉啀鐢宠澶囧搧浜�','warning');
+ return;
+ }
+ }
+
+ //share
+ var userAccess = new Array();
+ userAccess.push(result.applyUserId + '_Edit');
+
+ //SWAG-BZMA8W 鍘绘帀 鏈嶅姟缁忕悊閮ㄩ暱鍏变韩 start
+ //update lxy DLIU-BZNBG9 鍘绘帀鏈嶅姟缁忕悊閮ㄩ暱鍏变韩
+ //userAccess.push('{!Rental_Apply__c.JingliApprovalManagerId__c}_Read');
+ //userAccess.push('{!Rental_Apply__c.SalesManagerId__c}_Read');//20210727 ljh SFDC-C54C33 update 鍏变韩瑙﹀彂鍣ㄥ畬鎴�
+ //update lxy DLIU-BZNBG9 鍘绘帀鏈嶅姟缁忕悊閮ㄩ暱鍏变韩
+ //userAccess.push('{!Rental_Apply__c.BuchangApprovalManagerId__c}_Read');
+ //SWAG-BZMA8W 鍘绘帀 鏈嶅姟缁忕悊閮ㄩ暱鍏变韩 end
+ //userAccess.push('{!Rental_Apply__c.BuchangApprovalManagerSalesId__c}_Read');//20210727 ljh SFDC-C54C33 update 鍏变韩瑙﹀彂鍣ㄥ畬鎴�
+ //userAccess.push('{!Rental_Apply__c.ZongjianApprovalManagerId__c}_Read');//20210727 ljh SFDC-C54C33 update 鍏变韩瑙﹀彂鍣ㄥ畬鎴�
+ //userAccess.push('{!Rental_Apply__c.Status__c}_Read');
+
+ console.log('鍙傛暟==='+result.rentalApplyId+' '+userAccess+' '+result.ownerId);
+ setSObjectShare({
+ sobjectName:'Rental_Apply__Share',
+ rowCause:'ApplyUserShare__c',
+ parentId:result.rentalApplyId,
+ userAccess:userAccess,
+ ownerId:result.ownerId
+ }).then(res=>{
+
+ if(res!='OK'){
+ this.ToastShow(res,'warning');
+ return;
}else{
- this.ToastShow(changeResult,'error');
- }
+ console.log('setSObjectShareSuccess====OK');
+ //杩藉姞澶囧搧鐢宠鐘舵�佺‘璁わ紝宸茬粡鎻愪氦杩囩殑鐢宠锛屼笉鑳介噸澶嶆彁浜tatus__c
+ if (result.rentalApplyStatus != '宸叉壒鍑�' && result.rentalApplyStatus != '宸插嚭搴撴寚绀�') {
+ this.ToastShow('璇峰鍝佺敵璇风姸鎬佺‘璁わ紝鐢宠鐘舵�佸凡鎵瑰噯鍚庢墠鍙互鎻愪氦杩藉姞瀹℃壒','warning');
+ return;
+ }
+
+ changeAddApprovalStatus({
+ recordId: this.recordId,
+ status: '濉啓瀹屾瘯'
+ }).then(changeResult=>{
+ if(changeResult == '鏇存柊鎴愬姛'){
+ submitApproval({
+ recordId: this.recordId
+ }).then(submitApprovalRes=>{
+ if(submitApprovalRes == 'OK'){
+ this.ToastShow('鎻愪氦杩藉姞寰呭鎵规垚鍔�','success');
+ this.updateRecordView(this.recordId);
+ }else{
+ this.ToastShow('杩藉姞寰呭鎵瑰け璐�','ERROR');
+ }
+ })
+ }else{
+ this.ToastShow(changeResult,'error');
+ }
+ })
+ }
+ }).catch(err=>{
+ console.log('setSObjectShareErr===='+err);
})
- }
- }).catch(err=>{
- console.log('setSObjectShareErr===='+err);
- })
-
+ }
+ })
}).catch(err=>{
console.log('====1111====',err);
- })
+ })
}
ToastShow(msg,type){
const evt = new ShowToastEvent({
- title : msg,
- message: '',
+ //title : msg,
+ message: msg,
variant: type
});
this.dispatchEvent(evt);
@@ -183,4 +189,17 @@
updateRecordView(recordId) {
updateRecord({fields: { Id: recordId }});
}
+
+ async handleConfirmClick(msg) {
+ const result = await LightningConfirm.open({
+ message: msg,
+ variant: 'headerless',
+ label: 'this is the aria-label value'
+ });
+ if (result) {
+ this.ll();
+ } else {
+ window.history.go(-1);
+ }
+ }
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexAllReceivedBtns/lexAllReceivedBtns.js b/force-app/main/default/lwc/lexAllReceivedBtns/lexAllReceivedBtns.js
index a940c01..55965dc 100644
--- a/force-app/main/default/lwc/lexAllReceivedBtns/lexAllReceivedBtns.js
+++ b/force-app/main/default/lwc/lexAllReceivedBtns/lexAllReceivedBtns.js
@@ -7,7 +7,7 @@
import { NavigationMixin } from 'lightning/navigation';
-export default class LexAllReceivedBtns extends NavigationMixin(LightningElement) {
+export default class lexAllReceivedBtns extends NavigationMixin(LightningElement) {
@api raid;
IsLoading = true;
@wire(CurrentPageReference)
diff --git a/force-app/main/default/lwc/lexAllReceivedFse/lexAllReceivedFse.js b/force-app/main/default/lwc/lexAllReceivedFse/lexAllReceivedFse.js
index 1e29534..e088359 100644
--- a/force-app/main/default/lwc/lexAllReceivedFse/lexAllReceivedFse.js
+++ b/force-app/main/default/lwc/lexAllReceivedFse/lexAllReceivedFse.js
@@ -4,8 +4,8 @@
import { ShowToastEvent } from 'lightning/platformShowToastEvent';
import { updateRecord } from 'lightning/uiRecordApi';
-import init from '@salesforce/apex/AllReceivedFseController.init';
-import getRaeSet from '@salesforce/apex/AllReceivedFseController.getRaeSet';
+import init from '@salesforce/apex/LexAllReceivedFseController.init';
+import getRaeSet from '@salesforce/apex/LexAllReceivedFseController.getRaeSet';
export default class lexAllReceivedFse extends LightningElement {
@api recordId;
@@ -26,31 +26,33 @@
init({
recordId: this.recordId
}).then(res=>{
- console.log('loanerReceivedNgNum==='+ res.loanerReceivedNgNum);
- if(res.loanerReceivedNgNum == 0){
- const evt = new ShowToastEvent({
- title : '鐜板満宸茬粡鍏ㄩ儴鏀跺埌瀹炵墿浜�',
- message: '',
- variant: 'error'
- });
- this.dispatchEvent(evt);
- this.dispatchEvent(new CloseActionScreenEvent());
- }else{
- getRaeSet({
- recordId: this.recordId
- }).then(res=>{
- if(res == 'SUCCESS'){
- this.showToast('鐜板満宸插叏閮ㄦ敹璐�','success');
- return;
- }else{
- this.showToast(res,'warning');
- return;
- }
-
- })
- .catch(err=>{
- console.log('getRaeSet==='+err);
- })
+ console.log('loanerReceivedNgNum==='+ JSON.stringify(res));
+ if(res){
+ if(res.loanerReceivedNgNum == 0){
+ const evt = new ShowToastEvent({
+ title : '鐜板満宸茬粡鍏ㄩ儴鏀跺埌瀹炵墿浜�',
+ message: '',
+ variant: 'error'
+ });
+ this.dispatchEvent(evt);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }else{
+ getRaeSet({
+ recordId: this.recordId
+ }).then(res=>{
+ if(res == 'SUCCESS'){
+ this.showToast('鐜板満宸插叏閮ㄦ敹璐�','success');
+ return;
+ }else{
+ this.showToast(res,'warning');
+ return;
+ }
+
+ })
+ .catch(err=>{
+ console.log('getRaeSet==='+err);
+ })
+ }
}
}).catch(err=>{
console.log('init==='+err);
diff --git a/force-app/main/default/lwc/lexEquipmentRentalPDF/lexEquipmentRentalPDF.js b/force-app/main/default/lwc/lexEquipmentRentalPDF/lexEquipmentRentalPDF.js
index a73f06f..23d0a6e 100644
--- a/force-app/main/default/lwc/lexEquipmentRentalPDF/lexEquipmentRentalPDF.js
+++ b/force-app/main/default/lwc/lexEquipmentRentalPDF/lexEquipmentRentalPDF.js
@@ -4,7 +4,7 @@
import { ShowToastEvent } from 'lightning/platformShowToastEvent';
import { updateRecord } from 'lightning/uiRecordApi';
-import init from '@salesforce/apex/RentalApplyEquipmentRentalPDFController.initJumptoPDFButton';
+import init from '@salesforce/apex/LexRentalApplyPDFController.initJumptoPDFButton';
export default class lexEquipmentRentalPDF extends LightningElement {
@api recordId;
diff --git a/force-app/main/default/lwc/lexEquipmentRentalPicturePDF/lexEquipmentRentalPicturePDF.js b/force-app/main/default/lwc/lexEquipmentRentalPicturePDF/lexEquipmentRentalPicturePDF.js
index 2d24bf8..30c6e36 100644
--- a/force-app/main/default/lwc/lexEquipmentRentalPicturePDF/lexEquipmentRentalPicturePDF.js
+++ b/force-app/main/default/lwc/lexEquipmentRentalPicturePDF/lexEquipmentRentalPicturePDF.js
@@ -4,7 +4,7 @@
import { ShowToastEvent } from 'lightning/platformShowToastEvent';
import { updateRecord } from 'lightning/uiRecordApi';
-import init from '@salesforce/apex/EquipmentRentalPicturePDFController.init';
+import init from '@salesforce/apex/LexEquipmentRentalPicturePDFController.init';
export default class lexEquipmentRentalPicturePDF extends LightningElement {
@api recordId;
IsLoading = true;
@@ -25,15 +25,20 @@
init({
recordId: this.recordId
}).then(result=>{
- //console.log('result.shipmentRequestedCnt===' + result.shipmentRequestedCnt)
- if( result.shipmentRequestedCnt > 0){
- console.log(result.pagelength);
- for(var i =0; i<result.pagelength; i++){
- this.dispatchEvent(new CloseActionScreenEvent());
- window.open('/apex/FixtureRentalPicturePDF?raid='+ this.recordId +'&page=' + i);
+ console.log('result==='+JSON.stringify(result));
+ if(result){
+ //console.log('result.shipmentRequestedCnt===' + result.shipmentRequestedCnt)
+ if( result.shipmentRequestedCnt > 0){
+ console.log(result.pagelength);
+ for(var i =0; i<result.pagelength; i++){
+ this.dispatchEvent(new CloseActionScreenEvent());
+ window.open('/apex/FixtureRentalPicturePDF?raid='+ this.recordId +'&page=' + i);
+ }
+ }else{
+ this.showToast('褰撳墠鐨勭敵璇峰崟涓病鏈夊凡鍑哄簱鎸囩ず鐨勯厤濂椼��','error');
}
}else{
- this.showToast('褰撳墠鐨勭敵璇峰崟涓病鏈夊凡鍑哄簱鎸囩ず鐨勯厤濂椼��','error');
+ this.showToast("鏈煡鍒版暟鎹�", 'error');
}
}).catch(err=>{
this.dispatchEvent(new CloseActionScreenEvent());
diff --git a/force-app/main/default/lwc/lexEquipmentSetManage/lexEquipmentSetManage.html b/force-app/main/default/lwc/lexEquipmentSetManage/lexEquipmentSetManage.html
new file mode 100644
index 0000000..960b41d
--- /dev/null
+++ b/force-app/main/default/lwc/lexEquipmentSetManage/lexEquipmentSetManage.html
@@ -0,0 +1,5 @@
+<template>
+ <div class="Holder" if:true={IsLoading}>
+ <lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
+ </div>
+</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexEquipmentSetManage/lexEquipmentSetManage.js b/force-app/main/default/lwc/lexEquipmentSetManage/lexEquipmentSetManage.js
new file mode 100644
index 0000000..ad274ef
--- /dev/null
+++ b/force-app/main/default/lwc/lexEquipmentSetManage/lexEquipmentSetManage.js
@@ -0,0 +1,13 @@
+import { LightningElement, track, wire, api } from 'lwc';
+
+
+export default class lexEquipmentSetManage extends LightningElement {
+ @api recordId;
+ IsLoading=true;
+
+ connectedCallback(){
+ if (this.recordId) {
+ window.open("/apex/EquipmentSetManage?esetid="+this.recordId, "_top");
+ }
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexEquipmentSetManage/lexEquipmentSetManage.js-meta.xml b/force-app/main/default/lwc/lexEquipmentSetManage/lexEquipmentSetManage.js-meta.xml
new file mode 100644
index 0000000..538e8c8
--- /dev/null
+++ b/force-app/main/default/lwc/lexEquipmentSetManage/lexEquipmentSetManage.js-meta.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata" fqn="lexEquipmentSetManage">
+ <apiVersion>51.0</apiVersion>
+ <isExposed>true</isExposed>
+ <targets>
+
+ <target>lightning__AppPage</target>
+
+ <target>lightning__RecordPage</target>
+
+ <target>lightning__HomePage</target>
+
+ <target>lightning__RecordAction</target>
+
+ <!-- 灞忓箷娴侀厤缃� -->
+
+ <target>lightning__FlowScreen</target>
+
+ </targets>
+
+ <!-- 瀹氫箟鍙橀噺 -->
+
+ <targetConfigs>
+
+ <targetConfig targets="lightning__FlowScreen">
+
+ <!-- name js涓娇鐢ㄧ殑鍙橀噺锛屼粠灞忓箷娴佷腑鑾峰彇鍙傛暟 label 鍦ㄥ睆骞曟祦鐨勮LWC鐨勮缃腑鏄剧ず -->
+
+ <property name="recordId" type="String" label="recordId"/>
+
+ </targetConfig>
+
+ </targetConfigs>
+</LightningComponentBundle>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexFeedbackReport/lexFeedbackReport.html b/force-app/main/default/lwc/lexFeedbackReport/lexFeedbackReport.html
index 49a10f7..ba53413 100644
--- a/force-app/main/default/lwc/lexFeedbackReport/lexFeedbackReport.html
+++ b/force-app/main/default/lwc/lexFeedbackReport/lexFeedbackReport.html
@@ -1,5 +1,2 @@
<template>
- <div class="sisToOPDHolder" if:true={IsLoading}>
- <lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
- </div>
</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexFeedbackReport/lexFeedbackReport.js b/force-app/main/default/lwc/lexFeedbackReport/lexFeedbackReport.js
index 327730f..ddb8d31 100644
--- a/force-app/main/default/lwc/lexFeedbackReport/lexFeedbackReport.js
+++ b/force-app/main/default/lwc/lexFeedbackReport/lexFeedbackReport.js
@@ -3,12 +3,10 @@
import { ShowToastEvent } from 'lightning/platformShowToastEvent';
import { CurrentPageReference } from 'lightning/navigation';
-import init from '@salesforce/apex/RentalApplyFaultController.init';
-import updateRentalApplyFaultStatus from '@salesforce/apex/RentalApplyFaultController.updateRentalApplyFaultStatus';
+import init from '@salesforce/apex/LexRentalApplyFaultController.init';
+import updateRentalApplyFaultStatus from '@salesforce/apex/LexRentalApplyFaultController.updateRentalApplyFaultStatus';
export default class lexFeedbackReport extends LightningElement {
@api recordId;
- IsLoading = true;
-
@wire(CurrentPageReference)
getStateParameters(currentPageReference){
if(currentPageReference) {
@@ -24,21 +22,25 @@
init({
recordId: this.recordId
}).then(res=>{
- if(res.status__c!='宸插彂閫�'){
+ if(res){
+ if(res.status__c!='宸插彂閫�'){
this.showToast('鍙湁宸插彂閫佺殑妫�娴嬪垎鏋愭姤鍛婃墠鑳藉彂閫�','warning');
- return;
- }
-
- updateRentalApplyFaultStatus({
- recordId: this.recordId,
- updateStatus: '宸插弽棣�'
- }).then(result=>{
- if(result=='SUCCESS'){
- this.showToast('鎶ュ憡宸插弽棣�','success');
- }else{
- this.showToast(res,'error');
+ return;
}
- })
+
+ updateRentalApplyFaultStatus({
+ recordId: this.recordId,
+ updateStatus: '宸插弽棣�'
+ }).then(result=>{
+ if(result=='SUCCESS'){
+ this.showToast('鎶ュ憡宸插弽棣�','success');
+ }else{
+ this.showToast(res,'error');
+ }
+ })
+ }else{
+ this.showToast('鏈煡璇㈠埌鏁版嵁','warning');
+ }
})
}
diff --git a/force-app/main/default/lwc/lexFixtureSetManage/lexFixtureSetManage.js b/force-app/main/default/lwc/lexFixtureSetManage/lexFixtureSetManage.js
index d0129fc..0a14859 100644
--- a/force-app/main/default/lwc/lexFixtureSetManage/lexFixtureSetManage.js
+++ b/force-app/main/default/lwc/lexFixtureSetManage/lexFixtureSetManage.js
@@ -1,9 +1,28 @@
import { LightningElement, track, wire, api } from 'lwc';
+import { CurrentPageReference,NavigationMixin } from 'lightning/navigation';
export default class lexFixtureSetManage extends LightningElement {
@api recordId;
+ IsLoading = true;
+ @wire(CurrentPageReference)
+ getStateParameters(currentPageReference){
+ if(currentPageReference) {
+ const urlValue = currentPageReference.state.recordId;
+ if(urlValue) {
+ let str = `${urlValue}`;
+ this.recordId = str;
+ }
+ }
+ }
connectedCallback(){
+ this.IsLoading = false;
window.open("/apex/FixtureSetManage?pt_recid=" + this.recordId, "_top");
+ this.closeAction();
}
+
+ closeAction() {
+ //杩斿洖褰撳墠鐨勫鍝佺敵璇�
+ window.open("/"+this.recordId,'_self');
+ }
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexLoanerArrangedEmail/lexLoanerArrangedEmail.js b/force-app/main/default/lwc/lexLoanerArrangedEmail/lexLoanerArrangedEmail.js
index 45073e5..4e09ac0 100644
--- a/force-app/main/default/lwc/lexLoanerArrangedEmail/lexLoanerArrangedEmail.js
+++ b/force-app/main/default/lwc/lexLoanerArrangedEmail/lexLoanerArrangedEmail.js
@@ -4,8 +4,8 @@
import { ShowToastEvent } from 'lightning/platformShowToastEvent';
import { updateRecord } from 'lightning/uiRecordApi';
-import init from '@salesforce/apex/LoanerArrangedEmailController.init';
-import getRentalApplyEquipmentSet from '@salesforce/apex/LoanerArrangedEmailController.getRentalApplyEquipmentSet';
+import init from '@salesforce/apex/LexLoanerArrangedEmailController.init';
+import getRentalApplyEquipmentSet from '@salesforce/apex/LexLoanerArrangedEmailController.getRentalApplyEquipmentSet';
import approvalCheck from '@salesforce/apex/RentalApplyWebService.approvalCheck';
import setShipment_request from '@salesforce/apex/RentalApplyWebService.setShipment_request';
export default class lexLoanerArrangedEmail extends LightningElement {
diff --git a/force-app/main/default/lwc/lexLoanerArrangedEmailConsumApply/lexLoanerArrangedEmailConsumApply.js b/force-app/main/default/lwc/lexLoanerArrangedEmailConsumApply/lexLoanerArrangedEmailConsumApply.js
index fc3414c..b08131a 100644
--- a/force-app/main/default/lwc/lexLoanerArrangedEmailConsumApply/lexLoanerArrangedEmailConsumApply.js
+++ b/force-app/main/default/lwc/lexLoanerArrangedEmailConsumApply/lexLoanerArrangedEmailConsumApply.js
@@ -29,7 +29,7 @@
if(res.weiAssignedCnt > 0){
this.showToast('鐢宠鍗曞唴瀛樺湪鏈垎閰嶇殑鑰楁潗锛岃鍒嗛厤鎴栧垎鍓茬敵璇峰崟','warning');
return;
- }else if(res.consumApplyStatus == '鍙栨秷'){
+ }else if(res.campaignStatus == '鍙栨秷'){
this.showToast('瀛︿細鍙栨秷锛屼笉鍙嚭搴撴寚绀�','warning');
return;
}else if(res.consumApplyStatus == '宸插嚭搴撴寚绀�' && res.assignedNotShipment == 0){
diff --git a/force-app/main/default/lwc/lexMainFixtureSelect/lexMainFixtureSelect.js b/force-app/main/default/lwc/lexMainFixtureSelect/lexMainFixtureSelect.js
index 2a7b4aa..4d2ca9d 100644
--- a/force-app/main/default/lwc/lexMainFixtureSelect/lexMainFixtureSelect.js
+++ b/force-app/main/default/lwc/lexMainFixtureSelect/lexMainFixtureSelect.js
@@ -1,7 +1,6 @@
import { LightningElement, track, wire, api } from 'lwc';
import { CurrentPageReference,NavigationMixin } from 'lightning/navigation';
-import init from '@salesforce/apex/MainFixtureSelectButtonController.init';
export default class lexMainFixtureSelect extends LightningElement {
@api recordId;
IsLoading = true;
@@ -19,7 +18,9 @@
connectedCallback(){
+ this.IsLoading = false;
window.open("/apex/MainFixtureSelect?pt_recid=" + this.recordId, "_top");
+ this.closeAction();
}
closeAction() {
diff --git a/force-app/main/default/lwc/lexNewLeadFromContact2/lexNewLeadFromContact2.html b/force-app/main/default/lwc/lexNewLeadFromContact2/lexNewLeadFromContact2.html
new file mode 100644
index 0000000..8e46b4b
--- /dev/null
+++ b/force-app/main/default/lwc/lexNewLeadFromContact2/lexNewLeadFromContact2.html
@@ -0,0 +1,5 @@
+<template>
+ <div class="IntentionButton" if:true={IsLoading}>
+ <lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
+ </div>
+</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexNewLeadFromContact2/lexNewLeadFromContact2.js b/force-app/main/default/lwc/lexNewLeadFromContact2/lexNewLeadFromContact2.js
new file mode 100644
index 0000000..838579b
--- /dev/null
+++ b/force-app/main/default/lwc/lexNewLeadFromContact2/lexNewLeadFromContact2.js
@@ -0,0 +1,73 @@
+/*
+ * @Author: zhangchunxu
+ * @Date: 2023-07-19 13:22:53
+ * @LastEditors: zhangchunxu
+ * @LastEditTime: 2023-07-21 15:47:55
+ *
+ */
+import { LightningElement,wire,track,api} from 'lwc';
+import { CurrentPageReference ,NavigationMixin} from "lightning/navigation";
+import { CloseActionScreenEvent } from 'lightning/actions';
+import init from '@salesforce/apex/NewLeadFromContact2.NewLeadFromContact2';
+import { encodeDefaultFieldValues } from 'lightning/pageReferenceUtils';
+
+export default class LexNewLeadFromContact2 extends NavigationMixin(LightningElement) {
+ @api recordId;//褰撳墠杩欐潯鏁版嵁鐨刬d
+ id;//杩斿洖鍊肩殑id Tender_information__c鎷涙爣椤圭洰鐨刬d
+ IsLoading = true;
+ @wire(CurrentPageReference)
+ getStateParameters(currentPageReference) {
+ if (currentPageReference) {
+ const urlValue = currentPageReference.state.recordId;
+ if (urlValue) {
+ let str = `${urlValue}`;
+ this.recordId = str;
+ }
+ }
+ }
+ // 瀹㈡埛浜哄憳 鏂板缓璐拱鎰忓悜
+ connectedCallback(){
+ init({
+ recordId: this.recordId
+ }).then(result => {
+ // this.IsLoading = false;
+ // console.log(result,"xu111111111111");
+ // this.id = result.Id;
+ // /00Q/e?retURL=%2F00Q%2Fo&
+ // RecordType=01210000000QiRf
+ // &ent=Lead
+ // &CF00N10000006ps6f={!HTMLENCODE(Contact.Name)} 瀹㈡埛濮撳悕 contact_Name__c
+ // &CF00N10000006ps6f_lkid={!HTMLENCODE(Contact.Id)} 瀹㈡埛id contact_Name__c
+ // &CF00N10000002CvC5={!HTMLENCODE(Account.Name)} 鍖婚櫌鍚� Hospital_Name__c
+ // &CF00N10000002CvC5_lkid={!HTMLENCODE(Account.Id)}鍖婚櫌id Hospital_Name__c
+ // &lea3=%e4%b8%8d%e7%94%a8%e5%a1%ab%e5%86%99
+ // &name_lastlea2=%e4%b8%8d%e7%94%a8%e5%a1%ab%e5%86%99
+ // &CF00N10000006qNtt_lkid = {!HTMLENCODE(Account.Department_Class__c)} 鎴樼暐绉戝鍒嗙被id epartment_Class__c
+ // &CF00N10000006qNtt={!HTMLENCODE(Account.Department_Class__c)} 鎴樼暐绉戝鍒嗙被 epartment_Class__c
+ // var url = "/00Q/e?retURL=%2F00Q%2Fo&RecordType=01210000000QiRf&ent=Lead&CF00N10000006ps6f="+result.Name+"&CF00N10000006ps6f_lkid="+result.Id+"&CF00N10000002CvC5="+result.accountName+"&CF00N10000002CvC5_lkid="+result.accountIds+"&lea3=%e4%b8%8d%e7%94%a8%e5%a1%ab%e5%86%99&name_lastlea2=%e4%b8%8d%e7%94%a8%e5%a1%ab%e5%86%99&CF00N10000006qNtt_lkid ="+result.accountDepartmentClass+"&CF00N10000006qNtt="+result.accountDepartmentClass ;
+ // window.open(url);
+ const defaultValues = encodeDefaultFieldValues({
+ RecordType :result.NewDailyReport,
+ contact_Name__c:result.Id,
+ Hospital_Name__c:result.accountIds,
+ lea3:"",
+ name_lastlea2:"",
+ epartment_Class__c:result.accountDepartmentClass,
+
+ });
+ this[NavigationMixin.Navigate]({
+ type: 'standard__objectPage',
+ attributes: {
+ objectApiName: 'Lead',
+ actionName: 'new'
+ },
+ state:{
+ defaultFieldValues: defaultValues
+ }
+ });
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }).catch(error=>{
+ console.log(error)
+ })
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexNewLeadFromContact2/lexNewLeadFromContact2.js-meta.xml b/force-app/main/default/lwc/lexNewLeadFromContact2/lexNewLeadFromContact2.js-meta.xml
new file mode 100644
index 0000000..2b7649d
--- /dev/null
+++ b/force-app/main/default/lwc/lexNewLeadFromContact2/lexNewLeadFromContact2.js-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>54.0</apiVersion>
+ <isExposed>true</isExposed>
+ <targets>
+ <target>lightning__RecordPage</target>
+ <target>lightning__AppPage</target>
+ <target>lightning__HomePage</target>
+ <target>lightning__RecordAction</target>
+ </targets>
+</LightningComponentBundle>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexNewTransferApply/lexNewTransferApply.js b/force-app/main/default/lwc/lexNewTransferApply/lexNewTransferApply.js
index a73c401..263a764 100644
--- a/force-app/main/default/lwc/lexNewTransferApply/lexNewTransferApply.js
+++ b/force-app/main/default/lwc/lexNewTransferApply/lexNewTransferApply.js
@@ -2,8 +2,8 @@
import { CurrentPageReference,NavigationMixin } from 'lightning/navigation';
import { CloseActionScreenEvent } from 'lightning/actions';
import { encodeDefaultFieldValues } from 'lightning/pageReferenceUtils';
-import init from '@salesforce/apex/NewTransferApplyController.init';
-import getRecordId from '@salesforce/apex/NewTransferApplyController.getRecordId';
+import init from '@salesforce/apex/LexNewTransferApplyController.init';
+import getRecordId from '@salesforce/apex/LexNewTransferApplyController.getRecordId';
export default class lexNewTransferApply extends LightningElement {
@api recordId;
diff --git a/force-app/main/default/lwc/lexRentalApplyJump/lexRentalApplyJump.js b/force-app/main/default/lwc/lexRentalApplyJump/lexRentalApplyJump.js
index 38786e0..4f8a591 100644
--- a/force-app/main/default/lwc/lexRentalApplyJump/lexRentalApplyJump.js
+++ b/force-app/main/default/lwc/lexRentalApplyJump/lexRentalApplyJump.js
@@ -1,10 +1,10 @@
import { LightningElement,api, track, wire } from 'lwc';
import {CurrentPageReference} from 'lightning/navigation';
import { CloseActionScreenEvent } from 'lightning/actions';
-import getUserId from '@salesforce/apex/RentalApplyControllerLWT.getUserId';
-import init from '@salesforce/apex/SelectSubstituteControllerLWT.initFromSelectSubstituteButton';
-import selectRentalApplyEquipmentSetByID from '@salesforce/apex/SelectSubstituteControllerLWT.selectRentalApplyEquipmentSetByID';
-import selectRentalApplyEquipmentSetByRACID from '@salesforce/apex/SelectSubstituteControllerLWT.selectRentalApplyEquipmentSetByRACID';
+import getUserId from '@salesforce/apex/LexRentalApplyControllerLWT.getUserId';
+import init from '@salesforce/apex/LexSelectSubstituteControllerLWT.initFromSelectSubstituteButton';
+import selectRentalApplyEquipmentSetByID from '@salesforce/apex/LexSelectSubstituteControllerLWT.selectRentalApplyEquipmentSetByID';
+import selectRentalApplyEquipmentSetByRACID from '@salesforce/apex/LexSelectSubstituteControllerLWT.selectRentalApplyEquipmentSetByRACID';
import { ShowToastEvent } from 'lightning/platformShowToastEvent';
export default class lexRentalApplyJump extends LightningElement {
diff --git a/force-app/main/default/lwc/lexRentalFixtureSetAssignAgency/lexRentalFixtureSetAssignAgency.js b/force-app/main/default/lwc/lexRentalFixtureSetAssignAgency/lexRentalFixtureSetAssignAgency.js
index 67d459e..9ec851a 100644
--- a/force-app/main/default/lwc/lexRentalFixtureSetAssignAgency/lexRentalFixtureSetAssignAgency.js
+++ b/force-app/main/default/lwc/lexRentalFixtureSetAssignAgency/lexRentalFixtureSetAssignAgency.js
@@ -13,51 +13,53 @@
recordId: this.recordId
}).then(result=>{
this.IsLoading = false;
- let res = result.ra;
- console.log(res);
- if(res.Campaign__c != '' || res.Campaign__c != undefined){
- if(res.CampaignStatus == '鍙栨秷'){
- this.isShow = true;
- this.msg = '瀛︿細鍙栨秷锛屼笉鍙垎閰�';
- return;
+ if(result){
+ let res = result.ra;
+ console.log(res);
+ if(res.Campaign__c != '' || res.Campaign__c != undefined){
+ if(res.CampaignStatus == '鍙栨秷'){
+ this.isShow = true;
+ this.msg = '瀛︿細鍙栨秷锛屼笉鍙垎閰�';
+ return;
+ }
}
- }
- if(res.Repair__c != '' || res.Repair__c != undefined){
- if(res.Repair_Final_Inspection_Date_F__c != null && res.Repair_Final_Inspection_Date_F__c !=''
- || (res.RC_return_to_office__c!=null && res.RC_return_to_office__c != '')){
- this.isShow = true;
- this.msg = '淇悊鏈夋渶缁堟娴嬫棩鎴栦慨鐞嗗搧杩旈�佹棩锛屼笉鍙垎閰�';
- return;
+ if(res.Repair__c != '' || res.Repair__c != undefined){
+ if(res.Repair_Final_Inspection_Date_F__c != null && res.Repair_Final_Inspection_Date_F__c !=''
+ || (res.RC_return_to_office__c!=null && res.RC_return_to_office__c != '')){
+ this.isShow = true;
+ this.msg = '淇悊鏈夋渶缁堟娴嬫棩鎴栦慨鐞嗗搧杩旈�佹棩锛屼笉鍙垎閰�';
+ return;
+ }
}
- }
- assignBtn({
- Rid: this.recordId
- }).then(resultMsg => {
- if(res.Status__c == '鍙栨秷' && res.Rental_Apply_Equipment_Set_Cnt__c != 0){
- window.open("/apex/RentalFixtureSetAssignAgency?pt_recid=" + this.recordId);
- this.closeAction();
- }else if((res.demo_purpose2__c == '瀛︿細灞曚細' || res.demo_purpose2__c == '璇鹃鐮旂┒' || res.demo_purpose2__c == '鍩硅涓績')&& res.Status__c == '鑽夋涓�'){
- this.isShow = true;
- this.msg = "涓嶈兘鍒嗛厤锛岃纭鐢宠鐨勭姸鎬�";
- return
- }else if((res.demo_purpose2__c =='璇曠敤锛堟棤璇环锛�' || res.demo_purpose2__c == '璇曠敤锛堟湁璇环锛�' || res.demo_purpose2__c =='鍔ㄧ墿瀹為獙' ||
- res.demo_purpose2__c == '涓�鑸淮淇唬鐢�' || res.demo_purpose2__c== '淇濅慨鍚堝悓鐢ㄦ埛缁翠慨浠ｇ敤' || res.demo_purpose2__c == '宸茶喘寰呰揣')
- && res.Status__c != '宸叉壒鍑�' && res.Status__c != '宸插嚭搴撴寚绀�'){
- this.isShow = true;
- this.msg = "涓嶈兘鍒嗛厤锛岃纭鐢宠鐨勭姸鎬�";
- return;
- }else if(resultMsg == 'Fin'){
- window.open("/apex/RentalFixtureSetAssignAgency?pt_recid=" + this.recordId);
- this.closeAction();
- return;
- }else{
- this.isShow = true;
- this.msg = resultMsg;
- return;
- }
- })
+ assignBtn({
+ Rid: this.recordId
+ }).then(resultMsg => {
+ if(res.Status__c == '鍙栨秷' && res.Rental_Apply_Equipment_Set_Cnt__c != 0){
+ window.open("/apex/RentalFixtureSetAssignAgency?pt_recid=" + this.recordId);
+ this.closeAction();
+ }else if((res.demo_purpose2__c == '瀛︿細灞曚細' || res.demo_purpose2__c == '璇鹃鐮旂┒' || res.demo_purpose2__c == '鍩硅涓績')&& res.Status__c == '鑽夋涓�'){
+ this.isShow = true;
+ this.msg = "涓嶈兘鍒嗛厤锛岃纭鐢宠鐨勭姸鎬�";
+ return
+ }else if((res.demo_purpose2__c =='璇曠敤锛堟棤璇环锛�' || res.demo_purpose2__c == '璇曠敤锛堟湁璇环锛�' || res.demo_purpose2__c =='鍔ㄧ墿瀹為獙' ||
+ res.demo_purpose2__c == '涓�鑸淮淇唬鐢�' || res.demo_purpose2__c== '淇濅慨鍚堝悓鐢ㄦ埛缁翠慨浠ｇ敤' || res.demo_purpose2__c == '宸茶喘寰呰揣')
+ && res.Status__c != '宸叉壒鍑�' && res.Status__c != '宸插嚭搴撴寚绀�'){
+ this.isShow = true;
+ this.msg = "涓嶈兘鍒嗛厤锛岃纭鐢宠鐨勭姸鎬�";
+ return;
+ }else if(resultMsg == 'Fin'){
+ window.open("/apex/RentalFixtureSetAssignAgency?pt_recid=" + this.recordId);
+ this.closeAction();
+ return;
+ }else{
+ this.isShow = true;
+ this.msg = resultMsg;
+ return;
+ }
+ })
+ }
})
.catch(err=>{
console.log('initErr==='+err);
diff --git a/force-app/main/default/lwc/lexReturnDeliverySlip/lexReturnDeliverySlip.js b/force-app/main/default/lwc/lexReturnDeliverySlip/lexReturnDeliverySlip.js
index 01b9adc..383774e 100644
--- a/force-app/main/default/lwc/lexReturnDeliverySlip/lexReturnDeliverySlip.js
+++ b/force-app/main/default/lwc/lexReturnDeliverySlip/lexReturnDeliverySlip.js
@@ -5,7 +5,7 @@
import { ShowToastEvent } from 'lightning/platformShowToastEvent';
import { updateRecord } from 'lightning/uiRecordApi';
-import init from '@salesforce/apex/ReturnDeliverySlipController.init';
+import init from '@salesforce/apex/LexReturnDeliverySlipController.init';
export default class lexReturnDeliverySlip extends LightningElement {
@api recordId;
@@ -28,13 +28,17 @@
init({
recordId: this.recordId
}).then(result =>{
- console.log(JSON.stringify(result.raeSet));
- var check = result.raeSet && result.raeSet.length>0;
- if((check || result.rentalApplyEquipmentSetCnt - result.loanerReceivedNgNum > 0) && result.rentalApplyEquipmentSetCnt > 0){
- this.dispatchEvent(new CloseActionScreenEvent());
- window.open("/apex/EquipmentSetShippmentReceived4?id=" + result.name);
+ console.log('result==='+JSON.stringify(result));
+ if(result){
+ var check = result.raeSet && result.raeSet.length>0;
+ if((check || result.rentalApplyEquipmentSetCnt - result.loanerReceivedNgNum > 0) && result.rentalApplyEquipmentSetCnt > 0){
+ this.dispatchEvent(new CloseActionScreenEvent());
+ window.open("/apex/EquipmentSetShippmentReceived4?id=" + result.name);
+ }else{
+ this.showToast("娌℃湁鐢宠鑰呮敹鍒扮‘璁ょ殑鍊熷嚭澶囧搧", 'error');
+ }
}else{
- this.showToast("娌℃湁鐢宠鑰呮敹鍒扮‘璁ょ殑鍊熷嚭澶囧搧", 'error');
+ this.showToast("鏈煡鍒版暟鎹�", 'error');
}
}).catch(err=>{
this.dispatchEvent(new CloseActionScreenEvent());
diff --git a/force-app/main/default/lwc/lexReturnDeliverySlipConsumApply/lexReturnDeliverySlipConsumApply.js b/force-app/main/default/lwc/lexReturnDeliverySlipConsumApply/lexReturnDeliverySlipConsumApply.js
index e2bf008..a749001 100644
--- a/force-app/main/default/lwc/lexReturnDeliverySlipConsumApply/lexReturnDeliverySlipConsumApply.js
+++ b/force-app/main/default/lwc/lexReturnDeliverySlipConsumApply/lexReturnDeliverySlipConsumApply.js
@@ -22,12 +22,16 @@
init({
recordId: this.recordId
}).then(res=>{
- if(!res.flag){
+ if(res){
+ if(!res.flag){
this.showToast('鏈畬鎴愬埌璐х‘璁ゆ垨澶囧搧涓績鏈‘璁や笉鑳戒笂浼犺瘯鐢ㄨ〃','warning');
return;
- }
- if(res.size > 0){
- window.open("/apex/consumTrialConfirm?id=" + this.recordId);
+ }
+ if(res.size > 0){
+ this.dispatchEvent(new CloseActionScreenEvent());
+ window.open("/apex/consumTrialConfirm?id=" + this.recordId);
+ return;
+ }
}
})
}
diff --git a/force-app/main/default/lwc/lexSelectSubstitute/lexSelectSubstitute.js b/force-app/main/default/lwc/lexSelectSubstitute/lexSelectSubstitute.js
index 37846be..d081272 100644
--- a/force-app/main/default/lwc/lexSelectSubstitute/lexSelectSubstitute.js
+++ b/force-app/main/default/lwc/lexSelectSubstitute/lexSelectSubstitute.js
@@ -1,9 +1,9 @@
import { LightningElement,api, track, wire } from 'lwc';
import {CurrentPageReference} from 'lightning/navigation';
import { CloseActionScreenEvent } from 'lightning/actions';
-import init from '@salesforce/apex/SelectSubstituteControllerLWT.initFromSelectSubstituteButton';
-import selectRentalApplyEquipmentSetByID from '@salesforce/apex/SelectSubstituteControllerLWT.selectRentalApplyEquipmentSetByID';
-import selectRentalApplyCByName from '@salesforce/apex/SelectSubstituteControllerLWT.selectRentalApplyCByName';
+import init from '@salesforce/apex/LexSelectSubstituteControllerLWT.initFromSelectSubstituteButton';
+import selectRentalApplyEquipmentSetByID from '@salesforce/apex/LexSelectSubstituteControllerLWT.selectRentalApplyEquipmentSetByID';
+import selectRentalApplyCByName from '@salesforce/apex/LexSelectSubstituteControllerLWT.selectRentalApplyCByName';
export default class selectSubstituteLWC extends LightningElement {
diff --git a/force-app/main/default/lwc/lexSendReport/lexSendReport.js b/force-app/main/default/lwc/lexSendReport/lexSendReport.js
index bb442ab..5015f01 100644
--- a/force-app/main/default/lwc/lexSendReport/lexSendReport.js
+++ b/force-app/main/default/lwc/lexSendReport/lexSendReport.js
@@ -3,8 +3,8 @@
import { ShowToastEvent } from 'lightning/platformShowToastEvent';
import { CurrentPageReference } from 'lightning/navigation';
-import init from '@salesforce/apex/RentalApplyFaultController.init';
-import updateRentalApplyFaultStatus from '@salesforce/apex/RentalApplyFaultController.updateRentalApplyFaultStatus';
+import init from '@salesforce/apex/LexRentalApplyFaultController.init';
+import updateRentalApplyFaultStatus from '@salesforce/apex/LexRentalApplyFaultController.updateRentalApplyFaultStatus';
export default class lexSendReport extends LightningElement {
@api recordId;
@@ -25,23 +25,28 @@
init({
recordId: this.recordId
}).then(res=>{
- console.log('res==='+JSON.stringify(res));
- if(res.status__c!='鑽夋涓�' && res.status__c!=''){
- this.showToast('鍙湁鑽夋涓殑妫�娴嬪垎鏋愭姤鍛婃墠鑳藉彂閫佹姤鍛�','warning');
- return;
- }
-
- updateRentalApplyFaultStatus({
- recordId: this.recordId,
- updateStatus: '宸插彂閫�'
- }).then(result=>{
- console.log('result==='+result);
- if(result=='SUCCESS'){
- this.showToast('鎶ュ憡宸插彂閫�','success');
- }else{
- this.showToast(res.getMessage(),'error');
+ if(res){
+ console.log('res==='+JSON.stringify(res));
+ if(res.status__c!='鑽夋涓�' && res.status__c!=''){
+ this.showToast('鍙湁鑽夋涓殑妫�娴嬪垎鏋愭姤鍛婃墠鑳藉彂閫佹姤鍛�','warning');
+ return;
}
- })
+
+ updateRentalApplyFaultStatus({
+ recordId: this.recordId,
+ updateStatus: '宸插彂閫�'
+ }).then(result=>{
+ console.log('result==='+result);
+ if(result=='SUCCESS'){
+ this.showToast('鎶ュ憡宸插彂閫�','success');
+ }else{
+ this.showToast(res.getMessage(),'error');
+ }
+ })
+ }else{
+ this.showToast('鏈煡璇㈠埌鏁版嵁','warning');
+ }
+
}).catch(err=>{
console.log('init=='+err);
})
diff --git a/force-app/main/default/lwc/lexSubmitExtensionApprovalProcess/lexSubmitExtensionApprovalProcess.js b/force-app/main/default/lwc/lexSubmitExtensionApprovalProcess/lexSubmitExtensionApprovalProcess.js
index a78c32f..409c474 100644
--- a/force-app/main/default/lwc/lexSubmitExtensionApprovalProcess/lexSubmitExtensionApprovalProcess.js
+++ b/force-app/main/default/lwc/lexSubmitExtensionApprovalProcess/lexSubmitExtensionApprovalProcess.js
@@ -4,7 +4,7 @@
import { ShowToastEvent } from 'lightning/platformShowToastEvent';
import { updateRecord } from 'lightning/uiRecordApi';
-import init from '@salesforce/apex/SubmitExtensionApprovalProcessController.init';
+import init from '@salesforce/apex/LexSubmitExtensionController.init';
import extension_approval_processCheck from '@salesforce/apex/RentalApplyWebService.extension_approval_processCheck'
export default class lexSubmitExtensionApprovalProcess extends LightningElement {
@api
@@ -27,7 +27,11 @@
recordId:this.recordId
}).then(res=>{
console.log('res==='+JSON.stringify(res));
- var today = new Date();
+ if(JSON.stringify(res) == '{}'){
+ this.ToastShow('娌℃湁鏌ュ埌闇�瑕佺殑鏁版嵁','warning');
+ return;
+ }
+ let today = new Date();
//杩藉姞澶囧搧鐢宠鐘舵�佺‘璁わ紝宸茬粡鎻愪氦杩囩殑鐢宠锛屼笉鑳介噸澶嶆彁浜tatus__c
if(res.extensionStatus == '濉啓瀹屾瘯' || res.extensionStatus == '鐢宠涓�') {
this.showToast('璇风‘璁ゅ欢鏈熺敵璇风姸鎬侊紝宸茬粡鎻愪氦杩囩殑鐢宠锛屼笉鑳介噸澶嶆彁浜�','error');
diff --git a/force-app/main/default/lwc/lexTenderingProjectRestartButton/lexTenderingProjectRestartButton.html b/force-app/main/default/lwc/lexTenderingProjectRestartButton/lexTenderingProjectRestartButton.html
new file mode 100644
index 0000000..40d45aa
--- /dev/null
+++ b/force-app/main/default/lwc/lexTenderingProjectRestartButton/lexTenderingProjectRestartButton.html
@@ -0,0 +1,5 @@
+<template>
+ <div class="ProjectRestart" if:true={IsLoading}>
+ <lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
+ </div>
+</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexTenderingProjectRestartButton/lexTenderingProjectRestartButton.js b/force-app/main/default/lwc/lexTenderingProjectRestartButton/lexTenderingProjectRestartButton.js
new file mode 100644
index 0000000..82a00d0
--- /dev/null
+++ b/force-app/main/default/lwc/lexTenderingProjectRestartButton/lexTenderingProjectRestartButton.js
@@ -0,0 +1,64 @@
+import { LightningElement,wire,track,api} from 'lwc';
+import { CurrentPageReference ,NavigationMixin} from "lightning/navigation";
+import { CloseActionScreenEvent } from 'lightning/actions';
+import init from '@salesforce/apex/TenderingButtonController.initTenderingController';
+import { updateRecord } from 'lightning/uiRecordApi';
+import projectRestart from '@salesforce/apex/TenderingButtonController.projectRestart';
+import { ShowToastEvent } from 'lightning/platformShowToastEvent';
+import { encodeDefaultFieldValues } from 'lightning/pageReferenceUtils';
+export default class lexTenderingProjectRestartButton extends NavigationMixin(LightningElement) {
+ @api recordId;//褰撳墠杩欐潯鏁版嵁鐨刬d
+ id;//杩斿洖鍊肩殑id Tender_information__c鎷涙爣椤圭洰鐨刬d
+ status;
+ IsLoading = true;
+ @wire(CurrentPageReference)
+ getStateParameters(currentPageReference) {
+ if (currentPageReference) {
+ const urlValue = currentPageReference.state.recordId;
+ if (urlValue) {
+ let str = `${urlValue}`;
+ this.recordId = str;
+ }
+ }
+ }
+ //鎷涙爣椤圭洰 椤圭洰閲嶅惎
+ connectedCallback(){
+ init({
+ recordId: this.recordId
+ }).then(result => {
+ this.IsLoading = false;
+ this.status = result.status;
+ this.projectRestart();
+ })
+ }
+ projectRestart(){
+ if(this.status == '09.缁堟'){
+ projectRestart({recordId: this.recordId}).then(res=>{
+ if(res != "1"){
+ var messageage = "";
+ messageage = res;
+ this.showToast(messageage,"error");
+ }else{
+ this.updateRecordView();
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
+ }).catch(resp=>{
+ })
+ }else{
+ // alert('缁堟瀹℃壒鐘舵�佷笉婊¤冻鏉′欢锛屾棤娉曢噸鍚��');
+ this.showToast('缁堟瀹℃壒鐘舵�佷笉婊¤冻鏉′欢锛屾棤娉曢噸鍚��',"error");
+ return;
+ }
+ }
+ updateRecordView() {
+ updateRecord({fields: { Id: this.recordId }});
+ }
+ showToast(msg,type) {
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexTenderingProjectRestartButton/lexTenderingProjectRestartButton.js-meta.xml b/force-app/main/default/lwc/lexTenderingProjectRestartButton/lexTenderingProjectRestartButton.js-meta.xml
new file mode 100644
index 0000000..2b7649d
--- /dev/null
+++ b/force-app/main/default/lwc/lexTenderingProjectRestartButton/lexTenderingProjectRestartButton.js-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>54.0</apiVersion>
+ <isExposed>true</isExposed>
+ <targets>
+ <target>lightning__RecordPage</target>
+ <target>lightning__AppPage</target>
+ <target>lightning__HomePage</target>
+ <target>lightning__RecordAction</target>
+ </targets>
+</LightningComponentBundle>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexTenderingTerminateResponseButton/lexTenderingTerminateResponseButton.html b/force-app/main/default/lwc/lexTenderingTerminateResponseButton/lexTenderingTerminateResponseButton.html
new file mode 100644
index 0000000..40d45aa
--- /dev/null
+++ b/force-app/main/default/lwc/lexTenderingTerminateResponseButton/lexTenderingTerminateResponseButton.html
@@ -0,0 +1,5 @@
+<template>
+ <div class="ProjectRestart" if:true={IsLoading}>
+ <lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
+ </div>
+</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexTenderingTerminateResponseButton/lexTenderingTerminateResponseButton.js b/force-app/main/default/lwc/lexTenderingTerminateResponseButton/lexTenderingTerminateResponseButton.js
new file mode 100644
index 0000000..fc35620
--- /dev/null
+++ b/force-app/main/default/lwc/lexTenderingTerminateResponseButton/lexTenderingTerminateResponseButton.js
@@ -0,0 +1,79 @@
+/*
+ * @Author: zhangchunxu
+ * @Date: 2023-07-12 10:01:02
+ * @LastEditors: zhangchunxu
+ * @LastEditTime: 2023-07-21 14:30:48
+ *
+ */
+import { LightningElement,wire,track,api} from 'lwc';
+import { CurrentPageReference ,NavigationMixin} from "lightning/navigation";
+import { CloseActionScreenEvent } from 'lightning/actions';
+import init from '@salesforce/apex/TenderingButtonController.initTenderingController';
+import { updateRecord } from 'lightning/uiRecordApi';
+import projectRestart from '@salesforce/apex/TenderingButtonController.projectRestart';
+import { ShowToastEvent } from 'lightning/platformShowToastEvent';
+import { encodeDefaultFieldValues } from 'lightning/pageReferenceUtils';
+export default class lexTenderingTerminateResponseButton extends NavigationMixin(LightningElement) {
+ @api recordId;//褰撳墠杩欐潯鏁版嵁鐨刬d
+ id;//杩斿洖鍊肩殑id Tender_information__c鎷涙爣椤圭洰鐨刬d
+ status;
+ IsLoading = true;
+ TerminateApprovalStatus;
+ AccSize = [];
+
+ @wire(CurrentPageReference)
+ getStateParameters(currentPageReference) {
+ if (currentPageReference) {
+ const urlValue = currentPageReference.state.recordId;
+ if (urlValue) {
+ let str = `${urlValue}`;
+ this.recordId = str;
+ }
+ }
+ }
+ //鎷涙爣椤圭洰 椤圭洰缁堟
+ connectedCallback(){
+ init({
+ recordId: this.recordId
+ }).then(result => {
+ this.IsLoading = false;
+ this.status = result.status;
+ this.TerminateApprovalStatus = result.TerminateApprovalStatus;
+ this.AccSize = result.AccSize;
+ this.TerminateResponse();
+ })
+ }
+ TerminateResponse(){
+ if(this.TerminateApprovalStatus == '鎵瑰噯' || this.TerminateApprovalStatus == '鐢宠涓�'){
+ // alert("宸插瓨鍦ㄧ敵璇蜂腑鎴栬�呭凡鎵瑰噯鐨勭粓姝俊鎭��");
+ this.showToast('宸插瓨鍦ㄧ敵璇蜂腑鎴栬�呭凡鎵瑰噯鐨勭粓姝俊鎭��',"error");
+ return;
+ }
+ if (this.AccSize.length > 0 && parseInt(this.AccSize[0].total_cnt) > 0) {
+ // alert("娴嬭瘯:" + sqlResult.records);
+ var total_cnt = parseInt(this.AccSize[0].total_cnt);
+ var stage_cnt = parseInt(this.AccSize[0].stage_cnt);
+ var statusf_cnt = parseInt(this.AccSize[0].statusf_cnt);
+ // alert("娴嬭瘯:鍏宠仈璇环鏁�:"+total_cnt +"|鐘舵��1绗﹀悎鏁�:"+stage_cnt+"|鐘舵��2绗﹀悎鏁�:"+statusf_cnt+"|"+(total_cnt != stage_cnt || total_cnt != statusf_cnt));
+ // 鍒ゆ柇鎬绘暟鍜屽悇鐘舵�佺鍚堟暟
+ if (total_cnt != stage_cnt || total_cnt != statusf_cnt) {
+ // alert("鍏宠仈璇环鐘舵�佷笉绗﹀悎缁堟鐢宠鏉′欢銆�");
+ this.showToast('鍏宠仈璇环鐘舵�佷笉绗﹀悎缁堟鐢宠鏉′欢銆�',"error");
+ return;
+ }
+ }
+ window.open ('/apex/Terminate?id='+this.recordId, '', 'height=350, width=600, top=200, left=350,location=no');
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
+ updateRecordView() {
+ updateRecord({fields: { Id: this.recordId }});
+ }
+ showToast(msg,type) {
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexTenderingTerminateResponseButton/lexTenderingTerminateResponseButton.js-meta.xml b/force-app/main/default/lwc/lexTenderingTerminateResponseButton/lexTenderingTerminateResponseButton.js-meta.xml
new file mode 100644
index 0000000..2b7649d
--- /dev/null
+++ b/force-app/main/default/lwc/lexTenderingTerminateResponseButton/lexTenderingTerminateResponseButton.js-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>54.0</apiVersion>
+ <isExposed>true</isExposed>
+ <targets>
+ <target>lightning__RecordPage</target>
+ <target>lightning__AppPage</target>
+ <target>lightning__HomePage</target>
+ <target>lightning__RecordAction</target>
+ </targets>
+</LightningComponentBundle>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexTransferApplySelectDetail/lexTransferApplySelectDetail.css b/force-app/main/default/lwc/lexTransferApplySelectDetail/lexTransferApplySelectDetail.css
new file mode 100644
index 0000000..95c1c55
--- /dev/null
+++ b/force-app/main/default/lwc/lexTransferApplySelectDetail/lexTransferApplySelectDetail.css
@@ -0,0 +1,22 @@
+.holder{
+ position: relative;
+ display: inline-block;
+ width: 80px;
+ height: 80px;
+ text-align: center;
+}
+
+.container .uiContainerManager{
+ display : none !important;
+}
+.toast{
+ border: 1px solid #c9c9c9;
+ border-radius: 10px;
+ width: 50%;
+ margin: 0 auto;
+ font-size: 18px;
+ font-weight: bold;
+ padding: 10px 20px;
+ background: #feb75d;
+ display: flex;
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexTransferApplySelectDetail/lexTransferApplySelectDetail.html b/force-app/main/default/lwc/lexTransferApplySelectDetail/lexTransferApplySelectDetail.html
index 7063605..d2c3546 100644
--- a/force-app/main/default/lwc/lexTransferApplySelectDetail/lexTransferApplySelectDetail.html
+++ b/force-app/main/default/lwc/lexTransferApplySelectDetail/lexTransferApplySelectDetail.html
@@ -2,7 +2,7 @@
<div class="holder" if:true={IsLoading}>
<lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
</div>
- <div if:false={IsLoading} class="toast">
+ <div if:true={IsShow} class="toast">
<span style="padding: 10px;">{msg}</span>
<button class="slds-button slds-button_icon slds-modal__close slds-button_icon-inverse" onclick={closeAction} title="Close" style="background-color: #e5e4e2;margin-top: 15px;">
<lightning-icon class="greyIcon" icon-name="utility:close" alternative-text="Connected" variant="inverse" size="small"
diff --git a/force-app/main/default/lwc/lexTransferApplySelectDetail/lexTransferApplySelectDetail.js b/force-app/main/default/lwc/lexTransferApplySelectDetail/lexTransferApplySelectDetail.js
index 15e33ed..a5f13ee 100644
--- a/force-app/main/default/lwc/lexTransferApplySelectDetail/lexTransferApplySelectDetail.js
+++ b/force-app/main/default/lwc/lexTransferApplySelectDetail/lexTransferApplySelectDetail.js
@@ -4,12 +4,15 @@
export default class lexTransferApplySelectDetail extends LightningElement {
@api recordId;
msg;
-
+ IsLoading = true;
+ IsShow = false;
connectedCallback(){
transferApplySelectDetail({
recordId: this.recordId
}).then(res=>{
+ this.IsLoading = false;
if(res.TA_Status__c == '鍒犻櫎' || res.TA_Status__c == '鍙栨秷' || res.TA_Status__c == '瀹屼簡'){
+ this.IsShow = true;
this.msg = '璋冩嫧鐢宠宸茬粡'+ res.TA_Status__c +',涓嶈兘閫夋嫨璋冩嫧鏄庣粏'
}else{
window.open("/apex/TransferApplySelectDetail?id="+this.recordId, "_top");
diff --git a/force-app/main/default/pages/AssetMaintainDetail.page b/force-app/main/default/pages/AssetMaintainDetail.page
index 4c3f15a..f9d39fb 100644
--- a/force-app/main/default/pages/AssetMaintainDetail.page
+++ b/force-app/main/default/pages/AssetMaintainDetail.page
@@ -3,10 +3,67 @@
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:includeScript value="{!URLFOR($Resource.RelationListPagingCmpJS)}"/>
+ <apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/><!-- 20230619 ljh lightning -->
+ <style>
+ .headStyle td input{
+ width: 150px;
+ }
+
+ .headStyle td input.btn{
+ width: 70px;
+ }
+
+ .headStyle td{
+ padding-left: 30px;
+ padding-bottom: 10px;
+ }
+
+ body .bPageBlock .detailList .dataCol{
+ width: 18%;
+ }
+
+ body .bPageBlock .detailList .labelCol{
+ width: 8%;
+ }
+
+ table.list .col_Asset__r_Id {width:100px;}
+ table.list .col_Asset__r_Internal_asset_location__c{width:100px;}
+ table.list .col_Asset__r_Salesdepartment__c{width:100px;}
+ table.list .col_Asset__r_SalesProvince__c{width:100px;}
+ table.list .col_Asset__r_Fixture_Model_No_F__c{width:100px;}
+ table.list .col_Asset__r_Internal_Asset_number_key__c{width:100px;}
+ table.list .col_Asset__r_Internal_Asset_number__c{width:100px;}
+ table.list .col_Asset__r_SerialNumberLink__c{width:100px;}
+
+ table.list .col_Asset__r_Product_category__c {width:100px;}
+ table.list .col_Asset__r_Equipment_Type__c {width:100px;}
+ table.list .col_Asset__r_Consumable_Guaranteen_end__c {width:100px;}
+ table.list .col_Asset__r_Manage_type__c {width:100px;}
+ table.list .col_Asset__r_Loaner_accsessary__c {width:100px;}
+ table.list .col_Asset__r_EquipmentSet_Managment_Code__c {width:100px;}
+ table.list .col_Asset__r_AssetManageConfirm__c {width:100px;}
+ table.list .col_Asset__r_Fixture_QRCode__c {width:100px;}
+ table.list .col_Asset__r_WH_location__c {width:100px;}
+ table.list .col_MaintainReason__c {width:100px;}
+ table.list .col_MaintainCount__c {width:100px;}
+ table.list .col_AbandonReason__c {width:100px;}
+ table.list .col_AbandonCount__c {width:100px;}
+ table.list .col_Is_OneToOne_Accessory__c {width:100px;}
+ table.list .col_Asset__r_Main_OneToOne__c {width:100px;}
+ table.list .col_DisconnectCount__c {width:100px;}
+ table.list .col_Asset__r_Quantity {width:100px;}
+ table.list .col_Asset__r_You_Xiao_Ku_Cun__c {width:100px;}
+ table.list .col_Asset__r_Frozen_Quantity__c {width:100px;}
+ table.list .col_Asset__r_Ji_Zhong_Guan_Li_Ku_Cun__c {width:100px;}
+ table.list .col_Asset__r_In_wh_Fu_Shu_Pin_You_Xiao_Ku_Cun_Sum__c {width:100px;}
+ table.list .col_Asset__r_Fixture_Status__c {width:100px;}
+
+
+ </style>
<apex:form id="allForm">
<apex:actionFunction name="searchOpp" action="{!searchOpp}" rerender="allForm" oncomplete="windowResize();unblockUI();"/>
<apex:pageBlock id="searchBlock" title="缁存姢鏄庣粏鐢婚潰">
- <apex:pageBlockSection columns="2">
+ <apex:pageBlockSection columns="4">
<apex:outputField value="{!parentObj.Name}"/>
<apex:outputField value="{!parentObj.MaintainType__c}"/>
<apex:outputField value="{!parentObj.Submit_Time__c}" rendered="{!parentObj.MaintainType__c=='瀹炵墿鎶ュ簾'}"/>
@@ -16,42 +73,29 @@
</apex:pageBlockSection>
<apex:pageMessages />
<table>
- <tr>
- <td>鍏抽敭瀛�</td>
- <td>
- <apex:inputText value="{!keyword}"/>
- <apex:commandButton value="妫�绱�" onclick="blockme();searchOpp(); return false;"/>
- </td>
- <td>澶囧搧閰嶅鏄庣粏鍨嬪彿</td>
- <td><apex:inputText value="{!model}"/></td>
- <td>鍥哄畾璧勪骇缂栧彿</td>
- <td><apex:inputField value="{!ass.Internal_Asset_number__c}"/></td>
- <td>鏈鸿韩缂栫爜</td>
- <td><apex:inputField value="{!ass.SerialNumber}"/></td>
- <td>璐ф灦鍙�</td>
- <td><apex:inputField value="{!ass.WH_location__c}"/></td>
+ <tr class='headStyle'>
+ <td>鍏抽敭瀛楋細<apex:inputText value="{!keyword}"/></td>
+ <td>澶囧搧閰嶅鏄庣粏鍨嬪彿锛�<apex:inputText value="{!model}"/></td>
+ <td>鍥哄畾璧勪骇缂栧彿锛�<apex:inputField value="{!ass.Internal_Asset_number__c}"/></td>
+ <td>鏈鸿韩缂栫爜锛�<apex:inputField value="{!ass.SerialNumber}"/></td>
+ <td>璐ф灦鍙凤細<apex:inputField value="{!ass.WH_location__c}"/></td>
+ <td><apex:commandButton value="妫�绱�" onclick="blockme();searchOpp(); return false;"/></td>
</tr>
- <tr>
- <td>澶囧搧瀛樻斁鍦�</td>
- <td><apex:inputField value="{!ass.Internal_asset_location__c}"/></td>
- <td>涓讳綋/闄勫睘鍝�</td>
- <td>
+ <tr class='headStyle'>
+ <td>澶囧搧瀛樻斁鍦帮細<apex:inputField value="{!ass.Internal_asset_location__c}"/></td>
+ <td>涓讳綋/闄勫睘鍝侊細
<apex:selectList value="{!mainOrAccessory}" size="1">
<apex:selectOptions value="{!mainOrAccessoryOptions}"/>
</apex:selectList>
</td>
- <td>鏄惁鍥哄畾璧勪骇</td>
- <td>
+ <td>鏄惁鍥哄畾璧勪骇锛�
<apex:selectList value="{!isInternalAsset}" size="1">
<apex:selectOptions value="{!isInternalAssetOptions}"/>
</apex:selectList>
</td>
- <td>浜у搧鍒嗙被(GI/SP)</td>
- <td><apex:inputField value="{!ass.Product_category__c}"/></td>
- <td>澶囧搧鍒嗙被</td>
- <td><apex:inputField value="{!ass.Equipment_Type__c}"/></td>
- <td>绠＄悊绉嶇被</td>
- <td><apex:inputField value="{!ass.Manage_type__c}"/></td>
+ <td>浜у搧鍒嗙被(GI/SP)锛�<apex:inputField value="{!ass.Product_category__c}"/></td>
+ <td>澶囧搧鍒嗙被锛�<apex:inputField value="{!ass.Equipment_Type__c}"/></td>
+ <td>绠＄悊绉嶇被锛�<apex:inputField value="{!ass.Manage_type__c}"/></td>
</tr>
</table>
</apex:pageBlock>
diff --git a/force-app/main/default/pages/EquipmentRentalExtend.page b/force-app/main/default/pages/EquipmentRentalExtend.page
index cb846d6..0f71831 100644
--- a/force-app/main/default/pages/EquipmentRentalExtend.page
+++ b/force-app/main/default/pages/EquipmentRentalExtend.page
@@ -48,16 +48,22 @@
}
/* 20230703 ljh 棰滆壊涓嶉偅涔堥珮浜� */
div#in_Div_L td.tdRed {
- background-color:red;
+ background-color:#c36f6f;
+ /* background-color:red; */
}
div#in_Div_L td.tdYellow {
- background-color:yellow;
+ background-color:#d6d60a;
+ /* background-color:yellow; */
}
div#in_Div_L td.tdGray {
background-color:gray;
}
div#in_Div_L td.tdBlue {
background-color:Cyan;
+ }
+ /* 20230703 ljh 瀛椾綋棰滆壊榛戣壊 */
+ td.tdRed a,td.tdYellow a,td.tdGray a,td.tdBlue a,td.tdNormal a {
+ color: rgb(24, 24, 24);
}
/* 20230703 ljh 棰滆壊涓嶉偅涔堥珮浜� */
div#in_Div_L td.tdNormal {
@@ -70,10 +76,12 @@
word-wrap: break-word;
}
div#in_Div_R td.tdRed {
- background-color:red;
+ /* background-color:red; */
+ background-color:#c36f6f;
}
div#in_Div_R td.tdYellow {
- background-color:yellow;
+ /* background-color:yellow; */
+ background-color:#d6d60a;
}
div#in_Div_R td.tdGray {
background-color:gray;
@@ -84,6 +92,7 @@
div#in_Div_R td.tdNormal {
background-color:none;
}
+ /* 20230703 ljh */
div#in_Div_L td.dataCellBorder1{
border-bottom: 1px solid rgb(201, 201, 201);
}
@@ -128,6 +137,7 @@
function saveJs() {
blockme();
var flgReturn = j$(escapeVfId('allPage:allForm:returnIMFupdate')).value();
+ console.log(flgReturn);
if(flgReturn == 'Changed'){
var rg=confirm("娉ㄦ剰鏁村崟褰掕繕澶囧搧锛屽惁鍒欏皢鎸夌幇鍦鸿浆鍊熻杩濊3鐐�");
if(rg){
@@ -136,6 +146,7 @@
unblockUI();
}
}else{
+ console.log('璋冪敤saveFunc');
savefunc();
}
diff --git a/force-app/main/default/pages/EquipmentRentalLostReport.page b/force-app/main/default/pages/EquipmentRentalLostReport.page
index 05d924b..a4bb929 100644
--- a/force-app/main/default/pages/EquipmentRentalLostReport.page
+++ b/force-app/main/default/pages/EquipmentRentalLostReport.page
@@ -2,7 +2,12 @@
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
-
+<apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/><!-- 20230619 ljh lightning -->
+<style>
+ body .bPageBlock .detailList .dataCol{
+ width: 12%;
+ }
+</style>
<script type="text/javascript">
function savejs() {
if (confirm('鏄惁淇濆瓨閬楀け鎶ュ憡锛�')) {
@@ -97,14 +102,14 @@
<apex:pageBlockSection rendered="{!IF(rentalApplyId == null ,false, true)}" >
<apex:pageBlockSectionItem >
- <apex:outputLabel style="font-size: 15px;" value="{!$ObjectType.Rental_Apply__c.fields.Name.label}" for="Name"/>
+ <apex:outputLabel style="font-size: 15px;margin-top: -.125rem;" value="{!$ObjectType.Rental_Apply__c.fields.Name.label}" for="Name"/>
<apex:outputLink style="font-size: 15px;" value="/{!rentalApply.Id}" id="Name">{!rentalApply.Name}</apex:outputLink>
</apex:pageBlockSectionItem>
</apex:pageBlockSection>
<apex:pageBlockSection rendered="{!IF(rentalApplyId == null || rentalApplyId == '' ,true, false)}" >
<apex:pageBlockSectionItem >
- <apex:outputLabel style="font-size: 15px;" value="{!$ObjectType.TransferApply__c.fields.Name.label}" for="Name"/>
+ <apex:outputLabel style="font-size: 15px;margin-top: -.125rem;" value="{!$ObjectType.TransferApply__c.fields.Name.label}" for="Name"/>
<apex:outputLink style="font-size: 15px;" value="/{!TransferApply.Id}" id="Name">{!TransferApply.Name}</apex:outputLink>
</apex:pageBlockSectionItem>
</apex:pageBlockSection>
@@ -113,17 +118,17 @@
<apex:outputPanel rendered="{!IF(rentalApplyId == null ,false, true)}">
<table class="linetable" border="1" style="border-collapse: collapse;">
<colgroup>
- <col width="25"/>
- <col width="25"/>
- <col width="110"/>
+ <col width="80"/>
+ <col width="165"/>
+ <col width="100"/>
<col width="50"/>
<col width="50"/>
<col width="110"/>
+ <col width="80"/>
<col width="110"/>
+ <col width="50"/>
<col width="110"/>
- <col width="110"/>
- <col width="110"/>
- <col width="110"/>
+ <col width="80"/>
</colgroup>
<tr style="background-color:#DCDCDC;">
<th style="text-align:center">鎶ュ憡瀵硅薄<input type='checkbox' onClick='checkAll("checker","rowCheck")' id='checker'/></th>
@@ -143,7 +148,7 @@
<tr>
<td align="center"><apex:inputCheckbox disabled="{!info.checkBoxdisabled}" value="{!info.isSelect}" id="rowCheck"/></td>
<apex:repeat value="{!columnsApi}" var="c">
- <td align="left">
+ <td align="center">
<apex:outputPanel rendered="{!(c.size==2 && info.raesd[c[0]] != null)}" layout="none">
<apex:outputField value="{!info.raesd[c[0]][c[1]]}"/>
</apex:outputPanel>
@@ -165,17 +170,17 @@
<apex:outputPanel rendered="{!IF(rentalApplyId == null ,true, false)}">
<table class="linetable" border="1" style="border-collapse: collapse;">
<colgroup>
- <col width="25"/>
- <col width="25"/>
+ <col width="80"/>
+ <col width="170"/>
<col width="110"/>
- <col width="50"/>
- <col width="50"/>
+ <col width="70"/>
+ <col width="60"/>
<col width="110"/>
<col width="110"/>
<col width="110"/>
+ <col width="60"/>
<col width="110"/>
- <col width="110"/>
- <col width="110"/>
+ <col width="80"/>
</colgroup>
<tr style="background-color:#DCDCDC;">
<th style="text-align:center">鎶ュ憡瀵硅薄<input type='checkbox' onClick='checkAll("checker","rowCheck")' id='checker'/></th>
@@ -195,7 +200,7 @@
<tr>
<td align="center"><apex:inputCheckbox disabled="{!info.checkBoxdisabled}" value="{!info.isSelect}" id="rowCheck"/></td>
<apex:repeat value="{!columnsApi}" var="c">
- <td align="left">
+ <td align="center">
<apex:outputPanel rendered="{!(c.size==2 && info.raesd1[c[0]] != null)}" layout="none">
<apex:outputField value="{!info.raesd1[c[0]][c[1]]}"/>
</apex:outputPanel>
diff --git a/force-app/main/default/pages/FixtureRemind.page b/force-app/main/default/pages/FixtureRemind.page
index 261988c..8ed1116 100644
--- a/force-app/main/default/pages/FixtureRemind.page
+++ b/force-app/main/default/pages/FixtureRemind.page
@@ -2,7 +2,7 @@
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
-
+<apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/><!-- 20230619 ljh lightning -->
<style type="text/css">
th{
text-align: center;
diff --git a/force-app/main/default/pages/InventoryResultRecord.page b/force-app/main/default/pages/InventoryResultRecord.page
index 4799443..747d1e7 100644
--- a/force-app/main/default/pages/InventoryResultRecord.page
+++ b/force-app/main/default/pages/InventoryResultRecord.page
@@ -1,4 +1,4 @@
-<apex:page controller="InventoryResultRecordController" showHeader="false" sidebar="false" id="allPage" action="{!init}" tabStyle="CheckAllOlympusAsset__tab">
+<apex:page controller="InventoryResultRecordController" showHeader="false" sidebar="false" id="allPage" action="{!init}" tabStyle="CheckAllOlympusAsset__tab" lightningStylesheets="true">
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
@@ -7,6 +7,7 @@
<apex:includeScript value="{!URLFOR($Resource.jquery_confirm, 'jquery-confirm.min.js')}"/>
<apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
<apex:includeScript value="{!URLFOR($Resource.apex20)}"/>
+<apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/><!-- 20230619 ljh lightning -->
<style>
.overlay {
position: absolute;
@@ -51,6 +52,9 @@
}
.apexp .bPageBlock.apexDefaultPageBlock .pbBody {
margin: 0px;
+ }
+ .apexp .bPageBlock.apexDefaultPageBlock .pbBody .tableTr{
+ line-height: 40px;
}
.checkButtonStyle input {
width: 100%;
@@ -374,7 +378,7 @@
<apex:outputPanel layout="block">
<apex:pageBlock mode="maindetail" id="maindetailId">
<table style='height: 120px'>
- <tr>
+ <tr class="tableTr">
<td class="labelStyle">澶囧搧瀛樻斁鍦�</td>
<td class="inputTextStyle">
<apex:selectList value="{!bieCunFangDi}" size="1" id="bieCunFangDi" onchange="refreshJs(this); return false;">
@@ -396,7 +400,7 @@
<tr>
<td></td>
<td colspan="10">
- <input class="startInventoryButtonStyle blueStyle" style="margin-left: 0" type="button" value="寮�濮嬬洏鐐�" onclick="startjs(this);return false;" />
+ <input class="startInventoryButtonStyle blueStyle" style="margin-left: 0; margin-top: 2px;margin-bottom: 3px;" type="button" value="寮�濮嬬洏鐐�" onclick="startjs(this);return false;" />
</td>
</tr>
<!-- <tr>
@@ -436,7 +440,7 @@
</tr>
<tr><td><br /><br /></td></tr>
-->
- <tr>
+ <tr class="tableTr">
<td class="labelStyle">鎵�鍦ㄥ湴鍖�(鏈儴)</td>
<td class="inputTextStyle">
<apex:selectList value="{!salesdepartment}" id="salesDepartmentId" size="1">
@@ -472,7 +476,7 @@
</div> -->
</td>
</tr>
- <tr>
+ <tr class="tableTr">
<td class="labelStyle">鐩樹簭/鐩樼泩</td>
<td class="inputTextStyle">
<apex:selectList value="{!inventory_Deviation}" id="Inventory_Deviation" size="1">
diff --git a/force-app/main/default/pages/InventoryResultRecordCopy.page b/force-app/main/default/pages/InventoryResultRecordCopy.page
index de37d3f..f2d8afe 100644
--- a/force-app/main/default/pages/InventoryResultRecordCopy.page
+++ b/force-app/main/default/pages/InventoryResultRecordCopy.page
@@ -1,4 +1,4 @@
-<apex:page controller="InventoryResultRecordCopyController" showHeader="false" sidebar="false" id="allPage" action="{!init}" >
+<apex:page controller="InventoryResultRecordCopyController" showHeader="false" sidebar="false" id="allPage" action="{!init}" lightningStylesheets="true">
<!-- tabStyle="CheckAllOlympusAsset__tab" -->
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
@@ -7,6 +7,7 @@
<apex:stylesheet value="{!URLFOR($Resource.jquery_confirm, 'jquery-confirm.min.css')}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery_confirm, 'jquery-confirm.min.js')}"/>
<apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
+<apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/><!-- 20230619 ljh lightning -->
<apex:includeScript value="{!URLFOR($Resource.apex20)}"/>
<style>
.overlay {
@@ -52,6 +53,9 @@
}
.apexp .bPageBlock.apexDefaultPageBlock .pbBody {
margin: 0px;
+ }
+ .apexp .bPageBlock.apexDefaultPageBlock .pbBody .tableTr{
+ line-height: 40px;
}
.checkButtonStyle input {
width: 100%;
@@ -380,7 +384,7 @@
<apex:outputPanel layout="block">
<apex:pageBlock mode="maindetail" id="maindetailId">
<table style='height: 120px'>
- <tr>
+ <tr class="tableTr">
<td class="labelStyle">澶囧搧瀛樻斁鍦�</td>
<td class="inputTextStyle">
<apex:selectList value="{!bieCunFangDi}" size="1" id="bieCunFangDi" onchange="refreshJs(this); return false;">
@@ -402,7 +406,7 @@
<tr>
<td></td>
<td colspan="10">
- <input class="startInventoryButtonStyle blueStyle" style="margin-left: 0" type="button" value="寮�濮嬬洏鐐�" onclick="startjs(this);return false;" />
+ <input class="startInventoryButtonStyle blueStyle" style="margin-left: 0; margin-top: 2px;margin-bottom: 3px;" type="button" value="寮�濮嬬洏鐐�" onclick="startjs(this);return false;" />
</td>
</tr>
<!-- <tr>
@@ -442,7 +446,7 @@
</tr>
<tr><td><br /><br /></td></tr>
-->
- <tr>
+ <tr class="tableTr">
<td class="labelStyle">鎵�鍦ㄥ湴鍖�(鏈儴)</td>
<td class="inputTextStyle">
<apex:selectList value="{!salesdepartment}" id="salesDepartmentId" size="1">
@@ -478,7 +482,7 @@
</div> -->
</td>
</tr>
- <tr>
+ <tr class="tableTr">
<td class="labelStyle">鐩樹簭/鐩樼泩</td>
<td class="inputTextStyle">
<apex:selectList value="{!inventory_Deviation}" id="Inventory_Deviation" size="1">
diff --git a/force-app/main/default/pages/LostReportEdit.page b/force-app/main/default/pages/LostReportEdit.page
index 6fa062c..3bdebbe 100644
--- a/force-app/main/default/pages/LostReportEdit.page
+++ b/force-app/main/default/pages/LostReportEdit.page
@@ -4,6 +4,7 @@
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
<apex:includeScript value="{!URLFOR($Resource.apex20)}"/>
+<apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/><!-- 20230619 ljh lightning -->
<style>
.dateFormat {
display: none;
@@ -42,6 +43,12 @@
margin: 0px;
background-color: white;
}
+ .relatedProcessHistory{
+ margin-top: 5px;
+ margin-left: auto;
+ width: 75%;
+ margin-right: auto;
+ }
.bPageBlock {
border-top: 0px;
}
diff --git a/force-app/main/default/pages/LostReportEditAsset.page b/force-app/main/default/pages/LostReportEditAsset.page
index 18e18a6..b58a4b0 100644
--- a/force-app/main/default/pages/LostReportEditAsset.page
+++ b/force-app/main/default/pages/LostReportEditAsset.page
@@ -1,9 +1,10 @@
-<apex:page standardController="LostReport__c" extensions="LostReportEditAssetController" showHeader="false" sidebar="false" id="allPage" action="{!init}">
+<apex:page standardController="LostReport__c" extensions="LostReportEditAssetController" showHeader="false" sidebar="false" id="allPage" action="{!init}" lightningStylesheets="true">
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
<apex:includeScript value="{!URLFOR($Resource.apex20)}"/>
+<apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/><!-- 20230619 ljh lightning -->
<style>
.dateFormat {
display: none;
@@ -111,6 +112,12 @@
.bRelatedList .relatedProcessHistory .extraRow td.actionColumn .actionLink, .bRelatedList .relatedProcessHistory .extraRow td, .bRelatedList .relatedProcessHistory .extraRow th {
color: gray;
}
+ .relatedProcessHistory{
+ margin-top: 5px;
+ margin-left: auto;
+ width: 75%;
+ margin-right: auto;
+ }
.bPageBlock .list {
width: auto;
}
@@ -145,6 +152,7 @@
.topb {border-top: black 1px solid;}
.bottomb {border-bottom: black 1px solid;}
.B {font-weight:bold;}
+
td.center {text-align: center;}
td.right {text-align: right;}
@@ -276,7 +284,7 @@
<apex:commandButton styleClass="hiddenPrint" value="杩斿洖" rerender="allForm" onclick="returnjs();return false;"/>
<!-- <apex:commandButton value="濉啓閬楀け鎶ュ憡涔�" rerender="allForm" onclick="inventory_lost_report();return false;" /> -->
<apex:commandButton styleClass="hiddenPrint" value="淇濆瓨" id="saveData" rendered="{! pBean.islock == false && pBean.hasApprovedFlag == false }" style="float: right;" rerender="allForm" oncomplete="unblockUI();" onclick="blockme()" action="{!saveLR}" />
- <apex:commandButton styleClass="hiddenPrint" value="淇濆瓨骞舵彁浜ゅ鎵�" id="saveData1" rendered="{! pBean.islock == false && pBean.hasApprovedFlag == false}" style="float: right;" rerender="allForm, process" oncomplete="unblockUI();" onclick="saveLRjs('1'); return false;" />
+ <apex:commandButton styleClass="hiddenPrint" value="淇濆瓨骞舵彁浜ゅ鎵�" id="saveData1" rendered="{! pBean.islock == false && pBean.hasApprovedFlag == false}" style="float: right; height: auto; width: auto;" rerender="allForm, process" oncomplete="unblockUI();" onclick="saveLRjs('1'); return false;" />
<apex:commandButton styleClass="hiddenPrint" value="鍙栨秷" id="cancel" disabled="{!pBean.lr.Auto_Lost_item_giveupDetailCount__c != 0 || pBean.lr.Status__c == '鍙栨秷'}" style="float: right;" rerender="allForm, process" oncomplete="unblockUI();" onclick="cancelClick(); return false;" />
<!-- <apex:commandButton value="淇濆瓨" id="saveData" style="margin-left: 25%;" rerender="allForm" oncomplete="unblockUI();" action="{!saveData}" onclick="unvalid()" /> -->
<!-- <apex:commandButton value="鐩稿叧浜哄憳纭" rendered="{!IF(ihObj.InventoryCheck_PIC__c!=$User.Id, false, true)}" rerender="allForm" onclick="relevant_confirm();return false;" /> -->
@@ -474,7 +482,7 @@
</tr>
<tr>
<td >
- <apex:inputField id="ownerSys" value="{!pBean.lr.OwnerSys__c}"/>
+ <apex:inputField id="ownerSys" value="{!pBean.lr.OwnerSys__c}" style="width: 210px;"/>
<!-- <apex:outputField rendered="{!pBean.lr.Status__c != '鑽夋涓�'}" value="{!pBean.lr.OwnerSys__c}"/> -->
<script>
if( document.getElementById('allPage:allForm:ownerSys_mlktp')){
@@ -483,15 +491,15 @@
</script>
</td>
<td >
- <apex:inputField value="{!pBean.lr.AccountSys__c}"/>
+ <apex:inputField value="{!pBean.lr.AccountSys__c}" style="width: 210px;"/>
<!-- <apex:outputField rendered="{!pBean.lr.Status__c != '鑽夋涓�'}" value="{!pBean.lr.AccountSys__c}"/> -->
</td>
<td >
- <apex:inputField value="{!pBean.lr.Bollow_DateSys__c}"/>
+ <apex:inputField value="{!pBean.lr.Bollow_DateSys__c}" style="width: 210px;"/>
<!-- <apex:outputField value="{!pBean.lr.Bollow_DateSys__c}"/> -->
</td>
<td >
- <apex:inputField value="{!pBean.lr.demo_purpose2Sys__c}"/>
+ <apex:inputField value="{!pBean.lr.demo_purpose2Sys__c}" style="width: 210px;"/>
<!-- <apex:selectList size="1" value="{!pBean.lr.demo_purpose2Sys__c}"> -->
<!-- <apex:selectOptions value="{!demo_purpose2SysList}"/> -->
<!-- </apex:selectList> -->
diff --git a/force-app/main/default/pages/RentalReportExport.page b/force-app/main/default/pages/RentalReportExport.page
index dfcae60..da921b5 100644
--- a/force-app/main/default/pages/RentalReportExport.page
+++ b/force-app/main/default/pages/RentalReportExport.page
@@ -1,4 +1,4 @@
-<apex:page id="page" controller="RentalReportExportController" lightningStylesheets="true">
+<apex:page id="page" controller="RentalReportExportController">
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}" />
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}" />
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}" />
--
Gitblit v1.9.1