From da42e2995c00293af89c71fe5ba6e16cbb77e1b3 Mon Sep 17 00:00:00 2001
From: binxie <137736985@qq.com>
Date: 星期五, 16 六月 2023 17:24:31 +0800
Subject: [PATCH] backup code
---
force-app/main/default/experiences/Consumable1/views/createRecord.json | 59
force-app/main/default/experiences/Site3/routes/error.json | 18
force-app/main/default/experiences/Consumable1/routes/文件関連リスト.json | 16
force-app/main/default/experiences/Consumable1/routes/reportBuilder.json | 16
force-app/main/default/lwc/lexSaleAndDelivery/lexSaleAndDelivery.js | 19
force-app/main/default/experiences/Consumable1/routes/contactSupport.json | 18
force-app/main/default/experiences/Consumable1/routes/小组関連リスト.json | 16
force-app/main/default/lwc/lexTopPage/lexTopPage.js | 5
force-app/main/default/lwc/lexCustomLightningDatatable/lexCustomLightningDatatable.js | 17
force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAura.css | 2
force-app/main/default/experiences/Consumable1/views/lexOverdueStock.json | 121
.sf/orgs/00D0l0000004CqBEAU/localSourceTracking/config | 7
force-app/main/default/experiences/Consumable1/routes/checkPassword.json | 16
force-app/main/default/experiences/Site3/views/forgotPassword.json | 146
force-app/main/default/experiences/Consumable1/routes/error.json | 18
force-app/main/default/experiences/Consumable1/routes/userSettings.json | 16
force-app/main/default/experiences/Consumable1/routes/quipDocsRelatedList.json | 18
force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunityRenderer.js | 6
force-app/main/default/experiences/Consumable1/routes/loginError.json | 16
force-app/main/default/experiences/Consumable1.site-meta.xml | 2
force-app/main/default/experiences/Consumable1/views/campaignList.json | 274
force-app/main/default/experiences/Site3/routes/register.json | 16
force-app/main/default/lwc/customShipmentNumberComp/customShipmentNumberComp.js | 54
force-app/main/default/experiences/Site3/config/languages.json | 10
force-app/main/default/lwc/lexRemoveBox/lexRemoveBox.html | 2
force-app/main/default/sites/Site.site-meta.xml | 7
.sf/config.json | 4
force-app/main/default/experiences/Consumable1/routes/messages.json | 16
force-app/main/default/experiences/Consumable1/views/lexInventoryView.json | 147
force-app/main/default/experiences/Consumable1/routes/仪表板関連リスト.json | 16
force-app/main/default/experiences/Consumable1/views/lexConsumableAccountInfoPrint.json | 147
force-app/main/default/experiences/Consumable1/views/loginError.json | 103
force-app/main/default/experiences/Consumable1/views/fileDetail.json | 66
force-app/main/default/lwc/lexCancelRemoveBox/lexCancelRemoveBox.js | 2
force-app/main/default/experiences/Consumable1/views/用户関連リスト.json | 82
force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp | 1514 -
force-app/main/default/experiences/Consumable1/routes/search.json | 18
force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAuraRenderer.js | 5
force-app/main/default/experiences/Consumable1/routes/fileList.json | 16
force-app/main/default/lwc/lexLookup/lexLookup.html | 4
force-app/main/default/classes/LexArriveGoodsMainController.cls | 12
force-app/main/default/experiences/Consumable1/views/home.json | 463
force-app/main/default/experiences/Consumable1/views/lexSaleAndDelivery.json | 121
force-app/main/default/lwc/customShippingUnitPriceComp/customShippingUnitPriceComp.js | 10
force-app/main/default/experiences/Consumable1/routes/lexInventoryView.json | 18
force-app/main/default/experiences/Consumable1/routes/lexRemoveBox.json | 18
force-app/main/default/experiences/Consumable1/views/lexAgencyInfo.json | 147
force-app/main/default/experiences/Site3/routes/recordList.json | 18
force-app/main/default/lwc/lexInventory/lexInventory.js | 42
force-app/main/default/experiences/Consumable1/views/lexTopPage.json | 147
force-app/main/default/experiences/Consumable1/views/消耗品订单相关列表.json | 82
force-app/main/default/experiences/Consumable1/views/homeFlexible.json | 183
force-app/main/default/experiences/Consumable1/views/login.json | 154
force-app/main/default/lwc/lexSaleAndDelivery/lexSaleAndDelivery.html | 189
force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunityHelper.js | 510
force-app/main/default/experiences/Consumable1/routes/streamList.json | 16
force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.css | 84
force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.cmp-meta.xml | 2
force-app/main/default/experiences/Site3/themes/buildYourOwn.json | 263
force-app/main/default/experiences/Consumable1/views/lexArriveGoods.json | 147
.sf/orgs/00D0l0000004CqBEAU/localSourceTracking/HEAD | 1
force-app/main/default/experiences/Consumable1/routes/lexConsumable.json | 18
force-app/main/default/experiences/Consumable1/routes/流関連リスト.json | 16
force-app/main/default/experiences/Consumable1/routes/reportList.json | 16
force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAura.svg | 7
force-app/main/default/experiences/Consumable1/routes/报表関連リスト.json | 16
force-app/main/default/experiences/Site3/routes/checkPassword.json | 16
force-app/main/default/experiences/Consumable1/views/dashboardDetail.json | 105
force-app/main/default/experiences/Site3/views/奥林巴斯电子签收系统.json | 99
force-app/main/default/experiences/Consumable1/routes/cICリスト.json | 16
force-app/main/default/experiences/Consumable1/views/myAccount.json | 198
force-app/main/default/experiences/Consumable1/routes/lexSummonsCreat.json | 18
force-app/main/default/experiences/Consumable1/views/groupDetail.json | 113
force-app/main/default/lwc/lexRemoveBox/lexRemoveBox.js | 2
force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAura.auradoc | 6
force-app/main/default/experiences/Consumable1/routes/flow.json | 18
force-app/main/default/experiences/Site3/routes/进口单证明细.json | 10
force-app/main/default/experiences/Consumable1/routes/recordDetail.json | 16
force-app/main/default/lwc/lexArriveGsDetails/lexArriveGsDetails.js | 19
force-app/main/default/experiences/Consumable1/routes/caseDetail.json | 16
force-app/main/default/experiences/Consumable1/views/caseDetail.json | 140
force-app/main/default/experiences/Consumable1/routes/createRecord.json | 16
force-app/main/default/experiences/Consumable1/views/mDFAndCoop.json | 365
force-app/main/default/experiences/Consumable1/views/userSettings.json | 112
force-app/main/default/experiences/Site3/views/recordList.json | 96
force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAura.cmp-meta.xml | 5
force-app/main/default/experiences/Consumable1/views/lexProductLimitEdit.json | 147
force-app/main/default/experiences/Site3/config/loginAppPage.json | 12
force-app/main/default/experiences/Consumable1/routes/lexArriveGoods.json | 18
force-app/main/default/experiences/Consumable1/routes/userProfile.json | 16
force-app/main/default/experiences/Site3/brandingSets/buildYourOwn.json | 104
force-app/main/default/experiences/Consumable1/routes/消耗品订单详细信息.json | 18
force-app/main/default/experiences/Consumable1/views/reportBuilder.json | 70
force-app/main/default/lwc/lexConInvoiceView/lexConInvoiceView.css | 5
force-app/main/default/experiences/Consumable1/views/lexArriveGsDetails.json | 147
force-app/main/default/experiences/Site3/views/home.json | 81
force-app/main/default/experiences/Consumable1/views/questionDetail.json | 193
force-app/main/default/lwc/lexNewAndEditContactPIPL/lexNewAndEditContactPIPL.js | 425
force-app/main/default/experiences/Consumable1/routes/recordList.json | 18
force-app/main/default/classes/LexConsumableController.cls | 11
force-app/main/default/lwc/lexArriveGsDetails/lexArriveGsDetails.html | 4
force-app/main/default/lwc/lexNewAndEditContactPIPL/lexNewAndEditContactPIPL.css | 3
force-app/main/default/experiences/Consumable1/routes/lexArriveGsDetails.json | 18
force-app/main/default/sites/extsurvey.site-meta.xml | 8
force-app/main/default/experiences/Consumable1/views/lexInventory.json | 147
force-app/main/default/experiences/Consumable1/routes/register.json | 16
force-app/main/default/experiences/Consumable1/variations/defaultCustomComponentPropertiesComponentProperties.json | 30
force-app/main/default/experiences/Consumable1/routes/mDFAndCoop.json | 16
force-app/main/default/lwc/lexInventory/lexInventory.html | 2
force-app/main/default/experiences/Site3/views/createRecord.json | 70
force-app/main/default/lwc/lexCustomLightningDatatable/customdeleteReason.html | 8
force-app/main/default/experiences/Consumable1/views/lexConsumableAccount.json | 121
force-app/main/default/aura/DealerPersonnelInformationImport/DealerPersonnelInformationImport.cmp | 160
force-app/main/default/experiences/Site3/routes/loginError.json | 16
force-app/main/default/networks/电子签收系统.network-meta.xml | 25
force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.css | 5
force-app/main/default/lwc/lexCustomLightningDatatable/customShipmentNumber.html | 2
force-app/main/default/experiences/Consumable1/views/error.json | 103
force-app/main/default/experiences/Consumable1/routes/forgotPassword.json | 16
force-app/main/default/lwc/lexConInvoiceView/lexConInvoiceView.html | 312
force-app/main/default/experiences/Consumable1/routes/questionDetail.json | 16
force-app/main/default/experiences/Site3/views/recordDetail.json | 138
force-app/main/default/experiences/Consumable1/routes/relatedRecordList.json | 18
force-app/main/default/lwc/lexConsumableAccount/lexConsumableAccount.js | 270
force-app/main/default/triggers/ConsumableOrderDetail2Trigger.trigger-meta.xml | 2
force-app/main/default/lwc/lexinventoryViewLWC/lexinventoryViewLWC.css | 2
force-app/main/default/experiences/Consumable1/routes/lexOverdueStock.json | 18
force-app/main/default/experiences/Site3/views/register.json | 179
force-app/main/default/experiences/Consumable1/views/学会・培训詳細.json | 140
force-app/main/default/experiences/Consumable1/views/消耗品订单列表.json | 96
force-app/main/default/experiences/Consumable1/views/lexOutboundorderImport.json | 121
force-app/main/default/lwc/lexArriveGoodsMain/lexArriveGoodsMain.js | 4
force-app/main/default/objects/LicenceReminderDate__c/LicenceReminderDate__c.object-meta.xml | 2
force-app/main/default/lwc/lexinventoryViewLWC/lexinventoryViewLWC.js | 1271
force-app/main/default/experiences/Consumable1/views/messages.json | 48
force-app/main/default/lwc/lexOverdueStock/lexOverdueStock.html | 4
force-app/main/default/triggers/ContentDocumentTrigger.trigger | 3
force-app/main/default/experiences/Consumable1/views/search.json | 102
force-app/main/default/experiences/Consumable1/routes/lexTopPage.json | 18
force-app/main/default/experiences/Consumable1/views/contactSupport.json | 198
force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunityController.js | 579
force-app/main/default/experiences/Consumable1/views/accountManagement.json | 276
force-app/main/default/classes/LexConInvoicedetailsController.cls | 866
force-app/main/default/experiences/Consumable1/views/forgotPassword.json | 146
force-app/main/default/lwc/lexOverdueStock/lexOverdueStock.js | 545
force-app/main/default/experiences/Consumable1/routes/cIC関連リスト.json | 16
force-app/main/default/experiences/Site3/routes/relatedRecordList.json | 18
force-app/main/default/experiences/Consumable1/views/userProfile.json | 217
force-app/main/default/aura/DealerPersonnelInformationImport/DealerPersonnelInformationImportController.js | 7
force-app/main/default/experiences/Consumable1/routes/用户関連リスト.json | 16
force-app/main/default/experiences/Consumable1/views/reportDetail.json | 103
force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAuraHelper.js | 5
force-app/main/default/experiences/Consumable1/routes/消耗品订单相关列表.json | 18
force-app/main/default/experiences/Consumable1/views/cIC関連リスト.json | 82
force-app/main/default/experiences/Site3/routes/forgotPassword.json | 16
force-app/main/default/lwc/customShippingUnitPriceComp/customShippingUnitPriceComp.html | 4
force-app/main/default/experiences/Consumable1/routes/login.json | 16
force-app/main/default/sites/Consumable.site-meta.xml | 12
force-app/main/default/experiences/Consumable1/views/recordDetail.json | 140
force-app/main/default/experiences/Consumable1/routes/lexAgencyInfo.json | 18
force-app/main/default/experiences/Consumable1/views/quipDocsRelatedList.json | 70
force-app/main/default/aura/DealerPersonnelInformationImport/DealerPersonnelInformationImportHelper.js | 145
force-app/main/default/experiences/Consumable1/routes/lexCancelRemoveBox.json | 18
force-app/main/default/experiences/Consumable1/routes/myAccount.json | 16
force-app/main/default/experiences/Consumable1/routes/streamDetail.json | 16
force-app/main/default/lwc/lexNewAndEditContactPIPL/lexNewAndEditContactPIPL.html | 84
force-app/main/default/experiences/Consumable1/config/languages.json | 10
force-app/main/default/experiences/Consumable1/views/topicCatalog.json | 133
force-app/main/default/experiences/Consumable1/views/topicDetail.json | 170
force-app/main/default/objects/NoteStay__c/NoteStay__c.object-meta.xml | 2
force-app/main/default/experiences/Consumable1/routes/dashboardDetail.json | 16
force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.cmp | 341
force-app/main/default/experiences/Consumable1/config/mainAppPage.json | 18
force-app/main/default/experiences/Consumable1/views/lexCancelRemoveBox.json | 147
force-app/main/default/experiences/Consumable1/views/lexConsumable.json | 147
force-app/main/default/lwc/lexCustomDiffReasonComp/lexCustomDiffReasonComp.html | 1
force-app/main/default/experiences/Consumable1/routes/学会・培训詳細.json | 16
force-app/main/default/experiences/Consumable1/views/小组関連リスト.json | 82
force-app/main/default/experiences/Site3/config/mainAppPage.json | 18
force-app/main/default/experiences/Site3/views/search.json | 105
force-app/main/default/classes/LexArriveGsDetailsController.cls | 3
force-app/main/default/experiences/Consumable1/views/文件関連リスト.json | 82
force-app/main/default/lwc/customShipmentNumberComp/customShipmentNumberComp.html | 10
force-app/main/default/lwc/lexConsumableAccount/lexConsumableAccount.html | 14
force-app/main/default/experiences/Consumable1/routes/lexInventory.json | 18
force-app/main/default/experiences/Consumable1/routes/学会・培训関連リスト.json | 16
force-app/main/default/objects/NoteStay__c/fields/IsStay__c.field-meta.xml | 2
force-app/main/default/experiences/Site3/views/relatedRecordList.json | 82
force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAura.cmp | 27
force-app/main/default/experiences/Consumable1/routes/lexConInvoiceView.json | 18
force-app/main/default/sites/Site2.site-meta.xml | 6
force-app/main/default/aura/WeeklyReport/WeeklyReportController.js | 621
force-app/main/default/experiences/Consumable1/views/feedDetail.json | 70
force-app/main/default/experiences/Consumable1/views/checkPassword.json | 113
force-app/main/default/experiences/Consumable1/views/groupList.json | 85
force-app/main/default/classes/LexArriveGoodsController.cls-meta.xml | 2
force-app/main/default/experiences/Site3/routes/home.json | 18
force-app/main/default/experiences/Consumable1/views/lexRemoveBox.json | 147
force-app/main/default/classes/LexConsumableGoodsInfo.cls | 166
force-app/main/default/experiences/Site3/routes/奥林巴斯电子签收系统.json | 18
force-app/main/default/experiences/Consumable1/views/仪表板関連リスト.json | 82
force-app/main/default/objects/LicenceReminderDate__c/fields/ReminderDays__c.field-meta.xml | 2
force-app/main/default/experiences/Site3/views/error.json | 103
force-app/main/default/lwc/lexCustomLightningDatatable/customMyDrCheckBox.html | 10
force-app/main/default/experiences/Consumable1/views/resources.json | 136
force-app/main/default/classes/LexInventoryViewController.cls | 14
force-app/main/default/experiences/Consumable1/views/register.json | 179
force-app/main/default/networks/Consumable系统.network-meta.xml | 41
force-app/main/default/experiences/Consumable1/views/lexConInvoiceView.json | 121
force-app/main/default/classes/Batch_FixAttachmentToFiles.cls | 57
force-app/main/default/experiences/Consumable1/views/消耗品订单详细信息.json | 140
force-app/main/default/aura/WeeklyReport/WeeklyReport.css | 9
force-app/main/default/experiences/Consumable1/views/consumableDetailFix.json | 280
force-app/main/default/networks/消耗品管理系统.network-meta.xml | 25
force-app/main/default/classes/LexSummonsCreatController.cls | 2196 +-
force-app/main/default/experiences/Consumable1/routes/home.json | 18
force-app/main/default/experiences/Consumable1/views/flow.json | 69
force-app/main/default/experiences/Consumable1/views/recordList.json | 81
force-app/main/default/lwc/lexNewAndEditContactPIPL/lexNewAndEditContactPIPL.js-meta.xml | 5
force-app/main/default/classes/LexOverdueStockController.cls | 7
force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.js | 278
force-app/main/default/experiences/Consumable1/routes/lexArriveGoodsMain.json | 18
force-app/main/default/experiences/Consumable1/views/lexSummonsCreat.json | 121
force-app/main/default/experiences/Consumable1/views/streamDetail.json | 70
force-app/main/default/experiences/Site3.site-meta.xml | 2
force-app/main/default/lwc/lexConInvoiceView/lexConInvoiceView.js | 115
force-app/main/default/experiences/Consumable1/routes/accountManagement.json | 16
force-app/main/default/classes/LexConsumableAccountController.cls | 21
force-app/main/default/classes/ArriveGoodsController.cls | 10050 +++++-------
force-app/main/default/classes/Batch_FixAttachmentToFiles.cls-meta.xml | 5
force-app/main/default/lwc/lexinventoryViewLWC/lexinventoryViewLWC.html | 396
force-app/main/default/experiences/Consumable1/routes/lexSaleAndDelivery.json | 18
force-app/main/default/experiences/Consumable1/routes/lexOutboundorderImport.json | 18
force-app/main/default/experiences/Consumable1/routes/topicCatalog.json | 18
force-app/main/default/experiences/Consumable1/themes/partnerCentral.json | 306
force-app/main/default/experiences/Consumable1/views/报表関連リスト.json | 82
force-app/main/default/experiences/Consumable1/config/consumable系统.json | 20
force-app/main/default/experiences/Consumable1/views/relatedRecordList.json | 82
force-app/main/default/experiences/Consumable1/routes/dashboardList.json | 16
force-app/main/default/classes/LexUpAccountProLimit.cls | 14
force-app/main/default/experiences/Consumable1/routes/消耗品订单列表.json | 18
force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js | 5340 +++---
force-app/main/default/triggers/ConsumableOrderTrigger.trigger | 2
force-app/main/default/experiences/Site3/views/checkPassword.json | 123
manifest/package.xml | 10
force-app/main/default/experiences/Site3/config/电子签收系统.json | 20
force-app/main/default/experiences/Consumable1/routes/resources.json | 18
force-app/main/default/experiences/Consumable1/routes/lexConsumableAccount.json | 18
force-app/main/default/experiences/Site3/views/进口单证明细.json | 68
force-app/main/default/lwc/lexOutboundorderImport/lexOutboundorderImport.js | 10
force-app/main/default/experiences/Consumable1/views/reportList.json | 66
force-app/main/default/experiences/Consumable1/routes/fileDetail.json | 16
force-app/main/default/experiences/Consumable1/views/lexConsumableOrderManage.json | 147
force-app/main/default/experiences/Consumable1/routes/用户リスト.json | 16
force-app/main/default/experiences/Consumable1/routes/lexProductLimitEdit.json | 18
force-app/main/default/experiences/Site3/routes/recordDetail.json | 16
force-app/main/default/lwc/lexProductLimitEdit/lexProductLimitEdit.js | 250
force-app/main/default/lwc/lexCancelRemoveBox/lexCancelRemoveBox.html | 2
force-app/main/default/experiences/Site3/routes/search.json | 18
force-app/main/default/experiences/Consumable1/routes/groupList.json | 16
force-app/main/default/experiences/Consumable1/views/学会・培训関連リスト.json | 82
force-app/main/default/experiences/Consumable1/brandingSets/partnerCentral.json | 112
force-app/main/default/experiences/Consumable1/views/cICリスト.json | 96
force-app/main/default/experiences/Consumable1/views/fileList.json | 70
force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAura.design | 3
force-app/main/default/experiences/Consumable1/routes/groupDetail.json | 16
force-app/main/default/experiences/Consumable1/routes/feedDetail.json | 16
force-app/main/default/experiences/Consumable1/views/用户リスト.json | 48
force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAuraController.js | 9
force-app/main/default/experiences/Consumable1/views/流関連リスト.json | 48
force-app/main/default/experiences/Site3/views/loginError.json | 103
force-app/main/default/networks/Partner Sales.network-meta.xml | 27
force-app/main/default/sites/Partner_Sales.site-meta.xml | 7
force-app/main/default/experiences/Consumable1/config/loginAppPage.json | 12
force-app/main/default/triggers/ConsumableOrderDetail2Trigger.trigger | 49
force-app/main/default/experiences/Consumable1/routes/lexConsumableAccountInfoPrint.json | 18
force-app/main/default/lwc/lexConsumableOrderManage/lexConsumableOrderManage.html | 23
force-app/main/default/lwc/lexConsumable/lexConsumable.js | 2998 +--
force-app/main/default/experiences/Site3/routes/login.json | 16
force-app/main/default/experiences/Consumable1/views/lexArriveGoodsMain.json | 147
force-app/main/default/lwc/lexConsumable/lexConsumable.html | 88
force-app/main/default/experiences/Consumable1/routes/reportDetail.json | 16
force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.html | 362
force-app/main/default/experiences/Consumable1/views/dashboardList.json | 66
force-app/main/default/triggers/ContentDocumentLink.trigger | 3
force-app/main/default/experiences/Consumable1/routes/lexConsumableOrderManage.json | 18
force-app/main/default/experiences/Consumable1/views/streamList.json | 48
force-app/main/default/classes/LexArriveGoodsController.cls | 580
force-app/main/default/experiences/Consumable1/routes/campaignList.json | 16
force-app/main/default/experiences/Consumable1/routes/topicDetail.json | 16
force-app/main/default/experiences/Site3/views/login.json | 156
force-app/main/default/experiences/Site3/routes/createRecord.json | 16
force-app/main/default/lwc/lexCustomLightningDatatable/customaccountUrl.html | 10
293 files changed, 20,944 insertions(+), 24,095 deletions(-)
diff --git a/.sf/config.json b/.sf/config.json
index 5b4e627..3debff0 100644
--- a/.sf/config.json
+++ b/.sf/config.json
@@ -1,3 +1,3 @@
{
- "target-org": "OlympusDev"
-}
+ "target-org": "OlympusStageEnv"
+}
\ No newline at end of file
diff --git a/.sf/orgs/00D0l0000004CqBEAU/localSourceTracking/HEAD b/.sf/orgs/00D0l0000004CqBEAU/localSourceTracking/HEAD
new file mode 100644
index 0000000..b870d82
--- /dev/null
+++ b/.sf/orgs/00D0l0000004CqBEAU/localSourceTracking/HEAD
@@ -0,0 +1 @@
+ref: refs/heads/main
diff --git a/.sf/orgs/00D0l0000004CqBEAU/localSourceTracking/config b/.sf/orgs/00D0l0000004CqBEAU/localSourceTracking/config
new file mode 100644
index 0000000..d545cda
--- /dev/null
+++ b/.sf/orgs/00D0l0000004CqBEAU/localSourceTracking/config
@@ -0,0 +1,7 @@
+[core]
+ repositoryformatversion = 0
+ filemode = false
+ bare = false
+ logallrefupdates = true
+ symlinks = false
+ ignorecase = true
diff --git a/force-app/main/default/aura/DealerPersonnelInformationImport/DealerPersonnelInformationImport.cmp b/force-app/main/default/aura/DealerPersonnelInformationImport/DealerPersonnelInformationImport.cmp
index fd092dc..d87fcc0 100644
--- a/force-app/main/default/aura/DealerPersonnelInformationImport/DealerPersonnelInformationImport.cmp
+++ b/force-app/main/default/aura/DealerPersonnelInformationImport/DealerPersonnelInformationImport.cmp
@@ -1,31 +1,30 @@
-<!--
- * @Author: Thhto 997058689@qq.com
- * @Date: 2022-07-08 10:47:25
- * @LastEditors: Thhto 997058689@qq.com
- * @LastEditTime: 2023-02-03 15:25:46
- * @FilePath: \ceshihuanj\force-app\main\default\aura\DealerPersonnelInformationImport\DealerPersonnelInformationImport.cmp
- * @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
--->
<aura:component controller="DealerPersonnelController"
-implements="force:appHostable,flexipage:availableForAllPageTypes,flexipage:availableForRecordHome,force:hasRecordId,force:lightningQuickAction,forceCommunity:availableForAllPageTypes"
-access="global">
-<!-- 鎵归噺娣诲姞鍛ㄦ姤 start-->
-<!-- <aura:handler name="init" value="{!this}" action="{!c.doInit}" /> -->
-<aura:attribute name="reports_date" type="List" />
-<aura:attribute name="errorMessage" type="String" />
-<aura:attribute name="TableContent" type="String" description=" Show the Result class" />
-<aura:attribute name="TableContent2" type="String" description=" Show the Result class" />
-<aura:attribute name="TargetFileName" type="String" description="Name of the file" />
-<aura:attribute name="tableheaders" type="Object[]" />
-<aura:attribute name="fileContentData" type="String" />
-<aura:attribute name="filename" type="String" />
-<aura:attribute name="NumOfRecords" type="Integer" default="1000" />
-<aura:attribute name="showMain" type="Boolean" default="true" />
-<aura:attribute name="IsEventDefault" type="Boolean" default="true" />
-<aura:attribute name="login" type="Boolean" default="false" />
-<aura:attribute name="successMessage" type="String" />
-<!-- 鎵归噺娣诲姞鍛ㄦ姤 end-->
-<aura:renderIf isTrue="{!v.login}">
+ implements="force:appHostable,flexipage:availableForAllPageTypes,flexipage:availableForRecordHome,force:hasRecordId,force:lightningQuickAction,forceCommunity:availableForAllPageTypes"
+ access="global">
+ <!-- 鎵归噺娣诲姞鍛ㄦ姤 start-->
+ <!-- <aura:handler name="init" value="{!this}" action="{!c.doInit}" /> -->
+ <aura:attribute name="reports_date" type="List" />
+ <aura:attribute name="errorMessage" type="String" />
+ <aura:attribute name="TableContent" type="String" description=" Show the Result class" />
+ <aura:attribute name="TableContent2" type="String" description=" Show the Result class" />
+ <aura:attribute name="TargetFileName" type="String" description="Name of the file" />
+ <aura:attribute name="tableheaders" type="Object[]" />
+ <aura:attribute name="fileContentData" type="String" />
+ <aura:attribute name="filename" type="String" />
+ <aura:attribute name="NumOfRecords" type="Integer" default="1000" />
+ <aura:attribute name="showMain" type="Boolean" default="true" />
+ <aura:attribute name="IsEventDefault" type="Boolean" default="true" />
+ <aura:attribute name="login" type="Boolean" default="false" />
+ <aura:attribute name="successMessage" type="String" />
+ <!-- start DTT-zhj 澧炲姞閿欒淇℃伅table 2023-05-16-->
+ <aura:attribute name="errorData" type="Object" />
+ <aura:attribute name="errorColumns" type="List" />
+ <!-- show Error information -->
+ <aura:attribute name="showErrorInfo" type="Boolean" default="false" />
+ <!-- end DTT-zhj 澧炲姞閿欒淇℃伅table 2023-05-16-->
+
+ <!-- 鎵归噺娣诲姞鍛ㄦ姤 end-->
+ <aura:renderIf isTrue="{!v.login}">
<div class="slds-spinner_container height100vh">
<div class="slds-spinner--brand slds-spinner slds-spinner--medium" role="alert">
<span class="slds-assistive-text">Loading</span>
@@ -34,68 +33,75 @@
</div>
</div>
</aura:renderIf>
-<!-- 鎵归噺娣诲姞鍛ㄦ姤 start-->
-<div class="slds-modal slds-fade-in-open slds-hide" aura:id="errorDiv" style="z-index: 10001">
- <!-- <ui:inputText aura:id="articleURL" /> -->
- <div class="demo-only" style="height: 8rem;">
- <div class="slds-notify_container slds-is-relative">
- <div class="slds-notify slds-notify_toast slds-theme_error" role="status">
- <div class=" slds-m-left_xx-large">
- <div
- class="slds-notify__content slds-m-left_small slds-align_absolute-center slds-m-left_xx-large">
- <lightning:icon alternativeText="error" iconName="utility:error" size="small"
- class="buttonColor slds-m-right_small" />
- <!-- DB202301262139 SFDC缁忛攢鍟嗕汉鍛樺鍏ュ姛鑳芥敼杩� start -->
- <!-- <h2 class="slds-text-heading_small ">{!v.errorMessage}</h2> -->
- <pre class="slds-text-heading_small ">{!v.errorMessage}</pre>
- <!-- DB202301262139 SFDC缁忛攢鍟嗕汉鍛樺鍏ュ姛鑳芥敼杩� end -->
+ <!-- 鎵归噺娣诲姞鍛ㄦ姤 start-->
+ <div class="slds-modal slds-fade-in-open slds-hide" aura:id="errorDiv" style="z-index: 10001">
+ <ui:inputText aura:id="articleURL" />
+ <div class="demo-only" style="height: 8rem;">
+ <div class="slds-notify_container slds-is-relative">
+ <div class="slds-notify slds-notify_toast slds-theme_error" role="status">
+ <div class=" slds-m-left_xx-large">
+ <div
+ class="slds-notify__content slds-m-left_small slds-align_absolute-center slds-m-left_xx-large">
+ <lightning:icon alternativeText="error" iconName="utility:error" size="small"
+ class="buttonColor slds-m-right_small" />
+ <h2 class="slds-text-heading_small ">{!v.errorMessage}</h2>
+ </div>
</div>
</div>
</div>
</div>
</div>
-</div>
-<div class="slds-modal slds-fade-in-open slds-hide" aura:id="successDiv01">
- <!-- <ui:inputText aura:id="articleURL" /> -->
- <div class="demo-only" style="height: 8rem;">
- <div class="slds-notify_container slds-is-relative">
- <div class="slds-notify slds-notify_toast slds-theme_success" role="alert">
- <div class=" slds-m-left_xx-large">
- <div
- class="slds-notify__content slds-m-left_small slds-align_absolute-center slds-m-left_xx-large">
- <lightning:icon alternativeText="Success" iconName="utility:success" size="small"
- class="buttonColor slds-m-right_small" />
- <h2 class="slds-text-heading_small ">{!v.successMessage}</h2>
+ <div class="slds-modal slds-fade-in-open slds-hide" aura:id="successDiv01">
+ <ui:inputText aura:id="articleURL" />
+ <div class="demo-only" style="height: 8rem;">
+ <div class="slds-notify_container slds-is-relative">
+ <div class="slds-notify slds-notify_toast slds-theme_success" role="alert">
+ <div class=" slds-m-left_xx-large">
+ <div
+ class="slds-notify__content slds-m-left_small slds-align_absolute-center slds-m-left_xx-large">
+ <lightning:icon alternativeText="Success" iconName="utility:success" size="small"
+ class="buttonColor slds-m-right_small" />
+ <h2 class="slds-text-heading_small ">{!v.successMessage}</h2>
+ </div>
</div>
</div>
</div>
</div>
</div>
-</div>
-<div >
- <div class="slds-modal__header ">
- <h4 id="headerTarget" class="slds-float--left"></h4>
- <h2 id="headerTarget" class="slds-text-heading--medium">瀹㈡埛浜哄憳鎵归噺瀵煎叆</h2>
- </div>
- <div class="slds-modal__content slds-scrollable slds-grow slds-p-around--medium ">
- <aura:if isTrue="{!v.showMain}">
- <div>
- <center>
- <lightning:input type="file" class="file" uara:id="file" onchange="{!c.CreateRecord}" />
- </center>
- </div>
- <aura:set attribute="else">
- <ui:outputRichText class="uiOutputRichText slds-m--around-large" value="{!v.TableContent}" />
- <div class="slds-p-around--large slds-align--absolute-center">
- <lightning:button aura:id="save_con" label="淇濆瓨" variant="brand" onclick="{!c.processFileContent}" disabled="false" />
- <lightning:button label="鍙栨秷" variant="brand" onclick="{!c.cancel}" />
+ <div>
+ <div class="slds-modal__header ">
+ <h4 id="headerTarget" class="slds-float--left"></h4>
+ <h2 id="headerTarget" class="slds-text-heading--medium">瀹㈡埛浜哄憳鎵归噺瀵煎叆</h2>
+ </div>
+ <div class="slds-modal__content slds-scrollable slds-grow slds-p-around--medium ">
+ <aura:if isTrue="{!v.showMain}">
+ <div>
+ <center>
+ <lightning:input type="file" class="file" uara:id="file" onchange="{!c.CreateRecord}" />
+ </center>
</div>
+ <aura:set attribute="else">
+ <ui:outputRichText class="uiOutputRichText slds-m--around-large" value="{!v.TableContent}" />
+ <div class="slds-p-around--large slds-align--absolute-center">
+ <lightning:button label="淇濆瓨" variant="brand" onclick="{!c.processFileContent}" />
+ <lightning:button label="鍙栨秷" variant="brand" onclick="{!c.cancel}" />
+ </div>
+ <aura:if isTrue="{!v.showErrorInfo}">
+ <div class="slds-p-around--large slds-align--absolute-center">
+ <lightning:button label="瀵煎嚭閿欒淇℃伅" variant="brand" onclick="{!c.exportErrorInfo}" />
+ </div>
+ <div class="slds-p-around--large slds-align--absolute-center">
+ <div style="height: 300px;overflow-x:scroll">
+ <lightning:datatable keyField="id" data="{! v.errorData }" columns="{! v.errorColumns }"
+ hideCheckboxColumn="true" minColumnWidth="120"/>
+ </div>
+ </div>
+ </aura:if>
+ </aura:set>
+ </aura:if>
+ </div>
- </aura:set>
- </aura:if>
</div>
-
-</div>
-<!-- 鎵归噺娣诲姞鍛ㄦ姤 end-->
+ <!-- 鎵归噺娣诲姞鍛ㄦ姤 end-->
</aura:component>
\ No newline at end of file
diff --git a/force-app/main/default/aura/DealerPersonnelInformationImport/DealerPersonnelInformationImportController.js b/force-app/main/default/aura/DealerPersonnelInformationImport/DealerPersonnelInformationImportController.js
index f521073..91dbcfc 100644
--- a/force-app/main/default/aura/DealerPersonnelInformationImport/DealerPersonnelInformationImportController.js
+++ b/force-app/main/default/aura/DealerPersonnelInformationImport/DealerPersonnelInformationImportController.js
@@ -4,9 +4,14 @@
helper.readFile(component,helper,files[0]);
},
processFileContent : function(component,event,helper){
+ component.set("v.showErrorInfo",false);
helper.saveRecords(component,event,helper);
},
cancel : function(component,event,helper){
component.set("v.showMain",true);
- }
+ },
+ exportErrorInfo: function(component,event,helper){
+ console.log('enter exportErrorInfo');
+ helper.exportErrorInfoHelper(component);
+ },
})
\ No newline at end of file
diff --git a/force-app/main/default/aura/DealerPersonnelInformationImport/DealerPersonnelInformationImportHelper.js b/force-app/main/default/aura/DealerPersonnelInformationImport/DealerPersonnelInformationImportHelper.js
index 3048485..ddd60f2 100644
--- a/force-app/main/default/aura/DealerPersonnelInformationImport/DealerPersonnelInformationImportHelper.js
+++ b/force-app/main/default/aura/DealerPersonnelInformationImport/DealerPersonnelInformationImportHelper.js
@@ -1,6 +1,5 @@
({
readFile: function (component, helper, file) {
- debugger
if (!file) return;
if (!file.name.match(/\.(csv||CSV)$/)) {
return alert('only support csv files');
@@ -79,7 +78,6 @@
reader.readAsDataURL(file);
},
saveRecords: function (component, event, helper) {
- debugger
component.set('v.login', true);
var action = component.get("c.processData");
var fieldsList = ['Name', 'Phone', 'AccountNumber']; //Please write your code dynamic fields
@@ -93,26 +91,63 @@
if (state === "SUCCESS") {
var res = response.getReturnValue();
var res1 = '';
- debugger;
if (res != 'success') {
var ress = res.split('=');
console.log(ress);
+ let errorDatas = [];
+ let errorDataRow = [];
+ debugger
for (var i = 0; i < ress.length; i++) {
res1 += ress[i].substr(7) + '\n';
+ if (ress[i] != '') {
+ let errorData = {}
+ let index = errorDataRow.indexOf(ress[i].substr(7).substring(1, 2));
+ if (index == -1) {
+ errorData.errorRow = ress[i].substr(7).substring(1, 2);
+ errorDataRow.push(errorData.errorRow);
+ errorData.errorInfo = ress[i].substr(7).substring(6);
+ errorDatas.push(errorData);
+ } else {
+ errorDatas[index].errorInfo += '; ' + ress[i].substr(7).substring(6);
+ }
+ }
}
+ var fileContentData = component.get("v.fileContentData").split('\n');
+ let errorColumns = [
+ { label: '閿欒琛�', fieldName: 'errorRow', type: 'text', hideDefaultActions: true, initialWidth: 50 },
+ { label: '閿欒淇℃伅', fieldName: 'errorInfo', type: 'text', hideDefaultActions: true,initialWidth: 300,wrapText: true }
+ ];
+ for (var i = 0; i < fileContentData[0].split(',').length - 1; i++) {
+ errorColumns.push({
+ label: fileContentData[0].split(',')[i], fieldName: 'field' + i, type: 'text', hideDefaultActions: true,wrapText: true
+ });
+ }
+
+ for(var i = 0; i < errorDatas.length; i++){
+ let data = fileContentData[errorDatas[i].errorRow];
+ console.log('data = ' + JSON.stringify(data));
+ for(var j = 0; j < data.split(',').length; j++){
+ let label = 'field' + j;
+ errorDatas[i][label] = data.split(',')[j];
+ }
+ }
+ console.log('errorDatas = ' + JSON.stringify(errorDatas))
+
+ component.set('v.errorColumns', errorColumns);
+ component.set('v.errorData', errorDatas);
+ component.set("v.showErrorInfo", true);
+
console.log("==" + res1);
// this.error( "璇蜂慨鏀瑰悗閲嶆柊涓婁紶");
component.set('v.errorMessage', res1 + "璇蜂慨鏀瑰悗閲嶆柊涓婁紶");
this.showErrorToast(component);
component.set('v.login', false);
- component.find('save_con').set('v.disabled', true);
} else {
// this.success('瀵煎叆鎴愬姛');
component.set('v.successMessage', '瀵煎叆鎴愬姛');
this.showSuccessToast01(component);
component.set("v.showMain", true);
component.set('v.login', false);
- component.find('save_con').set('v.disabled', false);
}
}
else if (state === "INCOMPLETE") {
@@ -122,8 +157,18 @@
var errors = response.getError();
if (errors) {
if (errors[0] && errors[0].message) {
- console.log("Error message: " +
- errors[0].message);
+ console.log("Error message: " + errors[0].message);
+ let errorDatas = [{
+ errorRow: '1',
+ errorInfo: errors[0].message
+ }];
+ let errorColumns = [
+ { label: '閿欒琛�', fieldName: 'errorRow', type: 'text', hideDefaultActions: true, initialWidth: 50 },
+ { label: '閿欒淇℃伅', fieldName: 'errorInfo', type: 'text', hideDefaultActions: true,initialWidth: 300,wrapText: true }
+ ];
+ component.set('v.errorData', errorDatas);
+ component.set('v.errorColumns', errorColumns);
+ component.set("v.showErrorInfo", true);
component.set('v.login', false);
}
} else {
@@ -150,36 +195,100 @@
window.setTimeout($A.getCallback(function () {
$A.util.addClass(component.find('errorDiv'), 'slds-hide');
}),
- 7000
+ 4000
);
},
- success : function(message) {
+ success: function (message) {
var toastEvent = $A.get("e.force:showToast");
toastEvent.setParams({
- "title" : "鎴愬姛!",
- "message" : message,
- "duration" : "5000"
+ "title": "鎴愬姛!",
+ "message": message,
+ "duration": "5000"
});
toastEvent.fire();
},
-
- warning : function(message) {
+
+ warning: function (message) {
var toastEvent = $A.get("e.force:showToast");
toastEvent.setParams({
"title": "璀﹀憡!",
"message": message,
- "duration" : "10000"
+ "duration": "10000"
});
toastEvent.fire();
},
-
- error : function(message) {
+
+ error: function (message) {
var toastEvent = $A.get("e.force:showToast");
toastEvent.setParams({
"title": "閿欒!",
"message": message,
- "duration" : "sticky"
+ "duration": "sticky"
});
toastEvent.fire();
},
+ //zhj 瀵煎嚭閿欒淇℃伅 2023-05-16 start
+ exportErrorInfoHelper: function (component) {
+ var errorData = component.get('v.errorData');
+ var errorColumns = component.get('v.errorColumns');
+
+ var datas = [];
+ let errorColumnsArray = [];
+ for(var i in errorColumns){
+ errorColumnsArray.push(errorColumns[i].label);
+ }
+ datas.push(errorColumnsArray);
+ //datas.push(errorColumns);
+
+ for (var i in errorData) {
+ let data = [];
+ data.push(errorData[i].errorRow)
+ data.push(errorData[i].errorInfo)
+ for(var j = 0 ; j < Object.keys(errorData[i]).length - 2 ; j++){
+ data.push(errorData[i]['field' + j])
+ }
+ datas.push(data);
+ }
+
+ console.log('datas = ' + JSON.stringify(datas));
+ var csv = this.convertToCSV(component, datas);
+ console.log('csv = ' + JSON.stringify(csv))
+ this.downloadCSV(component, csv);
+ },
+
+ convertToCSV: function (component, data) {
+ console.log('enter convertToCSV')
+ console.log('data = ' + data);
+ var csv = '';
+ for (var i = 0; i < data.length; i++) {
+ var row = data[i];
+ console.log('row = ' + JSON.stringify(row));
+ for (var j = 0; j < row.length; j++) {
+ var val = '';
+ val = row[j] === null ? '' : row[j].toString();
+ console.log('val = ' + val);
+ if (val.indexOf(',') !== -1 || val.indexOf('"') !== -1 || val.indexOf('\n') !== -1) {
+ //val = '"' + val.replace(/"/g,'""') + '"';
+ }
+ if (j > 0) {
+ csv += ',';
+ }
+ csv += val;
+ }
+ csv += '\n';
+ }
+ return csv;
+ },
+
+ downloadCSV: function (component, csv) {
+ var link = document.createElement('a');
+ // 璁剧疆瀛楃闆嗗拰鏂囦欢澶�
+ let bom = "\uFEFF";
+ link.href = 'data:text/csv;charset=utf-8,' + encodeURIComponent(bom+csv);
+ link.download = 'data.csv';
+ document.body.appendChild(link);
+ link.click();
+ document.body.removeChild(link);
+ },
+ //zhj 瀵煎嚭閿欒淇℃伅 2023-05-16 end
})
\ No newline at end of file
diff --git a/force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAura.auradoc b/force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAura.auradoc
new file mode 100644
index 0000000..d0d6eb5
--- /dev/null
+++ b/force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAura.auradoc
@@ -0,0 +1,6 @@
+<aura:documentation>
+ <aura:description>Documentation</aura:description>
+ <aura:example name="ExampleName" ref="exampleComponentName" label="Label">
+ Example Description
+ </aura:example>
+</aura:documentation>
\ No newline at end of file
diff --git a/force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAura.cmp b/force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAura.cmp
new file mode 100644
index 0000000..99361e6
--- /dev/null
+++ b/force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAura.cmp
@@ -0,0 +1,27 @@
+<aura:component
+ implements="force:appHostable,flexipage:availableForAllPageTypes,flexipage:availableForRecordHome,force:hasRecordId,forceCommunity:availableForAllPageTypes,force:lightningQuickActionWithoutHeader,lightning:actionOverride"
+ access="global">
+ 聽 聽 <aura:html tag="style">
+ 聽 聽 聽 聽 .slds-modal__container{
+ 聽 聽 聽 聽 max-width: 65rem !important;
+ 聽 聽 聽 聽 width:100% !important;
+ 聽 聽 聽 聽 }
+ 聽 聽 聽 聽 .cuf-content {
+ 聽 聽 聽 聽 padding: 0 0rem !important;
+ 聽 聽 聽 聽 }
+ 聽 聽 聽 聽 .slds-p-around--medium {
+ 聽 聽 聽 聽 padding: 0rem !important;
+ 聽 聽 聽 聽 }
+ 聽 聽 聽 聽 .slds-modal__content{
+ 聽 聽 聽 聽 overflow-y:auto !important;
+ 聽 聽 聽 聽 height:unset !important;
+ 聽 聽 聽 聽 max-height:unset !important;
+ 聽 聽 聽 聽 min-height:8rem;
+ 聽 聽 聽 聽 }
+ 聽 聽 聽 聽 .slds-tile_board{
+ 聽 聽 聽 聽 padding:20px 40px;
+ 聽 聽 聽 聽 }
+ 聽 聽 </aura:html>
+ 聽 聽
+ <c:lexNewAndEditContactPIPL onclose="{!c.closeModal}" onrefresh="{!c.refreshView}" recordId="{!v.recordId}" />
+</aura:component>
\ No newline at end of file
diff --git a/force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAura.cmp-meta.xml b/force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAura.cmp-meta.xml
new file mode 100644
index 0000000..5a95bf7
--- /dev/null
+++ b/force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAura.cmp-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<AuraDefinitionBundle xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>57.0</apiVersion>
+ <description>A Lightning Component Bundle</description>
+</AuraDefinitionBundle>
diff --git a/force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAura.css b/force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAura.css
new file mode 100644
index 0000000..a5839d4
--- /dev/null
+++ b/force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAura.css
@@ -0,0 +1,2 @@
+.THIS {
+}
\ No newline at end of file
diff --git a/force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAura.design b/force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAura.design
new file mode 100644
index 0000000..d247163
--- /dev/null
+++ b/force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAura.design
@@ -0,0 +1,3 @@
+<design:component >
+
+</design:component>
\ No newline at end of file
diff --git a/force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAura.svg b/force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAura.svg
new file mode 100644
index 0000000..e201ae9
--- /dev/null
+++ b/force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAura.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<svg width="120px" height="120px" viewBox="0 0 120 120" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+ <path d="M120,108 C120,114.6 114.6,120 108,120 L12,120 C5.4,120 0,114.6 0,108 L0,12 C0,5.4 5.4,0 12,0 L108,0 C114.6,0 120,5.4 120,12 L120,108 L120,108 Z" id="Shape" fill="#2A739E" />
+ <path d="M77.7383308,20 L61.1640113,20 L44.7300055,63.2000173 L56.0543288,63.2000173 L40,99.623291 L72.7458388,54.5871812 L60.907727,54.5871812 L77.7383308,20 Z" id="Path-1" fill="#FFFFFF" />
+ </g>
+</svg>
\ No newline at end of file
diff --git a/force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAuraController.js b/force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAuraController.js
new file mode 100644
index 0000000..45518ce
--- /dev/null
+++ b/force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAuraController.js
@@ -0,0 +1,9 @@
+({
+ closeModal : function(cmp,event,helper){
+ $A.get('e.force:closeQuickAction').fire();
+ },
+
+ refreshView : function(cmp,event,helper){
+ $A.get('e.force:refreshView').fire();
+ }
+})
\ No newline at end of file
diff --git a/force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAuraHelper.js b/force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAuraHelper.js
new file mode 100644
index 0000000..ba7f386
--- /dev/null
+++ b/force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAuraHelper.js
@@ -0,0 +1,5 @@
+({
+ helperMethod : function() {
+
+ }
+})
\ No newline at end of file
diff --git a/force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAuraRenderer.js b/force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAuraRenderer.js
new file mode 100644
index 0000000..f1f0c75
--- /dev/null
+++ b/force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAuraRenderer.js
@@ -0,0 +1,5 @@
+({
+
+// Your renderer method overrides go here
+
+})
\ No newline at end of file
diff --git a/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.cmp b/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.cmp
index 8d41f3d..a16937c 100644
--- a/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.cmp
+++ b/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.cmp
@@ -5,216 +5,141 @@
@last modified on : 07-08-2022
@last modified by : ChangeMeIn@UserSettingsUnder.SFDoc
-->
-<aura:component
- implements="force:lightningQuickActionWithoutHeader,force:hasRecordId,lightning:actionOverride,lightning:isUrlAddressable"
- access="global"
- controller="NewAgencyOpportunityController"
->
- <aura:attribute name="recordId" type="Id" default="" />
- <aura:attribute name="recordTypeId" type="Id" default="" />
- <aura:attribute name="ac_name" type="string" />
- <aura:attribute name="title" type="string" />
- <aura:handler name="init" value="{!this}" action="{!c.doInit}" />
- <aura:attribute name="layout" type="LayoutDescriberHelper.LayoutWrapper" />
- <aura:attribute name="record_data" type="Map" />
- <aura:attribute name="section_names" type="List" />
- <aura:attribute name="showSpinner" type="Boolean" default="False" />
- <aura:attribute name="showSpinner2" type="Boolean" default="False" />
- <aura:attribute name="staticResource" type="Map" />
- <aura:attribute name="pi_fields_map" type="Map" />
- <aura:attribute name="isClone" type="Boolean" default="False" />
- <ltng:require scripts="{! $Resource.AWSService+'/AWSService.js' }" />
- <ltng:require scripts="{! $Resource.jquery183minjs }" />
- <aura:attribute name="isModalOpen" type="boolean" default="false" />
- <aura:attribute name="searchKeyWord" type="string" default="" />
- <aura:attribute name="contactAWSIds" type="List" />
- <aura:attribute name="login" type="Boolean" default="false" />
- <aura:attribute name="show" type="Boolean" default="false" />
- <aura:attribute name="showNewAgencyContact" type="Boolean" default="false" />
- <aura:handler
- name="NewAgencyContactEvent"
- event="c:NewAgencyContactEvent"
- action="{!c.closeAgencyContact}"
- />
+<aura:component implements="force:lightningQuickActionWithoutHeader,force:hasRecordId,lightning:actionOverride,lightning:isUrlAddressable" access="global"
+ controller="NewAgencyOpportunityController">
+
+ <aura:attribute name = "recordId" type = "Id" default = ""/>
+ <aura:attribute name = "recordTypeId" type = "Id" default = ""/>
+ <aura:attribute name="ac_name" type="string"/>
+ <aura:attribute name="title" type="string"/>
+ <aura:handler name="init" value="{!this}" action="{!c.doInit}" />
+ <aura:attribute name="layout" type="LayoutDescriberHelper.LayoutWrapper"/>
+ <aura:attribute name="record_data" type="Map"/>
+ <aura:attribute name="section_names" type="List"/>
+ <aura:attribute name="showSpinner" type="Boolean" default = "False"/>
+ <aura:attribute name="showSpinner2" type="Boolean" default = "False"/>
+ <aura:attribute name="staticResource" type="Map"/>
+ <aura:attribute name="pi_fields_map" type="Map"/>
+ <aura:attribute name="isClone" type="Boolean" default = "False"/>
+ <ltng:require scripts="{! $Resource.AWSService+'/AWSService.js' }" />
+ <ltng:require scripts="{! $Resource.jquery183minjs }" />
+ <aura:attribute name="isModalOpen" type="boolean" default="false"/>
+ <aura:attribute name="searchKeyWord" type="string" default=""/>
+ <aura:attribute name="contactAWSIds" type="List"/>
+ <aura:attribute name="login" type="Boolean" default="false"/>
+ <aura:attribute name="show" type="Boolean" default="false"/>
+ <aura:attribute name="showNewAgencyContact" type="Boolean" default="false"/>
+ <aura:handler name="NewAgencyContactEvent" event="c:NewAgencyContactEvent" action="{!c.closeAgencyContact}"/>
- <div class="{! v.container_class}">
- <!-- header -->
- <header class="slds-modal__header">
- <h2 id="modal-heading-01" class="slds-modal__title slds-hyphenate">
- {!v.title}
- </h2>
- </header>
-
- <div class="slds-modal__content slds-p-around_medium">
- <aura:if isTrue="{!v.showSpinner}">
- <lightning:spinner alternativeText="Loading" size="medium" />
- </aura:if>
-
- <lightning:recordEditForm objectApiName="Agency_Opportunity__c">
- <lightning:accordion
- activeSectionName="{! v.section_names }"
- allowMultipleSectionsOpen="true"
- class="greyyyy"
- >
- <aura:iteration items="{!v.layout}" var="section">
- <aura:if isTrue="{! section.editHeading }">
- <lightning:accordionSection
- name="{! section.label }"
- label="缁忛攢鍟嗚浠蜂俊鎭�"
- >
- <aura:iteration items="{! section.layoutColumns}" var="col">
- <aura:iteration items="{! col.layoutItems}" var="field">
- <aura:if
- isTrue="{! and(field.behavior != 'Readonly', field.field != 'Agency_Contact__c')}"
- >
- <lightning:inputField
- required="{! field.behavior == 'Required' }"
- aura:id="field"
- fieldName="{! field.field}"
- value="{! field.value}"
- />
- </aura:if>
- <aura:if isTrue="{! field.field == 'Agency_Contact__c' }">
- <lightning:layout>
- <lightning:layoutItem size="12">
- <lightning:input
- required="{! field.behavior == 'Required' }"
- label="瀹㈡埛浜哄憳"
- value="{! field.value}"
- variant="label-inline"
- style="margin-left: 0cm; display: none"
- onclick="{! c.openModel }"
- />
- <lightning:input
- required="{! field.behavior == 'Required' }"
- label="瀹㈡埛浜哄憳"
- value="{! v.ac_name}"
- variant="label-inline"
- style="margin-left: 0cm"
- onclick="{! c.openModel }"
- />
- </lightning:layoutItem>
- <!-- <lightning:layoutItem size="1">
- <lightning:buttonIcon iconName="utility:settings" variant="container" alternativeText="Settings" title="Settings" class = "name" />
- </lightning:layoutItem> -->
- </lightning:layout>
- </aura:if>
- </aura:iteration>
- </aura:iteration>
- </lightning:accordionSection>
- </aura:if>
- </aura:iteration>
- </lightning:accordion>
- </lightning:recordEditForm>
-
- <div style="text-align: center; margin: 5px">
- <lightning:button
- class="slds-button slds-button_neutral"
- label="鍙栨秷"
- onclick="{! c.cancelClick }"
- />
- <lightning:button
- class="slds-button slds-button_brand"
- variant="brand"
- label="淇濆瓨"
- onclick="{! c.saveClick }"
- />
- </div>
- </div>
- <aura:if isTrue="{!v.isModalOpen}">
- <!-- Modal/Popup Box starts here-->
- <section
- role="dialog"
- tabindex="-1"
- aria-labelledby="modal-heading-01"
- aria-modal="true"
- aria-describedby="modal-content-id-1"
- class="slds-modal slds-fade-in-open"
- >
- <aura:renderIf isTrue="{!v.login}">
- <div class="slds-spinner_container height100vh">
- <div
- class="slds-spinner--brand slds-spinner slds-spinner--medium"
- role="alert"
- >
- <span id="aa" class="slds-assistive-text">Loading</span>
- <div class="slds-spinner__dot-a"></div>
- <div class="slds-spinner__dot-b"></div>
- </div>
- </div>
- </aura:renderIf>
-
- <div class="slds-modal__container">
- <!-- Modal/Popup Box Header Starts here-->
- <header class="slds-modal__header">
- <lightning:buttonIcon
- iconName="utility:close"
- onclick="{! c.closeModel }"
- alternativeText="close"
- variant="bare-inverse"
- class="slds-modal__close"
- />
- <h2
- id="modal-heading-01"
- class="slds-text-heading_medium slds-hyphenate"
- >
- 鎼滅储瀹㈡埛浜哄憳
+
+
+ <div class="{! v.container_class}">
+ <!-- header -->
+ <header class="slds-modal__header">
+ <h2 id="modal-heading-01" class="slds-modal__title slds-hyphenate">
+ {!v.title}
</h2>
- </header>
+ </header>
- <!--Modal Body Start here-->
- <div
- class="slds-modal__content slds-p-around_medium modal-body"
- id="modal-content-id-1"
- >
- <lightning:layout>
- <lightning:layoutItem size="7">
- <ui:inputText
- label="璇疯緭鍏ュ鎴峰鍚�"
- class="field"
- value="{!v.searchKeyWord}"
- />
- </lightning:layoutItem>
- <lightning:layoutItem size="2" class="searchButton">
- <ui:button
- aura:id="button"
- buttonTitle="Click to see agency contact"
- class="button"
- label="鎼滅储"
- press="{!c.searchAgencyContact}"
- disabled="false"
- />
- </lightning:layoutItem>
- <lightning:layoutItem size="3" class="searchButton">
- <ui:button
- aura:id="newAgencyContact"
- buttonTitle="Click to see agency contact"
- class="newAgencyContact"
- label="鏂板缓.瀹㈡埛浜哄憳"
- disabled="false"
- press="{!c.showNewAgency}"
- />
- </lightning:layoutItem>
- </lightning:layout>
- <div id="QueryResult" style="margin-top: 20px"></div>
- </div>
+ <div class="slds-modal__content slds-p-around_medium">
+ <aura:if isTrue="{!v.showSpinner}">
+ <lightning:spinner alternativeText="Loading" size="medium" />
+ </aura:if>
+ <lightning:recordEditForm objectApiName="Agency_Opportunity__c">
+ <lightning:accordion activeSectionName="{! v.section_names }" allowMultipleSectionsOpen="true" class="greyyyy" >
+ <aura:iteration items="{!v.layout}" var="section">
+ <aura:if isTrue="{! section.editHeading }">
+ <lightning:accordionSection name="{! section.label }" label="缁忛攢鍟嗚浠蜂俊鎭�">
+ <aura:iteration items="{! section.layoutColumns}" var="col">
+ <aura:iteration items="{! col.layoutItems}" var="field">
+
+ <aura:if isTrue="{!and(field.behavior != 'Readonly', field.field != 'Agency_Contact__c')}">
+ <lightning:inputField required="{! field.behavior == 'Required' }" aura:id="field" fieldName="{! field.field}" value="{! field.value}" />
+ </aura:if>
+ <aura:if isTrue="{!field.field == 'Agency_Contact__c' }">
+ <lightning:layout>
+ <lightning:layoutItem size="12">
+ <lightning:input required="{! field.behavior == 'Required' }" label="瀹㈡埛浜哄憳" value = "{! field.value}" variant = "label-inline" style="margin-left: 0cm; display: none;" onclick="{! c.openModel }"/>
+ <lightning:input required="{! field.behavior == 'Required' }" label="瀹㈡埛浜哄憳" value = "{! v.ac_name}" variant = "label-inline" style="margin-left: 0cm; " onclick="{! c.openModel }"/>
+ </lightning:layoutItem>
+ </lightning:layout>
+ </aura:if>
- <aura:if isTrue="{!v.showNewAgencyContact}">
- <section
- role="dialog"
- tabindex="-1"
- aria-modal="true"
- aria-labelledby="modal-heading-01"
- class="slds-modal slds-fade-in-open"
- aura:id="NewAgencyContact"
- id="NewAgencyContact"
- >
- <c:NewAgencyContact2 />
- </section>
- </aura:if>
+
+ </aura:iteration>
+ </aura:iteration>
+ </lightning:accordionSection>
+ </aura:if>
+ </aura:iteration>
+ </lightning:accordion>
+ </lightning:recordEditForm>
+
+ <div style="text-align:center;margin: 5px;">
+ <lightning:button class="slds-button slds-button_neutral" label="鍙栨秷" onclick="{! c.cancelClick }" />
+ <lightning:button class="slds-button slds-button_brand" variant="brand" label="淇濆瓨" onclick="{! c.saveClick }" />
+ </div>
</div>
- </section>
- <div class="slds-backdrop slds-backdrop_open"></div>
- </aura:if>
- </div>
-</aura:component>
+ <aura:if isTrue="{!v.isModalOpen}">
+
+ <!-- Modal/Popup Box starts here-->
+ <section role="dialog" tabindex="-1" aria-labelledby="modal-heading-01"
+ aria-modal="true" aria-describedby="modal-content-id-1"
+ class="slds-modal slds-fade-in-open" >
+
+
+
+ <aura:renderIf isTrue="{!v.login}">
+ <div class="slds-spinner_container height100vh">
+ <div class="slds-spinner--brand slds-spinner slds-spinner--medium" role="alert">
+ <span id="aa" class="slds-assistive-text">Loading</span>
+ <div class="slds-spinner__dot-a"></div>
+ <div class="slds-spinner__dot-b"></div>
+ </div>
+ </div>
+ </aura:renderIf>
+
+
+
+ <div class="slds-modal__container">
+ <!-- Modal/Popup Box Header Starts here-->
+ <header class="slds-modal__header">
+ <lightning:buttonIcon iconName="utility:close"
+ onclick="{! c.closeModel }"
+ alternativeText="close"
+ variant="bare-inverse"
+ class="slds-modal__close"/>
+ <h2 id="modal-heading-01" class="slds-text-heading_medium slds-hyphenate">
+ 鎼滅储瀹㈡埛浜哄憳
+ </h2>
+ </header>
+
+ <!--Modal Body Start here-->
+ <div class="slds-modal__content slds-p-around_medium modal-body" id="modal-content-id-1">
+ <lightning:layout>
+ <lightning:layoutItem size="7">
+ <ui:inputText label="璇疯緭鍏ュ鎴峰鍚�" class="field" value="{!v.searchKeyWord}"/>
+ </lightning:layoutItem>
+ <lightning:layoutItem size="2" class = "searchButton">
+ <ui:button aura:id="button" buttonTitle="Click to see agency contact" class="button" label="鎼滅储" press="{!c.searchAgencyContact}" disabled="false"/>
+ </lightning:layoutItem>
+ <lightning:layoutItem size="3" class = "searchButton">
+ <ui:button aura:id="newAgencyContact" buttonTitle="Click to see agency contact" class="newAgencyContact" label="鏂板缓.瀹㈡埛浜哄憳" disabled="false" press="{!c.showNewAgency}"/>
+ </lightning:layoutItem>
+ </lightning:layout>
+ <div id="QueryResult" style = "margin-top:20px;">
+ </div>
+ </div>
+
+ <aura:if isTrue="{!v.showNewAgencyContact}">
+ <section role="dialog" tabindex="-1" aria-modal="true" aria-labelledby="modal-heading-01" class="slds-modal slds-fade-in-open" aura:id="NewAgencyContact" id="NewAgencyContact">
+ <c:NewAgencyContact2 />
+ </section>
+ </aura:if>
+
+ </div>
+ </section>
+ <div class="slds-backdrop slds-backdrop_open"></div>
+
+ </aura:if>
+ </div>
+</aura:component>
\ No newline at end of file
diff --git a/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.cmp-meta.xml b/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.cmp-meta.xml
index 2c30e5a..632b900 100644
--- a/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.cmp-meta.xml
+++ b/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.cmp-meta.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
<AuraDefinitionBundle xmlns="http://soap.sforce.com/2006/04/metadata">
<apiVersion>54.0</apiVersion>
<description>A Lightning Component Bundle</description>
diff --git a/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.css b/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.css
index fd6b83a..7438f38 100644
--- a/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.css
+++ b/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.css
@@ -1,63 +1,67 @@
.THIS {
}
-.THIS .name {
- margin-right: 0.5cm;
+.THIS .name{
+ margin-right:0.5cm;
}
-.THIS .wh {
- width: 670px;
- height: 500px;
+.THIS .wh{
+ width: 670px;
+ height: 500px;
}
-.THIS .slds-modal__container {
- max-width: 70rem !important;
- width: 90% !important;
+.THIS .slds-modal__container{
+ max-width:70rem !important;
+ width:90% !important;
}
-.THIS .modal-body {
- height: 500px !important;
- max-height: 500px !important;
+.THIS .modal-body{
+ height : 500px !important;
+ max-height: 500px !important;
}
-.THIS table {
- border-collapse: collapse;
- border-spacing: 0;
- width: 98%;
- margin-left: 5px;
- /* border: 1px solid #000000; */
- text-align: center;
+.THIS table{
+ border-collapse: collapse;
+ border-spacing: 0;
+ width: 98%;
+ margin-left: 5px;
+ /* border: 1px solid #000000; */
+ text-align: center;
}
-.THIS tr {
- /* border: 1px solid #000000; */
- text-align: center;
+.THIS tr{
+ /* border: 1px solid #000000; */
+ text-align: center;
}
-.THIS td {
- /* border: 1px solid #000000; */
- text-align: center;
+.THIS td{
+ /* border: 1px solid #000000; */
+ text-align: center;
}
-.THIS th {
- /* border: 1px solid #000000; */
- text-align: center;
+.THIS th{
+ /* border: 1px solid #000000; */
+ text-align: center;
}
.THIS.backgroundInverse {
- position: relative;
- background-color: #16325c;
- height: 80px;
+ position: relative;
+ background-color: #16325c;
+ height: 80px;
}
-.THIS.exampleHolder {
- position: relative;
- display: inline-block;
- margin-left: 15px;
- width: 55px;
- vertical-align: middle;
- white-space: nowrap;
+.THIS.exampleHolder{
+ position: relative;
+ display: inline-block;
+ margin-left: 15px;
+ width: 55px;
+ vertical-align: middle;
+ white-space: nowrap;
}
-.THIS .searchButton {
- margin-top: 20px;
- margin-left: 20px;
+.THIS .searchButton{
+ margin-top:20px;
+ margin-left:20px;
}
+
+.THIS .slds-spinner_container{
+ position: revert;
+}
\ No newline at end of file
diff --git a/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunityController.js b/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunityController.js
index 88b3795..d496604 100644
--- a/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunityController.js
+++ b/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunityController.js
@@ -1,309 +1,298 @@
({
- doInit: function (component, event, helper) {
- let rid = component.get("v.recordId");
- let pid = null;
- if (!rid) {
- pid = window.location.href.replace("https://", "").split("/")[4];
- }
-
- let record_type_id = "";
- let pageref = component.get("v.pageReference");
- if (!record_type_id && pageref) {
- record_type_id = pageref.state.recordTypeId
- ? pageref.state.recordTypeId
- : "";
- }
-
- let isClone = component.get("v.isClone");
- if (!rid || isClone) {
- component.set("v.title", $A.get("$Label.c.New") + "缁忛攢鍟嗚浠�");
- component.set("v.recordTypeId", record_type_id);
- } else {
- component.set("v.title", $A.get("$Label.c.Edit") + "缁忛攢鍟嗚浠�");
- }
- console.log("rid: " + rid);
- console.log("pid: " + pid);
- console.log("record_type_id: " + record_type_id);
- component.set("v.showSpinner", true);
- helper.CallBackAction(
- component,
- "Init",
- {
- rid: rid,
- pid: pid,
- //rid : component.get('v.recordId'),
- record_type_id: record_type_id
- },
- function (data) {
- console.log("data: " + data);
- if (data.getState() == "SUCCESS") {
- var rv = data.getReturnValue();
- console.log(rv);
- if (rv.IsSuccess) {
- debugger;
- let layout = JSON.parse(rv.Data.layout);
- let fields = rv.Data.fields;
- let staticResource = JSON.parse(rv.Data.staticResource);
- let section_names = [];
- // let awsData = rv.Data.awsDataIds;
- section_names = layout.map((s) => s.label);
- component.set("v.section_names", section_names);
-
- let m = {};
- for (let f of staticResource.PIDetails) {
- m[f.SF_Field_API_Name__c] = f;
+
+ doInit : function(component, event, helper) {
+ let rid = component.get('v.recordId');
+ let pid = null;
+ if(!rid){
+ pid = window.location.href.replace("https://","").split("/")[4];
+ }
+
+ let record_type_id = '';
+ let pageref = component.get("v.pageReference")
+ if(!record_type_id && pageref){
+ record_type_id = pageref.state.recordTypeId ? pageref.state.recordTypeId : '';
+ }
+
+ let isClone = component.get('v.isClone');
+ if(!rid || isClone){
+ component.set('v.title',$A.get("$Label.c.New")+'缁忛攢鍟嗚浠�');
+ component.set("v.recordTypeId", record_type_id);
+ }else{
+ component.set('v.title',$A.get("$Label.c.Edit")+'缁忛攢鍟嗚浠�');
+ }
+ console.log('rid: ' + rid);
+ console.log('pid: ' + pid);
+ console.log('record_type_id: ' + record_type_id);
+ component.set("v.showSpinner", true);
+ helper.CallBackAction(component,'Init',{
+ rid : rid,
+ pid : pid,
+ //rid : component.get('v.recordId'),
+ record_type_id : record_type_id
+ },function(data){
+ console.log('data: ' + data);
+ var rv = data.getReturnValue();
+ console.log('rv:' + rv);
+ console.log('rv.Data:' + rv.Data);
+ console.log('rv.IsSuccess:' + rv.IsSuccess);
+ if(data.getState() == "SUCCESS"){
+ if(rv.IsSuccess){
+ debugger;
+ let layout = JSON.parse(rv.Data.layout);
+ debugger;
+ let fields = rv.Data.fields;
+ debugger;
+ let staticResource = JSON.parse(rv.Data.staticResource)
+ debugger;
+ let section_names = layout.map(s=>s.label);
+ debugger;
+ // let awsData = rv.Data.awsDataIds;
+ // section_names = layout.map(s=>s.label);
+ component.set('v.section_names',section_names);
+ component.set('v.layout',layout);
+ component.set('v.fields',fields);
+ component.set('v.staticResource',staticResource);
+ debugger;
+ let m = {};
+ for(let f of staticResource.PIDetails){
+ m[f.SF_Field_API_Name__c] = f;
+ }
+ component.set('v.pi_fields_map',m);
+ if(rv.Data && rv.Data.data ){
+ debugger;
+ console.log('rv.Data.data = ' + rv.Data.data);
+ for(let s of layout){
+ for(let c of s.layoutColumns){
+ for(let item of c.layoutItems){
+ if(rv.Data.data.hasOwnProperty(item.field)){
+ item.value = rv.Data.data[item.field];
+ }
+ if(fields.hasOwnProperty(item.field)){
+ item.fi = fields[item.field];
+ }
+ }
+ }
+ }
+ // component.set('v.layout',layout);
+ component.set('v.record_data',rv.Data.data);
+ if(rv.Data.data.Agency_Contact__r){
+ if (rv.Data.data.Agency_Contact__r.AWS_Data_Id__c) {
+ helper.AwsGet(staticResource.queryUrl, {
+ dataId : rv.Data.data.Agency_Contact__r.AWS_Data_Id__c
+ }, function(data){
+ console.log('data = ' + data);
+ if (data.object) {
+ component.set('v.ac_name',data.object.name);
+ }
+ }, staticResource.token);
+ }
+ }
+ // }, staticResource.token);
+ }else{
+ debugger;
+ console.log('rv.Data.data = ' + rv.Data.data);
+ console.log('layout = ' + layout);
+ for(let s of layout){
+ for(let c of s.layoutColumns){
+ for(let item of c.layoutItems){
+ if(rv.Data && fields.hasOwnProperty(item.field) && fields[item.field].References && fields[item.field].References.map(m=>m.value).indexOf(rv.Data.pidType) > -1){
+ item.value = pid;
+ }
+ }
+ }
+ }
+ debugger;
+ // component.set('v.layout',layout);
+ }
+ // component.set('v.fields',fields);
+ // component.set('v.staticResource',staticResource);
+ component.set("v.showSpinner", false);
+ }else{
+ component.set("v.showSpinner", false);
+ helper.ShowToast({
+ "message" : rv.Message,
+ "type" : "error"
+ });
+ }
+
+ }else{
+ component.set("v.showSpinner", false);
+ helper.ShowToast({
+ "message" : "Init error",
+ "type" : "error"
+ });
+
}
- component.set("v.pi_fields_map", m);
-
- if (rv.Data && rv.Data.data) {
- console.log("rv.Data.data = " + rv.Data.data);
- for (let s of layout) {
- for (let c of s.layoutColumns) {
- for (let item of c.layoutItems) {
- if (rv.Data.data.hasOwnProperty(item.field)) {
- item.value = rv.Data.data[item.field];
+ });
+ },
+ saveClick : function(component, event, helper){
+
+ let staticResource = component.get('v.staticResource');
+ let record_id = component.get('v.recordId');
+ let record_type_id = component.get('v.recordTypeId');
+
+ let isClone = component.get('v.isClone');
+ let url = staticResource.newUrl;
+ let payloadPi = {};
+ if (record_id && !isClone) {
+ url = staticResource.updateUrl
+ payloadPi['dataId'] = component.get('v.record_data').AWS_Data_Id__c;
+ }
+ let layout = component.get('v.layout');
+
+ let pi_fields_map = component.get('v.pi_fields_map');
+
+ for(let s of layout){
+ for(let c of s.layoutColumns){
+ for(let item of c.layoutItems){
+ if(pi_fields_map.hasOwnProperty(item.field)){
+
+ payloadPi[pi_fields_map[item.field].AWS_Field_API__c] = item.value;
}
- if (fields.hasOwnProperty(item.field)) {
- item.fi = fields[item.field];
+ if (item.behavior == "Required" && !item.value ) {
+ let fs = component.find("field");
+ for(let fi in fs){
+ let f = fs[fi];
+ if(!f.get('v.value')){
+ f.reset();
+ }
+ }
+ return;
}
- }
}
- }
-
- component.set("v.layout", layout);
- component.set("v.record_data", rv.Data.data);
-
- if (rv.Data.data.Agency_Contact__r) {
- if (rv.Data.data.Agency_Contact__r.AWS_Data_Id__c) {
- helper.AwsGet(
- staticResource.queryUrl,
- {
- dataId: rv.Data.data.Agency_Contact__r.AWS_Data_Id__c
- },
- function (data) {
- console.log("data = " + data);
- if (data.object) {
- component.set("v.ac_name", data.object.name);
- }
- },
- staticResource.token
- );
- }
- }
-
- // }, staticResource.token);
- } else {
- for (let s of layout) {
- for (let c of s.layoutColumns) {
- for (let item of c.layoutItems) {
- if (
- rv.Data &&
- fields.hasOwnProperty(item.field) &&
- fields[item.field].References &&
- fields[item.field].References.map((m) => m.value).indexOf(
- rv.Data.pidType
- ) > -1
- ) {
- item.value = pid;
+ }
+ }
+
+ component.set("v.showSpinner", true);
+ debugger
+ let data = {};
+ if(record_id && !isClone){
+ data.Id = record_id;
+ }
+ for(let s of layout){
+ for(let c of s.layoutColumns){
+ for(let item of c.layoutItems){
+ if(item.field && item.behavior != "Readonly"){
+ data[item.field] = item.value;
}
- }
}
- }
- component.set("v.layout", layout);
}
-
- component.set("v.fields", fields);
- component.set("v.staticResource", staticResource);
- component.set("v.showSpinner", false);
- } else {
- component.set("v.showSpinner", false);
- helper.ShowToast({
- message: rv.Message,
- type: "error"
- });
- }
- } else {
- component.set("v.showSpinner", false);
- helper.ShowToast({
- message: "Init error",
- type: "error"
- });
}
- }
- );
- },
- saveClick: function (component, event, helper) {
- let staticResource = component.get("v.staticResource");
- let record_id = component.get("v.recordId");
- let record_type_id = component.get("v.recordTypeId");
-
- let isClone = component.get("v.isClone");
- let url = staticResource.newUrl;
- let payloadPi = {};
- if (record_id && !isClone) {
- url = staticResource.updateUrl;
- payloadPi["dataId"] = component.get("v.record_data").AWS_Data_Id__c;
- }
- let layout = component.get("v.layout");
-
- let pi_fields_map = component.get("v.pi_fields_map");
-
- for (let s of layout) {
- for (let c of s.layoutColumns) {
- for (let item of c.layoutItems) {
- if (pi_fields_map.hasOwnProperty(item.field)) {
- payloadPi[pi_fields_map[item.field].AWS_Field_API__c] = item.value;
- }
-
- if (item.behavior == "Required" && !item.value) {
- let fs = component.find("field");
- for (let fi in fs) {
- let f = fs[fi];
- if (!f.get("v.value")) {
- f.reset();
- }
+ let x = 1;
+ helper.CallBackAction(component,'Save',{
+ data : data,
+ transId :'1',
+ recordTypeId:record_type_id
+ },function(data){
+ component.set("v.showSpinner", false);
+ if(data.getState() == "SUCCESS"){
+ var rv = data.getReturnValue();
+ console.log(rv);
+ var sfId = null;
+ if(rv.IsSuccess){
+ sfId = rv.Data.recordId;
+ helper.ShowToast({
+ "message" : "鎴愬姛",
+ "type" : "success"
+ });
+ if (record_id){
+ $A.get("e.force:closeQuickAction").fire();
+ $A.get('e.force:refreshView').fire();
+ }else{
+ var sObjectEvent = $A.get("e.force:navigateToSObject");
+ sObjectEvent.setParams({
+ "recordId": sfId
+ })
+ sObjectEvent.fire();
+ }
+ }else{
+ helper.ShowToast({
+ "message" : rv.Message,
+ "type" : "error"
+ });
+ }
+ }else{
+ helper.ShowToast({
+ "message" : "Init error",
+ "type" : "error"
+ });
+ }
+ })
+ },
+ cancelClick : function(component, event, helper){
+ $A.get("e.force:closeQuickAction").fire();
+ //component.set("v.showNewAgencyContact", false);
+ },
+ searchAgencyContact : function(component, event, helper){
+ component.find('button').set('v.disabled', true);
+ helper.resetTable();
+ helper.preparePayloadForSearchAgencyContact(component, event, helper);
+ },
+ initContactTable : function(component, event, helper){
+ let cols = ['Name','AgencyHospital', 'DoctorDivision1','Type'];
+ let contactInfoList = [];
+ let awsDataIds = [];
+ let data = component.get('v.result');
+ if(data.object){
+ for(var i=0;i<data.object.length;i++){
+ if(data.object[i].dataId){
+ let contactInfo = new Object();
+ //闇�瑕佷慨鏀�
+ contactInfo.Name = data.object[i].name;
+ contactInfo.DoctorDivision1 = data.object[i].doctorDivision1;
+ contactInfo.AWSDataId = data.object[i].dataId;
+ contactInfo.Type = data.object[i].type;
+ contactInfo.pi = true;
+ awsDataIds.push(contactInfo.AWSDataId);
+ contactInfo.sfRecordId = '';
+ contactInfoList.push(contactInfo);
+ }
}
- return;
- }
}
- }
- }
-
- component.set("v.showSpinner", true);
- debugger;
- let data = {};
- if (record_id && !isClone) {
- data.Id = record_id;
- }
- for (let s of layout) {
- for (let c of s.layoutColumns) {
- for (let item of c.layoutItems) {
- if (item.field && item.behavior != "Readonly") {
- data[item.field] = item.value;
- }
- }
- }
- }
- let x = 1;
- helper.CallBackAction(
- component,
- "Save",
- {
- data: data,
- transId: "1",
- recordTypeId: record_type_id
- },
- function (data) {
- component.set("v.showSpinner", false);
- if (data.getState() == "SUCCESS") {
- var rv = data.getReturnValue();
- console.log(rv);
- var sfId = null;
- if (rv.IsSuccess) {
- sfId = rv.Data.recordId;
- helper.ShowToast({
- message: "鎴愬姛",
- type: "success"
- });
- if (record_id) {
- $A.get("e.force:closeQuickAction").fire();
- $A.get("e.force:refreshView").fire();
- } else {
- var sObjectEvent = $A.get("e.force:navigateToSObject");
- sObjectEvent.setParams({
- recordId: sfId
- });
- sObjectEvent.fire();
+ let AWSIdToSFIdMapValue = {};
+ },
+ openModel: function(component, event, helper) {
+ let layout = component.get('v.layout');
+ for(let s of layout){
+ for(let c of s.layoutColumns){
+ for(let item of c.layoutItems){
+ if(item.field == 'Agency_Hospital__c' && !item.value){
+ console.log('item.value = ' + item.value)
+ helper.ShowToast({
+ "message" : "璇峰厛閫夋嫨缁忛攢鍟嗗尰闄�",
+ "type" : "warning"
+ });
+ return
+ }
+ }
}
- } else {
- helper.ShowToast({
- message: rv.Message,
- type: "error"
- });
- }
- } else {
- helper.ShowToast({
- message: "Init error",
- type: "error"
- });
}
- }
- );
- },
- cancelClick: function (component, event, helper) {
- $A.get("e.force:closeQuickAction").fire();
- //component.set("v.showNewAgencyContact", false);
- },
- searchAgencyContact: function (component, event, helper) {
- component.find("button").set("v.disabled", true);
- helper.resetTable();
- helper.preparePayloadForSearchAgencyContact(component, event, helper);
- },
- initContactTable: function (component, event, helper) {
- let cols = ["Name", "AgencyHospital", "DoctorDivision1", "Type"];
- let contactInfoList = [];
- let awsDataIds = [];
- let data = component.get("v.result");
- if (data.object) {
- for (var i = 0; i < data.object.length; i++) {
- if (data.object[i].dataId) {
- let contactInfo = new Object();
- //闇�瑕佷慨鏀�
- contactInfo.Name = data.object[i].name;
- contactInfo.DoctorDivision1 = data.object[i].doctorDivision1;
- contactInfo.AWSDataId = data.object[i].dataId;
- contactInfo.Type = data.object[i].type;
- contactInfo.pi = true;
- awsDataIds.push(contactInfo.AWSDataId);
- contactInfo.sfRecordId = "";
- contactInfoList.push(contactInfo);
- }
- }
- }
- let AWSIdToSFIdMapValue = {};
- },
- openModel: function (component, event, helper) {
- let layout = component.get("v.layout");
- for (let s of layout) {
- for (let c of s.layoutColumns) {
- for (let item of c.layoutItems) {
- if (item.field == "Agency_Hospital__c" && !item.value) {
- console.log("item.value = " + item.value);
- helper.ShowToast({
- message: "璇峰厛閫夋嫨缁忛攢鍟嗗尰闄�",
- type: "warning"
- });
- return;
- }
- }
- }
- }
- // Set isModalOpen true
- component.set("v.isModalOpen", true);
- component.find("button").set("v.disabled", true);
- helper.preparePayloadForSearchAgencyContact(component, event, helper);
- },
-
- closeModel: function (component, event, helper) {
- // Set isModalOpen false
- component.set("v.isModalOpen", false);
- },
-
- saveDetails: function (component, event, helper) {
- //do something
- component.set("v.isModalOpen", false);
- },
-
- showNewAgency: function (component, event, helper) {
- //do something
- component.set("v.showNewAgencyContact", true);
- },
- closeAgencyContact: function (component, event, helper) {
- var message = event.getParam("showNewAgencyContact");
- component.set("v.showNewAgencyContact", message);
- component.find("button").set("v.disabled", true);
- helper.resetTable();
- helper.preparePayloadForSearchAgencyContact(component, event, helper);
- }
-});
+ // Set isModalOpen true
+ component.set("v.isModalOpen", true);
+ component.find('button').set('v.disabled', true);
+ helper.preparePayloadForSearchAgencyContact(component, event, helper);
+ },
+
+ closeModel: function(component, event, helper) {
+ // Set isModalOpen false
+ component.set("v.isModalOpen", false);
+ },
+
+ saveDetails: function(component, event, helper) {
+ //do something
+ component.set("v.isModalOpen", false);
+ },
+
+ showNewAgency: function(component, event, helper) {
+ //do something
+ component.set("v.showNewAgencyContact", true);
+ },
+ closeAgencyContact: function(component, event, helper) {
+ var message = event.getParam("showNewAgencyContact");
+ component.set("v.showNewAgencyContact", message);
+ component.find('button').set('v.disabled', true);
+ helper.resetTable();
+ helper.preparePayloadForSearchAgencyContact(component, event, helper);
+ },
+})
\ No newline at end of file
diff --git a/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunityHelper.js b/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunityHelper.js
index b861d13..18f1564 100644
--- a/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunityHelper.js
+++ b/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunityHelper.js
@@ -1,281 +1,239 @@
({
- CallBackAction: function (component, action_name, para, callback) {
- var action = component.get(
- "c." + action_name.trimStart().replace("c.", "")
- );
- if (para) {
- action.setParams(para);
- }
- if (callback) {
- action.setCallback(this, function (data) {
- callback(data);
- });
- }
-
- $A.enqueueAction(action);
- },
- ShowToast: function (paras) {
- var toastEvent = $A.get("e.force:showToast");
- toastEvent.setParams(paras);
- toastEvent.fire();
- },
- AwsPost: function (postURL, data, callback, token) {
- let payloadForNewPI = "";
- if (typeof data == "string") {
- payloadForNewPI = data;
- } else {
- payloadForNewPI = JSON.stringify(data);
- }
-
- AWSService.post(
- postURL,
- payloadForNewPI,
- function (result) {
- //this.insertCalloutLog(this.insertModule,postURL,JSON.stringify(payloadForNewPI),JSON.stringify(result),this.successStatus);
- if (callback) callback(result);
- },
- token
- );
- },
- AwsGet: function (url, data, callback, token) {
- if (typeof data == "string") {
- url += data;
- } else {
- let i = 0;
- for (let p in data) {
- url += i++ ? "&" : "?";
- url += p + "=" + data[p];
- }
- }
-
- AWSService.get(
- url,
- function (result) {
- //this.insertCalloutLog(this.insertModule,postURL,JSON.stringify(payloadForNewPI),JSON.stringify(result),this.successStatus);
- if (callback) callback(result);
- },
- token
- );
- },
- refreshTable: function (
- component,
- event,
- helper,
- cols,
- contactInfoList,
- contactsInfo
- ) {
- let that = this;
- let myTableDiv = document.getElementById("QueryResult");
- let table = document.createElement("TABLE");
- table.border = "1";
- table.id = "table";
- table.setAttribute(
- "class",
- "slds-table slds-table_cell-buffer slds-table_bordered"
- );
- let tableBody = document.createElement("TBODY");
- table.appendChild(tableBody);
- let headerTR = document.createElement("TR");
- headerTR.setAttribute("class", "slds-line-height_reset");
- let colsHeader = ["濮撳悕", "鍖婚櫌", "鍖荤敓鍖哄垎(鑱屽姟)", "鍒嗙被"];
- tableBody.appendChild(headerTR);
- for (let i = 0; i < colsHeader.length; i++) {
- let td = document.createElement("TH");
- td.width = "75";
- td.setAttribute("class", "slds-truncate");
- td.appendChild(document.createTextNode(colsHeader[i]));
- headerTR.appendChild(td);
- }
- //3. Init the AWS data
- for (let i = 0; i < contactInfoList.length; i++) {
- let tr = document.createElement("TR");
- tableBody.appendChild(tr);
- let contactInfoTemp = contactInfoList[i];
- for (let j = 0; j < cols.length; j++) {
- let td = document.createElement("TD");
- td.width = "75";
- if (contactInfoTemp.pi) {
- if (!contactsInfo.hasOwnProperty(contactInfoTemp.AWSDataId)) {
- continue;
- }
- if (j == 0 && contactsInfo[contactInfoTemp.AWSDataId]) {
- td.id = contactsInfo[contactInfoTemp.AWSDataId].Id;
- }
- } else {
- td.id = contactInfoTemp.sfRecordId;
+ CallBackAction : function(component,action_name,para,callback) {
+ var action = component.get("c." + action_name.trimStart().replace("c.",""));
+ if(para){
+ action.setParams(para);
}
- td.appendChild(
- document.createTextNode(
- contactInfoTemp[cols[j]] != null ? contactInfoTemp[cols[j]] : ""
- )
- );
- if (cols[j] == "Name") {
- td.addEventListener("click", function (obj) {
- that.redirectToParentPage(component, event, helper, obj);
- });
+ if(callback){
+ action.setCallback(this,function(data){
+ callback(data);
+ });
}
- tr.appendChild(td);
- }
- }
- myTableDiv.appendChild(table);
- component.find("button").set("v.disabled", false);
- },
- redirectToParentPage: function (component, event, helper, obj) {
- let agencyContactName = obj.currentTarget.innerText;
- let id = obj.currentTarget.id;
- component.set("v.ac_name", agencyContactName);
- let layout = component.get("v.layout");
- for (let s of layout) {
- for (let c of s.layoutColumns) {
- for (let item of c.layoutItems) {
- if (item.field == "Agency_Contact__c") {
- item.value = id;
- }
+
+ $A.enqueueAction(action);
+ },
+ ShowToast : function(paras){
+ var toastEvent = $A.get("e.force:showToast");
+ toastEvent.setParams(paras);
+ toastEvent.fire();
+ },
+ AwsPost : function(postURL, data ,callback,token){
+ let payloadForNewPI = '';
+ if(typeof(data) == 'string'){
+ payloadForNewPI = data;
+ }else{
+ payloadForNewPI = JSON.stringify(data);
}
- }
- }
- component.set("v.isModalOpen", false);
- },
- resetTable: function () {
- let queryResult = document.getElementById("QueryResult");
- let table = document.getElementsByTagName("table");
- if (table.length > 1) {
- for (var i = 1; i < table.length; i++) {
- queryResult.removeChild(table[i]);
- }
- }
- },
- preparePayloadForSearchAgencyContact: function (component, event, helper) {
- let that = this;
- let agencyHospitalId = "";
- let accountId = "";
- let layout = component.get("v.layout");
- for (let s of layout) {
- for (let c of s.layoutColumns) {
- for (let item of c.layoutItems) {
- if (item.field == "Agency_Hospital__c") {
- agencyHospitalId = item.value;
- }
- if (item.field == "Account_Opp__c") {
- accountId = item.value;
- }
- }
- }
- }
- var action = component.get("c.getAWSDataIds");
- action.setParams({
- agencyHospitalId: agencyHospitalId,
- accountId: accountId
- });
- action.setCallback(this, function (response) {
- var state = response.getState();
- if (state == "SUCCESS") {
- var rv = response.getReturnValue();
- if (rv.Data.length == 0) {
- component.find("button").set("v.disabled", false);
- helper.ShowToast({
- message: "璇ョ粡閿�鍟嗗尰闄笅闈㈡病鏈夊鎴蜂汉鍛�",
- type: "warning"
- });
- return;
- }
- let searchPayload = new Object();
- let searchAgencyContactName = component.get("v.searchKeyWord");
- searchPayload.dataIds = rv.Data;
- searchPayload.name = searchAgencyContactName;
- component.set("v.contactAWSIds", rv.Data);
- let staticResource = component.get("v.staticResource");
- let url = staticResource.searchUrl;
- let token = staticResource.token;
- this.AwsPost(
- url,
- searchPayload,
- function (data) {
- if (data.success) {
- let cols = ["Name", "AgencyHospital", "DoctorDivision1", "Type"];
- let contactInfoList = [];
- let awsDataIds = [];
- if (data.object.length == 0) {
- component.find("button").set("v.disabled", false);
- that.ShowToast({
- message: "娌℃湁鏌ヨ鍒拌瀹㈡埛浜哄憳",
- type: "warning"
- });
- return;
- }
- for (var i = 0; i < data.object.length; i++) {
- if (data.object[i].dataId) {
- let contactInfo = new Object();
- //闇�瑕佷慨鏀�
- contactInfo.Name = data.object[i].name;
- contactInfo.AgencyHospital = "";
- contactInfo.DoctorDivision1 = data.object[i].doctorDivision1;
- contactInfo.AWSDataId = data.object[i].dataId;
- contactInfo.Type = data.object[i].type;
- contactInfo.pi = true;
- awsDataIds.push(contactInfo.AWSDataId);
- contactInfo.sfRecordId = "";
- contactInfoList.push(contactInfo);
- }
- }
- //let AWSIdToSFIdMapValue = {};
- var searchAgencyContacts = component.get(
- "c.searchAgencyContacts"
- );
- searchAgencyContacts.setParams({
- awsAgencyContactIds: JSON.stringify(awsDataIds),
- agencyHospitalId: agencyHospitalId,
- accountId: accountId
- });
- searchAgencyContacts.setCallback(this, function (response) {
- var state = response.getState();
- if (state == "SUCCESS") {
- var rv = response.getReturnValue();
- if (rv.IsSuccess) {
- let contactsInfo = "";
- if (rv.Data) {
- contactsInfo = JSON.parse(
- rv.Data.replace(/("\;)/g, '"')
- );
- if (Object.keys(contactsInfo).length > 0) {
- for (let i = 0; i < contactInfoList.length; i++) {
- let contactFromSF =
- contactsInfo[contactInfoList[i]["AWSDataId"]];
- if (contactFromSF) {
- contactInfoList[i].sfRecordId = contactFromSF["Id"];
- if (contactFromSF["Agency_Hospital__r"]) {
- contactInfoList[i].AgencyHospital =
- contactFromSF["Agency_Hospital__r"]["Name"];
- }
- if (contactFromSF["Department_Class__r"]) {
- contactInfoList[i].AgencyHospital =
- contactFromSF["Department_Class__r"]["Parent"][
- "Name"
- ];
- }
- }
- }
- }
- }
- that.refreshTable(
- component,
- event,
- helper,
- cols,
- contactInfoList,
- contactsInfo
- );
- }
- }
- });
- $A.enqueueAction(searchAgencyContacts);
+
+ AWSService.post(postURL,payloadForNewPI,function(result) {
+ //this.insertCalloutLog(this.insertModule,postURL,JSON.stringify(payloadForNewPI),JSON.stringify(result),this.successStatus);
+ if(callback) callback(result);
+ },token);
+ },
+ AwsGet : function(url, data ,callback,token){
+
+ if(typeof(data) == 'string'){
+ url += data;
+ }else{
+ let i = 0;
+ for(let p in data){
+ url += (i++) ? '&' : '?';
+ url += p + '=' + data[p];
}
- },
- token
- );
- }
- });
- $A.enqueueAction(action);
- }
-});
+ }
+
+ AWSService.get(url,function(result){
+ //this.insertCalloutLog(this.insertModule,postURL,JSON.stringify(payloadForNewPI),JSON.stringify(result),this.successStatus);
+ if(callback) callback(result);
+ },token);
+ },
+ refreshTable : function(component, event, helper,cols,contactInfoList,contactsInfo){
+ let that = this;
+ let myTableDiv = document.getElementById("QueryResult");
+ let table = document.createElement('TABLE');
+ table.border = '1';
+ table.id = 'table';
+ table.setAttribute('class','slds-table slds-table_cell-buffer slds-table_bordered');
+ let tableBody = document.createElement('TBODY');
+ table.appendChild(tableBody);
+ let headerTR = document.createElement('TR');
+ headerTR.setAttribute('class','slds-line-height_reset');
+ let colsHeader = ['濮撳悕','鍖婚櫌', '鍖荤敓鍖哄垎(鑱屽姟)','鍒嗙被'];
+ tableBody.appendChild(headerTR);
+ for (let i = 0; i < colsHeader.length; i++) {
+ let td = document.createElement('TH');
+ td.width = '75';
+ td.setAttribute('class','slds-truncate slds-border_right');
+ td.appendChild(document.createTextNode(colsHeader[i]));
+ headerTR.appendChild(td);
+ }
+ //3. Init the AWS data
+ for (let i = 0; i < contactInfoList.length; i++) {
+ let tr = document.createElement('TR');
+ tableBody.appendChild(tr);
+ let contactInfoTemp = contactInfoList[i]
+ for (let j = 0; j < cols.length; j++) {
+ let td = document.createElement('TD');
+ td.width = '75';
+ if(contactInfoTemp.pi){
+ if (!contactsInfo.hasOwnProperty(contactInfoTemp.AWSDataId)) {
+ continue;
+ }
+ if(j == 0 && contactsInfo[contactInfoTemp.AWSDataId] ){
+ td.id = contactsInfo[contactInfoTemp.AWSDataId].Id;
+ }
+ }else{
+ td.id = contactInfoTemp.sfRecordId;
+ }
+ td.appendChild(document.createTextNode(contactInfoTemp[cols[j]]!=null?contactInfoTemp[cols[j]]:''));
+ if (cols[j] == 'Name') {
+ td.addEventListener("click", function (obj) {
+ that.redirectToParentPage(component, event, helper,obj);
+ });
+ }
+ tr.appendChild(td);
+ }
+ }
+ myTableDiv.appendChild(table);
+ component.find('button').set('v.disabled', false);
+ },
+ redirectToParentPage : function(component, event, helper,obj){
+ let agencyContactName = obj.currentTarget.innerText;
+ let id = obj.currentTarget.id;
+ component.set('v.ac_name',agencyContactName);
+ let layout = component.get('v.layout');
+ for(let s of layout){
+ for(let c of s.layoutColumns){
+ for(let item of c.layoutItems){
+ if(item.field == 'Agency_Contact__c'){
+ item.value = id;
+ }
+ }
+ }
+ }
+ component.set("v.isModalOpen", false);
+ },
+ resetTable : function(){
+ let queryResult = document.getElementById('QueryResult');
+ let table = document.getElementsByTagName('table');
+ debugger;
+ console.log('table:' + table);
+ debugger;
+ if(table.length > 1){
+ for(var i=1;i<table.length;i++){
+ queryResult.removeChild(table[i])
+ }
+ }
+ },
+ preparePayloadForSearchAgencyContact : function(component, event, helper){
+ let that = this;
+ let agencyHospitalId = '';
+ let accountId = '';
+ let layout = component.get('v.layout');
+ for(let s of layout){
+ for(let c of s.layoutColumns){
+ for(let item of c.layoutItems){
+ if(item.field == 'Agency_Hospital__c'){
+ agencyHospitalId = item.value;
+ }
+ if(item.field == 'Account_Opp__c'){
+ accountId = item.value;
+ }
+ }
+ }
+ }
+ var action = component.get('c.getAWSDataIds');
+ action.setParams({
+ "agencyHospitalId" : agencyHospitalId,
+ "accountId" : accountId
+ });
+ action.setCallback(this,function(response){
+ var state = response.getState();
+ if(state == 'SUCCESS'){
+ var rv = response.getReturnValue();
+ if(rv.Data.length == 0){
+ component.find('button').set('v.disabled', false);
+ helper.ShowToast({
+ "message" : "璇ョ粡閿�鍟嗗尰闄笅闈㈡病鏈夊鎴蜂汉鍛�",
+ "type" : "warning"
+ });
+ return
+ }
+ let searchPayload = new Object();
+ let searchAgencyContactName = component.get('v.searchKeyWord');
+ searchPayload.dataIds = rv.Data;
+ searchPayload.name = searchAgencyContactName;
+ component.set('v.contactAWSIds',rv.Data);
+ let staticResource = component.get('v.staticResource');
+ let url = staticResource.searchUrl;
+ let token = staticResource.token;
+ this.AwsPost(url,searchPayload,function(data){
+ if(data.success){
+ let cols = ['Name','AgencyHospital', 'DoctorDivision1','Type'];
+ let contactInfoList = [];
+ let awsDataIds = [];
+ if(data.object.length == 0){
+ component.find('button').set('v.disabled', false);
+ that.ShowToast({
+ "message" : '娌℃湁鏌ヨ鍒拌瀹㈡埛浜哄憳',
+ "type" : "warning"
+ });
+ return
+ }
+ for(var i=0;i<data.object.length;i++){
+ if(data.object[i].dataId){
+ let contactInfo = new Object();
+ //闇�瑕佷慨鏀�
+ contactInfo.Name = data.object[i].name;
+ contactInfo.AgencyHospital = '';
+ contactInfo.DoctorDivision1 = data.object[i].doctorDivision1;
+ contactInfo.AWSDataId = data.object[i].dataId;
+ contactInfo.Type = data.object[i].type;
+ contactInfo.pi = true;
+ awsDataIds.push(contactInfo.AWSDataId);
+ contactInfo.sfRecordId = '';
+ contactInfoList.push(contactInfo);
+ }
+ }
+ //let AWSIdToSFIdMapValue = {};
+ var searchAgencyContacts = component.get('c.searchAgencyContacts');
+ searchAgencyContacts.setParams({
+ "awsAgencyContactIds" : JSON.stringify(awsDataIds),
+ "agencyHospitalId" : agencyHospitalId,
+ "accountId" : accountId
+ });
+ searchAgencyContacts.setCallback(this,function(response){
+ var state = response.getState();
+ if(state == 'SUCCESS'){
+ var rv = response.getReturnValue();
+ if(rv.IsSuccess){
+ let contactsInfo = '';
+ if(rv.Data){
+ contactsInfo = JSON.parse(rv.Data.replace(/("\;)/g,"\""));
+ if(Object.keys(contactsInfo).length>0){
+ for(let i=0;i<contactInfoList.length;i++){
+ let contactFromSF = contactsInfo[contactInfoList[i]['AWSDataId']];
+ if(contactFromSF){
+ contactInfoList[i].sfRecordId = contactFromSF['Id'];
+ if(contactFromSF['Agency_Hospital__r']){
+ contactInfoList[i].AgencyHospital = contactFromSF['Agency_Hospital__r']['Name'];
+ }
+ if(contactFromSF['Department_Class__r']){
+ contactInfoList[i].AgencyHospital = contactFromSF['Department_Class__r']['Parent']['Name'];
+ }
+ }
+ }
+ }
+ }
+ that.refreshTable(component, event, helper,cols,contactInfoList,contactsInfo);
+ }
+ }
+ });
+ $A.enqueueAction(searchAgencyContacts);
+ }
+ },token);
+ }
+ });
+ $A.enqueueAction(action);
+ }
+})
\ No newline at end of file
diff --git a/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunityRenderer.js b/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunityRenderer.js
index aa209d1..f1f0c75 100644
--- a/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunityRenderer.js
+++ b/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunityRenderer.js
@@ -1,3 +1,5 @@
({
- // Your renderer method overrides go here
-});
+
+// Your renderer method overrides go here
+
+})
\ No newline at end of file
diff --git a/force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp b/force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp
index 2eef9b1..163d496 100644
--- a/force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp
+++ b/force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp
@@ -1,465 +1,314 @@
-<aura:component
- controller="WeeklyReportCmp"
- implements="force:appHostable,flexipage:availableForAllPageTypes,flexipage:availableForRecordHome,force:hasRecordId,force:lightningQuickAction,forceCommunity:availableForAllPageTypes"
- access="global"
->
- <ltng:require styles="{!$Resource.multilineToastCSS}" />聽
- <aura:handler name="init" value="{!this}" action="{!c.doInit}" />
- <aura:handler
- event="c:strike_evt"
- action="{!c.createAopp}"
- name="strike_evt_addNewRecord"
- />
- <aura:attribute
- name="data"
- type="Agency_Report__c"
- default="{sobjectType:'Agency_Report__c'}"
- />
- <aura:attribute
- name="oppdata"
- type="Agency_Opportunity__c"
- default="{sobjectType:'Agency_Opportunity__c'}"
- />
- <aura:attribute
- name="acondata"
- type="Agency_Contact__c"
- default="{sobjectType:'Agency_Contact__c'}"
- />
- <!-- <aura:attribute name="oppdata_old" type="Agency_Opportunity__c" default="{sobjectType:'Agency_Opportunity__c'}"/> -->
- <aura:attribute name="Close_Forecasted_Date__c_o" type="Date" />
- <aura:attribute name="Amount__c_o" type="String" />
- <aura:attribute name="OCMSale_Price__c_o" type="String" />
- <aura:attribute name="StageName__c_o" type="String" />
- <aura:attribute name="fieldsmap" type="Map" />
- <aura:attribute name="alldata" type="List" />
- <aura:attribute name="allselectlist" type="Map" />
- <aura:attribute name="doclist" type="List" />
- <aura:attribute name="docmap" type="Map" />
- <aura:attribute name="login" type="Boolean" default="false" />
- <aura:attribute name="loadOpp" type="Boolean" default="false" />
- <aura:attribute name="reportPageData" type="Map" />
- <aura:attribute name="selectbody" type="String" />
- <aura:attribute name="report_date_list" type="Map" />
- <aura:attribute name="selected_date" type="String" />
- <aura:attribute name="selected_agency_person" type="String" />
- <aura:attribute name="agency_report_header" type="String" />
- <aura:attribute name="agency_report_header_id" type="String" />
- <aura:attribute name="result" type="String" default="" />
- <aura:attribute name="hospital" type="string" default="" />
- <aura:attribute name="hospitalId" type="string" default="" />
- <aura:attribute name="hospitalLinkId" type="string" default="" />
- <aura:handler name="change" value="{!v.hospital}" action="{!c.hosChange}" />
- <aura:attribute name="hospitalList" type="Map" />
- <aura:attribute name="doctor_list" type="Map" />
- <aura:attribute name="doctor_title" type="String" />
- <aura:attribute name="opportunity_list" type="Map" />
- <aura:handler
- name="change"
- value="{!v.data.Opportunity__c}"
- action="{!c.opportunityChange}"
- />
- <aura:attribute name="edit_copy_select_report_id" type="String" />
- <aura:attribute name="create_agency_report_id" type="String" />
- <aura:attribute name="reports" type="List" />
- <aura:attribute name="reports_now" type="List" />
- <aura:attribute name="reports_now_count" type="Integer" />
- <aura:attribute name="mode" type="String" />
- <aura:attribute name="select_report_data" type="Map" />
- <aura:attribute name="select_report_data_radio" type="Map" />
- <aura:attribute name="default_select_doctor_id" type="String" />
- <aura:attribute name="default_select_opportunity_id" type="String" />
- <aura:attribute name="report_count" type="Integer" />
- <aura:attribute name="dialog_type" type="String" />
- <aura:attribute name="truthy" type="Boolean" default="false" />
- <aura:attribute name="list_message" type="String" default="鎼滅储" />
- <aura:attribute name="confirm_status" type="Integer" default="0" />
- <aura:attribute name="modal_confirm_title" type="String" />
- <aura:attribute name="modal_confirm_text" type="String" />
- <aura:attribute name="opportunity_cfilter" type="String" />
- <!-- <aura:handler name="change" value="{!v.data.Product_Category1__c}" action="{!c.productcategoryChange1}"/>
+<aura:component controller="WeeklyReportCmp" implements="force:appHostable,flexipage:availableForAllPageTypes,flexipage:availableForRecordHome,force:hasRecordId,force:lightningQuickAction,forceCommunity:availableForAllPageTypes" access="global" >
+ <ltng:require styles="{!$Resource.multilineToastCSS}" />聽
+ <aura:handler name="init" value="{!this}" action="{!c.doInit}"/>
+ <aura:handler event="c:strike_evt" action="{!c.createAopp}" name="strike_evt_addNewRecord"/>
+ <aura:attribute name="data" type="Agency_Report__c" default="{sobjectType:'Agency_Report__c'}"/>
+ <aura:attribute name="oppdata" type="Agency_Opportunity__c" default="{sobjectType:'Agency_Opportunity__c'}"/>
+ <aura:attribute name="acondata" type="Agency_Contact__c" default="{sobjectType:'Agency_Contact__c'}"/>
+ <!-- <aura:attribute name="oppdata_old" type="Agency_Opportunity__c" default="{sobjectType:'Agency_Opportunity__c'}"/> -->
+ <aura:attribute name="Close_Forecasted_Date__c_o" type="Date"/>
+ <aura:attribute name="Amount__c_o" type="String"/>
+ <aura:attribute name="OCMSale_Price__c_o" type="String"/>
+ <aura:attribute name="StageName__c_o" type="String"/>
+ <aura:attribute name="fieldsmap" type="Map"/>
+ <aura:attribute name="alldata" type="List"/>
+ <aura:attribute name="allselectlist" type="Map"/>
+ <aura:attribute name="doclist" type="List"/>
+ <aura:attribute name="docmap" type="Map"/>
+ <aura:attribute name="login" type="Boolean" default="false"/>
+ <aura:attribute name="loadOpp" type="Boolean" default="false"/>
+ <aura:attribute name="reportPageData" type="Map"/>
+ <aura:attribute name="selectbody" type="String"/>
+ <aura:attribute name="report_date_list" type="Map"/>
+ <aura:attribute name="selected_date" type="String"/>
+ <aura:attribute name="selected_agency_person" type="String"/>
+ <aura:attribute name="agency_report_header" type="String"/>
+ <aura:attribute name="agency_report_header_id" type="String"/>
+ <aura:attribute name="result" type="String" default=""/>
+ <aura:attribute name="hospital" type="string" default=""/>
+ <aura:attribute name="hospitalId" type="string" default=""/>
+ <aura:attribute name="hospitalLinkId" type="string" default=""/>
+ <aura:handler name="change" value="{!v.hospital}" action="{!c.hosChange}"/>
+ <aura:attribute name="hospitalList" type="Map" />
+ <aura:attribute name="doctor_list" type="Map"/>
+ <aura:attribute name="doctor_title" type="String"/>
+ <aura:attribute name="opportunity_list" type="Map"/>
+ <aura:handler name="change" value="{!v.data.Opportunity__c}" action="{!c.opportunityChange}"/>
+ <aura:attribute name="edit_copy_select_report_id" type="String"/>
+ <aura:attribute name="create_agency_report_id" type="String"/>
+ <aura:attribute name="reports" type="List"/>
+ <aura:attribute name="reports_now" type="List"/>
+ <aura:attribute name="reports_now_count" type="Integer"/>
+ <aura:attribute name="mode" type="String"/>
+ <aura:attribute name="select_report_data" type="Map"/>
+ <aura:attribute name="select_report_data_radio" type="Map"/>
+ <aura:attribute name="default_select_doctor_id" type="String"/>
+ <aura:attribute name="default_select_opportunity_id" type="String"/>
+ <aura:attribute name="report_count" type="Integer"/>
+ <aura:attribute name="dialog_type" type="String"/>
+ <aura:attribute name="truthy" type="Boolean" default="false"/>
+ <aura:attribute name="list_message" type="String" default="鎼滅储" />
+ <aura:attribute name="confirm_status" type="Integer" default="0" />
+ <aura:attribute name="modal_confirm_title" type="String" />
+ <aura:attribute name="modal_confirm_text" type="String" />
+ <aura:attribute name="opportunity_cfilter" type="String" />
+ <!-- <aura:handler name="change" value="{!v.data.Product_Category1__c}" action="{!c.productcategoryChange1}"/>
<aura:handler name="change" value="{!v.data.Product_Category2__c}" action="{!c.productcategoryChange2}"/>
<aura:handler name="change" value="{!v.data.Product_Category3__c}" action="{!c.productcategoryChange3}"/> -->
- <!-- <aura:handler name="change" value="{!v.oppdata.StageName__c}" action="{!c.stageNameChange}"/> -->
- <aura:attribute
- name="update_select_report_data_id"
- type="String"
- default=""
- />
+ <!-- <aura:handler name="change" value="{!v.oppdata.StageName__c}" action="{!c.stageNameChange}"/> -->
+ <aura:attribute name="update_select_report_data_id" type="String" default=""/>
- <!-- 鎵归噺娣诲姞鍛ㄦ姤 start-->
- <aura:attribute name="reports_date" type="List" />
- <!-- <aura:attribute name="reports_date1" type="Date" />
+ <!-- 鎵归噺娣诲姞鍛ㄦ姤 start-->
+ <aura:attribute name="reports_date" type="List" />
+ <!-- <aura:attribute name="reports_date1" type="Date" />
<aura:attribute name="reports_date2" type="Date" /> -->
- <aura:attribute
- name="TableContent"
- type="String"
- description=" Show the Result class"
- />
- <aura:attribute
- name="TableContent2"
- type="String"
- description=" Show the Result class"
- />
- <aura:attribute
- name="TargetFileName"
- type="String"
- description="Name of the file"
- />
- <aura:attribute name="tableheaders" type="Object[]" />
- <aura:attribute name="fileContentData" type="String" />
- <aura:attribute name="filename" type="String" />
- <!-- It will display 100 records . Change for your requirement-->
- <aura:attribute name="NumOfRecords" type="Integer" default="1000" />
- <aura:attribute name="showMain" type="Boolean" default="true" />
- <!-- PIPL update Yin Mingjie 21/02/2022 start -->
- <aura:attribute name="AWStoken" type="String" />
- <aura:attribute name="AWSsearch" type="String" />
- <aura:attribute name="AWSinsert" type="String" />
- <aura:attribute name="AWStransactionURL" type="String" />
- <aura:attribute name="AWSDoctor2Map" type="String" />
- <aura:attribute name="awsurl" type="Map" />
- <aura:attribute name="contactawsurl" type="Map" />
- <aura:attribute name="allselectlistAgencyPerson" type="Map" />
- <!-- PIPL update Yin Mingjie 21/02/2022 end -->
- <!-- 鎵归噺娣诲姞鍛ㄦ姤 end-->
- <ltng:require scripts="{! $Resource.AWSService+'/AWSService.js' }" />
- <ltng:require scripts="{! $Resource.jquery183minjs }" />
+ <aura:attribute name="TableContent" type="String" description=" Show the Result class"/>
+ <aura:attribute name="TableContent2" type="String" description=" Show the Result class"/>
+ <aura:attribute name="TargetFileName" type="String" description="Name of the file"/>
+ <aura:attribute name="tableheaders" type="Object[]" />
+ <aura:attribute name="fileContentData" type="String"/>
+ <aura:attribute name="filename" type="String"/>
+ <!-- It will display 100 records . Change for your requirement-->
+ <aura:attribute name="NumOfRecords" type="Integer" default="1000"/>
+ <aura:attribute name="showMain" type="Boolean" default="true"/>
+ <!-- PIPL update Yin Mingjie 21/02/2022 start -->
+ <aura:attribute name="AWStoken" type="String"/>
+ <aura:attribute name="AWSsearch" type="String"/>
+ <aura:attribute name="AWSinsert" type="String"/>
+ <aura:attribute name="AWStransactionURL" type="String"/>
+ <aura:attribute name="AWSDoctor2Map" type="String"/>
+ <aura:attribute name="awsurl" type="Map"/>
+ <aura:attribute name="contactawsurl" type="Map"/>
+ <aura:attribute name="allselectlistAgencyPerson" type="Map"/>
+ <!-- PIPL update Yin Mingjie 21/02/2022 end -->
- <!--銉兗銉変腑...-->
- <aura:renderIf isTrue="{!v.login}">
- <div class="slds-spinner_container height100vh">
- <div
- class="slds-spinner--brand slds-spinner slds-spinner--medium"
- role="alert"
- >
- <span id="aa" class="slds-assistive-text">Loading</span>
- <div class="slds-spinner__dot-a"></div>
- <div class="slds-spinner__dot-b"></div>
+ <!-- start DTT-zhj 澧炲姞閿欒淇℃伅table 2023-05-16-->
+ <aura:attribute name="errorData" type="Object" />
+ <aura:attribute name="errorColumns" type="List" />
+ <!-- show Error information -->
+ <aura:attribute name="showErrorInfo" type="Boolean" default="false" />
+ <!-- end DTT-zhj 澧炲姞閿欒淇℃伅table 2023-05-16-->
+
+ <!-- 鎵归噺娣诲姞鍛ㄦ姤 end-->
+ <ltng:require scripts="{! $Resource.AWSService+'/AWSService.js' }" />
+ <ltng:require scripts="{! $Resource.jquery183minjs }" />
+
+ <!--銉兗銉変腑...-->
+ <aura:renderIf isTrue="{!v.login}">
+ <div class="weeklyReportSpinner">
+ <div class="slds-spinner_container">
+ <div class="slds-spinner--brand slds-spinner slds-spinner--medium" role="alert">
+ <span id="aa" class="slds-assistive-text">Loading</span>
+ <div class="slds-spinner__dot-a"></div>
+ <div class="slds-spinner__dot-b"></div>
+ </div>
+ </div>
</div>
+ </aura:renderIf>
+
+ <div aura:id="report" id="report">
+ <div class="slds-grid slds-wrap slds-grid--pull-padded">
+ <div class="tr mt5 slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-12 slds-large-size--1-of-12">
+ 鍛�
+ </div>
+ <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12">
+ <ui:inputSelect aura:id="select_date" class="slds-select" change="{!c.select_date_change}"/>
+ </div>
+
+ <!-- 浠ｇ悊搴楁媴褰撹�� -->
+ <div class="tr mt5 slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-12 slds-large-size--1-of-12">
+ {!v.fieldsmap.Person_In_Charge2__c}
+ </div>
+ <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12">
+ <ui:inputSelect aura:id="select_agency_person" class="slds-select agency_person_select" change="{!c.select_agency_change}"/>
+ </div>
+ <div class="tr slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-12 slds-large-size--1-of-12">
+ <ui:button aura:id="new_button" label="鏂板缓" press="{!c.new_report}" disabled="true"/>
+ </div>
+ <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12">
+ <ui:button aura:id="copy_button" label="澶嶅埗" press="{!c.copy_button}" disabled="true"/>
+ <!-- <ui:button aura:id="import" label="瀵煎叆" press="{!c.import}" /> -->
+ <ui:button aura:id="import" label="瀵煎叆" press="{!c.import}" />
+
+ <!-- <input type="file" class="file" aura:id="file" onchange="{!c.CreateRecord}" style="position:absolute;filter:alpha(opacity=0);" size="1" hidden="true" /> -->
+ <!-- <ui:button aura:id="import" label="瀵煎嚭" press="{!c.export}"/> -->
+ <ui:button aura:id="export" label="瀵煎嚭" press="{!c.export_condition}"/>
+ </div>
+
+ </div>
</div>
- </aura:renderIf>
-
- <div aura:id="report" id="report" class="contents_wrapper">
- <div class="slds-grid slds-wrap slds-grid--pull-padded">
- <div
- class="tr mt5 slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-12 slds-large-size--1-of-12"
- >
- 鍛�
- </div>
- <div
- class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12"
- >
- <ui:inputSelect
- aura:id="select_date"
- class="slds-select"
- change="{!c.select_date_change}"
- />
- </div>
-
- <!-- 浠ｇ悊搴楁媴褰撹�� -->
- <div
- class="tr mt5 slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-12 slds-large-size--1-of-12"
- >
- {!v.fieldsmap.Person_In_Charge2__c}
- </div>
- <div
- class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12"
- >
- <ui:inputSelect
- aura:id="select_agency_person"
- class="slds-select agency_person_select"
- change="{!c.select_agency_change}"
- />
- </div>
- <div
- class="tr slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12"
- >
- <ui:button
- aura:id="new_button"
- label="鏂板缓"
- press="{!c.new_report}"
- disabled="true"
- />
- </div>
- <div
- class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12"
- >
- <ui:button
- aura:id="copy_button"
- label="澶嶅埗"
- press="{!c.copy_button}"
- disabled="true"
- />
- <!-- <ui:button aura:id="import" label="瀵煎叆" press="{!c.import}" /> -->
- <ui:button aura:id="import" label="瀵煎叆" press="{!c.import}" />
-
- <!-- <input type="file" class="file" aura:id="file" onchange="{!c.CreateRecord}" style="position:absolute;filter:alpha(opacity=0);" size="1" hidden="true" /> -->
- <!-- <ui:button aura:id="import" label="瀵煎嚭" press="{!c.export}"/> -->
- <ui:button
- aura:id="export"
- label="瀵煎嚭"
- press="{!c.export_condition}"
- />
- </div>
- </div>
- </div>
-
- <div aura:id="report_list" class="report_list_area">
- <div class="slds-table--edit_container slds-is-relative">
- <table
- class="slds-table slds-table--edit slds-table--bordered slds-table--fixed-layout slds-no-cell-focus"
- role="grid"
- style="width: 66.75rem"
- >
- <thead>
- <tr class="slds-line-height--reset">
- <th class="table_header slds-text-title--caps"></th>
- <th class="table_header slds-text-title--caps">
- <span class="slds-truncate" title="Name"
- >{!v.fieldsmap.Person_In_Charge2__c}</span
- >
- </th>
- <th class="table_header slds-text-title--caps">
- <span class="slds-truncate" title="Name">鍖婚櫌</span>
- </th>
- <th class="table_header slds-text-title--caps">
- <span class="slds-truncate" title="Name"
- >{!v.fieldsmap.Department_Cateogy__c}</span
- >
- </th>
- <th class="table_header slds-text-title--caps">
- <!-- PIPL update Yin Mingjie 21/02/2022 start
+
+ <div aura:id="report_list" class="report_list_area">
+ <div class="slds-table--edit_container slds-is-relative">
+ <table class="slds-table slds-table--edit slds-table--bordered slds-table--fixed-layout slds-no-cell-focus" role="grid" style="width:66.75rem;">
+ <thead>
+ <tr class="slds-line-height--reset">
+ <th class="table_header slds-text-title--caps" style="width: 250px;">
+
+ </th>
+ <th class="table_header slds-text-title--caps" style="width: 100px;">
+ <span class="slds-truncate" title="Name">{!v.fieldsmap.Person_In_Charge2__c}</span>
+ </th>
+ <th class="table_header slds-text-title--caps" style="width: 250px;">
+ <span class="slds-truncate" title="Name">鍖婚櫌</span>
+ </th>
+ <th class="table_header slds-text-title--caps" style="width: 100px;">
+ <span class="slds-truncate" title="Name">{!v.fieldsmap.Department_Cateogy__c}</span>
+ </th>
+ <th class="table_header slds-text-title--caps" style="width: 100px;">
+ <!-- PIPL update Yin Mingjie 21/02/2022 start
<span class="slds-truncate" title="Name">{!v.fieldsmap.doctor2__r}</span>
PIPL update Yin Mingjie 21/02/2022 end-->
- <span class="slds-truncate" title="Name"
- >{!v.fieldsmap.Agency_Contact__c}</span
- >
- </th>
- <th class="table_header slds-text-title--caps">
- <span class="slds-truncate" title="Name"
- >{!v.fieldsmap.visitor_title__c}</span
- >
- </th>
- <th class="table_header slds-text-title--caps">
- <span class="slds-truncate" title="Name"
- >{!v.fieldsmap.Purpose_Type__c}</span
- >
- </th>
- </tr>
- </thead>
- <tbody>
- <aura:iteration items="{!v.reports}" var="item" indexVar="index">
- <tr class="slds-hint-parent">
- <td role="gridcell" class="slds-cell-edit">
- <ui:inputRadio
- class="report_radio"
- name="report_radio"
- label="{!item.Name}"
- change="{!c.change_report_radio}"
- />
- <lightning:buttonIcon
- class="edit_button"
- iconName="utility:edit"
- size="small"
- alternativeText="edit"
- value="{!index}"
- onclick="{!c.edit_button}"
- />
- </td>
- <td role="gridcell" class="slds-cell-edit">
- <span class="slds-grid slds-grid--align-spread">
- <span
- class="slds-truncate"
- title="{!item.Person_In_Charge2__r.Name}"
- >
- {!item.Person_In_Charge2__r.Name}
- <!-- <span class="decrypt">{!item.Person_In_Charge2__r.awsdata.lastName}</span> -->
- </span>
- </span>
- </td>
- <th scope="row" tabindex="0" class="slds-cell-edit">
- <span class="slds-grid slds-grid--align-spread">
- {!item.Agency_Hospital__r.Name}
- </span>
- </th>
- <td role="gridcell" class="slds-cell-edit">
- <span class="slds-grid slds-grid--align-spread">
- <span
- class="slds-truncate"
- title="{!item.Department_Cateogy__c}"
- >{!item.Department_Cateogy__c}</span
- >
- </span>
- </td>
- <td role="gridcell" class="slds-cell-edit">
- <span class="slds-grid slds-grid--align-spread">
- <span class="slds-truncate" title="{!item.doctor2__r.Name}">
- <span class="encrypt">{!item.doctor2__r.Name}</span>
- <span class="decrypt">{!item.doctor2__r.awsdata.name}</span>
- </span>
- </span>
- </td>
- <td role="gridcell" class="slds-cell-edit">
- <span class="slds-grid slds-grid--align-spread">
- <span class="slds-truncate" title="{!item.visitor_title__c}">
- <span class="encrypt">{!item.visitor_title__c}</span>
- <span class="decrypt"
- >{!item.doctor2__r.awsdata.doctorDivision1}</span
- >
- </span>
- </span>
- </td>
- <td role="gridcell" class="slds-cell-edit">
- <span class="slds-grid slds-grid--align-spread">
- <span class="slds-truncate" title="{!item.Purpose_Type__c}"
- >{!item.Purpose_Type__c}</span
- >
- </span>
- </td>
- </tr>
- </aura:iteration>
- </tbody>
- </table>
+ <span class="slds-truncate" title="Name" style="width: 100px;">{!v.fieldsmap.Agency_Contact__c}</span>
+
+ </th>
+ <th class="table_header slds-text-title--caps" style="width: 100px;">
+ <span class="slds-truncate" title="Name">{!v.fieldsmap.visitor_title__c}</span>
+ </th>
+ <th class="table_header slds-text-title--caps">
+ <span class="slds-truncate" title="Name">{!v.fieldsmap.Purpose_Type__c}</span>
+ </th>
+ </tr>
+ </thead>
+ <tbody>
+ <aura:iteration items="{!v.reports}" var="item" indexVar="index">
+ <tr class="slds-hint-parent">
+ <td role="gridcell" class="slds-cell-edit">
+ <ui:inputRadio class="report_radio" name="report_radio" label="{!item.Name}" change="{!c.change_report_radio}"/>
+ <lightning:buttonIcon class="edit_button" iconName="utility:edit" size="small" alternativeText="edit" value="{!index}" onclick="{!c.edit_button}"/>
+ </td>
+ <td role="gridcell" class="slds-cell-edit">
+ <span class="slds-grid slds-grid--align-spread">
+ <span class="slds-truncate" title="{!item.Person_In_Charge2__r.Name}">
+ {!item.Person_In_Charge2__r.Name}
+ <!-- <span class="decrypt">{!item.Person_In_Charge2__r.awsdata.lastName}</span> -->
+ </span>
+ </span>
+ </td>
+ <th scope="row" tabindex="0" class="slds-cell-edit">
+ <span class="slds-grid slds-grid--align-spread" style="word-wrap:break-word;word-break:break-all; ">
+ {!item.Agency_Hospital__r.Name}
+ </span>
+ </th>
+ <td role="gridcell" class="slds-cell-edit">
+ <span class="slds-grid slds-grid--align-spread">
+ <span class="slds-truncate" title="{!item.Department_Cateogy__c}">{!item.Department_Cateogy__c}</span>
+ </span>
+ </td>
+ <td role="gridcell" class="slds-cell-edit">
+ <span class="slds-grid slds-grid--align-spread">
+ <span class="slds-truncate" title="{!item.doctor2__r.Name}">
+ <span class="encrypt">{!item.doctor2__r.Name}</span>
+ <span class="decrypt">{!item.doctor2__r.awsdata.name}</span>
+ </span>
+ </span>
+ </td>
+ <td role="gridcell" class="slds-cell-edit">
+ <span class="slds-grid slds-grid--align-spread">
+ <span class="slds-truncate" title="{!item.visitor_title__c}">
+ <span class="encrypt">{!item.visitor_title__c}</span>
+ <span class="decrypt">{!item.doctor2__r.awsdata.doctorDivision1}</span>
+ </span>
+ </span>
+ </td>
+ <td role="gridcell" class="slds-cell-edit">
+ <span class="slds-grid slds-grid--align-spread">
+ <span class="slds-truncate" title="{!item.Purpose_Type__c}">{!item.Purpose_Type__c}</span>
+ </span>
+ </td>
+ </tr>
+ </aura:iteration>
+ </tbody>
+ </table>
+ </div>
+ <aura:renderIf isTrue="{!v.report_count > 0}">
+ <aura:set attribute="else">
+ <div class="no_data_area">
+ {!v.list_message}
+ </div>
+ </aura:set>
+ </aura:renderIf>
</div>
- <aura:renderIf isTrue="{!v.report_count > 0}">
- <aura:set attribute="else">
- <div class="no_data_area">{!v.list_message}</div>
- </aura:set>
- </aura:renderIf>
- </div>
- <!-- <ui:button aura:id="test_button" label="test" class="fade animation_on" press="{!c.test}"/>-->
- <!-- 鎵归噺娣诲姞鍛ㄦ姤 start-->
- <div
- aura:id="modal_import"
- role="dialog"
- tabindex="-1"
- class="disp_none slds-modal slds-fade-in-open slds-modal--large"
- aria-labelledby="headerTarget"
- >
- <div class="slds-modal__container">
- <div class="slds-modal__header">
- <h4 id="headerTarget" class="slds-float--left"></h4>
- <h2 id="headerTarget" class="slds-text-heading--medium">
- 鍛ㄦ姤鎵归噺瀵煎叆
- </h2>
- <ui:button
- aura:id="close_button"
- label="鍏抽棴"
- class="close_button slds-button slds-button--neutral slds-order--1"
- press="{!c.close_import}"
- />
- </div>
- <div
- class="slds-modal__content slds-scrollable slds-grow slds-p-around--medium"
- >
- <aura:if isTrue="{!v.showMain}">
- <div>
- <!-- <input type="file" class="file" aura:id="file" onchange="{!c.CreateRecord}" value="瀵煎叆" /> -->
- <lightning:input
- type="file"
- class="file"
- uara:id="file"
- onchange="{!c.CreateRecord}"
- />
- <!-- <ui:button label="Create Accounts" press="{!c.CreateRecord}"/> -->
- </div>
- <aura:set attribute="else">
- <!-- <ui:outputRichText class="uiOutputRichText slds-m-around-large" value="{!v.TargetFileName}"/> -->
- <ui:outputRichText
- class="uiOutputRichText slds-m--around-large"
- value="{!v.TableContent}"
- />
- <div class="slds-p-around--large slds-align--absolute-center">
- <lightning:button
- label="淇濆瓨"
- variant="brand"
- onclick="{!c.processFileContent}"
- />
- <lightning:button
- label="鍙栨秷"
- variant="brand"
- onclick="{!c.cancel}"
- />
+<!-- <ui:button aura:id="test_button" label="test" class="fade animation_on" press="{!c.test}"/>-->
+ <!-- 鎵归噺娣诲姞鍛ㄦ姤 start-->
+ <div aura:id="modal_import" role="dialog" tabindex="-1" class="disp_none slds-modal slds-fade-in-open slds-modal--large" aria-labelledby="headerTarget">
+ <div class="slds-modal__container ">
+ <div class="slds-modal__header ">
+ <h4 id="headerTarget" class="slds-float--left"></h4>
+ <h2 id="headerTarget" class="slds-text-heading--medium">鍛ㄦ姤鎵归噺瀵煎叆</h2>
+ <ui:button aura:id="close_button" label="鍏抽棴" class="close_button slds-button slds-button--neutral slds-order--1" press="{!c.close_import}"/>
</div>
- </aura:set>
- </aura:if>
- </div>
+ <div class="slds-modal__content slds-scrollable slds-grow slds-p-around--medium " >
+ <aura:if isTrue="{!v.showMain}">
+ <div>
+ <!-- <input type="file" class="file" aura:id="file" onchange="{!c.CreateRecord}" value="瀵煎叆" /> -->
+ <lightning:input type="file" class="file" uara:id="file" onchange="{!c.CreateRecord}" />
+ <!-- <ui:button label="Create Accounts" press="{!c.CreateRecord}"/> -->
+ </div>
+ <aura:set attribute="else">
+ <!-- <ui:outputRichText class="uiOutputRichText slds-m-around-large" value="{!v.TargetFileName}"/> -->
+ <ui:outputRichText class="uiOutputRichText slds-m--around-large" value="{!v.TableContent}"/>
+ <div class="slds-p-around--large slds-align--absolute-center">
+ <lightning:button label="淇濆瓨" variant="brand" onclick="{!c.processFileContent}"
+ />
+ <lightning:button label="鍙栨秷" variant="brand"
+ onclick="{!c.cancel}" />
+ </div>
+ <!-- start DTT-zhj 澧炲姞閿欒淇℃伅table 2023-05-16-->
+ <aura:if isTrue="{!v.showErrorInfo}">
+ <div class="slds-p-around--large slds-align--absolute-center">
+ <lightning:button label="瀵煎嚭閿欒淇℃伅" variant="brand" onclick="{!c.exportErrorInfo}" />
+ </div>
+ <div class="slds-p-around--large slds-align--absolute-center">
+ <div style="height: 300px;overflow-x:scroll">
+ <lightning:datatable keyField="id" data="{! v.errorData }"
+ columns="{! v.errorColumns }" hideCheckboxColumn="true" />
+ </div>
+ </div>
+ </aura:if>
+ <!-- start DTT-zhj 澧炲姞閿欒淇℃伅table 2023-05-16-->
+ </aura:set>
+ </aura:if>
+ </div>
+ </div>
</div>
- </div>
- <div
- aura:id="modal_importbg"
- class="disp_none slds-backdrop slds-backdrop--open"
- ></div>
- <!-- 鎵归噺娣诲姞鍛ㄦ姤 end-->
+ <div aura:id="modal_importbg" class="disp_none slds-backdrop slds-backdrop--open"></div>
+ <!-- 鎵归噺娣诲姞鍛ㄦ姤 end-->
- <!-- 鎵归噺瀵煎嚭鍛ㄦ姤 start-->
- <div
- aura:id="modal_export"
- role="dialog"
- tabindex="-1"
- class="disp_none slds-modal slds-fade-in-open slds-modal--large"
- >
- <div class="slds-modal__container">
- <div class="slds-modal__header">
- <h4 id="headerTarget" class="slds-float--left"></h4>
- <h2 id="headerTarget" class="slds-text-heading--medium">
- 鍛ㄦ姤鎵归噺瀵煎嚭
- </h2>
- <ui:button
- aura:id="close_button"
- label="鍏抽棴"
- class="close_button slds-button slds-button--neutral slds-order--1"
- press="{!c.close_export}"
- />
- </div>
- <div
- class="slds-modal__content slds-scrollable slds-grow slds-p-around--medium"
- >
- <aura:if isTrue="{!v.showMain}">
- <div class="slds-grid slds-wrap slds-grid--pull-padded">
- <div
- class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-4"
- ></div>
- <div
- class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-4"
- >
- 娲诲姩鏃ュ紑濮嬫棩鏈�
+ <!-- 鎵归噺瀵煎嚭鍛ㄦ姤 start-->
+ <div aura:id="modal_export" role="dialog" tabindex="-1" class="disp_none slds-modal slds-fade-in-open slds-modal--large" >
+ <div class="slds-modal__container">
+ <div class="slds-modal__header">
+ <h4 id="headerTarget" class="slds-float--left"></h4>
+ <h2 id="headerTarget" class="slds-text-heading--medium">鍛ㄦ姤鎵归噺瀵煎嚭</h2>
+ <ui:button aura:id="close_button" label="鍏抽棴" class="close_button slds-button slds-button--neutral slds-order--1" press="{!c.close_export}"/>
+ </div>
+ <div class="slds-modal__content slds-scrollable slds-grow slds-p-around--medium">
+ <aura:if isTrue="{!v.showMain}">
+ <div class="slds-grid slds-wrap slds-grid--pull-padded" >
+ <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-4">
+ </div>
+ <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-4">
+ 娲诲姩鏃ュ紑濮嬫棩鏈�
+
+ <lightning:input type="Date" class="slds-input slds-input_bare " aura:id="input-report-date1" />
+ </div>
+ <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-4">
+ 娲诲姩鏃ョ粨鏉熸棩鏈�
+ <lightning:input type="Date" class="slds-input slds-input_bare " aura:id="input-report-date2" />
+ </div>
+ <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-4">
+ </div>
- <lightning:input
- type="Date"
- class="slds-input slds-input_bare"
- aura:id="input-report-date1"
- />
- </div>
- <div
- class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-4"
- >
- 娲诲姩鏃ョ粨鏉熸棩鏈�
- <lightning:input
- type="Date"
- class="slds-input slds-input_bare"
- aura:id="input-report-date2"
- />
- </div>
- <div
- class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-4"
- ></div>
-
- <div class="slds-p-around--large slds-align--absolute-center">
- <lightning:button
- label="纭"
- variant="brand"
- onclick="{!c.select_repores_date}"
- />
- <lightning:button
- label="鍙栨秷"
- variant="brand"
- onclick="{!c.close_export}"
- />
- </div>
- </div>
- <!-- <div>
+ <div class="slds-p-around--large slds-align--absolute-center">
+ <lightning:button label="纭" variant="brand" onclick="{!c.select_repores_date}"
+ />
+ <lightning:button label="鍙栨秷" variant="brand"
+ onclick="{!c.close_export}" />
+ </div>
+ </div>
+ <!-- <div>
璇疯緭鍏ヨ瀵煎嚭鏃ユ姤鐨勬姤娲诲姩鏃ョ殑寮�濮嬪拰缁撴潫鏃ユ湡
<force:inputField aura:id="input-report-date1"/>鍒�
<force:inputField aura:id="input-report-date2"/>
@@ -468,511 +317,286 @@
<lightning:button label="鍙栨秷" variant="brand"
onclick="{!c.close_export}" />
</div> -->
- <aura:set attribute="else">
- <ui:outputRichText
- class="uiOutputRichText slds-m--around-large"
- value="{!v.TableContent2}"
- />
- <div class="slds-p-around--large slds-align--absolute-center">
- <lightning:button
- label="纭"
- variant="brand"
- onclick="{!c.exportDate}"
- />
- <lightning:button
- label="鍙栨秷"
- variant="brand"
- onclick="{!c.close_export}"
- />
- </div>
- </aura:set>
- </aura:if>
- </div>
- </div>
- </div>
- <div
- aura:id="modal_exportbg"
- class="disp_none slds-backdrop slds-backdrop--open"
- ></div>
- <!-- 鎵归噺瀵煎嚭鍛ㄦ姤 end-->
-
- <div
- aura:id="modal_window"
- role="dialog"
- tabindex="-1"
- class="disp_none slds-modal slds-fade-in-open slds-modal--large"
- aria-labelledby="headerTarget"
- >
- <div class="slds-modal__container">
- <div class="slds-modal__header">
- <h4 id="headerTarget" class="slds-float--left">{!v.dialog_type}</h4>
- <h2 id="headerTarget" class="slds-text-heading--medium">
- 鍛ㄦ姤({!v.selected_date} {!v.selected_agency_person})
- </h2>
- <ui:button
- aura:id="close_button"
- label="鍏抽棴"
- class="close_button slds-button slds-button--neutral slds-order--1"
- press="{!c.toggle_report}"
- />
- </div>
- <div class="slds-modal__content slds-grow slds-p-around--medium">
- <div class="slds-box slds-theme--shade">
- <div class="slds-grid slds-wrap slds-grid--pull-padded">
- <div
- class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6"
- >
- 娲诲姩鏃�
- <!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> -->
- <force:inputField
- value="{!v.data.Report_Date__c}"
- aura:id="input-report-date"
- />
- </div>
- <!-- 鍖婚櫌 -->
- <div
- aura:id="hospital_list"
- class="slds-form-element slds-lookup slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-5"
- data-select="single"
- >
- <ui:inputText
- aura:id="hospital_input_text"
- label="鍖婚櫌"
- class="field"
- value="{!v.hospital}"
- updateOn="keyup"
- />
- <div class="slds-lookup__menu" id="lookup-66">
- <ul class="slds-lookup__list" role="listbox">
- <aura:iteration var="hospital" items="{!v.hospitalList}">
- <li
- role="presentation"
- onclick="{!c.selectHos}"
- data-accName="{!hospital.Hospital_Name_readonly__c}"
- data-accId="{!hospital.Hospital__c}"
- >
- <span
- class="slds-lookup__item-action slds-media"
- id="lookup-option-498"
- role="option"
- >
- <div class="slds-media__body">
- <div class="slds-lookup__result-text">
- {!hospital.Hospital_Name_readonly__c}
- </div>
+ <aura:set attribute="else">
+ <ui:outputRichText class="uiOutputRichText slds-m--around-large" value="{!v.TableContent2}"/>
+ <div class="slds-p-around--large slds-align--absolute-center">
+ <lightning:button label="纭" variant="brand" onclick="{!c.exportDate}"
+ />
+ <lightning:button label="鍙栨秷" variant="brand"
+ onclick="{!c.close_export}" />
</div>
- </span>
- </li>
- </aura:iteration>
- </ul>
- </div>
+
+ </aura:set>
+ </aura:if>
</div>
-
- <!-- 绉戝鍒嗙被 -->
- <div
- class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-8"
- >
- {!v.fieldsmap.Department_Cateogy__c}
- <ui:inputSelect
- aura:id="select_department"
- class="slds-select"
- change="{!c.select_department}"
- />
- </div>
-
- <!-- 鍏堢敓 -->
- <div
- class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-8"
- >
- {!v.fieldsmap.doctor2__c}
- <ui:inputSelect
- aura:id="select_doctor"
- class="slds-select"
- change="{!c.doctor_change}"
- />
- </div>
-
- <div
- class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-12"
- >
- <br />
- <ui:button
- label="鏂板缓"
- class="slds-button"
- press="{!c.createCon}"
- disabled="true"
- aura:id="new_con"
- />
- </div>
-
- <!-- 鑱屼綅 -->
- <div
- class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-8"
- >
- {!v.fieldsmap.visitor_title__c}
- <div>{!v.doctor_title}</div>
- </div>
- <!-- 娲诲姩鍖哄垎 -->
- <div
- class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6"
- >
- {!v.fieldsmap.Purpose_Type__c}
- <ui:inputSelect
- aura:id="select_purpose_type"
- class="slds-select"
- change="{!c.select_purpose_type}"
- />
- </div>
- <!-- 璇环 -->
- <div
- aura:id="input-opportunity-opp"
- class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--4-of-12 slds-large-size--4-of-12"
- >
- {!v.fieldsmap.Opportunity__c}
- <!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> -->
- <!-- <force:inputField value="{!v.data.Opportunity__c}" aura:id="input-opportunity"/> -->
- <c:strike_lookup
- label=""
- object="Agency_Opportunity__c"
- searchField="Name"
- placeholder="鎼滅储缁忛攢鍟嗚浠�..."
- iconName="standard:opportunity"
- subtitleField="Department_Cateogy__c,Agency_Opportunity_No__c,Change_To_Opportunity__r.Name"
- order="StageName__c"
- limit="5"
- loadingMessage="Loading..."
- errorMessage="Invalid input"
- allowNewRecords="true"
- overrideNewEvent="true"
- showRecentRecords="true"
- value="{!v.data.Opportunity__c}"
- filter="{!v.opportunity_cfilter}"
- subTitleFormat="{0}+{1}+{2}"
- />
- </div>
- <div
- aura:id="input-opportunity-blank"
- class="lds-p-horizontal--small slds-size--1-of-1 slds-medium-size--8-of-12 slds-large-size--8-of-12"
- ></div>
- <div
- aura:id="input-opportunity-stage"
- class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12"
- >
- {!v.fieldsmap.StageName__c}
- <!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> -->
- <ui:inputSelect aura:id="select_stageName" class="slds-select" />
- <!-- <force:inputField value="{!v.oppdata.StageName__c}" aura:id="input-oppstage" /> -->
- </div>
- <div
- aura:id="input-opportunity-amount1"
- class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12"
- >
- {!v.fieldsmap.Amount__c}
- <!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> -->
- <force:inputField value="{!v.oppdata.Amount__c}" class="" />
- </div>
- <div
- aura:id="input-opportunity-amount2"
- class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12"
- >
- {!v.fieldsmap.OCMSale_Price__c}
- <!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> -->
- <force:inputField
- value="{!v.oppdata.OCMSale_Price__c}"
- class=""
- />
- </div>
- <div
- aura:id="input-opportunity-date"
- class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12"
- >
- {!v.fieldsmap.Close_Forecasted_Date__c}
- <!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> -->
- <force:inputField
- value="{!v.oppdata.Close_Forecasted_Date__c}"
- class=""
- />
- </div>
- <!-- 瑁藉搧鍒嗛 -->
- <div
- aura:id="product_category_select1"
- class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12"
- >
- {!v.fieldsmap.Product_Category1__c}
- <!-- <force:inputField value="{!v.data.Product_Category1__c}" aura:id="input-product-category1"/> -->
- <ui:inputSelect
- aura:id="select_Product1"
- class="slds-select"
- change="{!c.productcategoryChange1}"
- />
- </div>
- <div
- aura:id="product_category_select2"
- class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12"
- >
- {!v.fieldsmap.Product_Category2__c}
- <!-- <force:inputField value="{!v.data.Product_Category2__c}" aura:id="input-product-category2"/> -->
- <ui:inputSelect
- aura:id="select_Product2"
- class="slds-select"
- change="{!c.productcategoryChange2}"
- />
- </div>
- <div
- aura:id="product_category_select3"
- class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12"
- >
- {!v.fieldsmap.Product_Category3__c}
- <!-- <force:inputField value="{!v.data.Product_Category3__c}" aura:id="input-product-category3"/> -->
- <ui:inputSelect
- aura:id="select_Product3"
- class="slds-select"
- change="{!c.productcategoryChange3}"
- />
- </div>
- <!--SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start-->
- <!-- 鏀彺闇�姹� change="{!c.SupportNeeds__c}"-->
- <div
- class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6"
- >
- {!v.fieldsmap.SupportNeeds__c}
- <ui:inputSelect aura:id="SupportNeeds__c" class="slds-select" />
- </div>
- <!--SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� end-->
- <div
- aura:id="result"
- class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12"
- >
- {!v.fieldsmap.Result__c}
- <ui:inputSelect aura:id="select_result" class="slds-select" />
- <!-- <ui:inputText label="缁撴灉" class="bcolor" value="{!v.result}"/> -->
- </div>
- </div>
</div>
- <div class="save_button_area">
- <ui:button
- aura:id="save_button"
- label="淇濆瓨骞舵柊寤�"
- class="save_button slds-button slds-button--brand slds-order--3"
- press="{!c.save_report}"
- />
- </div>
+ </div>
+ <div aura:id="modal_exportbg" class="disp_none slds-backdrop slds-backdrop--open"></div>
+ <!-- 鎵归噺瀵煎嚭鍛ㄦ姤 end-->
- <aura:renderIf isTrue="{!v.reports_now_count > 0}">
- <div class="mt40 slds-box slds-theme--shade">
- <div class="slds-table--edit_container slds-is-relative">
- <table
- class="slds-table slds-table--edit slds-table--bordered slds-table--fixed-layout slds-no-cell-focus"
- role="grid"
- >
- <thead>
- <tr class="slds-line-height--reset">
- <th class="table_header slds-text-title--caps">
- <span class="slds-truncate" title="Name"></span>
- </th>
- <th class="table_header slds-text-title--caps">
- <span class="slds-truncate" title="Name">鍖婚櫌</span>
- </th>
- <th class="table_header slds-text-title--caps">
- <span class="slds-truncate" title="Name"
- >{!v.fieldsmap.Department_Cateogy__c}</span
- >
- </th>
- <th class="table_header slds-text-title--caps">
- <span class="slds-truncate" title="Name"
- >{!v.fieldsmap.doctor2__c}</span
- >
- </th>
- <th class="table_header slds-text-title--caps">
- <span class="slds-truncate" title="Name"
- >{!v.fieldsmap.visitor_title__c}</span
- >
- </th>
- <th class="table_header slds-text-title--caps">
- <span class="slds-truncate" title="Name"
- >{!v.fieldsmap.Purpose_Type__c}</span
- >
- </th>
- </tr>
- </thead>
- <tbody>
- <aura:iteration
- items="{!v.reports_now}"
- var="item"
- indexVar="index"
- >
- <tr aura:id="modal_data_list_tr" class="slds-hint-parent">
- <td role="gridcell" class="slds-cell-edit">
- <span class="slds-grid slds-grid--align-spread">
- <span
- class="slds-truncate"
- title="{!item.Department_Cateogy__c}"
- >{!item.Name}</span
- >
- </span>
- </td>
- <td role="gridcell" class="slds-cell-edit">
- <span class="slds-grid slds-grid--align-spread">
- <span
- class="slds-truncate"
- title="{!item.Agency_Hospital__r.Name}"
- >{!item.Agency_Hospital__r.Name}</span
- >
- </span>
- </td>
- <td role="gridcell" class="slds-cell-edit">
- <span class="slds-grid slds-grid--align-spread">
- <span
- class="slds-truncate"
- title="{!item.Department_Cateogy__c}"
- >{!item.Department_Cateogy__c}</span
- >
- </span>
- </td>
- <td role="gridcell" class="slds-cell-edit">
- <span class="slds-grid slds-grid--align-spread">
- <span
- class="slds-truncate"
- title="{!item.doctor2__r.Name}"
- >
- <span class="encrypt">{!item.doctor2__r.Name}</span>
- <span class="decrypt"
- >{!item.doctor2NameOrigin}</span
- >
- </span>
- </span>
- </td>
- <td role="gridcell" class="slds-cell-edit">
- <span class="slds-grid slds-grid--align-spread">
- <span
- class="slds-truncate"
- title="{!item.visitor_title__c}"
- >
- <span class="encrypt"
- >{!item.visitor_title__c}</span
- >
- <span class="decrypt"
- >{!item.visitorTitleOrigin}</span
- >
- </span>
- </span>
- </td>
- <td role="gridcell" class="slds-cell-edit">
- <span class="slds-grid slds-grid--align-spread">
- <span
- class="slds-truncate"
- title="{!item.Purpose_Type__c}"
- >{!item.Purpose_Type__c}</span
- >
- </span>
- </td>
- </tr>
- </aura:iteration>
- </tbody>
- </table>
+ <div aura:id="modal_window" role="dialog" tabindex="-1" class="disp_none slds-modal slds-fade-in-open slds-modal--large" aria-labelledby="headerTarget">
+ <div class="slds-modal__container">
+ <div class="slds-modal__header">
+ <h4 id="headerTarget" class="slds-float--left">{!v.dialog_type}</h4>
+ <h2 id="headerTarget" class="slds-text-heading--medium">鍛ㄦ姤({!v.selected_date} {!v.selected_agency_person})</h2>
+ <ui:button aura:id="close_button" label="鍏抽棴" class="close_button slds-button slds-button--neutral slds-order--1" press="{!c.toggle_report}"/>
</div>
- </div>
- </aura:renderIf>
- </div>
+ <div class="slds-modal__content slds-grow slds-p-around--medium">
+ <div class="slds-box slds-theme--shade">
+ <div class="slds-grid slds-wrap slds-grid--pull-padded" >
+ <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6">
+ 娲诲姩鏃�
+ <!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> -->
+ <force:inputField value="{!v.data.Report_Date__c}" aura:id="input-report-date"/>
+ </div>
+ <!-- 鍖婚櫌 -->
+ <div aura:id="hospital_list" class="slds-form-element slds-lookup slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-5" data-select="single">
+ <ui:inputText aura:id="hospital_input_text" label="鍖婚櫌" class="field" value="{!v.hospital}" updateOn="keyup"/>
+ <div class="slds-lookup__menu" id="lookup-66">
+ <ul class="slds-lookup__list" role="listbox">
+ <aura:iteration var="hospital" items="{!v.hospitalList}">
+ <li role="presentation" onclick="{!c.selectHos}" data-accName="{!hospital.Hospital_Name_readonly__c}" data-accId="{!hospital.Hospital__c}">
+ <span class="slds-lookup__item-action slds-media" id="lookup-option-498" role="option">
+ <div class="slds-media__body">
+ <div class="slds-lookup__result-text">{!hospital.Hospital_Name_readonly__c}</div>
+ </div>
+ </span>
+ </li>
+ </aura:iteration>
+ </ul>
+ </div>
+ </div>
+
+ <!-- 绉戝鍒嗙被 -->
+ <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-8">
+ {!v.fieldsmap.Department_Cateogy__c}
+ <ui:inputSelect aura:id="select_department" class="slds-select" change="{!c.select_department}"/>
+ </div>
+
+ <!-- 鍏堢敓 -->
+ <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-8">
+ {!v.fieldsmap.doctor2__c}
+ <ui:inputSelect aura:id="select_doctor" class="slds-select" change="{!c.doctor_change}"/>
+ </div>
+
+ <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-12">
+ <br/>
+ <ui:button label="鏂板缓" class="slds-button" press="{!c.createCon}" disabled="true" aura:id="new_con"/>
+ </div>
+
+ <!-- 鑱屼綅 -->
+ <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-8">
+ {!v.fieldsmap.visitor_title__c}
+ <div>{!v.doctor_title}</div>
+ </div>
+ <!-- 娲诲姩鍖哄垎 -->
+ <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6">
+ {!v.fieldsmap.Purpose_Type__c}
+ <ui:inputSelect aura:id="select_purpose_type" class="slds-select" change="{!c.select_purpose_type}"/>
+ </div>
+ <!-- 璇环 -->
+ <div aura:id="input-opportunity-opp" class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--4-of-12 slds-large-size--4-of-12">
+ {!v.fieldsmap.Opportunity__c}
+ <!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> -->
+ <!-- <force:inputField value="{!v.data.Opportunity__c}" aura:id="input-opportunity"/> -->
+ <c:strike_lookup label=""
+ object="Agency_Opportunity__c"
+ searchField="Name"
+ placeholder="鎼滅储缁忛攢鍟嗚浠�..."
+ iconName="standard:opportunity"
+ subtitleField="Department_Cateogy__c,Agency_Opportunity_No__c,Change_To_Opportunity__r.Name"
+ order="StageName__c"
+ limit="5"
+ loadingMessage="Loading..."
+ errorMessage="Invalid input"
+ allowNewRecords = "true"
+ overrideNewEvent = "true"
+ showRecentRecords ="true"
+ value="{!v.data.Opportunity__c}"
+ filter="{!v.opportunity_cfilter}"
+ subTitleFormat="{0}+{1}+{2}"/>
+ </div>
+ <div aura:id="input-opportunity-blank" class="lds-p-horizontal--small slds-size--1-of-1 slds-medium-size--8-of-12 slds-large-size--8-of-12">
+ </div>
+ <div aura:id="input-opportunity-stage" class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12">
+ {!v.fieldsmap.StageName__c}
+ <!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> -->
+ <ui:inputSelect aura:id="select_stageName" class="slds-select"/>
+ <!-- <force:inputField value="{!v.oppdata.StageName__c}" aura:id="input-oppstage" /> -->
+ </div>
+ <div aura:id="input-opportunity-amount1" class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12">
+ {!v.fieldsmap.Amount__c}
+ <!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> -->
+ <force:inputField value="{!v.oppdata.Amount__c}" class=""/>
+ </div>
+ <div aura:id="input-opportunity-amount2" class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12">
+ {!v.fieldsmap.OCMSale_Price__c}
+ <!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> -->
+ <force:inputField value="{!v.oppdata.OCMSale_Price__c}" class=""/>
+ </div>
+ <div aura:id="input-opportunity-date" class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12">
+ {!v.fieldsmap.Close_Forecasted_Date__c}
+ <!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> -->
+ <force:inputField value="{!v.oppdata.Close_Forecasted_Date__c}" class=""/>
+ </div>
+ <!-- 瑁藉搧鍒嗛 -->
+ <div aura:id="product_category_select1" class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12">
+ {!v.fieldsmap.Product_Category1__c}
+ <!-- <force:inputField value="{!v.data.Product_Category1__c}" aura:id="input-product-category1"/> -->
+ <ui:inputSelect aura:id="select_Product1" class="slds-select" change="{!c.productcategoryChange1}"/>
+ </div>
+ <div aura:id="product_category_select2" class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12">
+ {!v.fieldsmap.Product_Category2__c}
+ <!-- <force:inputField value="{!v.data.Product_Category2__c}" aura:id="input-product-category2"/> -->
+ <ui:inputSelect aura:id="select_Product2" class="slds-select" change="{!c.productcategoryChange2}"/>
+ </div>
+ <div aura:id="product_category_select3" class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12">
+ {!v.fieldsmap.Product_Category3__c}
+ <!-- <force:inputField value="{!v.data.Product_Category3__c}" aura:id="input-product-category3"/> -->
+ <ui:inputSelect aura:id="select_Product3" class="slds-select" change="{!c.productcategoryChange3}"/>
+ </div>
+ <!--SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start-->
+ <!-- 鏀彺闇�姹� change="{!c.SupportNeeds__c}"-->
+ <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6">
+ {!v.fieldsmap.SupportNeeds__c}
+ <ui:inputSelect aura:id="SupportNeeds__c" class="slds-select" />
+ </div>
+ <!--SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� end-->
+ <div aura:id="result" class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12">
+ {!v.fieldsmap.Result__c}
+ <ui:inputSelect aura:id="select_result" class="slds-select"/>
+ <!-- <ui:inputText label="缁撴灉" class="bcolor" value="{!v.result}"/> -->
+ </div>
+ </div>
+ </div>
+ <div class="save_button_area">
+ <ui:button aura:id="save_button" label="淇濆瓨骞舵柊寤�" class="save_button slds-button slds-button--brand slds-order--3" press="{!c.save_report}"/>
+ </div>
+
+ <aura:renderIf isTrue="{!v.reports_now_count > 0}">
+ <div class="mt40 slds-box slds-theme--shade">
+ <div class="slds-table--edit_container slds-is-relative">
+ <table class="slds-table slds-table--edit slds-table--bordered slds-table--fixed-layout slds-no-cell-focus" role="grid">
+ <thead>
+ <tr class="slds-line-height--reset">
+ <th class="table_header slds-text-title--caps">
+ <span class="slds-truncate" title="Name"></span>
+ </th>
+ <th class="table_header slds-text-title--caps">
+ <span class="slds-truncate" title="Name">鍖婚櫌</span>
+ </th>
+ <th class="table_header slds-text-title--caps">
+ <span class="slds-truncate" title="Name">{!v.fieldsmap.Department_Cateogy__c}</span>
+ </th>
+ <th class="table_header slds-text-title--caps">
+ <span class="slds-truncate" title="Name">{!v.fieldsmap.doctor2__c}</span>
+ </th>
+ <th class="table_header slds-text-title--caps">
+ <span class="slds-truncate" title="Name">{!v.fieldsmap.visitor_title__c}</span>
+ </th>
+ <th class="table_header slds-text-title--caps">
+ <span class="slds-truncate" title="Name">{!v.fieldsmap.Purpose_Type__c}</span>
+ </th>
+ </tr>
+ </thead>
+ <tbody>
+ <aura:iteration items="{!v.reports_now}" var="item" indexVar="index">
+ <tr aura:id="modal_data_list_tr" class="slds-hint-parent">
+ <td role="gridcell" class="slds-cell-edit">
+ <span class="slds-grid slds-grid--align-spread">
+ <span class="slds-truncate" title="{!item.Department_Cateogy__c}">{!item.Name}</span>
+ </span>
+ </td>
+ <td role="gridcell" class="slds-cell-edit">
+ <span class="slds-grid slds-grid--align-spread">
+ <span class="slds-truncate" title="{!item.Agency_Hospital__r.Name}">{!item.Agency_Hospital__r.Name}</span>
+ </span>
+ </td>
+ <td role="gridcell" class="slds-cell-edit">
+ <span class="slds-grid slds-grid--align-spread">
+ <span class="slds-truncate" title="{!item.Department_Cateogy__c}">{!item.Department_Cateogy__c}</span>
+ </span>
+ </td>
+ <td role="gridcell" class="slds-cell-edit">
+ <span class="slds-grid slds-grid--align-spread">
+ <span class="slds-truncate" title="{!item.doctor2__r.Name}">
+ <span class="encrypt">{!item.doctor2__r.Name}</span>
+ <span class="decrypt">{!item.doctor2NameOrigin}</span>
+ </span>
+ </span>
+ </td>
+ <td role="gridcell" class="slds-cell-edit">
+ <span class="slds-grid slds-grid--align-spread">
+ <span class="slds-truncate" title="{!item.visitor_title__c}">
+ <span class="encrypt">{!item.visitor_title__c}</span>
+ <span class="decrypt">{!item.visitorTitleOrigin}</span>
+ </span>
+ </span>
+ </td>
+ <td role="gridcell" class="slds-cell-edit">
+ <span class="slds-grid slds-grid--align-spread">
+ <span class="slds-truncate" title="{!item.Purpose_Type__c}">{!item.Purpose_Type__c}</span>
+ </span>
+ </td>
+ </tr>
+ </aura:iteration>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </aura:renderIf>
+ </div>
+ </div>
</div>
- </div>
- <div
- aura:id="modal_bg"
- class="disp_none slds-backdrop slds-backdrop--open"
- ></div>
-
- <div
- aura:id="modal_confirm"
- role="dialog"
- tabindex="-2"
- aria-labelledby="header43"
- class="disp_none slds-modal slds-fade-in-open"
- >
- <div class="slds-modal__container">
- <div class="slds-modal__header">
- <h2 id="header43" class="slds-text-heading--medium">
- {!v.modal_confirm_title}
- </h2>
- </div>
- <div class="slds-modal__content slds-p-around--medium">
- <p>{!v.modal_confirm_text}</p>
- </div>
- <div class="slds-modal__footer">
- <ui:button
- label="鏄�"
- class="slds-button slds-button--brand"
- press="{!c.yes_button}"
- />
- <ui:button
- label="鍚�"
- class="slds-button slds-button--neutral"
- press="{!c.no_button}"
- />
- </div>
+ <div aura:id="modal_bg" class="disp_none slds-backdrop slds-backdrop--open"></div>
+
+ <div aura:id="modal_confirm" role="dialog" tabindex="-2" aria-labelledby="header43" class="disp_none slds-modal slds-fade-in-open">
+ <div class="slds-modal__container">
+ <div class="slds-modal__header">
+ <h2 id="header43" class="slds-text-heading--medium">{!v.modal_confirm_title}</h2>
+ </div>
+ <div class="slds-modal__content slds-p-around--medium">
+ <p>{!v.modal_confirm_text}</p>
+ </div>
+ <div class="slds-modal__footer">
+ <ui:button label="鏄�" class="slds-button slds-button--brand" press="{!c.yes_button}"/>
+ <ui:button label="鍚�" class="slds-button slds-button--neutral" press="{!c.no_button}" />
+ </div>
+ </div>
</div>
- </div>
- <div
- aura:id="modal_confirm_bg"
- class="disp_none slds-backdrop slds-backdrop--open"
- ></div>
+ <div aura:id="modal_confirm_bg" class="disp_none slds-backdrop slds-backdrop--open"></div>
- <div
- aura:id="modal_newAC"
- role="dialog"
- tabindex="-3"
- aria-labelledby="headertest"
- class="disp_none slds-modal slds-fade-in-open"
- >
- <div class="slds-modal__container">
- <div class="slds-modal__header">
- <h2 id="headertest" class="slds-text-heading--medium">鏂板缓.瀹㈡埛浜哄憳</h2>
- </div>
- <div class="slds-modal__content slds-p-around--medium">
- <lightning:recordEditForm
- aura:id="recordEditForm"
- objectApiName="Agency_Contact__c"
- onsuccess="{!c.handleSuccess}"
- onload="{!c.showRequiredFields}"
- onsubmit="{!c.handleSubmit}"
- >
- <lightning:messages aura:id="OppMessage" />
- <!-- onload="{!c.showRequiredFields}" -->
- <aura:renderIf isTrue="{!v.truthy}">
- <lightning:inputField
- fieldName="Name"
- aura:id="newOpportunityField"
- />
- <lightning:inputField
- fieldName="Type__c"
- aura:id="newOpportunityField"
- />
- <lightning:inputField
- fieldName="Doctor_Division1__c"
- aura:id="newOpportunityField"
- />
- <!-- <lightning:inputField class="customRequired none" aura:id="Input_type__c" fieldName="Type__c"/>
+ <div aura:id="modal_newAC" role="dialog" tabindex="-3" aria-labelledby="headertest" class="disp_none slds-modal slds-fade-in-open">
+ <div class="slds-modal__container">
+ <div class="slds-modal__header">
+ <h2 id="headertest" class="slds-text-heading--medium">鏂板缓.瀹㈡埛浜哄憳</h2>
+ </div>
+ <div class="slds-modal__content slds-p-around--medium">
+ <lightning:recordEditForm aura:id="recordEditForm" objectApiName="Agency_Contact__c" onsuccess="{!c.handleSuccess}" onload="{!c.showRequiredFields}" onsubmit="{!c.handleSubmit}">
+ <lightning:messages aura:id="OppMessage" />
+ <!-- onload="{!c.showRequiredFields}" -->
+ <aura:renderIf isTrue="{!v.truthy}">
+ <lightning:inputField fieldName="Name" aura:id="newOpportunityField" />
+ <lightning:inputField fieldName="Type__c" aura:id="newOpportunityField" />
+ <lightning:inputField fieldName="Doctor_Division1__c" aura:id="newOpportunityField" />
+ <!-- <lightning:inputField class="customRequired none" aura:id="Input_type__c" fieldName="Type__c"/>
<lightning:inputField class="customRequired none" aura:id="Input_Doctor_Division1__c" fieldName="Doctor_Division1__c"/> -->
- </aura:renderIf>
- <br />
- <br />
- <br />
- <br />
- <br />
- <div class="save_button_area">
- <lightning:button
- class="slds-m-top_small"
- type="button"
- label="鍙栨秷"
- onclick="{!c.createCancel}"
- />
- <lightning:button
- class="slds-m-top_small"
- type="submit"
- label="淇濆瓨"
- />
- </div>
- </lightning:recordEditForm>
- </div>
+ </aura:renderIf>
+ <br/>
+ <br/>
+ <br/>
+ <br/>
+ <br/>
+ <div class="save_button_area">
+ <lightning:button class="slds-m-top_small" type="button" label="鍙栨秷" onclick="{!c.createCancel}"/>
+ <lightning:button class="slds-m-top_small" type="submit" label="淇濆瓨" />
+ </div>
+
+
+ </lightning:recordEditForm>
+ </div>
+ </div>
</div>
- </div>
-</aura:component>
+
+
+</aura:component>
\ No newline at end of file
diff --git a/force-app/main/default/aura/WeeklyReport/WeeklyReport.css b/force-app/main/default/aura/WeeklyReport/WeeklyReport.css
index 2cf535d..061767d 100644
--- a/force-app/main/default/aura/WeeklyReport/WeeklyReport.css
+++ b/force-app/main/default/aura/WeeklyReport/WeeklyReport.css
@@ -138,4 +138,13 @@
.THIS tr:hover .encrypt{
display: none;
+}
+
+.THIS .weeklyReportSpinner{
+ top:100px;
+}
+
+.THIS .slds-spinner_container{
+ position: absolute;
+ top:100px;
}
\ No newline at end of file
diff --git a/force-app/main/default/aura/WeeklyReport/WeeklyReportController.js b/force-app/main/default/aura/WeeklyReport/WeeklyReportController.js
index 010e828..b44219b 100644
--- a/force-app/main/default/aura/WeeklyReport/WeeklyReportController.js
+++ b/force-app/main/default/aura/WeeklyReport/WeeklyReportController.js
@@ -1,346 +1,325 @@
({
- doInit: function (component, event, helper) {
- console.log("zhj 鏂版柟妗�");
- if (window.location.href.endsWith("weekly-report")) {
- helper.doinit(component, event, helper);
- } else {
- helper.hideCmp(component, event, helper);
- }
- },
+ doInit : function(component, event, helper) {
+ console.log('zhj 鏂版柟妗坵eeklyReport');
+ if (window.location.href.endsWith("weekly-report")) {
+ helper.doinit(component, event, helper);
+ } else {
+ helper.hideCmp(component, event, helper);
+ }
+ component.set("v.showErrorInfo", false);
+ },
- createAopp: function (component, event, helper) {
- var addRecordEvent = $A.get("e.force:createRecord");
- addRecordEvent.setParams({
- entityApiName: "Agency_Opportunity__c",
- recordTypeId: "012100000006KW7"
- });
- addRecordEvent.fire();
- },
+ createAopp : function(component, event, helper) {
+ var addRecordEvent = $A.get('e.force:createRecord');
+ addRecordEvent.setParams({
+ entityApiName: 'Agency_Opportunity__c',
+ recordTypeId: '012100000006KW7'
+ });
+ addRecordEvent.fire();
+ component.set("v.showErrorInfo", false);
+ },
+
+ new_report : function(component, event, helper) {
+ component.find('save_button').set('v.label', '淇濆瓨骞舵柊寤�');
+ helper.new_report(component, event, helper);
+ },
+
+ copy_button : function(component, event, helper) {
+ component.find('save_button').set('v.label', '淇濆瓨骞舵柊寤�');
+ helper.copy_button(component, event, helper);
+ },
+
+ change_report_radio : function(component, event, helper) {
+ helper.change_report_radio(component, event, helper);
+ },
+
+ edit_button : function(component, event, helper) {
+ component.find('save_button').set('v.label', '淇濆瓨');
+ helper.edit_button(component, event, helper);
+ },
+
+ createCon : function(component, event, helper) {
+ helper.createCon(component, event, helper);
+ },
- new_report: function (component, event, helper) {
- component.find("save_button").set("v.label", "淇濆瓨骞舵柊寤�");
- helper.new_report(component, event, helper);
- },
-
- copy_button: function (component, event, helper) {
- component.find("save_button").set("v.label", "淇濆瓨骞舵柊寤�");
- helper.copy_button(component, event, helper);
- },
-
- change_report_radio: function (component, event, helper) {
- helper.change_report_radio(component, event, helper);
- },
-
- edit_button: function (component, event, helper) {
- component.find("save_button").set("v.label", "淇濆瓨");
- helper.edit_button(component, event, helper);
- },
-
- createCon: function (component, event, helper) {
- helper.createCon(component, event, helper);
- },
-
- showRequiredFields: function (component, event, helper) {
- $A.util.removeClass(component.find("newOpportunityField"), "none");
- $A.util.removeClass(component.find("newOpportunityField"), "none");
- },
-
- handleSuccess: function (component, event, helper) {
- helper.handleSuccess(component, event, helper);
- },
-
- handleSubmit: function (component, event, helper) {
- /*
+ showRequiredFields: function(component, event, helper){
+ $A.util.removeClass(component.find("newOpportunityField"), "none");
+ $A.util.removeClass(component.find("newOpportunityField"), "none");
+ },
+
+ handleSuccess : function(component, event, helper) {
+ helper.handleSuccess(component, event, helper);
+ },
+
+ handleSubmit : function(component, event, helper) {
+ /*
var params = event.getParams();
params.fields["Agency_Hospital__c"] = component.get('v.hospitalLinkId');
console.log(params);
event.setParams(params);
*/
- event.preventDefault(); // stop form submission
- // vivek 娣诲姞楠岃瘉 start
- // helper.handleFormSubmit(component);
- var showValidationError = false;
- var fields = component.find("newOpportunityField");
- var vaildationFailReason = "";
- // var vaildationFailReason2 = '';
- // var currentDate = new Date().toJSON().slice(0,10);
+ event.preventDefault(); // stop form submission
+ // vivek 娣诲姞楠岃瘉 start
+ // helper.handleFormSubmit(component);
+ var showValidationError = false;
+ var fields = component.find("newOpportunityField");
+ var vaildationFailReason = '';
+ // var vaildationFailReason2 = '';
+ // var currentDate = new Date().toJSON().slice(0,10);
+
+ // PIPL update Yin Mingjie 21/02/2022 start
+ let agencyReport = Object.create(null);
+ // PIPL update Yin Mingjie 21/02/2022 end
- // PIPL update Yin Mingjie 21/02/2022 start
- let agencyReport = Object.create(null);
- // PIPL update Yin Mingjie 21/02/2022 end
-
- fields.forEach(function (field) {
- if (
- field.get("v.fieldName") === "Type__c" &&
- $A.util.isEmpty(field.get("v.value"))
- ) {
- showValidationError = true;
- vaildationFailReason = "鍒嗙被涓嶈兘涓虹┖锛�";
- } else if (
- field.get("v.fieldName") === "Doctor_Division1__c" &&
- $A.util.isEmpty(field.get("v.value"))
- ) {
- showValidationError = true;
- if (vaildationFailReason != "") {
- vaildationFailReason += "鍖荤敓鍖哄垎(鑱屽姟)涓嶈兘涓虹┖锛�";
- } else {
- vaildationFailReason = "鍖荤敓鍖哄垎(鑱屽姟)涓嶈兘涓虹┖锛�";
- }
- }
- // PIPL update Yin Mingjie 21/02/2022 start
- if (field.get("v.fieldName") === "Name") {
- agencyReport["name"] = field.get("v.value");
- } else if (field.get("v.fieldName") === "Type__c") {
- agencyReport["type"] = field.get("v.value");
- } else if (field.get("v.fieldName") === "Doctor_Division1__c") {
- agencyReport["doctorDivision1"] = field.get("v.value");
- }
- // PIPL update Yin Mingjie 21/02/2022 end
- });
-
- if (!showValidationError) {
- // PIPL update Yin Mingjie 21/02/2022 start
- /*
+ fields.forEach(function (field) {
+ if(field.get("v.fieldName") === 'Type__c' && $A.util.isEmpty(field.get("v.value"))){
+ showValidationError = true;
+ vaildationFailReason = "鍒嗙被涓嶈兘涓虹┖锛�";
+ }else if(field.get("v.fieldName") === 'Doctor_Division1__c' && $A.util.isEmpty(field.get("v.value"))){
+ showValidationError = true;
+ if(vaildationFailReason != ''){
+ vaildationFailReason += "鍖荤敓鍖哄垎(鑱屽姟)涓嶈兘涓虹┖锛�";
+ }else{
+ vaildationFailReason = "鍖荤敓鍖哄垎(鑱屽姟)涓嶈兘涓虹┖锛�";
+ }
+
+ }
+ // PIPL update Yin Mingjie 21/02/2022 start
+ if(field.get("v.fieldName") === 'Name'){
+ agencyReport['name'] = field.get("v.value");
+ }else if(field.get("v.fieldName") === 'Type__c'){
+ agencyReport['type'] = field.get("v.value");
+ }else if(field.get("v.fieldName") === 'Doctor_Division1__c'){
+ agencyReport['doctorDivision1'] = field.get("v.value");
+ }
+ // PIPL update Yin Mingjie 21/02/2022 end
+ });
+
+ if (!showValidationError) {
+ // PIPL update Yin Mingjie 21/02/2022 start
+ /*
var eventFields = event.getParam("fields");
eventFields["Agency_Hospital__c"] = component.get('v.hospitalLinkId');
component.find('recordEditForm').submit(eventFields);
*/
- var agencyHospitalid = component.get("v.hospitalLinkId");
- //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 start
- debugger;
- let hospitalName = "";
- //璋冪敤鍚庣searchAgencyDataId鏂规硶鏌ヨ鍑哄尰闄笅闈㈡墍鏈夊鎴蜂汉鍛榙ataid
- helper.CallBackAction(
- component,
- "searchAgencyDataId",
- {
- hospitalId: agencyHospitalid
- },
- function (data) {
- if (data.getState() == "SUCCESS") {
- var data = data.getReturnValue();
- if (data.IsSuccess == true) {
- let agencyContactIds = "";
- if (data.Message == "" && data.Data && data.Data.length > 0) {
- hospitalName = data.Data[0].Agency_Hospital__r.Name;
- for (var i = 0; i < data.Data.length; i++) {
- if (data.Data[i].AWS_Data_Id__c)
- agencyContactIds += "," + data.Data[i].AWS_Data_Id__c;
+ var agencyHospitalid = component.get('v.hospitalLinkId');
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 start
+ debugger
+ let hospitalName = '';
+ //璋冪敤鍚庣searchAgencyDataId鏂规硶鏌ヨ鍑哄尰闄笅闈㈡墍鏈夊鎴蜂汉鍛榙ataid
+ helper.CallBackAction(component,'searchAgencyDataId',{
+ hospitalId : agencyHospitalid
+ },function(data){
+ if(data.getState() == "SUCCESS"){
+ var data = data.getReturnValue();
+ if(data.IsSuccess == true){
+ let agencyContactIds = ''
+ if(data.Message == '' && data.Data && data.Data.length > 0){
+ hospitalName = data.Data[0].Agency_Hospital__r.Name;
+ for(var i=0;i<data.Data.length;i++){
+ if(data.Data[i].AWS_Data_Id__c)
+ agencyContactIds += ','+data.Data[i].AWS_Data_Id__c;
+ }
+ agencyContactIds = agencyContactIds.substring(1);
+ agencyReport['agencyContactIds'] = agencyContactIds;
+ }else{
+ agencyReport['agencyContactIds'] = agencyContactIds;
+ }
+ var arr = new Array();
+ arr.push(agencyReport);
+ var requestData = JSON.stringify(arr);
+ // helper.set_aws_url(component,data,agencyHospitalid);
+
+ var token = component.get('v.AWStoken');
+ var newUrl = component.get('v.AWSinsert') + 'V2';
+
+ component.set('v.login',true);
+ helper.insert_agencycontact(component,token,newUrl,requestData,agencyHospitalid,helper,hospitalName);
+ }else{
+ helper.ShowToast({
+ "message" : data.message,
+ "type" : "error"
+ });
+ }
+ }else{
+ helper.ShowToast({
+ "message" : 'searchAgency澶辫触',
+ "type" : "error"
+ });
}
- agencyContactIds = agencyContactIds.substring(1);
- agencyReport["agencyContactIds"] = agencyContactIds;
- } else {
- agencyReport["agencyContactIds"] = agencyContactIds;
- }
- var arr = new Array();
- arr.push(agencyReport);
- var requestData = JSON.stringify(arr);
- // helper.set_aws_url(component,data,agencyHospitalid);
+ })
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 end
+ // var arr = new Array();
+ // arr.push(agencyReport);
+ // var data = JSON.stringify(arr);
+ // // helper.set_aws_url(component,data,agencyHospitalid);
- var token = component.get("v.AWStoken");
- var newUrl = component.get("v.AWSinsert") + "V2";
+ // var token = component.get('v.AWStoken');
+ // var newUrl = component.get('v.AWSinsert');
+
+ // component.set('v.login',true);
+ // helper.insert_agencycontact(component,token,newUrl,data,agencyHospitalid,helper);
- component.set("v.login", true);
- helper.insert_agencycontact(
- component,
- token,
- newUrl,
- requestData,
- agencyHospitalid,
- helper,
- hospitalName
- );
- } else {
- helper.ShowToast({
- message: data.message,
- type: "error"
- });
- }
- } else {
- helper.ShowToast({
- message: "searchAgency澶辫触",
- type: "error"
- });
- }
+ // PIPL update Yin Mingjie 21/02/2022 end
+ }else{
+ component.find('OppMessage').setError(vaildationFailReason);
}
- );
- //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 end
- // var arr = new Array();
- // arr.push(agencyReport);
- // var data = JSON.stringify(arr);
- // // helper.set_aws_url(component,data,agencyHospitalid);
+ // var eventFields = event.getParam("fields");
+ // eventFields["Agency_Hospital__c"] = component.get('v.hospitalLinkId');
+ // component.find('recordEditForm').submit(eventFields);
+ // vivek 娣诲姞楠岃瘉 end
+ },
+
+ createCancel : function(component, event, helper) {
+ helper.createCancel(component, event, helper);
+ },
+
+ yes_button : function(component, event, helper) {
+ component.set('v.confirm_status', 1);
+ helper.close_confirm(component, component.get('v.modal_confirm_title'), component.get('v.modal_confirm_text'));
+ },
- // var token = component.get('v.AWStoken');
- // var newUrl = component.get('v.AWSinsert');
+ no_button : function(component, event, helper) {
+ component.set('v.confirm_status', 2);
+ helper.close_confirm(component, component.get('v.modal_confirm_title'), component.get('v.modal_confirm_text'));
+ },
+
+ toggle_report : function(component, event, helper) {
+ helper.toggle_report(component);
+ },
- // component.set('v.login',true);
- // helper.insert_agencycontact(component,token,newUrl,data,agencyHospitalid,helper);
+ save_report : function(component, event, helper) {
+ helper.save_report(component, event, helper);
+ },
+
+ select_date_change : function(component, event, helper) {
+ helper.select_date_change(component, event, helper);
+ },
+
+ select_agency_change : function(component, event, helper) {
+ helper.select_agency_change(component, event, helper);
+ },
+
+ hosChange : function(component, event, helper) {
+ var hospital_name = event.getParam("value");
+ if (hospital_name.match(/(\S+\s)+/)) {
+ helper.searchHos(component, event, helper);
+ } else {
+ helper.hideSearch(component, event, helper);
+ }
+ },
+
+ selectHos : function(component, event, helper) {
+ helper.selectHos(component, event, helper);
+ helper.setOpportunity_cfilter(component);
+ },
+ select_department : function(component, event, helper) {
+ helper.select_department(component, event, helper);
+ helper.setOpportunity_cfilter(component);
+ },
+ select_purpose_type : function(component, event, helper) {
+ helper.select_purpose_type(component, event, helper);
+ },
+
+ doctor_change : function(component, event, helper) {
+ helper.doctor_change(component, event, helper);
+ },
+
+ opportunityChange : function(component, event, helper) {
+ helper.opportunityChange(component, event, helper);
+ },
+
+ productcategoryChange1 : function(component, event, helper) {
+ helper.productcategoryChange1(component, event, helper);
+ },
+ productcategoryChange2 : function(component, event, helper) {
+ helper.productcategoryChange2(component, event, helper);
+ },
+ productcategoryChange3 : function(component, event, helper) {
+ helper.productcategoryChange3(component, event, helper);
+ },
+ stageNameChange : function(component, event, helper) {
+ helper.stageNameChange(component, event, helper);
+ },
+ onDragOver : function(component, event, helper) {
+ event.preventDefault();
+ },
+
+ onDrop : function(component, event, helper) {
+ event.stopPropagation();
+ event.preventDefault();
+ event.dataTransfer.dropEffect='copy';
+ var files=event.dataTransfer.files;
+ helper.readFile(component,helper,files[0]);
+ },
+ CreateRecord : function(component, event, helper){
+ var files = event.getSource().get("v.files");
+ // var fileInput = component.find("file").getElement();
+ // var file = fileInput.files[0];
+ helper.readFile(component,helper,files[0]);
+ component.set("v.showErrorInfo", false);
+ },
- // PIPL update Yin Mingjie 21/02/2022 end
- } else {
- component.find("OppMessage").setError(vaildationFailReason);
- }
- // var eventFields = event.getParam("fields");
- // eventFields["Agency_Hospital__c"] = component.get('v.hospitalLinkId');
- // component.find('recordEditForm').submit(eventFields);
- // vivek 娣诲姞楠岃瘉 end
- },
+ processFileContent : function(component,event,helper){
+ helper.saveRecords(component,event,helper);
+ component.set("v.showErrorInfo", false);
+ },
+
+ cancel : function(component,event,helper){
+ component.set("v.showMain",true);
+ },
- createCancel: function (component, event, helper) {
- helper.createCancel(component, event, helper);
- },
+ import : function(component,event,helper){
+ // component.find('file').click();
+ // console.log('lll'+component.find('file'));
+ helper.showImport(component);
+ },
+ exportDate : function(component,event,helper){
+ var stockData = component.get("v.reports_date");
+ console.log('瀵煎嚭鏁版嵁'+stockData);
+ var csv = helper.convertArrayOfObjectsToCSV(component,stockData);
+ if (csv == null){return;}
- yes_button: function (component, event, helper) {
- component.set("v.confirm_status", 1);
- helper.close_confirm(
- component,
- component.get("v.modal_confirm_title"),
- component.get("v.modal_confirm_text")
- );
- },
+ // ####--code for create a temp. <a> html tag [link tag] for download the CSV file--####
+ var universalBOM = "\uFEFF";
+ var hiddenElement = document.createElement('a');
+ hiddenElement.href = 'data:text/csv;charset=utf-8,' + encodeURI(universalBOM+csv);
+ hiddenElement.target = '_self'; //
+ hiddenElement.download = 'ExportData.csv'; // CSV file Name* you can change it.[only name not .csv]
+ document.body.appendChild(hiddenElement); // Required for FireFox browser
+ hiddenElement.click(); // using click() js function to download csv file
+ // helper.showExport(component);
+
+ },
- no_button: function (component, event, helper) {
- component.set("v.confirm_status", 2);
- helper.close_confirm(
- component,
- component.get("v.modal_confirm_title"),
- component.get("v.modal_confirm_text")
- );
- },
+ export_condition : function(component,event,helper){
+ helper.showExport(component);
+ },
- toggle_report: function (component, event, helper) {
- helper.toggle_report(component);
- },
-
- save_report: function (component, event, helper) {
- helper.save_report(component, event, helper);
- },
-
- select_date_change: function (component, event, helper) {
- helper.select_date_change(component, event, helper);
- },
-
- select_agency_change: function (component, event, helper) {
- helper.select_agency_change(component, event, helper);
- },
-
- hosChange: function (component, event, helper) {
- var hospital_name = event.getParam("value");
- if (hospital_name.match(/(\S+\s)+/)) {
- helper.searchHos(component, event, helper);
- } else {
- helper.hideSearch(component, event, helper);
- }
- },
-
- selectHos: function (component, event, helper) {
- helper.selectHos(component, event, helper);
- helper.setOpportunity_cfilter(component);
- },
- select_department: function (component, event, helper) {
- helper.select_department(component, event, helper);
- helper.setOpportunity_cfilter(component);
- },
- select_purpose_type: function (component, event, helper) {
- helper.select_purpose_type(component, event, helper);
- },
-
- doctor_change: function (component, event, helper) {
- helper.doctor_change(component, event, helper);
- },
-
- opportunityChange: function (component, event, helper) {
- helper.opportunityChange(component, event, helper);
- },
-
- productcategoryChange1: function (component, event, helper) {
- helper.productcategoryChange1(component, event, helper);
- },
- productcategoryChange2: function (component, event, helper) {
- helper.productcategoryChange2(component, event, helper);
- },
- productcategoryChange3: function (component, event, helper) {
- helper.productcategoryChange3(component, event, helper);
- },
- stageNameChange: function (component, event, helper) {
- helper.stageNameChange(component, event, helper);
- },
- onDragOver: function (component, event, helper) {
- event.preventDefault();
- },
-
- onDrop: function (component, event, helper) {
- event.stopPropagation();
- event.preventDefault();
- event.dataTransfer.dropEffect = "copy";
- var files = event.dataTransfer.files;
- helper.readFile(component, helper, files[0]);
- },
- CreateRecord: function (component, event, helper) {
- var files = event.getSource().get("v.files");
- // var fileInput = component.find("file").getElement();
- // var file = fileInput.files[0];
- helper.readFile(component, helper, files[0]);
- },
-
- processFileContent: function (component, event, helper) {
- helper.saveRecords(component, event, helper);
- },
-
- cancel: function (component, event, helper) {
- component.set("v.showMain", true);
- },
-
- import: function (component, event, helper) {
- // component.find('file').click();
- // console.log('lll'+component.find('file'));
- helper.showImport(component);
- },
- exportDate: function (component, event, helper) {
- var stockData = component.get("v.reports_date");
- console.log("瀵煎嚭鏁版嵁" + stockData);
- var csv = helper.convertArrayOfObjectsToCSV(component, stockData);
- if (csv == null) {
- return;
- }
-
- // ####--code for create a temp. <a> html tag [link tag] for download the CSV file--####
- var universalBOM = "\uFEFF";
- var hiddenElement = document.createElement("a");
- hiddenElement.href =
- "data:text/csv;charset=utf-8," + encodeURI(universalBOM + csv);
- hiddenElement.target = "_self"; //
- hiddenElement.download = "ExportData.csv"; // CSV file Name* you can change it.[only name not .csv]
- document.body.appendChild(hiddenElement); // Required for FireFox browser
- hiddenElement.click(); // using click() js function to download csv file
- // helper.showExport(component);
- },
-
- export_condition: function (component, event, helper) {
- helper.showExport(component);
- },
-
- select_repores_date: function (component, event, helper) {
- helper.select_repores_date(component, event, helper);
- // var stockData = component.get("v.reports_date");
- // console.log('鏌ュ嚭鐨勬暟鎹�'+stockData);
- // helper.showExportDate(component,stockData);
- // this.export(component,event,helper);
- },
- export: function (component, event, helper) {
- console.log("杩涘叆export");
- var stockData = component.get("v.reports_date");
- console.log("鏌ュ嚭鐨勬暟鎹�" + stockData);
- // helper.showExportDate(component,stockData);
- // helper.showExport(component);
- },
- close_import: function (component, event, helper) {
- component.set("v.showMain", true);
- helper.close_import(component);
- },
- close_export: function (component, event, helper) {
- component.set("v.showMain", true);
- helper.close_export(component);
- }
-});
+ select_repores_date : function(component,event,helper){
+ helper.select_repores_date(component,event,helper);
+ // var stockData = component.get("v.reports_date");
+ // console.log('鏌ュ嚭鐨勬暟鎹�'+stockData);
+ // helper.showExportDate(component,stockData);
+ // this.export(component,event,helper);
+ },
+ export : function(component,event,helper){
+ console.log('杩涘叆export');
+ var stockData = component.get("v.reports_date");
+ console.log('鏌ュ嚭鐨勬暟鎹�'+stockData);
+ // helper.showExportDate(component,stockData);
+ // helper.showExport(component);
+ },
+ close_import : function(component,event,helper){
+ component.set("v.showMain",true);
+ helper.close_import(component);
+ },
+ close_export : function(component,event,helper){
+ component.set("v.showMain",true);
+ helper.close_export(component);
+ },
+ exportErrorInfo: function(component,event,helper){
+ helper.exportErrorInfoHelper(component);
+ },
+})
\ No newline at end of file
diff --git a/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js b/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js
index a656549..eefe84a 100644
--- a/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js
+++ b/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js
@@ -1,1687 +1,1369 @@
({
- doinit: function (component, event, helper) {
- this.report_date_list(component, event, helper, 5);
- component.set("v.login", true);
- var action = component.get("c.getalldata");
- action.setCallback(this, function (response) {
- var state = response.getState();
- if (state == "SUCCESS") {
- var res = response.getReturnValue();
- component.set("v.alldata", res.reports);
- component.set("v.fieldsmap", res.fieldsMap);
- component.set("v.allselectlist", res.allselectlist);
- component.set("v.doclist", res.doclist);
- // PIPL update Yin Mingjie 21/02/2022 start
- component
- .find("select_agency_person")
- .set(
- "v.options",
- this.conv_selected(res.allselectlist.AgencyPerson__c)
- );
- // this.search_contact(component, event, helper,res.allselectlist.AgencyPerson__c);
- // PIPL update Yin Mingjie 21/02/2022 end
- component
- .find("select_department")
- .set(
- "v.options",
- this.conv_selected(res.allselectlist.Department_Cateogy__c)
- );
- component
- .find("select_purpose_type")
- .set(
- "v.options",
- this.conv_selected(res.allselectlist.Purpose_Type__c)
- );
- component
- .find("select_result")
- .set("v.options", this.conv_selected(res.allselectlist.Result__c));
- component
- .find("select_stageName")
- .set("v.options", this.conv_selected(res.allselectlist.StageName__c));
- //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
- component
- .find("SupportNeeds__c")
- .set(
- "v.options",
- this.conv_selected(res.allselectlist.SupportNeeds__c)
- );
- //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� end
- component.set(
- "v.selected_agency_person",
- res.allselectlist.AgencyPerson__c[0].label
- );
- component.set("v.dialog_type", "鏂板缓");
- component.set("v.awsurl", res.awsurl); // 20220222 PI鏀归�� by Bright
- component.set("v.contactawsurl", res.contactawsurl); // 20220222 PI鏀归�� by Bright
-
- this.get_reports(
- component,
- event,
- helper,
- component.find("select_date").get("v.value"),
- component.find("select_agency_person").get("v.value")
- );
-
- component.set("v.login", false);
- } else {
- this.error("doinit failed.");
- component.set("v.login", false);
- }
- });
- $A.enqueueAction(action);
- },
-
- // PIPL update Yin Mingjie 21/02/2022 start
- search_contact: function (component, event, helper, resobj) {
- let contactData = Object.create(null);
- var dataArr = new Array();
- for (let i = 0; i < resobj.length; i++) {
- if (resobj[i].awsid != null && resobj[i].awsid != "") {
- contactData[resobj[i].awsid] = resobj[i];
- dataArr.push(resobj[i].awsid);
- }
- }
- let obj = Object.create(null);
- obj["dataIds"] = dataArr;
- var payload = JSON.stringify(obj);
- this.search_contact_url(component, "Contact", (result) => {
- var token = result.token;
- var searchUrl = result.searchUrl;
- this.search_core(
- token,
- searchUrl,
- payload,
- (result) => {
- if (result.status == "0") {
- if (result.object != null) {
- this.to_contact_list(result, contactData, component);
- } else {
- component.set("v.login", false);
- }
- } else {
- this.error("AWS search status1 : " + result.status);
- component.set("v.login", false);
- }
- },
- component
- );
- });
- },
-
- to_contact_list: function (result, retMap, component) {
- var resls = result.object;
- var res = [];
- var space = {};
- space["label"] = "";
- space["selected"] = true;
- space["value"] = "";
- res.push(space);
-
- for (var i = 0; i < resls.length; i++) {
- var t = {};
- t["label"] = resls[i].lastName;
- t["selected"] = false;
- t["Doctor_Division1__c"] = resls[i].doctorDivision1;
- t["value"] = retMap[resls[i].dataId].value;
- res.push(t);
- }
- component.find("select_agency_person").set("v.options", res);
- component.set("v.allselectlistAgencyPerson", res);
- component.set("v.login", false);
- },
-
- search_contact_url: function (component, sobject, callback) {
- var action = component.get("c.getAwsurl");
- action.setParams({
- sobj: sobject
- });
- action.setCallback(this, function (response) {
- var state = response.getState();
- if (state == "SUCCESS") {
- var result = response.getReturnValue();
- if (callback) callback(result);
- } else {
- this.error("AWS url/token error.");
- component.set("v.login", false);
- }
- });
- $A.enqueueAction(action);
- },
- // PIPL update Yin Mingjie 21/02/2022 end
-
- select_department: function (component, event, helper) {
- var dc = component.find("select_department").get("v.value");
- dc = dc ? "%" + dc + "%" : "";
- var purpose_type = component.find("select_purpose_type").get("v.value");
- if (purpose_type) {
- if (purpose_type.substr(-3) == "OPD") {
- purpose_type = "OPD";
- } else if (purpose_type.substr(-3) == "SIS") {
- purpose_type = "SIS";
- } else {
- purpose_type = "";
- }
- }
- if (dc != "" || purpose_type != "") {
- var action = component.get("c.getProductList");
- action.setParams({
- dc: dc,
- opdsis: purpose_type
- });
- action.setCallback(this, function (response) {
- var state = response.getState();
- if (state == "SUCCESS") {
- var res = response.getReturnValue();
- component
- .find("select_Product1")
- .set("v.options", JSON.parse(JSON.stringify(res)));
- component
- .find("select_Product2")
- .set("v.options", JSON.parse(JSON.stringify(res)));
- component
- .find("select_Product3")
- .set("v.options", JSON.parse(JSON.stringify(res)));
- } else {
- this.error("getProductList failed.");
- }
- });
- $A.enqueueAction(action);
- } else {
- component.find("select_Product1").set("v.options", []);
- component.find("select_Product2").set("v.options", []);
- component.find("select_Product3").set("v.options", []);
- }
- },
-
- get_reports: function (component, event, helper, date_str, person_str) {
- if (!date_str) {
- return false;
- }
-
- date_str = this.get_date_string(date_str);
-
- var action = component.get("c.getReports");
- action.setParams({
- date_str: date_str,
- person_str: person_str
- });
-
- component.set("v.login", true);
- action.setCallback(this, function (response) {
- var state = response.getState();
- if (state == "SUCCESS") {
- var res = response.getReturnValue();
- component.set("v.reports", res.reports);
-
- // 20220222 PI鏀归�� by Bright--start
- let dataIds = [];
- let dataIds1 = [];
- let mm = {};
- let b = false;
- let b1 = false;
- for (const rep of res.reports) {
- if (rep.doctor2__r && rep.doctor2__r.AWS_Data_Id__c) {
- dataIds.push(rep.doctor2__r.AWS_Data_Id__c);
- }
-
- if (
- rep.Person_In_Charge2__r &&
- rep.Person_In_Charge2__r.AWS_Data_Id__c
- ) {
- dataIds1.push(rep.Person_In_Charge2__r.AWS_Data_Id__c);
- }
- }
- let Foo = null;
- Foo = function () {
- if (b && b1) {
- for (const rep of res.reports) {
- if (
- rep.doctor2__r &&
- rep.doctor2__r.AWS_Data_Id__c &&
- mm.hasOwnProperty(rep.doctor2__r.AWS_Data_Id__c)
- ) {
- rep.doctor2__r.awsdata = mm[rep.doctor2__r.AWS_Data_Id__c];
- }
- if (
- rep.Person_In_Charge2__r &&
- rep.Person_In_Charge2__r.AWS_Data_Id__c &&
- mm.hasOwnProperty(rep.Person_In_Charge2__r.AWS_Data_Id__c)
- ) {
- rep.Person_In_Charge2__r.awsdata =
- mm[rep.Person_In_Charge2__r.AWS_Data_Id__c];
- }
- }
-
- $A.getCallback(() => component.set("v.reports", res.reports))();
- } else {
- console.log("b=" + b + ",b1=" + b1 + ",continue");
- setTimeout(Foo, 100);
- }
- };
-
- if (dataIds.length > 0) {
- let awsurl = component.get("v.awsurl");
- helper.search_core(
- awsurl.token,
- awsurl.searchUrl,
- JSON.stringify({
- dataIds: dataIds
- }),
- (result) => {
- if (result.status == "0") {
- for (const m of result.object) {
- mm[m.dataId] = m;
- }
- b = true;
- Foo();
- } else {
- //this.error('AWS search status2 : ' + result.status);
- this.success("璇烽噸鏂板埛鏂伴〉闈㈣繘琛岃В瀵�");
- }
- },
- component
- );
- } else {
- b = true;
- }
-
- if (dataIds1.length > 0) {
- let contactawsurl = component.get("v.contactawsurl");
- helper.search_core(
- contactawsurl.token,
- contactawsurl.searchUrl,
- JSON.stringify({
- dataIds: dataIds1
- }),
- (result) => {
- if (result.status == "0") {
- for (const m of result.object) {
- mm[m.dataId] = m;
- }
- b1 = true;
- Foo();
- } else {
- this.error("AWS search status3 : " + result.status);
- }
- },
- component
- );
- } else {
- b1 = true;
- }
- // 20220222 PI鏀归�� by Bright--end
-
- component.set("v.report_count", res.reports.length);
-
- // 鏇存柊淇濆瓨寰屻伄select_data鐢�
- var report_id = component.get("v.update_select_report_data_id");
-
- if (report_id != "") {
- for (i = 0; i < res.reports.length; i++) {
- if (res.reports[i]["Id"] == report_id) {
- component.set("v.select_report_data", res.reports[i]);
- break;
- }
- }
- component.set("v.update_select_report_data_id", "");
- }
-
- if (res.reports.length > 0) {
- component.set("v.list_message", "");
- } else {
- component.set("v.list_message", "no_data");
- }
- component.set("v.login", false);
- } else {
- this.error("get_reports failed.");
- component.set("v.login", false);
- }
- });
- $A.enqueueAction(action);
- },
-
- select_date_change: function (component, event, helper) {
- this.get_reports(
- component,
- event,
- helper,
- component.find("select_date").get("v.value"),
- component.find("select_agency_person").get("v.value")
- );
- this.new_button_disabled(component, event, helper);
-
- component.set("v.select_report_data_radio", "");
- component.find("copy_button").set("v.disabled", true);
- },
-
- select_agency_change: function (component, event, helper) {
- var select_value = component.find("select_agency_person").get("v.value");
- var new_label = this.get_agency_person_name(component, select_value);
- component.set("v.selected_agency_person", new_label);
-
- this.get_reports(
- component,
- event,
- helper,
- component.find("select_date").get("v.value"),
- select_value
- );
- this.new_button_disabled(component, event, helper);
-
- component.set("v.select_report_data_radio", "");
- component.find("copy_button").set("v.disabled", true);
- },
-
- get_agency_person_name: function (component, agency_person_value) {
- // PIPL update Yin Mingjie 21/02/2022 start
- var allselectlist = component.get("v.allselectlist.AgencyPerson__c");
- // var allselectlist = component.get('v.allselectlistAgencyPerson');
- // PIPL update Yin Mingjie 21/02/2022 end
- var new_label = "";
- for (var i = 0; i < allselectlist.length; i++) {
- if (agency_person_value == allselectlist[i].value) {
- new_label = allselectlist[i].label;
- break;
- }
- }
- return new_label;
- },
-
- new_button_disabled: function (component, event, helper) {
- var select_date = component.find("select_date").get("v.value");
- var select_agency = component.find("select_agency_person").get("v.value");
- if (select_date && select_agency) {
- component.find("new_button").set("v.disabled", false);
- } else {
- component.find("new_button").set("v.disabled", true);
- }
- },
-
- toggle_report: function (component) {
- var modal_window = component.find("modal_window");
- var modal_bg = component.find("modal_bg");
- if ($A.util.hasClass(modal_window, "disp_none")) {
- // OPEN
- $A.util.removeClass(modal_window, "disp_none");
- $A.util.removeClass(modal_bg, "disp_none");
-
- if (
- component.get("v.mode") == "edit" ||
- component.get("v.mode") == "copy"
- ) {
- var select_data = "";
- if (component.get("v.mode") == "edit") {
- select_data = component.get("v.select_report_data");
- } else if (component.get("v.mode") == "copy") {
- select_data = component.get("v.select_report_data_radio");
- }
-
- var reports = component.get("v.reports");
- var Agency_Hospital_text = "";
- var Agency_Hospital_parent_id = "";
- debugger;
- // 鍖婚櫌鍚�
- if (select_data["Agency_Hospital__c"] != "") {
- for (var i = 0; i < reports.length; i++) {
- if (
- reports[i]["Agency_Hospital__c"] ==
- select_data["Agency_Hospital__c"]
- ) {
- Agency_Hospital_text = reports[i]["Agency_Hospital__r"]["Name"];
- Agency_Hospital_parent_id =
- reports[i]["Agency_Hospital__r"]["Hospital__c"];
- }
- }
- component.set("v.hospital", Agency_Hospital_text);
- component.set("v.hospitalId", Agency_Hospital_parent_id);
- component.set("v.hospitalLinkId", select_data["Agency_Hospital__c"]);
- component.find("new_con").set("v.disabled", false);
- }
-
- // 绉戝
- if (select_data["Department_Cateogy__c"] != "") {
- this.set_selected(
- component,
- "select_department",
- select_data["Department_Cateogy__c"]
- );
- }
- // 鎷滆浜�
- component.set("v.default_select_doctor_id", select_data["doctor2__c"]);
- this.set_doctor_list(component);
-
- // 娲诲姩鍖哄垎
- if (select_data["Purpose_Type__c"] != "") {
- this.set_selected(
- component,
- "select_purpose_type",
- select_data["Purpose_Type__c"]
- );
- this.select_purpose_type(component);
- }
- //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
- // 鏀彺闇�姹�
- if (select_data["SupportNeeds__c"] != "") {
- this.set_selected(
- component,
- "SupportNeeds__c",
- select_data["SupportNeeds__c"]
- );
- }
- //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� end
- // 绲愭灉
- if (
- select_data["Result__c"] != "" &&
- typeof select_data["Result__c"] !== "undefined"
- ) {
- component
- .find("select_result")
- .set("v.value", select_data["Result__c"]);
- }
-
- // 璇环
- var report_id = component.get("v.edit_copy_select_report_id");
- if (report_id != "") {
- var select_opp = "";
- var select_product_category1 = "";
- var select_product_category2 = "";
- var select_product_category3 = "";
- var reportDate;
- var i = 0;
- for (i = 0; i < reports.length; i++) {
- if (report_id == reports[i]["Id"]) {
- select_opp = reports[i]["Opportunity__c"];
- select_product_category1 = reports[i]["Product_Category1__c"];
- select_product_category2 = reports[i]["Product_Category2__c"];
- select_product_category3 = reports[i]["Product_Category3__c"];
- reportDate = reports[i]["Report_Date__c"];
- break;
- }
- }
-
- // 璇环
- if (select_opp != null && select_opp != "") {
- var select_opp_name = component.get("v.reports")[i].OppName__c;
- component.set("v.data.Opportunity__c", select_opp);
- if ($A.get("$Browser.formFactor") == "DESKTOP") {
- var values = [
- {
- type: "Agency_Opportunity__c",
- id: select_opp,
- label: select_opp_name,
- icon: {
- url: "/img/icon/t4v35/custom/custom12_120.png",
- backgroundColor: "dc71d1",
- alt: "Agency_Opportunity__c"
- }
- }
- ];
- component.set("v.data.Opportunity__c", select_opp);
- // component.find('input-opportunity').get("v.body")[0].set('v.values', values);
- } else {
- component
- .find("input-opportunity")
- .get("v.body")[0]
- .set("v.selectedLabel", select_opp_name);
- }
- }
-
- // 浜у搧鍖哄垎
- if (
- select_product_category1 != null &&
- select_product_category1 != ""
- ) {
- component
- .find("select_Product1")
- .set("v.value", select_product_category1);
- }
- if (
- select_product_category2 != null &&
- select_product_category2 != ""
- ) {
- component
- .find("select_Product2")
- .set("v.value", select_product_category2);
- }
- if (
- select_product_category3 != null &&
- select_product_category3 != ""
- ) {
- component
- .find("select_Product3")
- .set("v.value", select_product_category3);
- }
-
- if (reportDate != null) {
- component.set("v.data.Report_Date__c", reportDate);
- }
-
- component.set("v.edit_copy_select_report_id", "");
- }
- }
- } else {
- // CLOSE
-
- var select_report_data = component.get("v.select_report_data");
- var Report_Date__c = component.get("v.data.Report_Date__c");
- var Agency_Hospital__c = component.get("v.hospitalLinkId");
- var Department_Cateogy__c = component
- .find("select_department")
- .get("v.value");
- var doctor2__c = component.find("select_doctor").get("v.value");
- var Purpose_Type__c = component
- .find("select_purpose_type")
- .get("v.value");
- var SupportNeeds__c = component.find("SupportNeeds__c").get("v.value");
- var Opportunity__c = component.get("v.data.Opportunity__c");
- var Product_Category1__c = component
- .find("select_Product1")
- .get("v.value");
- var Product_Category2__c = component
- .find("select_Product2")
- .get("v.value");
- var Product_Category3__c = component
- .find("select_Product3")
- .get("v.value");
- var Result__c = component.find("select_result").get("v.value");
-
- if (select_report_data !== null) {
- if (typeof select_report_data["Opportunity__c"] === "undefined") {
- select_report_data["Opportunity__c"] = "";
- }
- if (typeof select_report_data["Product_Category1__c"] === "undefined") {
- select_report_data["Product_Category1__c"] = "";
- }
- if (typeof select_report_data["Product_Category2__c"] === "undefined") {
- select_report_data["Product_Category2__c"] = "";
- }
- if (typeof select_report_data["Product_Category3__c"] === "undefined") {
- select_report_data["Product_Category3__c"] = "";
- }
- if (typeof select_report_data["Result__c"] === "undefined") {
- select_report_data["Result__c"] = "";
- }
- }
-
- if (component.get("v.mode") == "new") {
- var confirm_title = "璀﹀憡!";
- var confirm_text = "鏀惧純鏂板缓鍛ㄦ姤锛�";
-
- if (
- !Report_Date__c &&
- !Agency_Hospital__c &&
- !Department_Cateogy__c &&
- !doctor2__c &&
- !Purpose_Type__c &&
- !SupportNeeds__c && //WAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔�
- !Opportunity__c &&
- !Product_Category1__c &&
- !Product_Category2__c &&
- !Product_Category3__c &&
- !Result__c
- ) {
- this.allclear(component);
- $A.util.addClass(modal_window, "disp_none");
- $A.util.addClass(modal_bg, "disp_none");
- } else {
- this.close_confirm(component, confirm_title, confirm_text);
- }
- } else if (component.get("v.mode") == "copy") {
- var confirm_title = "璀﹀憡!";
- var confirm_text = "鏀惧純鏂板缓鍛ㄦ姤锛�";
-
- if (
- select_report_data["Report_Date__c"] == Report_Date__c &&
- select_report_data["Agency_Hospital__c"] == Agency_Hospital__c &&
- select_report_data["Department_Cateogy__c"] ==
- Department_Cateogy__c &&
- select_report_data["doctor2__c"] == doctor2__c &&
- select_report_data["Purpose_Type__c"] == Purpose_Type__c &&
- select_report_data["SupportNeeds__c"] == SupportNeeds__c && //WAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔�
- select_report_data["Opportunity__c"] == Opportunity__c &&
- select_report_data["Product_Category1__c"] == Product_Category1__c &&
- select_report_data["Product_Category2__c"] == Product_Category2__c &&
- select_report_data["Product_Category3__c"] == Product_Category3__c &&
- select_report_data["Result__c"] == Result__c
- ) {
- this.allclear(component);
- $A.util.addClass(modal_window, "disp_none");
- $A.util.addClass(modal_bg, "disp_none");
- } else {
- this.close_confirm(component, confirm_title, confirm_text);
- }
- } else if (component.get("v.mode") == "edit") {
- var confirm_title = "璀﹀憡!";
- var confirm_text = "鏀惧純缂栬緫鍛ㄦ姤锛�";
-
- if (
- select_report_data["Report_Date__c"] == Report_Date__c &&
- select_report_data["Agency_Hospital__c"] == Agency_Hospital__c &&
- select_report_data["Department_Cateogy__c"] ==
- Department_Cateogy__c &&
- select_report_data["doctor2__c"] == doctor2__c &&
- select_report_data["Purpose_Type__c"] == Purpose_Type__c &&
- select_report_data["SupportNeeds__c"] == SupportNeeds__c && //WAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔�
- select_report_data["Opportunity__c"] == Opportunity__c &&
- select_report_data["Product_Category1__c"] == Product_Category1__c &&
- select_report_data["Product_Category2__c"] == Product_Category2__c &&
- select_report_data["Product_Category3__c"] == Product_Category3__c &&
- select_report_data["Result__c"] == Result__c
- ) {
- this.allclear(component);
- $A.util.addClass(modal_window, "disp_none");
- $A.util.addClass(modal_bg, "disp_none");
- } else {
- this.close_confirm(component, confirm_title, confirm_text);
- }
- }
- }
- },
-
- close_confirm: function (component, title, text) {
- var confirm_status = component.get("v.confirm_status");
- component.set("v.modal_confirm_title", title);
- component.set("v.modal_confirm_text", text);
- var modal_window = component.find("modal_window");
- var modal_bg = component.find("modal_bg");
- var modal_confirm = component.find("modal_confirm");
- var modal_confirm_bg = component.find("modal_confirm_bg");
-
- if (confirm_status == 0) {
- $A.util.addClass(modal_window, "disp_none");
- $A.util.addClass(modal_bg, "disp_none");
- $A.util.removeClass(modal_confirm, "disp_none");
- $A.util.removeClass(modal_confirm_bg, "disp_none");
- } else if (confirm_status == 1) {
- // 鏄�
- $A.util.addClass(modal_confirm, "disp_none");
- $A.util.addClass(modal_confirm_bg, "disp_none");
- component.set("v.mode", "");
- this.allclear(component);
- component.set("v.reports_now", "");
- component.set("v.reports_now_count", 0);
- component.set("v.confirm_status", 0);
- } else if (confirm_status == 2) {
- // 鍚�
- $A.util.removeClass(modal_window, "disp_none");
- $A.util.removeClass(modal_bg, "disp_none");
- $A.util.addClass(modal_confirm, "disp_none");
- $A.util.addClass(modal_confirm_bg, "disp_none");
- component.set("v.confirm_status", 0);
- }
- },
-
- new_report: function (component, event, helper) {
- component.set("v.mode", "new");
- component.set("v.dialog_type", "鏂板缓");
- var select_date = component.find("select_date").get("v.value");
- var select_agency = component.find("select_agency_person").get("v.value");
- component.set("v.selected_date", select_date);
- var name = component.get("v.selected_agency_person");
- var ret = this.create_report_header(
- component,
- name,
- select_agency,
- select_date
- );
- // PIPL update Yin Mingjie 21/02/2022 start
- this.set_aws_url(component, "Agency_Contact__c");
- // PIPL update Yin Mingjie 21/02/2022 end
- },
-
- copy_button: function (component, event, helper) {
- this.allclear(component);
- component.set("v.mode", "copy");
- component.set("v.dialog_type", "鏂板缓");
- var select_report_data = component.get("v.select_report_data_radio");
- component.set("v.loadOpp", true);
- // 閫�
- var now = new Date();
- var start_day = new Date(
- now.getFullYear(),
- now.getMonth(),
- now.getDate() - now.getDay() + 1
- );
- var select_date =
- start_day.getFullYear() +
- "/" +
- (start_day.getMonth() + 1) +
- "/" +
- start_day.getDate();
- this.set_selected(component, "select_date", select_date);
- component.set("v.selected_date", select_date);
-
- // 鎷呭綋
- var select_agency = select_report_data["Person_In_Charge2__c"];
- var new_label = this.get_agency_person_name(component, select_agency);
- component.set("v.selected_agency_person", new_label);
- this.set_selected(component, "select_agency_person", select_agency);
-
- this.new_button_disabled(component, event, helper);
-
- var name = component.get("v.selected_agency_person");
-
- component.set("v.edit_copy_select_report_id", select_report_data["Id"]);
- component.set("v.select_report_data", select_report_data);
-
- var ret = this.create_report_header(
- component,
- name,
- select_agency,
- select_date
- );
- },
-
- change_report_radio: function (component, event, helper) {
- var reports = component.get("v.reports");
- for (var i = 0; i < reports.length; i++) {
- if (reports[i].Name == event.getSource().get("v.label")) {
- component.set("v.select_report_data_radio", reports[i]);
- component.find("copy_button").set("v.disabled", false);
- break;
- }
- }
- },
-
- edit_button: function (component, event, helper) {
- this.allclear(component);
- component.set("v.loadOpp", true);
- var index = event.getSource().get("v.value");
- component.set("v.select_report_data", component.get("v.reports")[index]);
- component.set("v.mode", "edit");
- component.set("v.dialog_type", "缂栬緫");
-
- var select_date = component.get("v.reports")[index].Submit_date__c;
- var select_agency = component.get("v.reports")[index].Person_In_Charge2__c;
- var text_tmp = select_date.split("-");
- var select_date_text =
- text_tmp[0] + "/" + Number(text_tmp[1]) + "/" + Number(text_tmp[2]);
- component.set("v.selected_date", select_date_text);
- var name = component.get("v.reports")[index].Person_In_Charge2__r.Name;
-
- this.set_selected(component, "select_agency_person", select_agency);
- this.new_button_disabled(component, event, helper);
-
- var new_label = this.get_agency_person_name(component, select_agency);
- component.set("v.selected_agency_person", new_label);
-
- component.set(
- "v.edit_copy_select_report_id",
- component.get("v.reports")[index].Id
- );
-
- var ret = this.create_report_header(
- component,
- name,
- select_agency,
- select_date
- );
- },
-
- save_report: function (component, event, helper) {
- // 20220222 PI鏀归�� by Bright--start
- let doctor2Name = "";
- let visitortitle = "";
- for (let op of component.find("select_doctor").get("v.options")) {
- if (op.selected) {
- doctor2Name = op.label;
- visitortitle = op.Doctor_Division1__c;
- }
- }
- // 20220222 PI鏀归�� by Bright--end
-
- component.find("save_button").set("v.disabled", true);
-
- var Report_Date__c = component.get("v.data.Report_Date__c");
- // alert('Report_Date__c'+Report_Date__c);
- var Person_In_Charge2__c = "";
- var Submit_date__c = "";
- if (component.get("v.mode") == "edit") {
- // 鍛� Submit_date__c
- Submit_date__c = component.get("v.select_report_data").Submit_date__c;
- // alert('Submit_date__c'+Submit_date__c);
-
- // 鎷呭綋 Person_In_Charge2__c
- Person_In_Charge2__c = component.get(
- "v.select_report_data"
- ).Person_In_Charge2__c;
- } else {
- // 鍛� Submit_date__c
- Submit_date__c = this.get_date_string(
- component.find("select_date").get("v.value")
- );
- // alert('Submit_date__c'+Submit_date__c);
-
- // 鎷呭綋 Person_In_Charge2__c
- Person_In_Charge2__c = component
- .find("select_agency_person")
- .get("v.value");
- }
- // Agency_Report_Header__c
- var Agency_Report_Header__c = component.get("v.agency_report_header_id");
-
- // 鍖婚櫌 Agency_Hospital__c (Agency_Hospital_Link__c)
- var Agency_Hospital__c = component.get("v.hospitalLinkId");
-
- // 绉戝 Department_Cateogy__c
- var Department_Cateogy__c = component
- .find("select_department")
- .get("v.value");
-
- // 鎷滆浜� doctor2__c
- var doctor2__c = component.find("select_doctor").get("v.value");
-
- // 娲诲姩鍖哄垎 Purpose_Type__c
- var Purpose_Type__c = component.find("select_purpose_type").get("v.value");
- //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
- // 鏀彺闇�姹� SupportNeeds__c
- var SupportNeeds__c = component.find("SupportNeeds__c").get("v.value");
- //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� end
- // 璇环 Opportunity__c
- var Opportunity__c = component.get("v.data.Opportunity__c");
-
- var StageName__c = component.find("select_stageName").get("v.value");
- var Amount__c =
- component.get("v.oppdata.Amount__c") != null
- ? component.get("v.oppdata.Amount__c").toString()
- : "";
- var OCMSale_Price__c =
- component.get("v.oppdata.OCMSale_Price__c") != null
- ? component.get("v.oppdata.OCMSale_Price__c").toString()
- : "";
- var Close_Forecasted_Date__c = component.get(
- "v.oppdata.Close_Forecasted_Date__c"
- );
-
- var StageName__c_o = component.get("v.StageName__c_o");
- var Amount__c_o = component.get("v.Amount__c_o");
- var OCMSale_Price__c_o = component.get("v.OCMSale_Price__c_o");
- var Close_Forecasted_Date__c_o = component.get(
- "v.Close_Forecasted_Date__c_o"
- );
- if (StageName__c_o == undefined) StageName__c_o = "";
- if (Amount__c_o == undefined) Amount__c_o = "";
- if (OCMSale_Price__c_o == undefined) OCMSale_Price__c_o = "";
- if (Close_Forecasted_Date__c_o == undefined)
- Close_Forecasted_Date__c_o = "";
- if (
- StageName__c == StageName__c_o &&
- OCMSale_Price__c_o == OCMSale_Price__c &&
- Amount__c == Amount__c_o &&
- Close_Forecasted_Date__c == Close_Forecasted_Date__c_o
- ) {
- StageName__c = "";
- Amount__c = "";
- OCMSale_Price__c = "";
- Close_Forecasted_Date__c = "";
- }
-
- // 浜у搧鍖哄垎 Product_Category__c (ProductTypes__c)
- var Product_Category1__c = component.find("select_Product1").get("v.value");
- var Product_Category2__c = component.find("select_Product2").get("v.value");
- var Product_Category3__c = component.find("select_Product3").get("v.value");
-
- // 绲愭灉 Result__c
- var Result__c = component.find("select_result").get("v.value");
-
- // 銉愩儶銉囥兗銈枫儳銉�
- var error = [];
- if (!Report_Date__c) {
- error.push("娲诲姩鏃� 涓嶅瓨鍦�");
- }
- if (!Submit_date__c) {
- error.push("鍛� 涓嶅瓨鍦�");
- }
- var rDate = new Date(Report_Date__c);
- var sDate = new Date(Submit_date__c);
- sDate.setDate(sDate.getDate() - 1);
- if (rDate < sDate) {
- error.push("娲诲姩鏃ュ繀椤绘槸鏈懆锛�");
- }
- sDate.setDate(sDate.getDate() + 7);
- if (rDate >= sDate) {
- error.push("娲诲姩鏃ュ繀椤绘槸鏈懆锛�");
- }
-
- if (!Person_In_Charge2__c) {
- error.push("鎷呭綋 涓嶅瓨鍦�");
- }
- if (!Agency_Report_Header__c) {
- this.error("Report Header Id 涓嶅瓨鍦�");
- }
- if (!Agency_Hospital__c) {
- error.push("鍖婚櫌 涓嶅瓨鍦�");
- }
- if (!Department_Cateogy__c) {
- error.push("绉戝 涓嶅瓨鍦�");
- }
- if (!doctor2__c) {
- error.push("鎷滆浜� 涓嶅瓨鍦�");
- }
- if (!Purpose_Type__c) {
- error.push("娲诲姩鍖哄垎 涓嶅瓨鍦�");
- }
- // if (!SupportNeeds__c) { error.push("鏀彺闇�姹� 涓嶅瓨鍦�"); }
- if (!Opportunity__c) {
- Opportunity__c = "";
- }
- if (!Product_Category1__c) {
- error.push("浜у搧鍖哄垎1 涓嶅瓨鍦�");
- }
- if (
- Purpose_Type__c &&
- (Purpose_Type__c.substr(-3) == "SIS" ||
- Purpose_Type__c.substr(-3) == "OPD")
- ) {
- if (!Result__c) {
- error.push("缁撴灉 涓嶅瓨鍦�");
- }
- }
- for (var i = 0; i < error.length; i++) {
- this.warning(error[i]);
- }
- if (error.length > 0) {
- component.find("save_button").set("v.disabled", false);
- return false;
- }
-
- // 淇濆瓨鍑︾悊
- component.set("v.login", true);
- if (component.get("v.mode") == "edit") {
- var Agency_Report__c = component.get("v.select_report_data").Id;
- var action = component.get("c.editAgencyReport");
- debugger;
- // alert("Purpose_Type:"+Purpose_Type__c+","+"SupportNeedsc:"+SupportNeeds__c);
- action.setParams({
- Agency_Report_Id: Agency_Report__c,
- Department_Cateogy: Department_Cateogy__c,
- Purpose_Type: Purpose_Type__c,
- //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
- SupportNeedsc: SupportNeeds__c,
- //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� end
- Agency_Report_Header: Agency_Report_Header__c,
- Agency_Hospital: Agency_Hospital__c,
- Person_In_Charge2: Person_In_Charge2__c,
- doctor: doctor2__c,
- Submit_date: Submit_date__c,
- Product_Category1: Product_Category1__c,
- Product_Category2: Product_Category2__c,
- Product_Category3: Product_Category3__c,
- Result: Result__c,
- Opportunity: Opportunity__c,
- StageName: StageName__c,
- oppAmount: Amount__c,
- oppOCMPrice: OCMSale_Price__c,
- Close_Forecasted_Date: Close_Forecasted_Date__c,
- Report_Date: Report_Date__c
- });
-
- action.setCallback(this, function (response) {
- var state = response.getState();
- if (state == "SUCCESS") {
- this.success("缂栬緫淇濆瓨鎴愬姛");
- var report_id = response.getReturnValue();
- component.set("v.create_agency_report_id", report_id);
-
- var select_agency_list =
- component.get("v.allselectlist").AgencyPerson__c;
- for (var i = 0; i < select_agency_list.length; i++) {
- if (
- select_agency_list[i].value ==
- component.get("v.select_report_data").Person_In_Charge2__c
- ) {
- select_agency_list[i].selected = true;
- } else {
- select_agency_list[i].selected = false;
- }
- }
- component
- .find("select_agency_person")
- .set("v.options", select_agency_list);
-
- component.set("v.update_select_report_data_id", report_id);
- this.get_reports(
- component,
- event,
- helper,
- component.get("v.select_report_data").Submit_date__c,
- component.get("v.select_report_data").Person_In_Charge2__c
- );
-
- component.find("save_button").set("v.disabled", false);
- component.set("v.login", false);
- } else {
- // var error = response.getError();
- // alert(JSON.stringify(error));
- // alert(JSON.stringify(error[0].fieldErrors));
- // alert(JSON.stringify(error[0].fieldErrors.next()));
- // alert(JSON.stringify(error[0].fieldErrors.next()[0]));
- // if (this.error(response.getError()[0].message))
- // else () {
- // error[0].fieldErrors[0]
- // }
- this.error("save_report failed.");
- component.find("save_button").set("v.disabled", false);
- component.set("v.login", false);
- }
- });
- $A.enqueueAction(action);
- } else {
- /* Save (New & Copy) */
-
- var action = component.get("c.saveAgencyReport");
- debugger;
- // alert(SupportNeeds__c);
- action.setParams({
- Department_Cateogy: Department_Cateogy__c,
- Purpose_Type: Purpose_Type__c,
- //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
- SupportNeedsc: SupportNeeds__c,
- //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� end
- Agency_Report_Header: Agency_Report_Header__c,
- Agency_Hospital: Agency_Hospital__c,
- Person_In_Charge2: Person_In_Charge2__c,
- doctor: doctor2__c,
- Submit_date: Submit_date__c,
- Product_Category1: Product_Category1__c,
- Product_Category2: Product_Category2__c,
- Product_Category3: Product_Category3__c,
- Result: Result__c,
- Opportunity: Opportunity__c,
- StageName: StageName__c,
- oppAmount: Amount__c,
- oppOCMPrice: OCMSale_Price__c,
- Close_Forecasted_Date: Close_Forecasted_Date__c,
- Report_Date: Report_Date__c
- });
-
- action.setCallback(this, function (response) {
- var state = response.getState();
- if (state == "SUCCESS") {
- this.success("淇濆瓨鎴愬姛");
- var report_id = response.getReturnValue();
- component.set("v.create_agency_report_id", report_id);
-
- this.get_reports(
- component,
- event,
- helper,
- component.find("select_date").get("v.value"),
- component.find("select_agency_person").get("v.value")
- );
-
- // 銉€兗銉�銉偊銈ｃ兂銉夈偊鍐呫伄涓�瑕х敤
- var action2 = component.get("c.getReportsById");
- action2.setParams({
- report_id: report_id
- });
- action2.setCallback(this, function (response) {
+ doinit : function(component, event, helper) {
+ this.report_date_list(component, event, helper, 5);
+ component.set('v.login',true);
+ var action = component.get('c.getalldata');
+ action.setCallback(this,function(response){
var state = response.getState();
- if (state == "SUCCESS") {
- var res = response.getReturnValue();
- var reports_now = component.get("v.reports_now");
- var reports_now_count = 0;
- if (reports_now.length > 0 && reports_now != "") {
- reports_now_count = reports_now.length;
- }
-
- // Save&New鏅傘伄銈︺偅銉炽儔銈﹀唴銉囥兗銈夸竴瑕�
- if (res.length > 0) {
- // 20220222 PI鏀归�� by Bright--start
- res[0].doctor2NameOrigin = doctor2Name;
- res[0].visitorTitleOrigin = visitortitle;
- // 20220222 PI鏀归�� by Bright--end
- reports_now[reports_now_count] = res[0];
-
- reports_now.sort(function (a, b) {
- if (a.Name > b.Name) return -1;
- if (a.Name < b.Name) return 1;
- return 0;
- });
-
- component.set("v.reports_now", reports_now);
- component.set("v.reports_now_count", reports_now.length);
- var data_list = component.find("modal_data_list_tr");
- }
- } else {
- this.error("get_reports_now failed.");
- component.find("save_button").set("v.disabled", false);
- component.set("v.login", false);
+ if(state == 'SUCCESS'){
+ var res = response.getReturnValue();
+ component.set('v.alldata',res.reports);
+ component.set('v.fieldsmap',res.fieldsMap);
+ component.set('v.allselectlist',res.allselectlist);
+ component.set('v.doclist',res.doclist);
+ // PIPL update Yin Mingjie 21/02/2022 start
+ component.find('select_agency_person').set('v.options', this.conv_selected(res.allselectlist.AgencyPerson__c));
+ // this.search_contact(component, event, helper,res.allselectlist.AgencyPerson__c);
+ // PIPL update Yin Mingjie 21/02/2022 end
+ component.find('select_department').set('v.options', this.conv_selected(res.allselectlist.Department_Cateogy__c));
+ component.find('select_purpose_type').set('v.options', this.conv_selected(res.allselectlist.Purpose_Type__c));
+ component.find('select_result').set('v.options', this.conv_selected(res.allselectlist.Result__c));
+ component.find('select_stageName').set('v.options', this.conv_selected(res.allselectlist.StageName__c));
+ //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
+ component.find('SupportNeeds__c').set('v.options', this.conv_selected(res.allselectlist.SupportNeeds__c));
+ //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� end
+ component.set('v.selected_agency_person', res.allselectlist.AgencyPerson__c[0].label);
+ component.set('v.dialog_type', '鏂板缓');
+ component.set('v.awsurl', res.awsurl);// 20220222 PI鏀归�� by Bright
+ component.set('v.contactawsurl', res.contactawsurl);// 20220222 PI鏀归�� by Bright
+
+ this.get_reports(component, event, helper, component.find('select_date').get('v.value'), component.find('select_agency_person').get('v.value'));
+
+ component.set('v.login',false);
}
- });
- $A.enqueueAction(action2);
-
- this.allclear(component);
- component.find("save_button").set("v.disabled", false);
- component.set("v.login", false);
- } else {
- var error = response.getError();
- // alert(JSON.stringify(error));
- this.error("saveAgencyReport failed.");
- component.find("save_button").set("v.disabled", false);
- component.set("v.login", false);
- }
- });
- $A.enqueueAction(action);
- }
- },
-
- allclear: function (component) {
- var clear = [{ label: "", value: "", selected: true }];
- component.set("v.hospital", "");
- component.set("v.hospitalId", "");
- component.set("v.hospitalLinkId", "");
- component.find("new_con").set("v.disabled", true);
- component.find("select_doctor").set("v.options", clear);
- component.set("v.doctor_title", "");
- component
- .find("select_department")
- .set(
- "v.options",
- this.conv_selected(
- component.get("v.allselectlist.Department_Cateogy__c")
- )
- );
- component
- .find("select_purpose_type")
- .set(
- "v.options",
- this.conv_selected(component.get("v.allselectlist.Purpose_Type__c"))
- );
- //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
- component
- .find("SupportNeeds__c")
- .set(
- "v.options",
- this.conv_selected(component.get("v.allselectlist.SupportNeeds__c"))
- );
- //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� end
- // ToDo闇�瑕佹祴璇曟墜鏈轰笂鑳借繍琛屼笉
- component.set("v.data.Opportunity__c", "");
- component.find("select_Product1").set("v.value", "");
- component.find("select_Product2").set("v.value", "");
- component.find("select_Product3").set("v.value", "");
- component.set("v.data.Report_Date__c", "");
- component.set("v.oppdata.Close_Forecasted_Date__c", "");
- component.set("v.oppdata.Amount__c", "");
- component.set("v.oppdata.OCMSale_Price__c", "");
- component.set("v.oppdata.StageName__c", "");
- // component.set('v.oppdata', '');
- component.set("v.Close_Forecasted_Date__c_o", "");
- component.set("v.Amount__c_o", "");
- component.set("v.OCMSale_Price__c_o", "");
- component.set("v.StageName__c_o", "");
- $A.util.addClass(component.find("input-opportunity-stage"), "disp_none");
- $A.util.addClass(component.find("input-opportunity-amount1"), "disp_none");
- $A.util.addClass(component.find("input-opportunity-amount2"), "disp_none");
- $A.util.addClass(component.find("input-opportunity-date"), "disp_none");
- $A.util.removeClass(component.find("input-opportunity-blank"), "disp_none");
- // if ($A.get("$Browser.formFactor") == 'DESKTOP') {
- // var values = [];
- // component.find('input-opportunity').get("v.body")[0].set('v.values', values);
- // } else {
- // component.find('input-opportunity').get("v.body")[0].set('v.selectedLabel', '');
- // }
- // component.find('input-opportunity').set("v.body",[]);
- // if (component.find('input-product-category1'))
- // component.find('input-product-category1').get("v.body")[0].set('v.values', values);
- // if (component.find('input-product-category2'))
- // component.find('input-product-category2').get("v.body")[0].set('v.values', values);
- // if (component.find('input-product-category3'))
- // component.find('input-product-category3').get("v.body")[0].set('v.values', values);
- component.find("select_result").set("v.value", "");
- this.select_purpose_type(component);
- },
-
- report_date_list: function (component, event, helper, count) {
- var ret_obj = [];
- var now = new Date();
- for (var i = 0; i < count; i++) {
- var start_day = new Date(
- now.getFullYear(),
- now.getMonth(),
- now.getDate() - now.getDay() + 1 - i * 7
- );
- var end_day = new Date(
- now.getFullYear(),
- now.getMonth(),
- now.getDate() + (7 - now.getDay()) - i * 7
- );
-
- var start_day_show = new Date(
- now.getFullYear(),
- now.getMonth(),
- now.getDate() - now.getDay() - i * 7
- );
- var end_day_show = new Date(
- now.getFullYear(),
- now.getMonth(),
- now.getDate() + (6 - now.getDay()) - i * 7
- );
- var date_text =
- start_day.getFullYear() +
- "/" +
- (start_day.getMonth() + 1) +
- "/" +
- start_day.getDate() +
- "~" +
- end_day.getFullYear() +
- "/" +
- (end_day.getMonth() + 1) +
- "/" +
- end_day.getDate();
- if (i == 0) {
- ret_obj.push({
- selected: true,
- value:
- start_day.getFullYear() +
- "/" +
- (start_day.getMonth() + 1) +
- "/" +
- start_day.getDate(),
- label:
- start_day_show.getFullYear() +
- "/" +
- (start_day_show.getMonth() + 1) +
- "/" +
- start_day_show.getDate() +
- "~" +
- end_day_show.getFullYear() +
- "/" +
- (end_day_show.getMonth() + 1) +
- "/" +
- end_day_show.getDate()
+ else{
+ this.error('doinit failed.');
+ component.set('v.login',false);
+ }
});
- } else {
- ret_obj.push({
- selected: false,
- value:
- start_day.getFullYear() +
- "/" +
- (start_day.getMonth() + 1) +
- "/" +
- start_day.getDate(),
- label:
- start_day_show.getFullYear() +
- "/" +
- (start_day_show.getMonth() + 1) +
- "/" +
- start_day_show.getDate() +
- "~" +
- end_day_show.getFullYear() +
- "/" +
- (end_day_show.getMonth() + 1) +
- "/" +
- end_day_show.getDate()
+ $A.enqueueAction(action);
+ },
+
+ // PIPL update Yin Mingjie 21/02/2022 start
+ search_contact : function(component, event, helper, resobj) {
+ let contactData = Object.create(null);
+ var dataArr = new Array();
+ for (let i = 0; i < resobj.length; i++) {
+ if (resobj[i].awsid != null && resobj[i].awsid != ''){
+ contactData[resobj[i].awsid] = resobj[i];
+ dataArr.push(resobj[i].awsid);
+ }
+ }
+ let obj= Object.create(null);
+ obj['dataIds'] = dataArr;
+ var payload = JSON.stringify(obj);
+ this.search_contact_url(component, 'Contact', (result)=>{
+ var token = result.token;
+ var searchUrl = result.searchUrl;
+ this.search_core(token,searchUrl,payload,(result)=>{
+ if(result.status == '0'){
+ if(result.object != null){
+ this.to_contact_list(result,contactData,component);
+ }else{
+ component.set('v.login',false);
+ }
+ }else{
+ this.error('AWS search status1 : ' + result.status);
+ component.set('v.login',false);
+ }
+ },component);
+
});
- }
- }
+ },
- component.find("select_date").set("v.options", ret_obj);
- component.set("v.report_date_list", ret_obj);
- },
+ to_contact_list : function(result,retMap,component) {
+ var resls = result.object;
+ var res = [];
+ var space = {};
+ space['label'] = '';
+ space['selected'] = true;
+ space['value'] = '';
+ res.push(space);
- create_report_header: function (component, name, s_agency, s_date) {
- s_date = this.get_date_string(s_date);
- if (s_date == false) {
- this.error("get_date_string failed.");
- return false;
- }
-
- var head_key = this.create_header_input_key(s_agency, s_date);
- component.set("v.agency_report_header", head_key);
- if (head_key == false) {
- this.error("create_header_input_key failed.");
- return false;
- }
-
- var key2 = s_date.replace(/-/g, "");
- var action = component.get("c.createReportHeader");
-
- action.setParams({
- name: name,
- s_date: s_date,
- s_agency: s_agency,
- head_key: head_key
- });
-
- component.set("v.login", true);
- action.setCallback(this, function (response) {
- var state = response.getState();
- if (state == "SUCCESS") {
- var res = response.getReturnValue();
- component.set("v.agency_report_header_id", res);
- component.set("v.login", false);
- this.toggle_report(component);
- } else {
- this.error("createReportHeader callback failed.");
- component.set("v.login", false);
- }
- });
- $A.enqueueAction(action);
- },
-
- create_header_input_key: function (agency_id, s_date) {
- if (typeof s_date != "string") {
- s_date = this.get_date_string(s_date);
- if (s_date == false) {
- this.error("get_date_string in create_header_input_key.");
- return false;
- }
- }
- if (!agency_id || !s_date) {
- return false;
- }
-
- s_date = s_date.replace(/-/g, "");
- var headkey = agency_id + ":" + s_date;
-
- return headkey;
- },
-
- /* typeof is not cool
- * @ret : String, Boolean, Date, Error, Array, Function, Null, Undefined, etc
- */
- object_type: function (obj) {
- var obj_type = Object.prototype.toString.call(obj).slice(8, -1);
- return obj_type;
- },
-
- // create yyyy-mm-dd string
- get_date_string: function (val) {
- if (typeof val == "string") {
- if (val.match(/^\d{4}\/\d{1,2}\/\d{1,2}$/)) {
- val = val.replace(/[\/]/g, "-");
- var tmp = val.split("-");
- if (tmp[1].length == 1) {
- tmp[1] = "0" + tmp[1];
+ for (var i = 0; i < resls.length; i++) {
+ var t = {};
+ t['label'] = resls[i].lastName;
+ t['selected'] = false;
+ t['Doctor_Division1__c'] = resls[i].doctorDivision1;
+ t['value'] = retMap[resls[i].dataId].value;
+ res.push(t);
}
- if (tmp[2].length == 1) {
- tmp[2] = "0" + tmp[2];
+ component.find('select_agency_person').set('v.options',res);
+ component.set('v.allselectlistAgencyPerson',res);
+ component.set('v.login',false);
+ },
+
+ search_contact_url : function(component, sobject, callback) {
+ var action = component.get('c.getAwsurl');
+ action.setParams({
+ "sobj" : sobject,
+ });
+ action.setCallback(this,function(response){
+ var state = response.getState();
+ if(state == 'SUCCESS'){
+ var result = response.getReturnValue();
+ if(callback)callback(result);
+ }
+ else{
+ this.error('AWS url/token error.');
+ component.set('v.login',false);
+ }
+ });
+ $A.enqueueAction(action);
+ },
+ // PIPL update Yin Mingjie 21/02/2022 end
+
+ select_department : function(component, event, helper) {
+ var dc = component.find("select_department").get("v.value");
+ dc = dc ? '%'+dc+'%' : '';
+ var purpose_type = component.find("select_purpose_type").get("v.value");
+ if (purpose_type) {
+ if (purpose_type.substr(-3) == 'OPD') {
+ purpose_type = 'OPD';
+ } else if (purpose_type.substr(-3) == 'SIS') {
+ purpose_type = 'SIS';
+ } else {
+ purpose_type = '';
+ }
}
- val = tmp[0] + "-" + tmp[1] + "-" + tmp[2];
- } else if (val.match(/^\d{4}-\d{1,2}-\d{1,2}$/)) {
- //ok
- } else {
- return false;
- }
- } else if (this.object_type(val) == "Date") {
- var mm = val.getMonth() + 1;
- if (String(mm).length == 1) {
- mm = "0" + mm;
- }
+ if (dc != '' || purpose_type != '') {
- var dd = "";
- if (String(val.getDate()).length == 1) {
- dd = "0" + val.getDate();
- } else {
- dd = val.getDate();
- }
+ var action = component.get('c.getProductList');
+ action.setParams({
+ "dc" : dc,
+ "opdsis" : purpose_type,
+ });
+ action.setCallback(this,function(response){
+ var state = response.getState();
+ if(state == 'SUCCESS'){
- val = val.getFullYear() + "-" + mm + "-" + dd;
- } else {
- return false;
- }
-
- return val;
- },
-
- searchHos: function (component, event, helper) {
- var hospital_name = event.getParam("value");
- var action = component.get("c.getHospitalList");
- debugger;
- action.setParams({ hospital_name: hospital_name });
-
- action.setCallback(this, function (response) {
- var state = response.getState();
- if (state === "SUCCESS") {
- var hospital_list = component.find("hospital_list");
- var hosList = response.getReturnValue();
- if (hosList.length > 0) {
- $A.util.addClass(hospital_list, "slds-is-open");
+ var res = response.getReturnValue();
+ component.find('select_Product1').set("v.options", JSON.parse(JSON.stringify(res)));
+ component.find('select_Product2').set("v.options", JSON.parse(JSON.stringify(res)));
+ component.find('select_Product3').set("v.options", JSON.parse(JSON.stringify(res)));
+ }
+ else{
+ this.error('getProductList failed.');
+ }
+ });
+ $A.enqueueAction(action);
} else {
- $A.util.removeClass(hospital_list, "slds-is-open");
+ component.find('select_Product1').set('v.options', []);
+ component.find('select_Product2').set('v.options', []);
+ component.find('select_Product3').set('v.options', []);
}
- component.set("v.hospitalList", response.getReturnValue());
- } else {
- $A.util.removeClass(hospital_list, "slds-is-open");
- }
- });
- $A.enqueueAction(action);
- },
+ },
- hideSearch: function (component, event, helper) {
- var hospital_list = component.find("hospital_list");
- $A.util.removeClass(hospital_list, "slds-is-open");
- },
+ get_reports : function(component, event, helper, date_str, person_str) {
+ if (!date_str) {
+ return false;
+ }
+
+ date_str = this.get_date_string(date_str);
+
+ var action = component.get('c.getReports');
+ action.setParams({
+ "date_str" : date_str,
+ "person_str" : person_str,
+ });
- selectHos: function (component, event, helper) {
- debugger;
- var hospital_list = component.find("hospital_list");
- $A.util.removeClass(hospital_list, "slds-is-open");
- var accname = event.currentTarget.dataset.accname;
- var accid = event.currentTarget.dataset.accid;
- var hospital_data = component.get("v.hospitalList");
- for (var i = 0; i < hospital_data.length; i++) {
- if (hospital_data[i].Hospital__c == accid) {
- component.set("v.hospitalLinkId", hospital_data[i].Id);
- component.set("v.data.Agency_Hospital__c", hospital_data[i].Id);
- component.find("new_con").set("v.disabled", false);
- }
- }
- component.set("v.hospital", accname);
- component.set("v.hospitalId", accid);
- this.set_doctor_list(component);
- this.opportunityChange(component, event, helper);
- },
+ component.set('v.login',true);
+ action.setCallback(this,function(response){
+ var state = response.getState();
+ if(state == 'SUCCESS'){
+ var res = response.getReturnValue();
+ component.set('v.reports', res.reports);
+
+ // 20220222 PI鏀归�� by Bright--start
+ let dataIds = [];
+ let dataIds1 = [];
+ let mm = {};
+ let b = false;
+ let b1 = false;
+ for (const rep of res.reports) {
+ if (rep.doctor2__r && rep.doctor2__r.AWS_Data_Id__c) {
+ dataIds.push(rep.doctor2__r.AWS_Data_Id__c);
+ }
- select_purpose_type: function (component) {
- var purpose_type = component.find("select_purpose_type").get("v.value");
- if (
- (purpose_type != null &&
- purpose_type != undefined &&
- purpose_type.substr(-3) == "OPD") ||
- purpose_type.substr(-3) == "SIS"
- ) {
- var result = component.find("result");
- $A.util.removeClass(result, "disp_none");
- } else {
- component.find("select_result").set("v.value", "");
- var result = component.find("result");
- $A.util.addClass(result, "disp_none");
- }
- this.select_department(component, null, null);
- },
+ if (rep.Person_In_Charge2__r && rep.Person_In_Charge2__r.AWS_Data_Id__c) {
+ dataIds1.push(rep.Person_In_Charge2__r.AWS_Data_Id__c);
+ }
+ }
+ let Foo = null;
+ Foo = function(){
+ if(b && b1){
+ for (const rep of res.reports) {
+ if (rep.doctor2__r && rep.doctor2__r.AWS_Data_Id__c && mm.hasOwnProperty(rep.doctor2__r.AWS_Data_Id__c)) {
+ rep.doctor2__r.awsdata = mm[rep.doctor2__r.AWS_Data_Id__c];
+ }
+ if (rep.Person_In_Charge2__r && rep.Person_In_Charge2__r.AWS_Data_Id__c && mm.hasOwnProperty(rep.Person_In_Charge2__r.AWS_Data_Id__c)) {
+ rep.Person_In_Charge2__r.awsdata = mm[rep.Person_In_Charge2__r.AWS_Data_Id__c];
+ }
+ }
- doctor_change: function (component, event, helper) {
- var doctor_value = component.find("select_doctor").get("v.value");
- var doctor_list = component.get("v.doctor_list");
- var flg = false;
- for (var i = 0; i < doctor_list.length; i++) {
- if (doctor_list[i].value == doctor_value) {
- component.set("v.doctor_title", doctor_list[i].Doctor_Division1__c);
- flg = true;
- break;
- }
- }
- if (flg == false) {
- component.set("v.doctor_title", "");
- }
- },
- // PIPL update Yin Mingjie 21/02/2022 start
- set_aws_url: function (component, sobject) {
- var action = component.get("c.getAwsurl");
- action.setParams({
- sobj: sobject
- });
- action.setCallback(this, function (response) {
- var state = response.getState();
- if (state == "SUCCESS") {
- var awsmap = this.conv_selected(response.getReturnValue());
- component.set("v.AWStoken", awsmap.token);
- component.set("v.AWSinsert", awsmap.newUrl);
- component.set("v.AWSsearch", awsmap.searchUrl);
- component.set("v.AWStransactionURL", awsmap.transactionURL);
- } else {
- this.error("AWS url/token error.");
- component.set("v.login", false);
- }
- });
- $A.enqueueAction(action);
- },
+ $A.getCallback(()=>component.set('v.reports', res.reports))();
+ }else{
+ console.log('b='+b + ',b1='+b1+',continue');
+ setTimeout(Foo,100);
+ }
+ }
+
+ if(dataIds.length > 0){
+ let awsurl = component.get('v.awsurl');
+ helper.search_core(awsurl.token,awsurl.searchUrl,JSON.stringify({
+ "dataIds":dataIds
+ }),(result)=>{
+ if(result.status == '0'){
+
+ for (const m of result.object) {
+ mm[m.dataId] = m;
+ }
+ b = true;
+ Foo();
+ }else{
+ //this.error('AWS search status2 : ' + result.status);
+ this.success('璇烽噸鏂板埛鏂伴〉闈㈣繘琛岃В瀵�');
+ }
+ },component);
+ }else{
+ b = true;
+ }
- insert_agencycontact: function (
- component,
- token,
- newUrl,
- payload,
- agencyHospitalid,
- helper,
- hospitalName
- ) {
- // AWSService.insert(newUrl,payload,function(result){
- // if(result.status == '0'){
- // $A.getCallback(function(){
- // helper.to_agencycontact(component,result,agencyHospitalid);
- // })();
+
+
+ if(dataIds1.length > 0){
+ let contactawsurl = component.get('v.contactawsurl');
+ helper.search_core(contactawsurl.token,contactawsurl.searchUrl,JSON.stringify({
+ "dataIds":dataIds1
+ }),(result)=>{
+ if(result.status == '0'){
+
+ for (const m of result.object) {
+ mm[m.dataId] = m;
+ }
+ b1 = true;
+ Foo();
+ }else{
+ this.error('AWS search status3 : ' + result.status);
+ }
+ },component);
+ }else{
+ b1 = true;
+ }
+ // 20220222 PI鏀归�� by Bright--end
- // }else{
- // console.log('AWS status error:' + result)
- // component.set('v.login',false);
- // component.find('OppMessage').setError('AWS insert error.');
- // }
- // },token);
+ component.set('v.report_count', res.reports.length);
- fetch(newUrl, {
- method: "POST",
- body: payload,
- headers: {
- "Content-Type": "application/json",
- "pi-token": token
- }
- })
- .then((data) => {
- return data.json();
- })
- .then((result) => {
- if (result.status == "0") {
- $A.getCallback(function () {
- helper.to_agencycontact(component, result, agencyHospitalid);
- })();
+ // 鏇存柊淇濆瓨寰屻伄select_data鐢�
+ var report_id = component.get('v.update_select_report_data_id');
+
+ if (report_id != "") {
+ for (i = 0; i < res.reports.length; i++) {
+ if (res.reports[i]['Id'] == report_id) {
+ component.set('v.select_report_data', res.reports[i]);
+ break;
+ }
+ }
+ component.set('v.update_select_report_data_id', '');
+ }
+
+ if (res.reports.length > 0) {
+ component.set('v.list_message', '');
+ } else {
+ component.set('v.list_message', 'no_data');
+ }
+ component.set('v.login',false);
+ }
+ else{
+ this.error('get_reports failed.');
+ component.set('v.login',false);
+ }
+ });
+ $A.enqueueAction(action);
+ },
+
+ select_date_change : function(component, event, helper) {
+ this.get_reports(component, event, helper, component.find('select_date').get('v.value'), component.find('select_agency_person').get('v.value'));
+ this.new_button_disabled(component, event, helper);
+
+ component.set('v.select_report_data_radio', '');
+ component.find('copy_button').set('v.disabled', true);
+ },
+
+ select_agency_change : function(component, event, helper) {
+ var select_value = component.find('select_agency_person').get('v.value');
+ var new_label = this.get_agency_person_name(component, select_value);
+ component.set('v.selected_agency_person', new_label);
+
+ this.get_reports(component, event, helper, component.find('select_date').get('v.value'), select_value);
+ this.new_button_disabled(component, event, helper);
+
+ component.set('v.select_report_data_radio', '');
+ component.find('copy_button').set('v.disabled', true);
+ },
+
+ get_agency_person_name : function(component, agency_person_value) {
+ // PIPL update Yin Mingjie 21/02/2022 start
+ var allselectlist = component.get('v.allselectlist.AgencyPerson__c');
+ // var allselectlist = component.get('v.allselectlistAgencyPerson');
+ // PIPL update Yin Mingjie 21/02/2022 end
+ var new_label = '';
+ for (var i = 0; i < allselectlist.length; i++) {
+ if (agency_person_value == allselectlist[i].value) {
+ new_label = allselectlist[i].label;
+ break;
+ }
+ }
+ return new_label;
+ },
+
+ new_button_disabled : function(component, event, helper) {
+ var select_date = component.find('select_date').get('v.value');
+ var select_agency = component.find('select_agency_person').get('v.value');
+ if (select_date && select_agency) {
+ component.find('new_button').set('v.disabled', false);
} else {
- console.log("AWS status error:" + result);
- component.set("v.login", false);
- if (result.status == "129") {
- component
- .find("OppMessage")
- .setError(
- "璇ュ鎴蜂汉鍛樺悕瀛楀凡瀛樺湪锛屽湪" + hospitalName + "鍖婚櫌锛岃淇敼"
- );
- } else {
- component.find("OppMessage").setError("AWS insert error.");
- }
+ component.find('new_button').set('v.disabled', true);
}
- })
- .catch((error) => {
- console.log("AWS insert error:" + error);
- component.set("v.login", false);
- component.find("OppMessage").setError("AWS insert error.");
- });
- },
+ },
+
+ toggle_report : function(component) {
+ var modal_window = component.find('modal_window');
+ var modal_bg = component.find('modal_bg');
+ if ($A.util.hasClass(modal_window, 'disp_none')) {
+ // OPEN
+ $A.util.removeClass(modal_window, 'disp_none');
+ $A.util.removeClass(modal_bg, 'disp_none');
+
+ if (component.get('v.mode') == 'edit' || component.get('v.mode') == 'copy') {
+ var select_data = '';
+ if (component.get('v.mode') == 'edit') {
+ select_data = component.get('v.select_report_data');
+ } else if (component.get('v.mode') == 'copy') {
+ select_data = component.get('v.select_report_data_radio');
+ }
+
+ var reports = component.get('v.reports');
+ var Agency_Hospital_text = '';
+ var Agency_Hospital_parent_id = '';
+ debugger
+ // 鍖婚櫌鍚�
+ if (select_data['Agency_Hospital__c'] != '') {
+ for (var i = 0; i < reports.length; i++) {
+ if (reports[i]['Agency_Hospital__c'] == select_data['Agency_Hospital__c']) {
+ Agency_Hospital_text = reports[i]['Agency_Hospital__r']['Name'];
+ Agency_Hospital_parent_id = reports[i]['Agency_Hospital__r']['Hospital__c'];
+ }
+ }
+ component.set('v.hospital', Agency_Hospital_text);
+ component.set('v.hospitalId', Agency_Hospital_parent_id);
+ component.set('v.hospitalLinkId', select_data['Agency_Hospital__c']);
+ component.find('new_con').set('v.disabled', false);
+ }
+
+ // 绉戝
+ if (select_data['Department_Cateogy__c'] != '') {
+ this.set_selected(component, 'select_department', select_data['Department_Cateogy__c']);
+ }
+ // 鎷滆浜�
+ component.set('v.default_select_doctor_id', select_data['doctor2__c']);
+ this.set_doctor_list(component);
+
+ // 娲诲姩鍖哄垎
+ if (select_data['Purpose_Type__c'] != '') {
+ this.set_selected(component, 'select_purpose_type', select_data['Purpose_Type__c']);
+ this.select_purpose_type(component);
+ }
+ //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
+ // 鏀彺闇�姹�
+ if (select_data['SupportNeeds__c'] != '') {
+ this.set_selected(component, 'SupportNeeds__c', select_data['SupportNeeds__c']);
+ }
+ //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� end
+ // 绲愭灉
+ if (select_data['Result__c'] != '' && typeof select_data['Result__c'] !== "undefined") {
+ component.find('select_result').set('v.value', select_data['Result__c']);
+ }
+
+ // 璇环
+ var report_id = component.get('v.edit_copy_select_report_id');
+ if (report_id != "") {
+ var select_opp = '';
+ var select_product_category1 = '';
+ var select_product_category2 = '';
+ var select_product_category3 = '';
+ var reportDate;
+ var i = 0;
+ for (i = 0; i < reports.length; i++) {
+ if (report_id == reports[i]["Id"]) {
+ select_opp = reports[i]["Opportunity__c"];
+ select_product_category1 = reports[i]["Product_Category1__c"];
+ select_product_category2 = reports[i]["Product_Category2__c"];
+ select_product_category3 = reports[i]["Product_Category3__c"];
+ reportDate = reports[i]["Report_Date__c"];
+ break;
+ }
+ }
+
+ // 璇环
+ if (select_opp != null && select_opp != '') {
+ var select_opp_name = component.get('v.reports')[i].OppName__c;
+ component.set('v.data.Opportunity__c', select_opp);
+ if ($A.get("$Browser.formFactor") == 'DESKTOP') {
+ var values = [{
+ type: 'Agency_Opportunity__c',
+ id: select_opp,
+ label: select_opp_name,
+ icon : {
+ url:'/img/icon/t4v35/custom/custom12_120.png',
+ backgroundColor:'dc71d1',
+ alt:'Agency_Opportunity__c'
+ }
+ }];
+ component.set('v.data.Opportunity__c', select_opp);
+ // component.find('input-opportunity').get("v.body")[0].set('v.values', values);
+ } else {
+ component.find('input-opportunity').get("v.body")[0].set('v.selectedLabel', select_opp_name);
+ }
+ }
+
+ // 浜у搧鍖哄垎
+ if (select_product_category1 != null && select_product_category1 != '') {
+ component.find('select_Product1').set('v.value', select_product_category1);
+ }
+ if (select_product_category2 != null && select_product_category2 != '') {
+ component.find('select_Product2').set('v.value', select_product_category2);
+ }
+ if (select_product_category3 != null && select_product_category3 != '') {
+ component.find('select_Product3').set('v.value', select_product_category3);
+ }
- to_agencycontact: function (component, result, agencyHospitalid) {
- var action = component.get("c.saveAgencyContact");
- action.setParams({
- name: result.object[0].name,
- //"nameEncrypt" : result.object[0].nameEncrypt,
- type: result.object[0].type,
- //"typeEncrypt" : result.object[0].typeEncrypt,
- doctorDivision1: result.object[0].doctorDivision1,
- //"doctorDivision1Encrypt" : result.object[0].doctorDivision1Encrypt,
- agencyHospitalid: agencyHospitalid,
- awsid: result.object[0].dataId
- });
- action.setCallback(this, function (response) {
- var state = response.getState();
- if (state == "SUCCESS") {
- var acMap = this.conv_selected(response.getReturnValue());
- console.log(acMap);
- if (acMap.AgencyContactId != "") {
- //纭浜嬪姟
- var token = component.get("v.AWStoken");
- var confirmUrl = component.get("v.AWStransactionURL");
-
- let data = Object.create(null);
- data["isSuccess"] = 1;
- data["sfRecordId"] = "";
- data["txId"] = result.txId;
-
- this.to_confirm(component, token, confirmUrl, JSON.stringify(data));
- } else if (acMap.errormsg != "") {
- this.error(acMap.errormsg);
- component.set("v.login", false);
+ if (reportDate != null) {
+ component.set('v.data.Report_Date__c', reportDate);
+ }
+
+ component.set('v.edit_copy_select_report_id', "");
+ }
+ }
} else {
- this.error("agency contact insert id error.");
- component.set("v.login", false);
- }
- } else {
- this.error("agency contact insert error.");
- component.set("v.login", false);
- }
- });
- $A.enqueueAction(action);
- },
+ // CLOSE
- to_confirm: function (component, token, confirmUrl, payload) {
- fetch(confirmUrl, {
- method: "POST",
- body: payload,
- headers: {
- "Content-Type": "application/json",
- "pi-token": token
- }
- })
- .then((data) => {
- return data.json();
- })
- .then((result) => {
- if (
- result.status == "0" &&
- result.hasOwnProperty("success") &&
- result.success
- ) {
- component.set("v.truthy", false);
- var modal_newAC = component.find("modal_newAC");
- $A.util.addClass(modal_newAC, "disp_none");
- this.success(".瀹㈡埛浜哄憳宸插垱寤恒��");
- this.set_doctor_list(component);
+ var select_report_data = component.get('v.select_report_data');
+ var Report_Date__c = component.get('v.data.Report_Date__c');
+ var Agency_Hospital__c = component.get('v.hospitalLinkId');
+ var Department_Cateogy__c = component.find('select_department').get('v.value');
+ var doctor2__c = component.find('select_doctor').get('v.value');
+ var Purpose_Type__c = component.find('select_purpose_type').get('v.value');
+ var SupportNeeds__c = component.find('SupportNeeds__c').get('v.value');
+ var Opportunity__c = component.get('v.data.Opportunity__c');
+ var Product_Category1__c = component.find('select_Product1').get('v.value');
+ var Product_Category2__c = component.find('select_Product2').get('v.value');
+ var Product_Category3__c = component.find('select_Product3').get('v.value');
+ var Result__c = component.find('select_result').get('v.value');
+
+ if (select_report_data !== null) {
+ if (typeof select_report_data['Opportunity__c'] === "undefined") {
+ select_report_data['Opportunity__c'] = "";
+ }
+ if (typeof select_report_data['Product_Category1__c'] === "undefined") {
+ select_report_data['Product_Category1__c'] = "";
+ }
+ if (typeof select_report_data['Product_Category2__c'] === "undefined") {
+ select_report_data['Product_Category2__c'] = "";
+ }
+ if (typeof select_report_data['Product_Category3__c'] === "undefined") {
+ select_report_data['Product_Category3__c'] = "";
+ }
+ if (typeof select_report_data['Result__c'] === "undefined") {
+ select_report_data['Result__c'] = "";
+ }
+ }
+
+ if (component.get('v.mode') == 'new') {
+ var confirm_title = '璀﹀憡!'
+ var confirm_text = '鏀惧純鏂板缓鍛ㄦ姤锛�';
+
+ if (!Report_Date__c &&
+ !Agency_Hospital__c &&
+ !Department_Cateogy__c &&
+ !doctor2__c &&
+ !Purpose_Type__c &&
+ !SupportNeeds__c&&//WAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔�
+ !Opportunity__c &&
+ !Product_Category1__c &&
+ !Product_Category2__c &&
+ !Product_Category3__c &&
+ !Result__c)
+ {
+ this.allclear(component);
+ $A.util.addClass(modal_window, 'disp_none');
+ $A.util.addClass(modal_bg, 'disp_none');
+ } else {
+ this.close_confirm(component, confirm_title, confirm_text);
+ }
+ } else if (component.get('v.mode') == 'copy') {
+ var confirm_title = '璀﹀憡!'
+ var confirm_text = '鏀惧純鏂板缓鍛ㄦ姤锛�';
+
+ if (select_report_data['Report_Date__c'] == Report_Date__c &&
+ select_report_data['Agency_Hospital__c'] == Agency_Hospital__c &&
+ select_report_data['Department_Cateogy__c'] == Department_Cateogy__c &&
+ select_report_data['doctor2__c'] == doctor2__c &&
+ select_report_data['Purpose_Type__c'] == Purpose_Type__c &&
+ select_report_data['SupportNeeds__c'] == SupportNeeds__c &&//WAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔�
+ select_report_data['Opportunity__c'] == Opportunity__c &&
+ select_report_data['Product_Category1__c'] == Product_Category1__c &&
+ select_report_data['Product_Category2__c'] == Product_Category2__c &&
+ select_report_data['Product_Category3__c'] == Product_Category3__c &&
+ select_report_data['Result__c'] == Result__c)
+ {
+ this.allclear(component);
+ $A.util.addClass(modal_window, 'disp_none');
+ $A.util.addClass(modal_bg, 'disp_none');
+ } else {
+ this.close_confirm(component, confirm_title, confirm_text);
+ }
+ } else if (component.get('v.mode') == 'edit') {
+ var confirm_title = '璀﹀憡!'
+ var confirm_text = '鏀惧純缂栬緫鍛ㄦ姤锛�';
+
+ if (select_report_data['Report_Date__c'] == Report_Date__c &&
+ select_report_data['Agency_Hospital__c'] == Agency_Hospital__c &&
+ select_report_data['Department_Cateogy__c'] == Department_Cateogy__c &&
+ select_report_data['doctor2__c'] == doctor2__c &&
+ select_report_data['Purpose_Type__c'] == Purpose_Type__c &&
+ select_report_data['SupportNeeds__c'] == SupportNeeds__c &&//WAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔�
+ select_report_data['Opportunity__c'] == Opportunity__c &&
+ select_report_data['Product_Category1__c'] == Product_Category1__c &&
+ select_report_data['Product_Category2__c'] == Product_Category2__c &&
+ select_report_data['Product_Category3__c'] == Product_Category3__c &&
+ select_report_data['Result__c'] == Result__c)
+ {
+ this.allclear(component);
+ $A.util.addClass(modal_window, 'disp_none');
+ $A.util.addClass(modal_bg, 'disp_none');
+ } else {
+ this.close_confirm(component, confirm_title, confirm_text);
+ }
+ }
+
+ }
+ },
+
+ close_confirm : function(component, title, text) {
+ var confirm_status = component.get('v.confirm_status');
+ component.set('v.modal_confirm_title', title);
+ component.set('v.modal_confirm_text', text);
+ var modal_window = component.find('modal_window');
+ var modal_bg = component.find('modal_bg');
+ var modal_confirm = component.find('modal_confirm');
+ var modal_confirm_bg = component.find('modal_confirm_bg');
+
+ if (confirm_status == 0) {
+ $A.util.addClass(modal_window, 'disp_none');
+ $A.util.addClass(modal_bg, 'disp_none');
+ $A.util.removeClass(modal_confirm, 'disp_none');
+ $A.util.removeClass(modal_confirm_bg, 'disp_none');
+ } else if (confirm_status == 1) {
+ // 鏄�
+ $A.util.addClass(modal_confirm, 'disp_none');
+ $A.util.addClass(modal_confirm_bg, 'disp_none');
+ component.set('v.mode', '');
+ this.allclear(component);
+ component.set('v.reports_now', "");
+ component.set('v.reports_now_count', 0);
+ component.set('v.confirm_status', 0);
+ } else if (confirm_status == 2) {
+ // 鍚�
+ $A.util.removeClass(modal_window, 'disp_none');
+ $A.util.removeClass(modal_bg, 'disp_none');
+ $A.util.addClass(modal_confirm, 'disp_none');
+ $A.util.addClass(modal_confirm_bg, 'disp_none');
+ component.set('v.confirm_status', 0);
+ }
+ },
+
+ new_report : function(component, event, helper) {
+ component.set('v.mode', 'new');
+ component.set('v.dialog_type', '鏂板缓');
+ var select_date = component.find('select_date').get('v.value');
+ var select_agency = component.find('select_agency_person').get('v.value');
+ component.set('v.selected_date', select_date);
+ var name = component.get('v.selected_agency_person');
+ var ret = this.create_report_header(component, name, select_agency, select_date);
+ // PIPL update Yin Mingjie 21/02/2022 start
+ this.set_aws_url(component,'Agency_Contact__c')
+ // PIPL update Yin Mingjie 21/02/2022 end
+ },
+
+ copy_button : function(component, event, helper) {
+ this.allclear(component);
+ component.set('v.mode', 'copy');
+ component.set('v.dialog_type', '鏂板缓');
+ var select_report_data = component.get('v.select_report_data_radio');
+ component.set('v.loadOpp', true);
+ // 閫�
+ var now = new Date();
+ var start_day = new Date(now.getFullYear(), now.getMonth(), (now.getDate() - now.getDay() + 1));
+ var select_date = start_day.getFullYear() + '/' + (start_day.getMonth() + 1) + '/' + start_day.getDate();
+ this.set_selected(component, 'select_date', select_date);
+ component.set('v.selected_date', select_date);
+
+ // 鎷呭綋
+ var select_agency = select_report_data['Person_In_Charge2__c'];
+ var new_label = this.get_agency_person_name(component, select_agency);
+ component.set('v.selected_agency_person', new_label);
+ this.set_selected(component, 'select_agency_person', select_agency);
+
+ this.new_button_disabled(component, event, helper);
+
+ var name = component.get('v.selected_agency_person');
+
+ component.set('v.edit_copy_select_report_id', select_report_data['Id']);
+ component.set('v.select_report_data', select_report_data);
+
+ var ret = this.create_report_header(component, name, select_agency, select_date);
+ },
+
+ change_report_radio : function(component, event, helper) {
+ var reports = component.get('v.reports');
+ for (var i = 0; i < reports.length; i++) {
+ if (reports[i].Name == event.getSource().get('v.label')) {
+ component.set('v.select_report_data_radio', reports[i]);
+ component.find('copy_button').set('v.disabled', false);
+ break;
+ }
+ }
+ },
+
+ edit_button : function(component, event, helper) {
+ this.allclear(component);
+ component.set('v.loadOpp', true);
+ var index = event.getSource().get('v.value');
+ component.set('v.select_report_data', component.get('v.reports')[index]);
+ component.set('v.mode', 'edit');
+ component.set('v.dialog_type', '缂栬緫');
+
+ var select_date = component.get('v.reports')[index].Submit_date__c;
+ var select_agency = component.get('v.reports')[index].Person_In_Charge2__c;
+ var text_tmp = select_date.split('-');
+ var select_date_text = text_tmp[0] + '/' + Number(text_tmp[1]) + '/' + Number(text_tmp[2]);
+ component.set('v.selected_date', select_date_text);
+ var name = component.get('v.reports')[index].Person_In_Charge2__r.Name;
+
+ this.set_selected(component, 'select_agency_person', select_agency);
+ this.new_button_disabled(component, event, helper);
+
+ var new_label = this.get_agency_person_name(component, select_agency);
+ component.set('v.selected_agency_person', new_label);
+
+ component.set('v.edit_copy_select_report_id', component.get('v.reports')[index].Id);
+
+ var ret = this.create_report_header(component, name, select_agency, select_date);
+ },
+
+ save_report : function(component, event, helper) {
+
+ // 20220222 PI鏀归�� by Bright--start
+ let doctor2Name = '';
+ let visitortitle = '';
+ for(let op of component.find('select_doctor').get('v.options')){
+ if (op.selected) {
+ doctor2Name = op.label;
+ visitortitle = op.Doctor_Division1__c;
+ }
+ }
+ // 20220222 PI鏀归�� by Bright--end
+
+
+ component.find('save_button').set('v.disabled', true);
+
+ var Report_Date__c = component.get('v.data.Report_Date__c');
+ // alert('Report_Date__c'+Report_Date__c);
+ var Person_In_Charge2__c = "";
+ var Submit_date__c = "";
+ if (component.get('v.mode') == 'edit') {
+ // 鍛� Submit_date__c
+ Submit_date__c = component.get('v.select_report_data').Submit_date__c;
+ // alert('Submit_date__c'+Submit_date__c);
+
+
+ // 鎷呭綋 Person_In_Charge2__c
+ Person_In_Charge2__c = component.get('v.select_report_data').Person_In_Charge2__c;
} else {
- this.error("AWS confirm error.");
- component.set("v.login", false);
- }
- })
- .catch((error) => {
- this.error("AWS confirm error.");
- component.set("v.login", false);
- });
- },
- // PIPL update Yin Mingjie 21/02/2022 end
+ // 鍛� Submit_date__c
+ Submit_date__c = this.get_date_string(component.find('select_date').get('v.value'));
+ // alert('Submit_date__c'+Submit_date__c);
- set_doctor_list: function (component) {
- var hospital_id = component.get("v.hospitalLinkId");
- if (hospital_id) {
- component.set("v.login", true);
- var action = component.get("c.getDoctorList");
- action.setParams({
- hospital_id: hospital_id
- });
- action.setCallback(this, function (response) {
- var state = response.getState();
- if (state == "SUCCESS") {
- var retMap = this.conv_selected(response.getReturnValue());
- // PIPL update Yin Mingjie 21/02/2022 start
- this.AWS_search(retMap, component);
- /*
+ // 鎷呭綋 Person_In_Charge2__c
+ Person_In_Charge2__c = component.find('select_agency_person').get('v.value');
+ }
+ // Agency_Report_Header__c
+ var Agency_Report_Header__c = component.get('v.agency_report_header_id');
+
+ // 鍖婚櫌 Agency_Hospital__c (Agency_Hospital_Link__c)
+ var Agency_Hospital__c = component.get('v.hospitalLinkId');
+
+ // 绉戝 Department_Cateogy__c
+ var Department_Cateogy__c = component.find('select_department').get('v.value');
+
+ // 鎷滆浜� doctor2__c
+ var doctor2__c = component.find('select_doctor').get('v.value');
+
+ // 娲诲姩鍖哄垎 Purpose_Type__c
+ var Purpose_Type__c = component.find('select_purpose_type').get('v.value');
+ //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
+ // 鏀彺闇�姹� SupportNeeds__c
+ var SupportNeeds__c = component.find('SupportNeeds__c').get('v.value');
+ //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� end
+ // 璇环 Opportunity__c
+ var Opportunity__c = component.get('v.data.Opportunity__c');
+
+ var StageName__c = component.find('select_stageName').get('v.value');
+ var Amount__c = component.get('v.oppdata.Amount__c') != null ? component.get('v.oppdata.Amount__c').toString() : '';
+ var OCMSale_Price__c = component.get('v.oppdata.OCMSale_Price__c') != null ? component.get('v.oppdata.OCMSale_Price__c').toString() : '';
+ var Close_Forecasted_Date__c = component.get('v.oppdata.Close_Forecasted_Date__c');
+
+ var StageName__c_o = component.get('v.StageName__c_o');
+ var Amount__c_o = component.get('v.Amount__c_o');
+ var OCMSale_Price__c_o = component.get('v.OCMSale_Price__c_o');
+ var Close_Forecasted_Date__c_o = component.get('v.Close_Forecasted_Date__c_o');
+ if (StageName__c_o == undefined) StageName__c_o = '';
+ if (Amount__c_o == undefined) Amount__c_o = '';
+ if (OCMSale_Price__c_o == undefined) OCMSale_Price__c_o = '';
+ if (Close_Forecasted_Date__c_o == undefined) Close_Forecasted_Date__c_o = '';
+ if (StageName__c == StageName__c_o && OCMSale_Price__c_o == OCMSale_Price__c && Amount__c == Amount__c_o && Close_Forecasted_Date__c == Close_Forecasted_Date__c_o) {
+ StageName__c = '';
+ Amount__c = '';
+ OCMSale_Price__c = '';
+ Close_Forecasted_Date__c = '';
+ }
+
+ // 浜у搧鍖哄垎 Product_Category__c (ProductTypes__c)
+ var Product_Category1__c = component.find('select_Product1').get('v.value');
+ var Product_Category2__c = component.find('select_Product2').get('v.value');
+ var Product_Category3__c = component.find('select_Product3').get('v.value');
+
+ // 绲愭灉 Result__c
+ var Result__c = component.find('select_result').get('v.value');
+
+ // 銉愩儶銉囥兗銈枫儳銉�
+ var error = [];
+ if (!Report_Date__c) { error.push("娲诲姩鏃� 涓嶅瓨鍦�"); }
+ if (!Submit_date__c) { error.push("鍛� 涓嶅瓨鍦�"); }
+ var rDate = new Date(Report_Date__c);
+ var sDate = new Date(Submit_date__c);
+ sDate.setDate(sDate.getDate() - 1);
+ if (rDate < sDate) {error.push('娲诲姩鏃ュ繀椤绘槸鏈懆锛�'); }
+ sDate.setDate(sDate.getDate() + 7);
+ if (rDate >= sDate) {error.push('娲诲姩鏃ュ繀椤绘槸鏈懆锛�'); }
+
+ if (!Person_In_Charge2__c) { error.push("鎷呭綋 涓嶅瓨鍦�"); }
+ if (!Agency_Report_Header__c) { this.error("Report Header Id 涓嶅瓨鍦�"); }
+ if (!Agency_Hospital__c) { error.push("鍖婚櫌 涓嶅瓨鍦�"); }
+ if (!Department_Cateogy__c) { error.push("绉戝 涓嶅瓨鍦�"); }
+ if (!doctor2__c) { error.push("鎷滆浜� 涓嶅瓨鍦�"); }
+ if (!Purpose_Type__c) { error.push("娲诲姩鍖哄垎 涓嶅瓨鍦�"); }
+ // if (!SupportNeeds__c) { error.push("鏀彺闇�姹� 涓嶅瓨鍦�"); }
+ if (!Opportunity__c) { Opportunity__c = ""; }
+ if (!Product_Category1__c) { error.push("浜у搧鍖哄垎1 涓嶅瓨鍦�"); }
+ if (Purpose_Type__c && (Purpose_Type__c.substr(-3) == 'SIS' || Purpose_Type__c.substr(-3) == 'OPD')) {
+ if (!Result__c) { error.push("缁撴灉 涓嶅瓨鍦�"); }
+ }
+ for (var i = 0; i < error.length; i++) {
+ this.warning(error[i]);
+ }
+ if (error.length > 0) {
+ component.find('save_button').set('v.disabled', false);
+ return false;
+ }
+
+
+ // 淇濆瓨鍑︾悊
+ component.set('v.login',true);
+ if (component.get('v.mode') == 'edit') {
+ var Agency_Report__c = component.get('v.select_report_data').Id;
+ var action = component.get('c.editAgencyReport');
+ debugger
+ // alert("Purpose_Type:"+Purpose_Type__c+","+"SupportNeedsc:"+SupportNeeds__c);
+ action.setParams({
+ "Agency_Report_Id" : Agency_Report__c,
+ "Department_Cateogy" : Department_Cateogy__c,
+ "Purpose_Type" : Purpose_Type__c,
+ //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
+ "SupportNeedsc" : SupportNeeds__c,
+ //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� end
+ "Agency_Report_Header" : Agency_Report_Header__c,
+ "Agency_Hospital" : Agency_Hospital__c,
+ "Person_In_Charge2" : Person_In_Charge2__c,
+ "doctor" : doctor2__c,
+ "Submit_date" : Submit_date__c,
+ "Product_Category1" : Product_Category1__c,
+ "Product_Category2" : Product_Category2__c,
+ "Product_Category3" : Product_Category3__c,
+ "Result" : Result__c,
+ "Opportunity" : Opportunity__c,
+ "StageName" : StageName__c,
+ "oppAmount" : Amount__c,
+ "oppOCMPrice" : OCMSale_Price__c,
+ "Close_Forecasted_Date" : Close_Forecasted_Date__c,
+ "Report_Date" : Report_Date__c,
+ });
+
+ action.setCallback(this,function(response){
+ var state = response.getState();
+ if(state == 'SUCCESS'){
+ this.success('缂栬緫淇濆瓨鎴愬姛');
+ var report_id = response.getReturnValue();
+ component.set('v.create_agency_report_id', report_id);
+
+ var select_agency_list = component.get('v.allselectlist').AgencyPerson__c;
+ for (var i = 0; i < select_agency_list.length; i++) {
+ if (select_agency_list[i].value == component.get('v.select_report_data').Person_In_Charge2__c) {
+ select_agency_list[i].selected = true;
+ } else {
+ select_agency_list[i].selected = false;
+ }
+ }
+ component.find('select_agency_person').set('v.options', select_agency_list);
+
+ component.set('v.update_select_report_data_id', report_id);
+ this.get_reports(component, event, helper, component.get('v.select_report_data').Submit_date__c, component.get('v.select_report_data').Person_In_Charge2__c);
+
+ component.find('save_button').set('v.disabled', false);
+ component.set('v.login',false);
+ }
+ else{
+ // var error = response.getError();
+ // alert(JSON.stringify(error));
+ // alert(JSON.stringify(error[0].fieldErrors));
+ // alert(JSON.stringify(error[0].fieldErrors.next()));
+ // alert(JSON.stringify(error[0].fieldErrors.next()[0]));
+ // if (this.error(response.getError()[0].message))
+ // else () {
+ // error[0].fieldErrors[0]
+ // }
+ this.error('save_report failed.');
+ component.find('save_button').set('v.disabled', false);
+ component.set('v.login',false);
+ }
+ });
+ $A.enqueueAction(action);
+ } else {
+ /* Save (New & Copy) */
+
+ var action = component.get('c.saveAgencyReport');
+ debugger;
+ // alert(SupportNeeds__c);
+ action.setParams({
+ "Department_Cateogy" : Department_Cateogy__c,
+ "Purpose_Type" : Purpose_Type__c,
+ //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
+ "SupportNeedsc" : SupportNeeds__c,
+ //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� end
+ "Agency_Report_Header" : Agency_Report_Header__c,
+ "Agency_Hospital" : Agency_Hospital__c,
+ "Person_In_Charge2" : Person_In_Charge2__c,
+ "doctor" : doctor2__c,
+ "Submit_date" : Submit_date__c,
+ "Product_Category1" : Product_Category1__c,
+ "Product_Category2" : Product_Category2__c,
+ "Product_Category3" : Product_Category3__c,
+ "Result" : Result__c,
+ "Opportunity" : Opportunity__c,
+ "StageName" : StageName__c,
+ "oppAmount" : Amount__c,
+ "oppOCMPrice" : OCMSale_Price__c,
+ "Close_Forecasted_Date" : Close_Forecasted_Date__c,
+ "Report_Date" : Report_Date__c,
+ });
+
+ action.setCallback(this,function(response){
+ var state = response.getState();
+ if(state == 'SUCCESS'){
+ this.success('淇濆瓨鎴愬姛');
+ var report_id = response.getReturnValue();
+ component.set('v.create_agency_report_id', report_id);
+
+ this.get_reports(component, event, helper, component.find('select_date').get('v.value'), component.find('select_agency_person').get('v.value'));
+
+ // 銉€兗銉�銉偊銈ｃ兂銉夈偊鍐呫伄涓�瑕х敤
+ var action2 = component.get('c.getReportsById');
+ action2.setParams({
+ "report_id" : report_id,
+ });
+ action2.setCallback(this,function(response){
+ var state = response.getState();
+ if(state == 'SUCCESS'){
+ var res = response.getReturnValue();
+ var reports_now = component.get('v.reports_now');
+ var reports_now_count = 0;
+ if (reports_now.length > 0 && reports_now != "") {
+ reports_now_count = reports_now.length;
+ }
+
+ // Save&New鏅傘伄銈︺偅銉炽儔銈﹀唴銉囥兗銈夸竴瑕�
+ if (res.length > 0) {
+ // 20220222 PI鏀归�� by Bright--start
+ res[0].doctor2NameOrigin = doctor2Name;
+ res[0].visitorTitleOrigin = visitortitle;
+ // 20220222 PI鏀归�� by Bright--end
+ reports_now[reports_now_count] = res[0];
+
+ reports_now.sort(function(a,b) {
+ if(a.Name>b.Name) return -1;
+ if(a.Name < b.Name) return 1;
+ return 0;
+ });
+
+ component.set('v.reports_now', reports_now);
+ component.set('v.reports_now_count', reports_now.length);
+ var data_list = component.find('modal_data_list_tr');
+ }
+ }
+ else{
+ this.error('get_reports_now failed.');
+ component.find('save_button').set('v.disabled', false);
+ component.set('v.login',false);
+ }
+ });
+ $A.enqueueAction(action2);
+
+ this.allclear(component);
+ component.find('save_button').set('v.disabled', false);
+ component.set('v.login',false);
+ }
+ else{
+ var error = response.getError();
+ // alert(JSON.stringify(error));
+ this.error('saveAgencyReport failed.');
+ component.find('save_button').set('v.disabled', false);
+ component.set('v.login',false);
+ }
+ });
+ $A.enqueueAction(action);
+ }
+ },
+
+ allclear : function(component) {
+ var clear = [{label:'', value:'', selected:true}];
+ component.set('v.hospital', '');
+ component.set('v.hospitalId', '');
+ component.set('v.hospitalLinkId', '');
+ component.find('new_con').set('v.disabled', true);
+ component.find('select_doctor').set('v.options', clear);
+ component.set('v.doctor_title', '');
+ component.find('select_department').set('v.options', this.conv_selected(component.get('v.allselectlist.Department_Cateogy__c')));
+ component.find('select_purpose_type').set('v.options', this.conv_selected(component.get('v.allselectlist.Purpose_Type__c')));
+ //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
+ component.find('SupportNeeds__c').set('v.options', this.conv_selected(component.get('v.allselectlist.SupportNeeds__c')));
+ //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� end
+ // ToDo闇�瑕佹祴璇曟墜鏈轰笂鑳借繍琛屼笉
+ component.set('v.data.Opportunity__c', '');
+ component.find('select_Product1').set('v.value','');
+ component.find('select_Product2').set('v.value','');
+ component.find('select_Product3').set('v.value','');
+ component.set('v.data.Report_Date__c', '');
+ component.set('v.oppdata.Close_Forecasted_Date__c', '');
+ component.set('v.oppdata.Amount__c', '');
+ component.set('v.oppdata.OCMSale_Price__c', '');
+ component.set('v.oppdata.StageName__c', '');
+ // component.set('v.oppdata', '');
+ component.set('v.Close_Forecasted_Date__c_o', '');
+ component.set('v.Amount__c_o', '');
+ component.set('v.OCMSale_Price__c_o', '');
+ component.set('v.StageName__c_o', '');
+ $A.util.addClass(component.find('input-opportunity-stage'), 'disp_none');
+ $A.util.addClass(component.find('input-opportunity-amount1'), 'disp_none');
+ $A.util.addClass(component.find('input-opportunity-amount2'), 'disp_none');
+ $A.util.addClass(component.find('input-opportunity-date'), 'disp_none');
+ $A.util.removeClass(component.find('input-opportunity-blank'), 'disp_none');
+ // if ($A.get("$Browser.formFactor") == 'DESKTOP') {
+ // var values = [];
+ // component.find('input-opportunity').get("v.body")[0].set('v.values', values);
+ // } else {
+ // component.find('input-opportunity').get("v.body")[0].set('v.selectedLabel', '');
+ // }
+ // component.find('input-opportunity').set("v.body",[]);
+ // if (component.find('input-product-category1'))
+ // component.find('input-product-category1').get("v.body")[0].set('v.values', values);
+ // if (component.find('input-product-category2'))
+ // component.find('input-product-category2').get("v.body")[0].set('v.values', values);
+ // if (component.find('input-product-category3'))
+ // component.find('input-product-category3').get("v.body")[0].set('v.values', values);
+ component.find('select_result').set('v.value', '');
+ this.select_purpose_type(component);
+ },
+
+ report_date_list : function(component, event, helper, count) {
+ var ret_obj = [];
+ var now = new Date();
+ for (var i = 0; i < count; i++) {
+
+ var start_day = new Date(now.getFullYear(), now.getMonth(), (now.getDate() - now.getDay() + 1 - (i * 7)));
+ var end_day = new Date(now.getFullYear(), now.getMonth(), now.getDate() + (7 - now.getDay()) - (i * 7));
+
+ var start_day_show = new Date(now.getFullYear(), now.getMonth(), (now.getDate() - now.getDay() - (i * 7)));
+ var end_day_show = new Date(now.getFullYear(), now.getMonth(), now.getDate() + (6 - now.getDay()) - (i * 7));
+ var date_text = start_day.getFullYear() + '/' + (start_day.getMonth() + 1) + '/' + start_day.getDate() + '~' + end_day.getFullYear() + '/' + (end_day.getMonth() + 1) + '/' + end_day.getDate();
+ if (i == 0) {
+ ret_obj.push({
+ selected : true,
+ value : start_day.getFullYear() + '/' + (start_day.getMonth() + 1) + '/' + start_day.getDate(),
+ label : start_day_show.getFullYear() + '/' + (start_day_show.getMonth() + 1) + '/' + start_day_show.getDate() + '~' + end_day_show.getFullYear() + '/' + (end_day_show.getMonth() + 1) + '/' + end_day_show.getDate(),
+ });
+ } else {
+ ret_obj.push({
+ selected : false,
+ value : start_day.getFullYear() + '/' + (start_day.getMonth() + 1) + '/' + start_day.getDate(),
+ label : start_day_show.getFullYear() + '/' + (start_day_show.getMonth() + 1) + '/' + start_day_show.getDate() + '~' + end_day_show.getFullYear() + '/' + (end_day_show.getMonth() + 1) + '/' + end_day_show.getDate(),
+ });
+ }
+ }
+
+ component.find('select_date').set('v.options', ret_obj);
+ component.set('v.report_date_list', ret_obj);
+ },
+
+ create_report_header : function(component, name, s_agency, s_date) {
+ s_date = this.get_date_string(s_date);
+ if (s_date == false) {
+ this.error('get_date_string failed.');
+ return false;
+ }
+
+ var head_key = this.create_header_input_key(s_agency, s_date);
+ component.set('v.agency_report_header', head_key);
+ if (head_key == false) {
+ this.error('create_header_input_key failed.');
+ return false;
+ }
+
+ var key2 = s_date.replace(/-/g, '');
+ var action = component.get('c.createReportHeader');
+
+ action.setParams({
+ "name" : name,
+ "s_date" : s_date,
+ "s_agency" : s_agency,
+ "head_key" : head_key,
+ });
+
+ component.set('v.login',true);
+ action.setCallback(this,function(response){
+ var state = response.getState();
+ if(state == 'SUCCESS'){
+ var res = response.getReturnValue();
+ component.set('v.agency_report_header_id', res);
+ component.set('v.login',false);
+ this.toggle_report(component);
+ }
+ else{
+ this.error('createReportHeader callback failed.');
+ component.set('v.login',false);
+ }
+ });
+ $A.enqueueAction(action);
+ },
+
+ create_header_input_key : function(agency_id, s_date) {
+ if (typeof(s_date) != 'string') {
+ s_date = this.get_date_string(s_date);
+ if (s_date == false) {
+ this.error('get_date_string in create_header_input_key.')
+ return false;
+ }
+ }
+ if (!agency_id || !s_date) {
+ return false;
+ }
+
+ s_date = s_date.replace(/-/g, '');
+ var headkey = agency_id + ":" + s_date;
+
+ return headkey;
+ },
+
+ /* typeof is not cool
+ * @ret : String, Boolean, Date, Error, Array, Function, Null, Undefined, etc
+ */
+ object_type : function(obj) {
+ var obj_type = Object.prototype.toString.call(obj).slice(8, -1);
+ return obj_type;
+ },
+
+ // create yyyy-mm-dd string
+ get_date_string : function(val) {
+ if (typeof(val) == 'string') {
+ if (val.match(/^\d{4}\/\d{1,2}\/\d{1,2}$/)) {
+ val = val.replace(/[\/]/g, '-');
+ var tmp = val.split('-');
+ if (tmp[1].length == 1) {
+ tmp[1] = '0' + tmp[1];
+ }
+ if (tmp[2].length == 1) {
+ tmp[2] = '0' + tmp[2];
+ }
+ val = tmp[0] + '-' + tmp[1] + '-' + tmp[2];
+ } else if (val.match(/^\d{4}-\d{1,2}-\d{1,2}$/)) {
+ //ok
+ } else {
+ return false;
+ }
+ } else if (this.object_type(val) == 'Date') {
+ var mm = val.getMonth() + 1;
+ if (String(mm).length == 1) {
+ mm = '0' + mm;
+ }
+
+ var dd = '';
+ if (String(val.getDate()).length == 1) {
+ dd = '0' + val.getDate();
+ } else {
+ dd = val.getDate();
+ }
+
+ val = val.getFullYear() + '-' + mm + '-' + dd;
+ } else {
+ return false;
+ }
+
+ return val;
+ },
+
+ searchHos : function(component, event, helper) {
+ var hospital_name = event.getParam("value");
+ var action = component.get("c.getHospitalList");
+ debugger;
+ action.setParams({"hospital_name": hospital_name});
+
+ action.setCallback(this, function(response) {
+ var state = response.getState();
+ if(state === "SUCCESS") {
+ var hospital_list = component.find('hospital_list');
+ var hosList = response.getReturnValue();
+ if (hosList.length > 0) {
+ $A.util.addClass(hospital_list, 'slds-is-open');
+ } else {
+ $A.util.removeClass(hospital_list, 'slds-is-open');
+ }
+ component.set("v.hospitalList", response.getReturnValue());
+ } else {
+ $A.util.removeClass(hospital_list, 'slds-is-open');
+ }
+ });
+ $A.enqueueAction(action);
+ },
+
+ hideSearch : function(component, event, helper) {
+ var hospital_list = component.find('hospital_list');
+ $A.util.removeClass(hospital_list, 'slds-is-open');
+ },
+
+ selectHos : function(component, event, helper) {
+ debugger
+ var hospital_list = component.find('hospital_list');
+ $A.util.removeClass(hospital_list, 'slds-is-open');
+ var accname = event.currentTarget.dataset.accname;
+ var accid = event.currentTarget.dataset.accid;
+ var hospital_data = component.get('v.hospitalList');
+ for (var i = 0; i < hospital_data.length; i++) {
+ if (hospital_data[i].Hospital__c == accid) {
+ component.set('v.hospitalLinkId', hospital_data[i].Id);
+ component.set('v.data.Agency_Hospital__c', hospital_data[i].Id);
+ component.find('new_con').set('v.disabled', false);
+ }
+ }
+ component.set("v.hospital", accname);
+ component.set("v.hospitalId", accid);
+ this.set_doctor_list(component);
+ this.opportunityChange(component, event, helper);
+ },
+
+ select_purpose_type : function(component) {
+ var purpose_type = component.find('select_purpose_type').get('v.value');
+ if (purpose_type != null && purpose_type != undefined && purpose_type.substr(-3) == 'OPD' || purpose_type.substr(-3) == 'SIS') {
+ var result = component.find('result');
+ $A.util.removeClass(result, 'disp_none');
+ } else {
+ component.find('select_result').set('v.value', '');
+ var result = component.find('result');
+ $A.util.addClass(result, 'disp_none');
+ }
+ this.select_department(component, null, null);
+ },
+
+ doctor_change : function(component, event, helper) {
+ var doctor_value = component.find('select_doctor').get('v.value');
+ var doctor_list = component.get('v.doctor_list');
+ var flg = false;
+ for (var i = 0; i < doctor_list.length; i++) {
+ if (doctor_list[i].value == doctor_value) {
+ component.set('v.doctor_title', doctor_list[i].Doctor_Division1__c);
+ flg = true;
+ break;
+ }
+ }
+ if (flg == false) {
+ component.set('v.doctor_title', '');
+ }
+ },
+ // PIPL update Yin Mingjie 21/02/2022 start
+ set_aws_url : function(component,sobject) {
+ var action = component.get('c.getAwsurl');
+ action.setParams({
+ "sobj" : sobject,
+ });
+ action.setCallback(this,function(response){
+ var state = response.getState();
+ if(state == 'SUCCESS'){
+ var awsmap = this.conv_selected(response.getReturnValue());
+ component.set('v.AWStoken',awsmap.token);
+ component.set('v.AWSinsert',awsmap.newUrl);
+ component.set('v.AWSsearch',awsmap.searchUrl);
+ component.set('v.AWStransactionURL',awsmap.transactionURL);
+ }
+ else{
+ this.error('AWS url/token error.');
+ component.set('v.login',false);
+ }
+ });
+ $A.enqueueAction(action);
+ },
+
+ insert_agencycontact : function(component,token,newUrl,payload,agencyHospitalid,helper,hospitalName) {
+
+ // AWSService.insert(newUrl,payload,function(result){
+ // if(result.status == '0'){
+ // $A.getCallback(function(){
+ // helper.to_agencycontact(component,result,agencyHospitalid);
+ // })();
+
+ // }else{
+ // console.log('AWS status error:' + result)
+ // component.set('v.login',false);
+ // component.find('OppMessage').setError('AWS insert error.');
+ // }
+ // },token);
+
+ fetch(newUrl, {
+ method: 'POST',
+ body: payload,
+ headers: {
+ 'Content-Type': 'application/json',
+ 'pi-token': token
+ }
+ }).then((data) => {
+ return data.json();
+ }).then((result) => {
+ if(result.status == '0'){
+ $A.getCallback(function(){
+ helper.to_agencycontact(component,result,agencyHospitalid);
+ })();
+ }else{
+ console.log('AWS status error:' + result)
+ component.set('v.login',false);
+ if(result.status == '129'){
+ component.find('OppMessage').setError('璇ュ鎴蜂汉鍛樺悕瀛楀凡瀛樺湪锛屽湪'+hospitalName+'鍖婚櫌锛岃淇敼');
+ }else{
+ component.find('OppMessage').setError('AWS insert error.');
+ }
+ }
+ }).catch(error => {
+ console.log('AWS insert error:' + error)
+ component.set('v.login',false);
+ component.find('OppMessage').setError('AWS insert error.');
+ });
+
+ },
+
+ to_agencycontact : function(component,result,agencyHospitalid) {
+ var action = component.get('c.saveAgencyContact');
+ action.setParams({
+ "name" : result.object[0].name,
+ //"nameEncrypt" : result.object[0].nameEncrypt,
+ "type" : result.object[0].type,
+ //"typeEncrypt" : result.object[0].typeEncrypt,
+ "doctorDivision1" : result.object[0].doctorDivision1,
+ //"doctorDivision1Encrypt" : result.object[0].doctorDivision1Encrypt,
+ "agencyHospitalid" : agencyHospitalid,
+ "awsid" : result.object[0].dataId,
+ });
+ action.setCallback(this,function(response){
+ var state = response.getState();
+ if(state == 'SUCCESS'){
+ var acMap = this.conv_selected(response.getReturnValue());
+ console.log(acMap);
+ if(acMap.AgencyContactId != ''){
+ //纭浜嬪姟
+ var token = component.get('v.AWStoken');
+ var confirmUrl = component.get('v.AWStransactionURL');
+
+ let data = Object.create(null);
+ data['isSuccess'] = 1;
+ data['sfRecordId'] = '';
+ data['txId'] = result.txId;
+
+ this.to_confirm(component,token,confirmUrl,JSON.stringify(data));
+ }else if(acMap.errormsg != ''){
+ this.error(acMap.errormsg);
+ component.set('v.login',false);
+ }else {
+ this.error('agency contact insert id error.');
+ component.set('v.login',false);
+ }
+ }
+ else{
+ this.error('agency contact insert error.');
+ component.set('v.login',false);
+ }
+ });
+ $A.enqueueAction(action);
+ },
+
+ to_confirm : function(component,token,confirmUrl,payload) {
+ fetch(confirmUrl, {
+ method: 'POST',
+ body: payload,
+ headers: {
+ 'Content-Type': 'application/json',
+ 'pi-token': token
+ }
+ }).then((data) => {
+ return data.json();
+ }).then((result) => {
+ if(result.status == '0' && result.hasOwnProperty('success') && result.success){
+ component.set('v.truthy', false);
+ var modal_newAC = component.find('modal_newAC')
+ $A.util.addClass(modal_newAC, 'disp_none');
+ this.success('.瀹㈡埛浜哄憳宸插垱寤恒��');
+ this.set_doctor_list(component);
+ }else {
+ this.error('AWS confirm error.');
+ component.set('v.login',false);
+ }
+ }).catch(error => {
+ this.error('AWS confirm error.');
+ component.set('v.login',false);
+ });
+ },
+ // PIPL update Yin Mingjie 21/02/2022 end
+
+ set_doctor_list : function(component) {
+ var hospital_id = component.get('v.hospitalLinkId');
+ if (hospital_id) {
+ component.set('v.login',true);
+ var action = component.get('c.getDoctorList');
+ action.setParams({
+ "hospital_id" : hospital_id,
+ });
+ action.setCallback(this,function(response){
+ var state = response.getState();
+ if(state == 'SUCCESS'){
+ var retMap = this.conv_selected(response.getReturnValue());
+ // PIPL update Yin Mingjie 21/02/2022 start
+ this.AWS_search(retMap,component);
+ /*
var default_doctor = component.get('v.default_select_doctor_id');
if (default_doctor != '' && res.length > 0) {
var doctor_title = '';
@@ -1707,1195 +1389,1177 @@
component.set('v.doctor_list', res);
component.set('v.login',false);
*/
- // PIPL update Yin Mingjie 21/02/2022 end
- } else {
- this.error("set_doctor_list failed.");
- component.set("v.login", false);
- }
- });
- $A.enqueueAction(action);
- }
- },
-
- // PIPL update Yin Mingjie 21/02/2022 start
- AWS_search: function (retMap, component) {
- var token = retMap.sre.token;
- var searchUrl = retMap.sre.searchUrl;
-
- var dataArr = new Array();
- for (const key in retMap) {
- if (key == "sre") {
- continue;
- }
- dataArr.push(key);
- }
- if (dataArr.length == 0) {
- component.set("v.login", false);
- this.warning("娌℃湁鎵惧埌绗﹀悎鏉′欢鐨勫鎴蜂汉鍛�");
- return;
- }
- let obj = Object.create(null);
- obj["dataIds"] = dataArr;
- var data = JSON.stringify(obj);
- this.search_agency_contact(token, searchUrl, data, retMap, component);
- },
-
- search_agency_contact: function (
- token,
- searchUrl,
- payload,
- retMap,
- component
- ) {
- this.search_core(
- token,
- searchUrl,
- payload,
- (result) => {
- if (result.status == "0") {
- this.to_doctor_list(result, retMap, component);
- } else {
- this.error("AWS search status4 : " + result.status);
- component.set("v.login", false);
- }
- },
- component
- );
- // fetch(searchUrl, {
- // method: 'POST',
- // body: payload,
- // headers: {
- // 'Content-Type': 'application/json',
- // 'pi-token': token
- // }
- // }).then((data) => {
- // return data.json();
- // }).then((result) => {
-
- // }).catch(error => {
- // this.error('AWS search error.');
- // component.set('v.login',false);
- // });
- },
- search_core: function (token, searchUrl, payload, callback, component) {
- console.log("token = " + token);
- console.log("searchUrl = " + searchUrl);
- console.log("payload = " + payload);
- fetch(searchUrl, {
- method: "POST",
- body: payload,
- headers: {
- "Content-Type": "application/json",
- "pi-token": token
- }
- })
- .then((data) => {
- return data.json();
- })
- .then((result) => {
- component.set("v.login", false);
- if (callback) callback(result);
- })
- .catch((error) => {
- console.log("error = " + JSON.stringify(error));
- this.error("AWS search error.");
- component.set("v.login", false);
- });
- },
-
- to_doctor_list: function (result, retMap, component) {
- var resls = result.object;
- var res = [];
- var space = {};
- space["label"] = "";
- space["selected"] = true;
- space["value"] = "";
- res.push(space);
-
- for (var i = 0; i < resls.length; i++) {
- var t = {};
- t["label"] = resls[i].name;
- t["selected"] = false;
- t["Doctor_Division1__c"] = resls[i].doctorDivision1;
- t["value"] = retMap[resls[i].dataId].value;
- res.push(t);
- }
-
- var default_doctor = component.get("v.default_select_doctor_id");
- if (default_doctor != "" && res.length > 0) {
- var doctor_title = "";
- for (var i = 0; i < res.length; i++) {
- if (res[i].value == default_doctor) {
- res[i].selected = true;
- doctor_title = res[i].Doctor_Division1__c;
- } else {
- res[i].selected = false;
- }
- }
-
- component.find("select_doctor").set("v.options", res);
- component.set("v.doctor_title", doctor_title);
- } else {
- component.find("select_doctor").set("v.options", res);
- if (res.length > 0) {
- component.set("v.doctor_title", res[0].Doctor_Division1__c);
- }
- }
-
- component.set("v.default_select_doctor_id", "");
- component.set("v.doctor_list", res);
- component.set("v.login", false);
- },
- // PIPL update Yin Mingjie 21/02/2022 end
-
- // stageNameChange : function(component, event, helper) {
- // var options = component.find('input-oppstage').get("v.body")[0].get('v.options');
- // var remove;
- // for (var i = 0; i < options.length; i++) {
- // if (options[i].label == '鐩爣') {
- // remove = i;
- // break;
- // }
- // }
- // options.splice(remove,1);
- // },
-
- opportunityChange: function (component, event, helper) {
- debugger;
- var opp_id = component.get("v.data.Opportunity__c");
- if (opp_id == "") {
- $A.util.addClass(component.find("input-opportunity-stage"), "disp_none");
- $A.util.addClass(
- component.find("input-opportunity-amount1"),
- "disp_none"
- );
- $A.util.addClass(
- component.find("input-opportunity-amount2"),
- "disp_none"
- );
- $A.util.addClass(component.find("input-opportunity-date"), "disp_none");
- $A.util.removeClass(
- component.find("input-opportunity-blank"),
- "disp_none"
- );
- } else if (opp_id == "MALFORMED_ID") {
- component.set("v.data.Opportunity__c", "");
- $A.util.addClass(component.find("input-opportunity-stage"), "disp_none");
- $A.util.addClass(
- component.find("input-opportunity-amount1"),
- "disp_none"
- );
- $A.util.addClass(
- component.find("input-opportunity-amount2"),
- "disp_none"
- );
- $A.util.addClass(component.find("input-opportunity-date"), "disp_none");
- $A.util.removeClass(
- component.find("input-opportunity-blank"),
- "disp_none"
- );
- } else if (opp_id != "") {
- var hospital_link_id = component.get("v.hospitalLinkId");
- if (hospital_link_id == "") {
- this.warning("鍖婚櫌涓嶅瓨鍦�");
- // ToDo闇�瑕佹祴璇曟墜鏈轰笂鑳借繍琛屼笉
- component.set("v.data.Opportunity__c", "");
- $A.util.addClass(
- component.find("input-opportunity-stage"),
- "disp_none"
- );
- $A.util.addClass(
- component.find("input-opportunity-amount1"),
- "disp_none"
- );
- $A.util.addClass(
- component.find("input-opportunity-amount2"),
- "disp_none"
- );
- $A.util.addClass(component.find("input-opportunity-date"), "disp_none");
- $A.util.removeClass(
- component.find("input-opportunity-blank"),
- "disp_none"
- );
- // if ($A.get("$Browser.formFactor") == 'DESKTOP') {
- // var values = [];
- // // component.find('input-opportunity').get("v.body")[0].set('v.values', values);
- // } else {
- // component.find('input-opportunity').get("v.body")[0].set('v.selectedLabel', '');
- // }
- return false;
- }
- var action = component.get("c.selectOpportunityByIdAndHospitalLinkId");
- action.setParams({
- opportunity_id: opp_id,
- agency_hospital_link_id: component.get("v.hospitalLinkId")
- });
-
- component.set("v.login", true);
- action.setCallback(this, function (response) {
- var state = response.getState();
- if (state == "SUCCESS") {
- var res = response.getReturnValue();
- if (res.length <= 0) {
- if (component.get("v.data.Opportunity__c")) {
- this.warning("鍖婚櫌鏈尮閰嶅埌");
- }
- // ToDo闇�瑕佹祴璇曟墜鏈轰笂鑳借繍琛屼笉
- component.set("v.data.Opportunity__c", "");
- $A.util.addClass(
- component.find("input-opportunity-stage"),
- "disp_none"
- );
- $A.util.addClass(
- component.find("input-opportunity-amount1"),
- "disp_none"
- );
- $A.util.addClass(
- component.find("input-opportunity-amount2"),
- "disp_none"
- );
- $A.util.addClass(
- component.find("input-opportunity-date"),
- "disp_none"
- );
- $A.util.removeClass(
- component.find("input-opportunity-blank"),
- "disp_none"
- );
- // if ($A.get("$Browser.formFactor") == 'DESKTOP') {
- // var values = [];
- // component.find('input-opportunity').get("v.body")[0].set('v.values', values);
- // } else {
- // component.find('input-opportunity').get("v.body")[0].set('v.selectedLabel', '');
- // }
- component.set("v.login", false);
- return false;
- }
- //SWAG-CKH5M8 銆愬鎵樸�戝懆鎶ュ叧鑱旇浠凤紝鍙�夋嫨璇环鑼冨洿璋冩暣 fy start
- // else if (res[0]['StageName2__c'] != '3.璇环' && !component.get('v.loadOpp')){
- // this.warning('璇烽�夋嫨璇环涓殑椤圭洰');
- // // ToDo闇�瑕佹祴璇曟墜鏈轰笂鑳借繍琛屼笉
- // component.set('v.data.Opportunity__c', '');
- // $A.util.addClass(component.find('input-opportunity-stage'), 'disp_none');
- // $A.util.addClass(component.find('input-opportunity-amount1'), 'disp_none');
- // $A.util.addClass(component.find('input-opportunity-amount2'), 'disp_none');
- // $A.util.addClass(component.find('input-opportunity-date'), 'disp_none');
- // $A.util.removeClass(component.find('input-opportunity-blank'), 'disp_none');
- // // if ($A.get("$Browser.formFactor") == 'DESKTOP') {
- // // var values = [];
- // // component.find('input-opportunity').get("v.body")[0].set('v.values', values);
- // // } else {
- // // component.find('input-opportunity').get("v.body")[0].set('v.selectedLabel', '');
- // // }
- // component.set('v.login',false);
- // return false;
- // }
- //SWAG-CKH5M8 銆愬鎵樸�戝懆鎶ュ叧鑱旇浠凤紝鍙�夋嫨璇环鑼冨洿璋冩暣 fy end
- else {
- component.set("v.loadOpp", false);
- component.set("v.oppdata", res[0]);
- this.set_selected(
- component,
- "select_stageName",
- res[0].StageName__c
- );
- component.set(
- "v.Close_Forecasted_Date__c_o",
- res[0].Close_Forecasted_Date__c
- );
- component.set("v.Amount__c_o", res[0].Amount__c);
- component.set("v.OCMSale_Price__c_o", res[0].OCMSale_Price__c);
- component.set("v.StageName__c_o", res[0].StageName__c);
-
- $A.util.removeClass(
- component.find("input-opportunity-stage"),
- "disp_none"
- );
- $A.util.removeClass(
- component.find("input-opportunity-amount1"),
- "disp_none"
- );
- $A.util.removeClass(
- component.find("input-opportunity-amount2"),
- "disp_none"
- );
- $A.util.removeClass(
- component.find("input-opportunity-date"),
- "disp_none"
- );
- $A.util.addClass(
- component.find("input-opportunity-blank"),
- "disp_none"
- );
- }
-
- component.set("v.login", false);
- } else {
- this.error("selectOpportunityByIdAndHospitalLinkId failed.");
- component.set("v.login", false);
- }
- });
- $A.enqueueAction(action);
- }
- },
-
- productcategoryChange1: function (component, event, helper) {
- var product_category_id = component.find("select_Product1").get("v.value");
- var pcId1 = component.find("select_Product2").get("v.value");
- var pcId2 = component.find("select_Product3").get("v.value");
- var p1bool = pcId1 != "" && pcId1 != null && pcId1 != undefined;
- var p2bool = pcId2 != "" && pcId2 != null && pcId2 != undefined;
- var p0bool =
- product_category_id != "" &&
- product_category_id != null &&
- product_category_id != undefined;
- if (
- (p1bool && p0bool && product_category_id == pcId1) ||
- (p2bool && p0bool && product_category_id == pcId2)
- ) {
- this.warning("涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝佸尯鍒�");
- component.find("select_Product1").set("v.value", "");
- }
- },
- productcategoryChange2: function (component, event, helper) {
- var product_category_id = component.find("select_Product2").get("v.value");
- var pcId1 = component.find("select_Product1").get("v.value");
- var pcId2 = component.find("select_Product3").get("v.value");
- var p1bool = pcId1 != "" && pcId1 != null && pcId1 != undefined;
- var p2bool = pcId2 != "" && pcId2 != null && pcId2 != undefined;
- var p0bool =
- product_category_id != "" &&
- product_category_id != null &&
- product_category_id != undefined;
- if (
- (p1bool && p0bool && product_category_id == pcId1) ||
- (p2bool && p0bool && product_category_id == pcId2)
- ) {
- this.warning("涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝佸尯鍒�");
- component.find("select_Product2").set("v.value", "");
- }
- },
- productcategoryChange3: function (component, event, helper) {
- var product_category_id = component.find("select_Product3").get("v.value");
- var pcId1 = component.find("select_Product1").get("v.value");
- var pcId2 = component.find("select_Product2").get("v.value");
- var p1bool = pcId1 != "" && pcId1 != null && pcId1 != undefined;
- var p2bool = pcId2 != "" && pcId2 != null && pcId2 != undefined;
- var p0bool =
- product_category_id != "" &&
- product_category_id != null &&
- product_category_id != undefined;
- if (
- (p1bool && p0bool && product_category_id == pcId1) ||
- (p2bool && p0bool && product_category_id == pcId2)
- ) {
- this.warning("涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝佸尯鍒�");
- component.find("select_Product3").set("v.value", "");
- }
- },
-
- conv_selected: function (obj) {
- for (var i = 0; i < obj.length; i++) {
- if (obj[i].selected) {
- if (obj[i].selected == "true") {
- obj[i].selected = true;
- } else {
- obj[i].selected = false;
- }
- }
- }
-
- return obj;
- },
-
- set_selected: function (component, aura_id_name, value) {
- var select_tmp = component.find(aura_id_name).get("v.options");
- if (select_tmp) {
- for (var i = 0; i < select_tmp.length; i++) {
- if (select_tmp[i].value == value) {
- select_tmp[i].selected = true;
- } else {
- select_tmp[i].selected = false;
- }
- }
- component.find(aura_id_name).set("v.options", select_tmp);
- return true;
- } else {
- return false;
- }
- },
-
- success: function (message) {
- var toastEvent = $A.get("e.force:showToast");
- toastEvent.setParams({
- title: "鎴愬姛!",
- message: message,
- type: "success",
- duration: "5000"
- });
- toastEvent.fire();
- },
-
- warning: function (message) {
- var toastEvent = $A.get("e.force:showToast");
- toastEvent.setParams({
- title: "璀﹀憡!",
- message: message,
- type: "warning",
- duration: "10000"
- });
- toastEvent.fire();
- },
-
- error: function (message) {
- // $('toastMessage.forceToastManager').css('white-space', 'pre-wrap');
- var toastEvent = $A.get("e.force:showToast");
-
- toastEvent.setParams({
- title: "閿欒!",
- message: message,
- type: "error",
- duration: "sticky"
- });
- toastEvent.fire();
- },
-
- createCon: function (component, event, helper) {
- var modal_newAC = component.find("modal_newAC");
- $A.util.removeClass(modal_newAC, "disp_none");
- component.set("v.truthy", true);
- // var modal_newAC = component.find('modal_newAC')
- // $A.util.removeClass(modal_newAC, 'disp_none');
- },
-
- // vivek start 娣诲姞楠岃瘉
- // handleFormSubmit : function(component) {
- // var showValidationError = false;
- // var fields = component.find("newOpportunityField");
- // var vaildationFailReason = '';
- // var currentDate = new Date().toJSON().slice(0,10);
-
- // fields.forEach(function (field) {
- // if(field.get("v.fieldName") === 'Type__c' && $A.util.isEmpty(field.get("v.value"))){
- // showValidationError = true;
- // vaildationFailReason = "鍒嗙被涓嶈兘涓虹┖锛�";
- // }else if(field.get("v.fieldName") === 'Doctor_Division1__c' && $A.util.isEmpty(field.get("v.value"))){
- // showValidationError = true;
- // vaildationFailReason = "鍖荤敓鍖哄垎(鑱屽姟)涓嶈兘涓虹┖锛�";
- // }
- // });
-
- // if (showValidationError) {
- // component.find('OppMessage').setError(vaildationFailReason);
- // }
- // },
- // vivek end 娣诲姞楠岃瘉
-
- hideCmp: function (component, event, helper) {
- var div1 = component.find("report");
- var div2 = component.find("report_list");
- $A.util.addClass(div1, "disp_none");
- $A.util.addClass(div2, "disp_none");
- },
-
- handleSuccess: function (component, event, helper) {
- var insertId = event.getParams().response.Id;
- var displayValue = event.getParams().response.fields.Name.value;
- event.setParams({});
- component.set("v.truthy", false);
- var modal_newAC = component.find("modal_newAC");
- $A.util.addClass(modal_newAC, "disp_none");
- this.success(".瀹㈡埛浜哄憳宸插垱寤恒��");
- this.set_doctor_list(component);
- },
-
- createCancel: function (component, event, helper) {
- component.set("v.truthy", false);
- var modal_newAC = component.find("modal_newAC");
- $A.util.addClass(modal_newAC, "disp_none");
- },
- setOpportunity_cfilter: function (component) {
- debugger;
- var hosId = component.get("v.hospitalId");
- var Department_Cateogy__c = component
- .find("select_department")
- .get("v.value");
- var opportunity_cfilter = "";
- if (hosId != "" && hosId != null) {
- opportunity_cfilter =
- " Agency_Hospital__r.Hospital__c=" + "'" + hosId + "'";
- }
- if (Department_Cateogy__c != "" && Department_Cateogy__c != null) {
- if (opportunity_cfilter != "" && opportunity_cfilter != null) {
- opportunity_cfilter += " AND ";
- }
- opportunity_cfilter +=
- "Department_Cateogy__c=" + "'" + Department_Cateogy__c + "'";
- }
- component.set("v.opportunity_cfilter", opportunity_cfilter);
- component.set("v.data.Opportunity__c", null);
- },
- readFile: function (component, helper, file) {
- if (!file) return;
- // console.log('file'+file.name);
- if (!file.name.match(/\.(csv||CSV)$/)) {
- return alert("only support csv files");
- } else {
- reader = new FileReader();
- reader.onerror = function errorHandler(evt) {
- switch (evt.target.error.code) {
- case evt.target.error.NOT_FOUND_ERR:
- alert("File Not Found!");
- break;
- case evt.target.error.NOT_READABLE_ERR:
- alert("File is not readable");
- break;
- case evt.target.error.ABORT_ERR:
- break; // noop
- default:
- alert("An error occurred reading this file.");
- }
- };
- //reader.onprogress = updateProgress;
- reader.onabort = function (e) {
- alert("File read cancelled");
- };
- reader.onloadstart = function (e) {
- var output =
- '<ui type="disc"><li><strong>' +
- file.name +
- "</strong> (" +
- file.type +
- ")- " +
- file.size +
- "bytes, last modified: " +
- file.lastModifiedDate.toLocaleDateString() +
- "</li></ui>";
- component.set("v.filename", file.name);
- component.set("v.TargetFileName", output);
- };
- reader.onload = function (e) {
- var data = e.target.result;
- component.set("v.fileContentData", data);
- console.log("file data" + JSON.stringify(data));
- // console.log("file data"+encodeURI(JSON.stringify(data),"utf-8"));
- var allTextLines = data.split(/\r\n|\n/);
- var dataRows = allTextLines.length - 1;
- var headers = allTextLines[0].split(",");
-
- // console.log("Rows length::"+dataRows);
-
- var numOfRows = component.get("v.NumOfRecords");
- if (dataRows > numOfRows + 1 || dataRows == 1 || dataRows == 0) {
- alert("File Rows between 1 to " + numOfRows + " .");
- component.set("v.showMain", true);
- } else {
- var lines = [];
- var filecontentdata;
- var content =
- '<table class="table slds-table slds-table--bordered slds-table--cell-buffer">';
- content += '<thead><tr class="slds-text-title--caps">';
- content += '<th scope="col">' + "琛屽彿" + "</th>";
- for (i = 0; i < headers.length; i++) {
- content += '<th scope="col">' + headers[i] + "</th>";
- }
- content += "</tr></thead>";
- for (var i = 1; i < allTextLines.length; i++) {
- filecontentdata = allTextLines[i].split(",");
- if (filecontentdata[0] != "") {
- content += "<tr>";
- content += "<td>" + i + "</td>";
- for (var j = 0; j < filecontentdata.length; j++) {
- content += "<td>" + filecontentdata[j] + "</td>";
- }
- content += "</tr>";
- }
- }
- content += "</table>";
- console.log(content);
- component.set("v.TableContent", content);
- component.set("v.showMain", false);
- }
- };
- reader.readAsText(file, "gb2312");
- }
- var reader = new FileReader();
- reader.onloadend = function () {};
- reader.readAsDataURL(file);
- },
-
- saveRecords: function (component, event, helper) {
- component.set("v.login", true);
- //fy 瀵煎叆 20220424 start
- var action1 = component.get("c.processDataAWSId");
- action1.setParams({
- fileData: component.get("v.fileContentData")
- });
- action1.setCallback(this, function (response) {
- console.log("response = " + JSON.stringify(response));
- var state = response.getState();
- if (state === "SUCCESS") {
- var ress = response.getReturnValue();
- console.log("ress = " + JSON.stringify(ress));
- if (ress) {
- var valur = ress.split("error1");
- if (valur.length <= 1) {
- var res = JSON.parse(response.getReturnValue());
- console.log("res = " + JSON.stringify(res));
- var dataArr = new Array();
- var dataMap = new Map();
- res.forEach((item) => {
- if (item.AWS_Data_Id__c) {
- dataArr.push(item.AWS_Data_Id__c);
- //dataMap.set(item.AWS_Data_Id__c,item.Name_Encrypted__c);
- dataMap.set(item.AWS_Data_Id__c, item.AWS_Data_Id__c); //zhj 鏂版柟妗堟敼閫� 2022-12-21
- }
- });
- debugger;
- let obj = Object.create(null);
- obj["dataIds"] = dataArr;
- var payload = JSON.stringify(obj);
- this.search_contact_url(
- component,
- "Agency_Contact__c",
- (result) => {
- var token = result.token;
- var searchUrl = result.searchUrl;
- this.search_core(
- token,
- searchUrl,
- payload,
- (result) => {
- if (result.status == "0") {
- if (result.object != null && result.object.length != 0) {
- // var resultjson = JSON.stringify(result.object);
- // if(resultjson){
- // debugger
- // console.warn('001');
- // component.set('v.login',true);
- // this.ImportMethod(component,resultjson);
- // }
- component.set("v.login", true);
- this.saveRecordsEditFile(
- component,
- dataMap,
- result.object,
- helper
- );
- } else {
- this.error("AWS search status5 ");
- component.set("v.login", false);
- }
- } else {
- this.error("AWS search status6 : " + result.status);
- component.set("v.login", false);
- }
- },
- component
- );
- // var resultjson =null;
- // this.ImportMethod(component,resultjson);
- }
- );
- // var resultjson =null;
- // this.ImportMethod(component,resultjson);
- } else {
- this.error(valur[1] + "\n" + "璇蜂慨鏀瑰悗閲嶆柊涓婁紶");
- }
- }
- }
- });
- $A.enqueueAction(action1);
- //fy 瀵煎叆 20220424 end
- // var action = component.get("c.processData");
- // var selectDate = component.find('select_date').get('v.value');
- // var fieldsList=['Name','Phone','AccountNumber']; //Please write your code dynamic
- // var sss=component.get("v.fileContentData");
- // action.setParams({
- // fileData : component.get("v.fileContentData"),
- // //selectDateselectDate :component.find('select_date').get('v.value'),
- // sobjectName:'Account', //Any object
- // fields:fieldsList
- // });
- // action.setCallback(this, function(response) {
- // var state = response.getState();
- // if (state === "SUCCESS") {
-
- // var res = response.getReturnValue();
- // var res1 = '';
- // console.log("[[[[[["+res);
- // if(res != 'success'){
- // debugger
- // var ress = res.split('=');
- // console.log(ress);
- // for (var i=0; i<ress.length; i++) {
- // res1 += ress[i].substr(7)+'\n';
- // }
- // // $('.forceToastManager').css('white-space', 'pre-wrap');
- // console.log("=="+res1);
- // this.error(res1+"璇蜂慨鏀瑰悗閲嶆柊涓婁紶");
- // component.set('v.login',false);
- // }else{
- // component.set("v.showMain",true);
- // this.success("瀵煎叆鎴愬姛");
- // // alert('saved successfully');
- // component.set('v.login',false);
- // }
-
- // }
- // else if (state === "INCOMPLETE") {
- // // do something
- // component.set('v.login',false);
- // }
- // else if (state === "ERROR") {
- // var errors = response.getError();
- // if (errors) {
- // if (errors[0] && errors[0].message) {
- // console.log("Error message: " +
- // errors[0].message);
- // component.set('v.login',false);
- // }
- // } else {
- // console.log("Unknown error");
- // component.set('v.login',false);
- // }
- // }
- // });
- // $A.enqueueAction(action);
- },
- ImportMethod: function (component, fileStr) {
- var actionss = component.get("c.processData");
- var selectDate = component.find("select_date").get("v.value");
- var fieldsList = ["Name", "Phone", "AccountNumber"]; //Please write your code dynamic
- var sss = component.get("v.fileContentData");
- actionss.setParams({
- // fileData : component.get("v.fileContentData"),
- fileData: fileStr,
- // selectDateselectDate :component.find('select_date').get('v.value'),
- sobjectName: "Account", //Any object
- fields: fieldsList
- // Agency_ContactListjson:resultjson
- });
- actionss.setCallback(this, function (response) {
- console.log("002");
- var state = response.getState();
- if (state === "SUCCESS") {
- var res = response.getReturnValue();
- var res1 = "";
- console.log("[[[[[[" + res);
- if (res != "success") {
- var ress = res.split("=");
- console.log(ress);
- for (var i = 0; i < ress.length; i++) {
- res1 += ress[i].substr(7) + "\n";
- }
- // $('.forceToastManager').css('white-space', 'pre-wrap');
- console.log("==" + res1);
- this.error(res1 + "璇蜂慨鏀瑰悗閲嶆柊涓婁紶");
- component.set("v.login", false);
- } else {
- component.set("v.showMain", true);
- this.success("瀵煎叆鎴愬姛");
- // alert('saved successfully');
- component.set("v.login", false);
- }
- } else if (state === "INCOMPLETE") {
- // do something
- component.set("v.login", false);
- } else if (state === "ERROR") {
- var errors = response.getError();
- if (errors) {
- if (errors[0] && errors[0].message) {
- console.log("Error message: " + errors[0].message);
- component.set("v.login", false);
- }
- } else {
- console.log("Unknown error");
- component.set("v.login", false);
- }
- }
- });
- $A.enqueueAction(actionss);
- },
- saveRecordsEditFile: function (component, dataMap, searchData, helper) {
- var searchDataMap = new Map();
- for (var i = 0; i < searchData.length; i++) {
- var sd = searchData[i];
- if (sd.name) searchDataMap.set(sd.name.replace(" ", ""), sd.dataId);
- }
- console.log("searchDataMap=" + searchDataMap);
- var error = "";
- var fileData = component.get("v.fileContentData");
- var files = fileData.split("\n");
-
- var fileStr = files[0];
- fileStr += "\n";
-
- for (var i = 1; i < files.length - 1; i++) {
- var filelist = files[i].split(",");
- var fileName = filelist[4];
-
- if (searchDataMap.get(fileName.replace(" ", ""))) {
- var nameDataId = searchDataMap.get(fileName.replace(" ", ""));
- if (dataMap.get(nameDataId)) {
- filelist[4] = dataMap.get(nameDataId); //zhj 鏂版柟妗堟敼閫� filelist[4]涓嶅啀瀛樼殑nameEncrpt 2022-12-21
- } else {
- error += "error1 绗�" + i + "琛屾暟鎹嫓璁夸汉SF涓嶅瓨鍦�";
- error += "=";
- }
- } else {
- error += "error1 绗�" + i + "琛屾暟鎹嫓璁夸汉AWS涓嶅瓨鍦�";
- error += "=";
- }
- fileStr += filelist.toString();
- fileStr += "\n";
- }
-
- if (error != "") {
- this.error(error);
- console.log("error=" + error);
- component.set("v.login", false);
- return;
- }
-
- console.log("fileStr=" + fileStr);
- $A.getCallback(function () {
- debugger;
- helper.ImportMethod(component, fileStr);
- })();
- },
- convertArrayOfObjectsToCSV: function (component, objectRecords) {
- var csvStringResult, counter, keys, columnDivider, lineDivider, thkeys;
- if (objectRecords == null || !objectRecords.length) {
- return null;
- }
- columnDivider = ",";
- lineDivider = "\n";
- //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start ,'SupportNeeds__c' ,'鏀彺闇�姹�'
- keys = [
- "Submit_date__c",
- "Person_In_Charge2__c",
- "Report_Date__c",
- "Agency_Hospital__c",
- "Department_Cateogy__c",
- "doctor2__c",
- "visitor_title__c",
- "Product_Category1__c",
- "Product_Category2__c",
- "Product_Category3__c",
- "Purpose_Type__c",
- "Result__c",
- "SupportNeeds__c"
- ];
- thkeys = [
- "鍛�",
- "鎷呭綋",
- "娲诲姩鏃�",
- "鍖婚櫌",
- "绉戝",
- "鎷滆浜�",
- "鑱屼綅",
- "浜у搧鍖哄垎1",
- "浜у搧鍖哄垎2",
- "浜у搧鍖哄垎3",
- "娲诲姩鍖哄垎",
- "缁撴灉",
- "鏀彺闇�姹�"
- ];
- csvStringResult = "";
- csvStringResult += thkeys.join(columnDivider);
- csvStringResult += lineDivider;
- console.log("杩涘叆瀵煎嚭helper");
- for (var i = 0; i < objectRecords.length; i++) {
- counter = 0;
- for (var sTempkey in keys) {
- var skey = keys[sTempkey];
- if (counter > 0) {
- csvStringResult += columnDivider;
- }
- if (typeof objectRecords[i][skey] === "undefined") {
- csvStringResult += '"' + "" + '"';
- continue;
- }
- if (skey == "Person_In_Charge2__c") {
- csvStringResult +=
- '"' + objectRecords[i].Person_In_Charge2__r.Name + '"';
- } else if (skey == "Agency_Hospital__c") {
- csvStringResult +=
- '"' + objectRecords[i].Agency_Hospital__r.Name + '"';
- } else if (skey == "doctor2__c") {
- csvStringResult += '"' + objectRecords[i].doctor2__r.Name + '"';
- } else if (skey == "Product_Category1__c") {
- csvStringResult +=
- '"' + objectRecords[i].Product_Category1__r.Name + '"';
- } else if (skey == "Product_Category2__c") {
- csvStringResult +=
- '"' + objectRecords[i].Product_Category2__r.Name + '"';
- } else if (skey == "Product_Category3__c") {
- csvStringResult +=
- '"' + objectRecords[i].Product_Category3__r.Name + '"';
- } else if (skey == "SupportNeeds__c") {
- //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
- csvStringResult += '"' + objectRecords[i].SupportNeeds__c + '"';
- } else {
- csvStringResult += '"' + objectRecords[i][skey] + '"';
- }
- counter++;
- } // inner for loop close
- console.log("瀵煎嚭寰幆缁撴潫");
- csvStringResult += lineDivider;
- } // outer main for loop close
-
- // return the CSV formate String
- return csvStringResult;
- },
- showExportDate: function (component, objectRecords) {
- console.log("杩涘叆showexceportdate" + objectRecords); //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start ,'SupportNeeds__c' ,'鏀彺闇�姹�'
- var keys = [
- "Submit_date__c",
- "Person_In_Charge2__c",
- "Report_Date__c",
- "Agency_Hospital__c",
- "Department_Cateogy__c",
- "doctor2__c",
- "visitor_title__c",
- "Product_Category1__c",
- "Product_Category2__c",
- "Product_Category3__c",
- "Purpose_Type__c",
- "Result__c",
- "SupportNeeds__c"
- ];
- var headers = [
- "鍛�",
- "鎷呭綋",
- "娲诲姩鏃�",
- "鍖婚櫌",
- "绉戝",
- "鎷滆浜�",
- "鑱屼綅",
- "浜у搧鍖哄垎1",
- "浜у搧鍖哄垎2",
- "浜у搧鍖哄垎3",
- "娲诲姩鍖哄垎",
- "缁撴灉",
- "鏀彺闇�姹�"
- ];
- var content =
- '<table class="table slds-table slds-table--bordered slds-table--cell-buffer">';
- content += '<thead><tr class="slds-text-title--caps">';
- for (i = 0; i < headers.length; i++) {
- content += '<th scope="col">' + headers[i] + "</th>";
- }
- content += "</tr></thead>";
- for (var i = 0; i < objectRecords.length; i++) {
- console.log("for" + content);
- content += "<tr>";
- // content += '<td>'+(i+1)+'</td>';
- for (var sTempkey in keys) {
- console.log("for1" + sTempkey);
- var skey = keys[sTempkey];
- if (typeof objectRecords[i][skey] === "undefined") {
- content += "<td>" + "" + "</td>";
- continue;
- }
- console.log("for2" + objectRecords[i].Person_In_Charge2__r.Name);
- if (skey == "Person_In_Charge2__c") {
- content +=
- "<td>" + objectRecords[i].Person_In_Charge2__r.Name + "</td>";
- } else if (skey == "Agency_Hospital__c") {
- content +=
- "<td>" + objectRecords[i].Agency_Hospital__r.Name + "</td>";
- } else if (skey == "doctor2__c") {
- content += "<td>" + objectRecords[i].doctor2__r.Name + "</td>";
- } else if (skey == "Product_Category1__c") {
- content +=
- "<td>" + objectRecords[i].Product_Category1__r.Name + "</td>";
- } else if (skey == "Product_Category2__c") {
- content +=
- "<td>" + objectRecords[i].Product_Category2__r.Name + "</td>";
- } else if (skey == "Product_Category3__c") {
- content +=
- "<td>" + objectRecords[i].Product_Category3__r.Name + "</td>";
- } else if (skey == "SupportNeeds__c") {
- //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
- content += "<td>" + objectRecords[i].SupportNeeds__c + "</td>";
- } else {
- content += "<td>" + objectRecords[i][skey] + "</td>";
- }
- } // inner for loop close
- content += "</tr>";
- } // outer main for loop close
- content += "</table>";
- console.log("helper寰幆缁撴潫" + content);
- component.set("v.TableContent2", content);
- component.set("v.showMain", false);
- },
-
- select_repores_date: function (component, event, helper) {
- component.set("v.login", true);
- var reportsdate1 = component.find("input-report-date1").get("v.value");
- var reportsdate2 = component.find("input-report-date2").get("v.value");
- console.log(
- "杈撳叆鐨勫紑濮嬫棩鏈�" + reportsdate1 + "杈撳叆鐨勭粨鏉熸棩鏈�" + reportsdate2
- );
- var action = component.get("c.getReportsByDate");
- console.log("杈撳叆鐨勫紑濮嬫棩鏈�1");
- action.setParams({
- date1: reportsdate1,
- date2: reportsdate2
- });
- console.log("杈撳叆鐨勫紑濮嬫棩鏈�2");
- action.setCallback(this, function (response) {
- var state = response.getState();
- if (state === "SUCCESS") {
- var res = response.getReturnValue();
- console.log("杈撳叆鐨勫紑濮嬫棩鏈�3" + res);
- component.set("v.login", false);
-
- // PI 鏀归�� By Bright 20220328
- if (true) {
- let awsids = [];
- for (let ri in res) {
- if (
- res[ri] &&
- res[ri].doctor2__r &&
- res[ri].doctor2__r.AWS_Data_Id__c
- ) {
- awsids.push(res[ri].doctor2__r.AWS_Data_Id__c);
- }
- }
- if (awsids.length > 0) {
- let awsurl = component.get("v.awsurl");
-
- AWSService.search(
- awsurl.searchUrl,
- {
- dataIds: awsids
- },
- function (data) {
- if (data && data.object && data.object.length) {
- let m = {};
- for (let di in data.object) {
- if (data.object[di] && data.object[di].dataId) {
- m[data.object[di].dataId] = data.object[di];
- }
- }
-
- for (let ri in res) {
- if (
- res[ri] &&
- res[ri].doctor2__r &&
- res[ri].doctor2__r.AWS_Data_Id__c &&
- m.hasOwnProperty(res[ri].doctor2__r.AWS_Data_Id__c)
- ) {
- res[ri].doctor2__r.Name =
- m[res[ri].doctor2__r.AWS_Data_Id__c].name;
- res[ri].visitor_title__c =
- m[res[ri].doctor2__r.AWS_Data_Id__c].doctorDivision1;
- }
- }
+ // PIPL update Yin Mingjie 21/02/2022 end
}
- helper.showExportDate(component, res);
+ else{
+ this.error('set_doctor_list failed.');
+ component.set('v.login',false);
+ }
+ });
+ $A.enqueueAction(action);
+ }
+ },
- component.set("v.login", false);
- },
- awsurl.token
- );
- } else {
- helper.showExportDate(component, res);
- }
+ // PIPL update Yin Mingjie 21/02/2022 start
+ AWS_search : function(retMap,component) {
+ var token = retMap.sre.token;
+ var searchUrl = retMap.sre.searchUrl;
+
+ var dataArr = new Array();
+ for (const key in retMap) {
+ if (key == 'sre') {continue;}
+ dataArr.push(key);
+ }
+ if(dataArr.length == 0){
+ component.set('v.login',false);
+ this.warning('娌℃湁鎵惧埌绗﹀悎鏉′欢鐨勫鎴蜂汉鍛�');
+ return;
+ }
+ let obj= Object.create(null);
+ obj['dataIds'] = dataArr;
+ var data = JSON.stringify(obj);
+ this.search_agency_contact(token,searchUrl,data,retMap,component);
+ },
+
+ search_agency_contact : function(token,searchUrl,payload,retMap,component) {
+ this.search_core(token,searchUrl,payload,(result)=>{
+ if(result.status == '0'){
+ this.to_doctor_list(result,retMap,component);
+ }else{
+ this.error('AWS search status4 : ' + result.status);
+ component.set('v.login',false);
+ }
+ },component);
+ // fetch(searchUrl, {
+ // method: 'POST',
+ // body: payload,
+ // headers: {
+ // 'Content-Type': 'application/json',
+ // 'pi-token': token
+ // }
+ // }).then((data) => {
+ // return data.json();
+ // }).then((result) => {
+
+ // }).catch(error => {
+ // this.error('AWS search error.');
+ // component.set('v.login',false);
+ // });
+ },
+ search_core : function(token,searchUrl,payload,callback,component) {
+ console.log('token = ' + token);
+ console.log('searchUrl = ' + searchUrl);
+ console.log('payload = ' + payload);
+ fetch(searchUrl, {
+ method: 'POST',
+ body: payload,
+ headers: {
+ 'Content-Type': 'application/json',
+ 'pi-token': token
+ }
+ }).then((data) => {
+ return data.json();
+ }).then((result) => {
+ component.set('v.login',false);
+ if(callback)callback(result);
+ }).catch(error => {
+ console.log('error = ' + JSON.stringify(error));
+ this.error('AWS search error.');
+ component.set('v.login',false);
+ });
+ },
+
+ to_doctor_list : function(result,retMap,component) {
+ var resls = result.object;
+ var res = [];
+ var space = {};
+ space['label'] = '';
+ space['selected'] = true;
+ space['value'] = '';
+ res.push(space);
+
+ for (var i = 0; i < resls.length; i++) {
+ var t = {};
+ t['label'] = resls[i].name;
+ t['selected'] = false;
+ t['Doctor_Division1__c'] = resls[i].doctorDivision1;
+ t['value'] = retMap[resls[i].dataId].value;
+ res.push(t);
}
- component.set("v.reports_date", res);
- } else {
- alert("瀵煎嚭澶辫触,璇锋鏌ユ椿鍔ㄦ棩");
- component.set("v.login", false);
- }
- });
- $A.enqueueAction(action);
- },
+ var default_doctor = component.get('v.default_select_doctor_id');
+ if (default_doctor != '' && res.length > 0) {
+ var doctor_title = '';
+ for (var i = 0; i < res.length; i++) {
+ if (res[i].value == default_doctor) {
+ res[i].selected = true;
+ doctor_title = res[i].Doctor_Division1__c;
+ } else {
+ res[i].selected = false;
+ }
+ }
- showImport: function (component) {
- // console.log('杩涘叆');
- // component.find('file').click();
- var modalimport = component.find("modal_import");
- var modalimportbg = component.find("modal_importbg");
- $A.util.removeClass(modalimport, "disp_none");
- $A.util.removeClass(modalimportbg, "disp_none");
- },
+ component.find('select_doctor').set('v.options', res);
+ component.set('v.doctor_title', doctor_title);
+ } else {
+ component.find('select_doctor').set('v.options', res);
+ if (res.length > 0) {
+ component.set('v.doctor_title', res[0].Doctor_Division1__c);
+ }
+ }
+
+ component.set('v.default_select_doctor_id', '');
+ component.set('v.doctor_list', res);
+ component.set('v.login',false);
+ },
+ // PIPL update Yin Mingjie 21/02/2022 end
- showExport: function (component) {
- var modalimport = component.find("modal_export");
- var modalimportbg = component.find("modal_exportbg");
- $A.util.removeClass(modalimport, "disp_none");
- $A.util.removeClass(modalimportbg, "disp_none");
- },
+ // stageNameChange : function(component, event, helper) {
+ // var options = component.find('input-oppstage').get("v.body")[0].get('v.options');
+ // var remove;
+ // for (var i = 0; i < options.length; i++) {
+ // if (options[i].label == '鐩爣') {
+ // remove = i;
+ // break;
+ // }
+ // }
+ // options.splice(remove,1);
+ // },
+
+ opportunityChange : function(component, event, helper) {
+ debugger
+ var opp_id = component.get('v.data.Opportunity__c');
+ if (opp_id == '') {
+ $A.util.addClass(component.find('input-opportunity-stage'), 'disp_none');
+ $A.util.addClass(component.find('input-opportunity-amount1'), 'disp_none');
+ $A.util.addClass(component.find('input-opportunity-amount2'), 'disp_none');
+ $A.util.addClass(component.find('input-opportunity-date'), 'disp_none');
+ $A.util.removeClass(component.find('input-opportunity-blank'), 'disp_none');
+ } else if (opp_id == 'MALFORMED_ID') {
+ component.set('v.data.Opportunity__c', '');
+ $A.util.addClass(component.find('input-opportunity-stage'), 'disp_none');
+ $A.util.addClass(component.find('input-opportunity-amount1'), 'disp_none');
+ $A.util.addClass(component.find('input-opportunity-amount2'), 'disp_none');
+ $A.util.addClass(component.find('input-opportunity-date'), 'disp_none');
+ $A.util.removeClass(component.find('input-opportunity-blank'), 'disp_none');
+ } else if (opp_id != "") {
+ var hospital_link_id = component.get('v.hospitalLinkId');
+ if (hospital_link_id == '') {
+ this.warning('鍖婚櫌涓嶅瓨鍦�');
+ // ToDo闇�瑕佹祴璇曟墜鏈轰笂鑳借繍琛屼笉
+ component.set('v.data.Opportunity__c', '');
+ $A.util.addClass(component.find('input-opportunity-stage'), 'disp_none');
+ $A.util.addClass(component.find('input-opportunity-amount1'), 'disp_none');
+ $A.util.addClass(component.find('input-opportunity-amount2'), 'disp_none');
+ $A.util.addClass(component.find('input-opportunity-date'), 'disp_none');
+ $A.util.removeClass(component.find('input-opportunity-blank'), 'disp_none');
+ // if ($A.get("$Browser.formFactor") == 'DESKTOP') {
+ // var values = [];
+ // // component.find('input-opportunity').get("v.body")[0].set('v.values', values);
+ // } else {
+ // component.find('input-opportunity').get("v.body")[0].set('v.selectedLabel', '');
+ // }
+ return false;
+ }
+ var action = component.get('c.selectOpportunityByIdAndHospitalLinkId');
+ action.setParams({
+ "opportunity_id" : opp_id,
+ "agency_hospital_link_id" : component.get('v.hospitalLinkId'),
+ });
- close_import: function (component) {
- var modalimport = component.find("modal_import");
- var modalimportbg = component.find("modal_importbg");
- $A.util.addClass(modalimport, "disp_none");
- $A.util.addClass(modalimportbg, "disp_none");
- },
+ component.set('v.login',true);
+ action.setCallback(this,function(response){
+ var state = response.getState();
+ if(state == 'SUCCESS'){
+ var res = response.getReturnValue();
+ if (res.length <= 0) {
+ if (component.get('v.data.Opportunity__c')) {
+ this.warning('鍖婚櫌鏈尮閰嶅埌');
+ }
+ // ToDo闇�瑕佹祴璇曟墜鏈轰笂鑳借繍琛屼笉
+ component.set('v.data.Opportunity__c', '');
+ $A.util.addClass(component.find('input-opportunity-stage'), 'disp_none');
+ $A.util.addClass(component.find('input-opportunity-amount1'), 'disp_none');
+ $A.util.addClass(component.find('input-opportunity-amount2'), 'disp_none');
+ $A.util.addClass(component.find('input-opportunity-date'), 'disp_none');
+ $A.util.removeClass(component.find('input-opportunity-blank'), 'disp_none');
+ // if ($A.get("$Browser.formFactor") == 'DESKTOP') {
+ // var values = [];
+ // component.find('input-opportunity').get("v.body")[0].set('v.values', values);
+ // } else {
+ // component.find('input-opportunity').get("v.body")[0].set('v.selectedLabel', '');
+ // }
+ component.set('v.login',false);
+ return false;
+ }
+ //SWAG-CKH5M8 銆愬鎵樸�戝懆鎶ュ叧鑱旇浠凤紝鍙�夋嫨璇环鑼冨洿璋冩暣 fy start
+ // else if (res[0]['StageName2__c'] != '3.璇环' && !component.get('v.loadOpp')){
+ // this.warning('璇烽�夋嫨璇环涓殑椤圭洰');
+ // // ToDo闇�瑕佹祴璇曟墜鏈轰笂鑳借繍琛屼笉
+ // component.set('v.data.Opportunity__c', '');
+ // $A.util.addClass(component.find('input-opportunity-stage'), 'disp_none');
+ // $A.util.addClass(component.find('input-opportunity-amount1'), 'disp_none');
+ // $A.util.addClass(component.find('input-opportunity-amount2'), 'disp_none');
+ // $A.util.addClass(component.find('input-opportunity-date'), 'disp_none');
+ // $A.util.removeClass(component.find('input-opportunity-blank'), 'disp_none');
+ // // if ($A.get("$Browser.formFactor") == 'DESKTOP') {
+ // // var values = [];
+ // // component.find('input-opportunity').get("v.body")[0].set('v.values', values);
+ // // } else {
+ // // component.find('input-opportunity').get("v.body")[0].set('v.selectedLabel', '');
+ // // }
+ // component.set('v.login',false);
+ // return false;
+ // }
+ //SWAG-CKH5M8 銆愬鎵樸�戝懆鎶ュ叧鑱旇浠凤紝鍙�夋嫨璇环鑼冨洿璋冩暣 fy end
+ else {
+ component.set('v.loadOpp', false);
+ component.set('v.oppdata',res[0]);
+ this.set_selected(component, 'select_stageName', res[0].StageName__c);
+ component.set('v.Close_Forecasted_Date__c_o', res[0].Close_Forecasted_Date__c);
+ component.set('v.Amount__c_o', res[0].Amount__c);
+ component.set('v.OCMSale_Price__c_o', res[0].OCMSale_Price__c);
+ component.set('v.StageName__c_o', res[0].StageName__c);
- close_export: function (component) {
- var modalimport = component.find("modal_export");
- var modalimportbg = component.find("modal_exportbg");
- $A.util.addClass(modalimport, "disp_none");
- $A.util.addClass(modalimportbg, "disp_none");
- },
+ $A.util.removeClass(component.find('input-opportunity-stage'), 'disp_none');
+ $A.util.removeClass(component.find('input-opportunity-amount1'), 'disp_none');
+ $A.util.removeClass(component.find('input-opportunity-amount2'), 'disp_none');
+ $A.util.removeClass(component.find('input-opportunity-date'), 'disp_none');
+ $A.util.addClass(component.find('input-opportunity-blank'), 'disp_none');
+ }
+
+ component.set('v.login',false);
+ }
+ else{
+ this.error('selectOpportunityByIdAndHospitalLinkId failed.');
+ component.set('v.login',false);
+ }
+ });
+ $A.enqueueAction(action);
+ }
+ },
+
+ productcategoryChange1 : function(component, event, helper) {
+ var product_category_id = component.find('select_Product1').get('v.value');
+ var pcId1 = component.find('select_Product2').get('v.value');
+ var pcId2 = component.find('select_Product3').get('v.value');
+ var p1bool = pcId1 != '' && pcId1 != null && pcId1 != undefined;
+ var p2bool = pcId2 != '' && pcId2 != null && pcId2 != undefined;
+ var p0bool = product_category_id != '' && product_category_id != null && product_category_id != undefined;
+ if ((p1bool && p0bool && product_category_id == pcId1) || (p2bool && p0bool && product_category_id == pcId2)) {
+ this.warning('涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝佸尯鍒�');
+ component.find('select_Product1').set('v.value','');
+ }
+ },
+ productcategoryChange2 : function(component, event, helper) {
+ var product_category_id = component.find('select_Product2').get('v.value');
+ var pcId1 = component.find('select_Product1').get('v.value');
+ var pcId2 = component.find('select_Product3').get('v.value');
+ var p1bool = pcId1 != '' && pcId1 != null && pcId1 != undefined;
+ var p2bool = pcId2 != '' && pcId2 != null && pcId2 != undefined;
+ var p0bool = product_category_id != '' && product_category_id != null && product_category_id != undefined;
+ if ((p1bool && p0bool && product_category_id == pcId1) || (p2bool && p0bool && product_category_id == pcId2)) {
+ this.warning('涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝佸尯鍒�');
+ component.find('select_Product2').set('v.value','');
+ }
+ },
+ productcategoryChange3 : function(component, event, helper) {
+ var product_category_id = component.find('select_Product3').get('v.value');
+ var pcId1 = component.find('select_Product1').get('v.value');
+ var pcId2 = component.find('select_Product2').get('v.value');
+ var p1bool = pcId1 != '' && pcId1 != null && pcId1 != undefined;
+ var p2bool = pcId2 != '' && pcId2 != null && pcId2 != undefined;
+ var p0bool = product_category_id != '' && product_category_id != null && product_category_id != undefined;
+ if ((p1bool && p0bool && product_category_id == pcId1) || (p2bool && p0bool && product_category_id == pcId2)) {
+ this.warning('涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝佸尯鍒�');
+ component.find('select_Product3').set('v.value','');
+ }
+ },
+
+ conv_selected : function(obj) {
+ for (var i = 0; i < obj.length; i++) {
+ if (obj[i].selected) {
+ if (obj[i].selected == 'true') {
+ obj[i].selected = true;
+ } else {
+ obj[i].selected = false;
+ }
+ }
+ }
+
+ return obj;
+ },
+
+ set_selected : function (component, aura_id_name, value) {
+ var select_tmp = component.find(aura_id_name).get('v.options');
+ if (select_tmp) {
+ for (var i = 0; i < select_tmp.length; i++) {
+ if (select_tmp[i].value == value) {
+ select_tmp[i].selected = true;
+ } else {
+ select_tmp[i].selected = false;
+ }
+ }
+ component.find(aura_id_name).set('v.options', select_tmp);
+ return true;
+ } else {
+ return false;
+ }
+ },
+
+ success : function(message) {
+ var toastEvent = $A.get("e.force:showToast");
+ toastEvent.setParams({
+ "title" : "鎴愬姛!",
+ "message" : message,
+ "type" : "success",
+ "duration" : "5000"
+ });
+ toastEvent.fire();
+ },
+
+ warning : function(message) {
+ var toastEvent = $A.get("e.force:showToast");
+ toastEvent.setParams({
+ "title": "璀﹀憡!",
+ "message": message,
+ "type":"warning",
+ "duration" : "10000"
+ });
+ toastEvent.fire();
+ },
+
+ error : function(message) {
+ // $('toastMessage.forceToastManager').css('white-space', 'pre-wrap');
+ var toastEvent = $A.get("e.force:showToast");
- //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 start
- CallBackAction: function (component, action_name, para, callback) {
- var action = component.get(
- "c." + action_name.trimStart().replace("c.", "")
- );
- if (para) {
- action.setParams(para);
- }
- if (callback) {
- action.setCallback(this, function (data) {
- callback(data);
- });
- }
+ toastEvent.setParams({
+ "title": "閿欒!",
+ "message": message,
+ "type":"error",
+ "duration" : "sticky"
+ });
+ toastEvent.fire();
+ },
+
+ createCon : function(component, event, helper) {
+ var modal_newAC = component.find('modal_newAC')
+ $A.util.removeClass(modal_newAC, 'disp_none');
+ component.set('v.truthy', true);
+ // var modal_newAC = component.find('modal_newAC')
+ // $A.util.removeClass(modal_newAC, 'disp_none');
+ },
- $A.enqueueAction(action);
- }
- //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 end
+ // vivek start 娣诲姞楠岃瘉
+ // handleFormSubmit : function(component) {
+ // var showValidationError = false;
+ // var fields = component.find("newOpportunityField");
+ // var vaildationFailReason = '';
+ // var currentDate = new Date().toJSON().slice(0,10);
+
+ // fields.forEach(function (field) {
+ // if(field.get("v.fieldName") === 'Type__c' && $A.util.isEmpty(field.get("v.value"))){
+ // showValidationError = true;
+ // vaildationFailReason = "鍒嗙被涓嶈兘涓虹┖锛�";
+ // }else if(field.get("v.fieldName") === 'Doctor_Division1__c' && $A.util.isEmpty(field.get("v.value"))){
+ // showValidationError = true;
+ // vaildationFailReason = "鍖荤敓鍖哄垎(鑱屽姟)涓嶈兘涓虹┖锛�";
+ // }
+ // });
+
+ // if (showValidationError) {
+ // component.find('OppMessage').setError(vaildationFailReason);
+ // }
+ // },
+ // vivek end 娣诲姞楠岃瘉
- // searchAgencyContact : function(res) {
- // var agencyContacts = [];
- // for (let idx = 0; idx < res.length; idx++) {
- // agencyContacts.push(res[idx].awsid);
- // }
- // var action = component.get('c.getAWStoken');
- // action.setCallback(this,function(response){
- // var state = response.getState();
- // console.log('state : ' + state);
- // if(state === 'SUCCESS') {
- // console.log('get name : ' + action.getName());
- // }
- // else if(state === 'INCOMPLETE') {
- // console.log('incomplete state');
- // } else if(state === 'ERROR') {
- // if (errors) {
- // if (errors[0] && errors[0].message) {
- // console.log("Error message: " +
- // errors[0].message);
- // }
- // } else {
- // console.log("Unknown error");
- // }
- // }
- // });
- // $A.enqueueAction(action);
- // // var requestSearchPayload = new Map();
- // // requestSearchPayload.set("dataIds",agencyContacts);
- // var data = '{"dataIds": ["944233643042144256", "943645353649897473"]}';
- // var token = 'eyJhbGciOiJIUzUxMiJ9.eyJjcmVhdGVkIjoxNjQ0NzY4MTIwNjc2LCJhcHBpZCI6IjZMeml6Y1JmN2g4eUx4MjgiLCJleHAiOjE2NDk5NTIxMjB9.6vORDP8BRaf_beCt4SEXrl3DEuYZ3owotkUqh27r8YhfmKDDWrv_NpVVpjTPeFjvzlQqaJMcFobZeAmPxpmq2A';
- // var searchUrl = 'https://52.83.101.205/api/agencycontact/search';
- // var data = this.search(searchUrl,data,token);
- // return data;searchUrl,requestSearchPayload,token
- // },
-});
+ hideCmp : function(component, event, helper) {
+ var div1 = component.find('report')
+ var div2 = component.find('report_list')
+ $A.util.addClass(div1, 'disp_none');
+ $A.util.addClass(div2, 'disp_none');
+ },
+
+ handleSuccess : function(component, event, helper) {
+ var insertId = event.getParams().response.Id;
+ var displayValue = event.getParams().response.fields.Name.value;
+ event.setParams({});
+ component.set('v.truthy', false);
+ var modal_newAC = component.find('modal_newAC')
+ $A.util.addClass(modal_newAC, 'disp_none');
+ this.success('.瀹㈡埛浜哄憳宸插垱寤恒��');
+ this.set_doctor_list(component);
+ },
+
+ createCancel : function(component, event, helper) {
+ component.set('v.truthy', false);
+ var modal_newAC = component.find('modal_newAC')
+ $A.util.addClass(modal_newAC, 'disp_none');
+ },
+ setOpportunity_cfilter : function(component) {
+ debugger
+ var hosId = component.get('v.hospitalId');
+ var Department_Cateogy__c = component.find('select_department').get('v.value');
+ var opportunity_cfilter = '';
+ if (hosId != '' && hosId != null) {
+ opportunity_cfilter = ' Agency_Hospital__r.Hospital__c=' + '\'' + hosId + '\'';
+ }
+ if (Department_Cateogy__c != '' && Department_Cateogy__c != null) {
+ if (opportunity_cfilter != '' && opportunity_cfilter != null) {
+ opportunity_cfilter += ' AND ';
+ }
+ opportunity_cfilter += 'Department_Cateogy__c=' + '\'' + Department_Cateogy__c + '\'';
+ }
+ component.set('v.opportunity_cfilter', opportunity_cfilter);
+ component.set('v.data.Opportunity__c', null);
+ },
+ readFile: function(component, helper, file) {
+ if (!file) return;
+ // console.log('file'+file.name);
+ if(!file.name.match(/\.(csv||CSV)$/)){
+ return alert('only support csv files');
+ }else{
+
+ reader = new FileReader();
+ reader.onerror =function errorHandler(evt) {
+ switch(evt.target.error.code) {
+ case evt.target.error.NOT_FOUND_ERR:
+ alert('File Not Found!');
+ break;
+ case evt.target.error.NOT_READABLE_ERR:
+ alert('File is not readable');
+ break;
+ case evt.target.error.ABORT_ERR:
+ break; // noop
+ default:
+ alert('An error occurred reading this file.');
+ };
+ }
+ //reader.onprogress = updateProgress;
+ reader.onabort = function(e) {
+ alert('File read cancelled');
+ };
+ reader.onloadstart = function(e) {
+
+ var output = '<ui type=\"disc\"><li><strong>'+file.name +'</strong> ('+file.type+')- '+file.size+'bytes, last modified: '+file.lastModifiedDate.toLocaleDateString()+'</li></ui>';
+ component.set("v.filename",file.name);
+ component.set("v.TargetFileName",output);
+
+ };
+ reader.onload = function(e) {
+ var data=e.target.result;
+ component.set("v.fileContentData",data);
+ console.log("file data"+JSON.stringify(data));
+ // console.log("file data"+encodeURI(JSON.stringify(data),"utf-8"));
+ var allTextLines = data.split(/\r\n|\n/);
+ var dataRows=allTextLines.length-1;
+ var headers = allTextLines[0].split(',');
+
+ // console.log("Rows length::"+dataRows);
+
+
+ var numOfRows=component.get("v.NumOfRecords");
+ if(dataRows > numOfRows+1 || dataRows == 1 || dataRows== 0){
+
+ alert("File Rows between 1 to "+numOfRows+" .");
+ component.set("v.showMain",true);
+
+ }
+ else{
+ var lines = [];
+ var filecontentdata;
+ var content = "<table class=\"table slds-table slds-table--bordered slds-table--cell-buffer\">";
+ content += "<thead><tr class=\"slds-text-title--caps\">";
+ content += '<th scope=\"col"\>'+'琛屽彿'+'</th>';
+ for(i=0;i<headers.length; i++){
+ content += '<th scope=\"col"\>'+headers[i]+'</th>';
+ }
+ content += "</tr></thead>";
+ for (var i=1; i<allTextLines.length; i++) {
+ filecontentdata = allTextLines[i].split(',');
+ if(filecontentdata[0]!=''){
+ content +="<tr>";
+ content +="<td>"+i+"</td>";
+ for(var j=0;j<filecontentdata.length;j++){
+ content +='<td>'+filecontentdata[j]+'</td>';
+ }
+ content +="</tr>";
+ }
+ }
+ content += "</table>";
+ console.log(content);
+ component.set("v.TableContent",content);
+ component.set("v.showMain",false);
+ }
+ }
+ reader.readAsText(file,'gb2312');
+
+ }
+ var reader = new FileReader();
+ reader.onloadend = function() {
+
+ };
+ reader.readAsDataURL(file);
+ },
+
+ saveRecords : function(component,event,helper){
+ debugger
+ component.set('v.login',true);
+ //fy 瀵煎叆 20220424 start
+ var action1 = component.get("c.processDataAWSId");
+ action1.setParams({
+ fileData : component.get("v.fileContentData"),
+ });
+ debugger
+ action1.setCallback(this, function(response) {
+ console.log('response = ' + JSON.stringify(response));
+ var state = response.getState();
+ if (state === "SUCCESS") {
+ var ress = response.getReturnValue();
+ console.log('ress = ' + JSON.stringify(ress));
+ if(ress){
+ var valur =ress.split('error1');
+ if(valur.length<=1){
+ var res = JSON.parse(response.getReturnValue());
+ console.log('res = ' + JSON.stringify(res));
+ var dataArr = new Array();
+ var dataMap = new Map();
+ res.forEach(item => {
+ if(item.AWS_Data_Id__c){
+ dataArr.push(item.AWS_Data_Id__c);
+ //dataMap.set(item.AWS_Data_Id__c,item.Name_Encrypted__c);
+ dataMap.set(item.AWS_Data_Id__c,item.AWS_Data_Id__c); //zhj 鏂版柟妗堟敼閫� 2022-12-21
+ }
+ });
+ let obj= Object.create(null);
+ obj['dataIds'] = dataArr;
+ var payload = JSON.stringify(obj);
+ console.log('payload zhj = ' + JSON.stringify(payload));
+
+ this.search_contact_url(component, 'Agency_Contact__c', (result)=>{
+ var token = result.token;
+ var searchUrl = result.searchUrl;
+ this.search_core(token,searchUrl,payload,(result)=>{
+ if(result.status == '0'){
+ if(result.object != null&&result.object.length != 0){
+ // var resultjson = JSON.stringify(result.object);
+ // if(resultjson){
+ // debugger
+ // console.warn('001');
+ // component.set('v.login',true);
+ // this.ImportMethod(component,resultjson);
+ // }
+ component.set('v.login',true);
+ this.saveRecordsEditFile(component,dataMap,result.object,helper);
+ }else{
+ this.error('AWS 鏌ヨ鏁版嵁涓虹┖ ' );
+ component.set('v.login',false);
+ }
+ }else{
+ this.error('AWS search status6 : ' + result.status);
+ component.set('v.login',false);
+ }
+ },component);
+ // var resultjson =null;
+ // this.ImportMethod(component,resultjson);
+
+ });
+ // var resultjson =null;
+ // this.ImportMethod(component,resultjson);
+ }else{
+ this.error(valur[1]+'\n'+"璇蜂慨鏀瑰悗閲嶆柊涓婁紶");
+ }
+ }
+ }
+ });
+ $A.enqueueAction(action1);
+ //fy 瀵煎叆 20220424 end
+ // var action = component.get("c.processData");
+ // var selectDate = component.find('select_date').get('v.value');
+ // var fieldsList=['Name','Phone','AccountNumber']; //Please write your code dynamic
+ // var sss=component.get("v.fileContentData");
+ // action.setParams({
+ // fileData : component.get("v.fileContentData"),
+ // //selectDateselectDate :component.find('select_date').get('v.value'),
+ // sobjectName:'Account', //Any object
+ // fields:fieldsList
+ // });
+ // action.setCallback(this, function(response) {
+ // var state = response.getState();
+ // if (state === "SUCCESS") {
+
+ // var res = response.getReturnValue();
+ // var res1 = '';
+ // console.log("[[[[[["+res);
+ // if(res != 'success'){
+ // debugger
+ // var ress = res.split('=');
+ // console.log(ress);
+ // for (var i=0; i<ress.length; i++) {
+ // res1 += ress[i].substr(7)+'\n';
+ // }
+ // // $('.forceToastManager').css('white-space', 'pre-wrap');
+ // console.log("=="+res1);
+ // this.error(res1+"璇蜂慨鏀瑰悗閲嶆柊涓婁紶");
+ // component.set('v.login',false);
+ // }else{
+ // component.set("v.showMain",true);
+ // this.success("瀵煎叆鎴愬姛");
+ // // alert('saved successfully');
+ // component.set('v.login',false);
+ // }
+
+ // }
+ // else if (state === "INCOMPLETE") {
+ // // do something
+ // component.set('v.login',false);
+ // }
+ // else if (state === "ERROR") {
+ // var errors = response.getError();
+ // if (errors) {
+ // if (errors[0] && errors[0].message) {
+ // console.log("Error message: " +
+ // errors[0].message);
+ // component.set('v.login',false);
+ // }
+ // } else {
+ // console.log("Unknown error");
+ // component.set('v.login',false);
+ // }
+ // }
+ // });
+ // $A.enqueueAction(action);
+
+ },isNumber: function(str) {
+ return /^\d+$/.test(str);
+ },ImportMethod : function(component,fileStr){
+ debugger
+ var actionss = component.get("c.processData");
+ var selectDate = component.find('select_date').get('v.value');
+ var fieldsList=['Name','Phone','AccountNumber']; //Please write your code dynamic
+ var sss=component.get("v.fileContentData");
+ actionss.setParams({
+ // fileData : component.get("v.fileContentData"),
+ fileData : fileStr,
+ // selectDateselectDate :component.find('select_date').get('v.value'),
+ sobjectName:'Account', //Any object
+ fields:fieldsList
+ // Agency_ContactListjson:resultjson
+ });
+ actionss.setCallback(this, function(response) {
+ console.log('002');
+ var state = response.getState();
+ if (state === "SUCCESS") {
+ var res = response.getReturnValue();
+ var res1 = '';
+ console.log("[[[[[["+res);
+ if(res != 'success'){
+ var ress = res.split('=');
+ console.log(ress);
+ let errorDatas = [];
+ let errorDataRow = [];
+ debugger
+ for (var i=0; i<ress.length; i++) {
+ res1 += ress[i].substr(7)+'\n';
+ if (ress[i] != '') {
+ let errorData = {}
+ if(!this.isNumber(ress[i].substr(7).substring(1, 2))){
+ continue
+ }
+ let index = errorDataRow.indexOf(ress[i].substr(7).substring(1, 2));
+ if (index == -1) {
+ errorData.errorRow = ress[i].substr(7).substring(1, 2);
+ errorDataRow.push(errorData.errorRow);
+ errorData.errorInfo = ress[i].substr(7).substring(5).replace('=','');
+ errorDatas.push(errorData);
+ } else {
+ errorDatas[index].errorInfo += '; ' + ress[i].substr(7).substring(5);
+ }
+ }
+ }
+ var fileContentData = component.get("v.fileContentData").split('\n');
+ let errorColumns = [
+ { label: '閿欒琛�', fieldName: 'errorRow', type: 'text', hideDefaultActions: true, initialWidth: 100 },
+ { label: '閿欒淇℃伅', fieldName: 'errorInfo', type: 'text', hideDefaultActions: true, initialWidth: 300, wrapText: true }
+ ];
+ for (var i = 0; i < fileContentData[0].split(',').length; i++) {
+ errorColumns.push({
+ label: fileContentData[0].split(',')[i],
+ fieldName: 'field' + i,
+ type: 'text',
+ hideDefaultActions: true,
+ wrapText: true,
+ initialWidth: 120
+ });
+ }
+
+ for (var i = 0; i < errorDatas.length; i++) {
+ let data = fileContentData[errorDatas[i].errorRow];
+ console.log('data = ' + JSON.stringify(data));
+ if(data){
+ for (var j = 0; j < data.split(',').length; j++) {
+ let label = 'field' + j;
+ errorDatas[i][label] = data.split(',')[j];
+ }
+ }
+ }
+ component.set('v.errorColumns', errorColumns);
+ component.set('v.errorData', errorDatas);
+ component.set("v.showErrorInfo", true);
+ console.log("=="+res1);
+ this.error(res1+"璇蜂慨鏀瑰悗閲嶆柊涓婁紶");
+ component.set('v.login',false);
+ }else{
+ component.set("v.showMain",true);
+ this.success("瀵煎叆鎴愬姛");
+ // alert('saved successfully');
+ component.set('v.login',false);
+ }
+
+ }
+ else if (state === "INCOMPLETE") {
+ // do something
+ component.set('v.login',false);
+ }
+ else if (state === "ERROR") {
+ var errors = response.getError();
+ if (errors) {
+ if (errors[0] && errors[0].message) {
+ console.log("Error message: " +
+ errors[0].message);
+ component.set('v.login',false);
+ }
+ } else {
+ console.log("Unknown error");
+ component.set('v.login',false);
+ }
+ }
+ });
+ $A.enqueueAction(actionss);
+ },saveRecordsEditFile : function(component,dataMap,searchData,helper){
+ var searchDataMap = new Map();
+ for (var i = 0; i < searchData.length; i++) {
+ var sd = searchData[i];
+ if(sd.name)
+ searchDataMap.set(sd.name.replace(' ',''),sd.dataId);
+ }
+ console.log('searchDataMap='+searchDataMap);
+ var error = '';
+ var fileData = component.get("v.fileContentData");
+ var files = fileData.split('\n');
+
+ var fileStr = files[0];
+ fileStr += '\n';
+
+ for (var i = 1; i < files.length-1; i++) {
+ var filelist = files[i].split(',');
+ var fileName = filelist[4];
+
+ if (searchDataMap.get(fileName.replace(' ',''))) {
+ var nameDataId = searchDataMap.get(fileName.replace(' ',''));
+ if (dataMap.get(nameDataId)) {
+ filelist[4] = dataMap.get(nameDataId); //zhj 鏂版柟妗堟敼閫� filelist[4]涓嶅啀瀛樼殑nameEncrpt 2022-12-21
+ }else {
+ error += 'error1 绗�'+i+'琛屾暟鎹嫓璁夸汉SF涓嶅瓨鍦�';
+ error += '=';
+ }
+ }else {
+ error += 'error1 绗�'+i+'琛屾暟鎹嫓璁夸汉AWS涓嶅瓨鍦�';
+ error += '=';
+ }
+ fileStr += filelist.toString();
+ fileStr += '\n';
+ }
+
+ if (error != '') {
+ console.log('zhj error = ' + error);
+ let errorArray = error.split('error1');
+ let errorDatas = [];
+ let errorDataRow = [];
+ debugger
+ console.log('errorArray = ' + JSON.stringify(errorArray))
+ for (var i in errorArray) {
+ if (errorArray[i] != '') {
+ let errorData = {}
+ if(!this.isNumber(errorArray[i].trim().substring(1, 2))){
+ continue
+ }
+ let index = errorDataRow.indexOf(errorArray[i].trim().substring(1, 2));
+ if (index == -1) {
+ errorData.errorRow = errorArray[i].trim().substring(1, 2);
+ errorDataRow.push(errorData.errorRow);
+ errorData.errorInfo = errorArray[i].trim().substring(5,errorArray[i].trim().length).replace('=','');
+ errorDatas.push(errorData);
+ } else {
+ errorDatas[index].errorInfo += '; ' + errorArray[i].trim().substring(5,errorArray[i].trim().length);
+ }
+ }
+ }
+ var fileContentData = component.get("v.fileContentData").split('\n');
+ let errorColumns = [
+ { label: '閿欒琛�', fieldName: 'errorRow', type: 'text', hideDefaultActions: true, initialWidth: 100 },
+ { label: '閿欒淇℃伅', fieldName: 'errorInfo', type: 'text', hideDefaultActions: true, initialWidth: 300, wrapText: true }
+ ];
+ for (var i = 0; i < fileContentData[0].split(',').length; i++) {
+ errorColumns.push({
+ label: fileContentData[0].split(',')[i],
+ fieldName: 'field' + i,
+ type: 'text',
+ hideDefaultActions: true,
+ wrapText: true,
+ initialWidth: 120
+ });
+ }
+
+ for (var i = 0; i < errorDatas.length; i++) {
+ let data = fileContentData[errorDatas[i].errorRow];
+ console.log('data = ' + JSON.stringify(data));
+ for (var j = 0; j < data.split(',').length; j++) {
+ let label = 'field' + j;
+ errorDatas[i][label] = data.split(',')[j];
+ }
+ }
+ console.log('errorDatas =' + JSON.stringify(errorDatas))
+ component.set('v.errorColumns', errorColumns);
+ component.set('v.errorData', errorDatas);
+ component.set("v.showErrorInfo", true);
+
+
+
+ console.log('error = ' + error);
+ component.set('v.errorMessage', error);
+
+ this.error(error);
+ console.log('error='+error);
+ component.set('v.login',false);
+ return;
+ }
+
+ console.log('fileStr='+fileStr);
+ $A.getCallback(function(){
+ debugger
+ helper.ImportMethod(component,fileStr);
+ })();
+
+ },
+ convertArrayOfObjectsToCSV : function(component,objectRecords){
+ var csvStringResult, counter, keys, columnDivider, lineDivider,thkeys;
+ if (objectRecords == null || !objectRecords.length) {
+ return null;
+ }
+ columnDivider = ',';
+ lineDivider = '\n';
+ //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start ,'SupportNeeds__c' ,'鏀彺闇�姹�'
+ keys = ['Submit_date__c','Person_In_Charge2__c','Report_Date__c','Agency_Hospital__c','Department_Cateogy__c','doctor2__c','visitor_title__c','Product_Category1__c','Product_Category2__c','Product_Category3__c','Purpose_Type__c','Result__c','SupportNeeds__c'];
+ thkeys = ['鍛�','鎷呭綋','娲诲姩鏃�','鍖婚櫌','绉戝','鎷滆浜�','鑱屼綅','浜у搧鍖哄垎1','浜у搧鍖哄垎2','浜у搧鍖哄垎3','娲诲姩鍖哄垎','缁撴灉','鏀彺闇�姹�']
+ csvStringResult = '';
+ csvStringResult += thkeys.join(columnDivider);
+ csvStringResult += lineDivider;
+ console.log("杩涘叆瀵煎嚭helper");
+ for(var i=0; i < objectRecords.length; i++){
+ counter = 0;
+ for(var sTempkey in keys) {
+ var skey = keys[sTempkey];
+ if(counter > 0){
+ csvStringResult += columnDivider;
+ }
+ if(typeof objectRecords[i][skey] === "undefined"){
+ csvStringResult += '"'+''+'"';
+ continue;
+ }
+ if(skey == 'Person_In_Charge2__c'){
+ csvStringResult += '"'+ objectRecords[i].Person_In_Charge2__r.Name+'"';
+ }else if(skey == 'Agency_Hospital__c'){
+ csvStringResult += '"'+ objectRecords[i].Agency_Hospital__r.Name+'"';
+ }else if(skey == 'doctor2__c'){
+ csvStringResult += '"'+ objectRecords[i].doctor2__r.Name+'"';
+ }else if(skey == 'Product_Category1__c'){
+ csvStringResult += '"'+ objectRecords[i].Product_Category1__r.Name+'"';
+ }else if(skey == 'Product_Category2__c'){
+ csvStringResult += '"'+ objectRecords[i].Product_Category2__r.Name+'"';
+ }else if(skey == 'Product_Category3__c'){
+ csvStringResult += '"'+ objectRecords[i].Product_Category3__r.Name+'"';
+ }
+ else if(skey == 'SupportNeeds__c'){//SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
+ csvStringResult += '"'+ objectRecords[i].SupportNeeds__c+'"';
+ }
+ else{
+ csvStringResult += '"'+ objectRecords[i][skey]+'"';
+ }
+ counter++;
+
+ } // inner for loop close
+ console.log("瀵煎嚭寰幆缁撴潫");
+ csvStringResult += lineDivider;
+ }// outer main for loop close
+
+ // return the CSV formate String
+ return csvStringResult;
+ },
+ showExportDate : function(component,objectRecords){
+ console.log('杩涘叆showexceportdate'+objectRecords);//SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start ,'SupportNeeds__c' ,'鏀彺闇�姹�'
+ var keys = ['Submit_date__c','Person_In_Charge2__c','Report_Date__c','Agency_Hospital__c','Department_Cateogy__c','doctor2__c','visitor_title__c','Product_Category1__c','Product_Category2__c','Product_Category3__c','Purpose_Type__c','Result__c','SupportNeeds__c'];
+ var headers = ['鍛�','鎷呭綋','娲诲姩鏃�','鍖婚櫌','绉戝','鎷滆浜�','鑱屼綅','浜у搧鍖哄垎1','浜у搧鍖哄垎2','浜у搧鍖哄垎3','娲诲姩鍖哄垎','缁撴灉','鏀彺闇�姹�']
+ var content = "<table class=\"table slds-table slds-table--bordered slds-table--cell-buffer\">";
+ content += "<thead><tr class=\"slds-text-title--caps\">";
+ for(i=0;i<headers.length; i++){
+ content += '<th scope=\"col"\>'+headers[i]+'</th>';
+ }
+ content += "</tr></thead>";
+ for(var i=0; i < objectRecords.length; i++){
+ console.log('for'+content);
+ content += '<tr>';
+ // content += '<td>'+(i+1)+'</td>';
+ for(var sTempkey in keys) {
+ console.log('for1'+sTempkey);
+ var skey = keys[sTempkey];
+ if(typeof objectRecords[i][skey] === "undefined"){
+ content += '<td>'+''+'</td>';
+ continue;
+ }
+ console.log('for2'+objectRecords[i].Person_In_Charge2__r.Name);
+ if(skey == 'Person_In_Charge2__c'){
+ content += '<td>'+ objectRecords[i].Person_In_Charge2__r.Name+'</td>';
+ }else if(skey == 'Agency_Hospital__c'){
+ content += '<td>'+ objectRecords[i].Agency_Hospital__r.Name+'</td>';
+ }else if(skey == 'doctor2__c'){
+ content += '<td>'+ objectRecords[i].doctor2__r.Name+'</td>';
+ }else if(skey == 'Product_Category1__c'){
+ content += '<td>'+ objectRecords[i].Product_Category1__r.Name+'</td>';
+ }else if(skey == 'Product_Category2__c'){
+ content += '<td>'+ objectRecords[i].Product_Category2__r.Name+'</td>';
+ }else if(skey == 'Product_Category3__c'){
+ content += '<td>'+ objectRecords[i].Product_Category3__r.Name+'</td>';
+ }
+ else if(skey == 'SupportNeeds__c'){//SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
+ content += '<td>'+ objectRecords[i].SupportNeeds__c+'</td>';
+ }
+ else{
+ content += '<td>'+ objectRecords[i][skey]+'</td>';
+ }
+ } // inner for loop close
+ content += '</tr>'
+ }// outer main for loop close
+ content += '</table>';
+ console.log("helper寰幆缁撴潫"+content);
+ component.set("v.TableContent2",content);
+ component.set("v.showMain",false);
+ },
+
+ select_repores_date : function(component,event,helper){
+ component.set('v.login',true);
+ var reportsdate1 = component.find('input-report-date1').get('v.value');
+ var reportsdate2 = component.find('input-report-date2').get('v.value');
+ console.log('杈撳叆鐨勫紑濮嬫棩鏈�'+reportsdate1+'杈撳叆鐨勭粨鏉熸棩鏈�'+reportsdate2);
+ var action = component.get("c.getReportsByDate");
+ console.log('杈撳叆鐨勫紑濮嬫棩鏈�1');
+ action.setParams({
+ date1 : reportsdate1,
+ date2: reportsdate2
+ });
+ console.log('杈撳叆鐨勫紑濮嬫棩鏈�2');
+ action.setCallback(this, function(response) {
+ var state = response.getState();
+ if (state === "SUCCESS") {
+
+ var res = response.getReturnValue();
+ console.log('杈撳叆鐨勫紑濮嬫棩鏈�3'+res);
+ component.set('v.login',false);
+
+ // PI 鏀归�� By Bright 20220328
+ if(true){
+ let awsids = [];
+ for (let ri in res) {
+ if(res[ri] && res[ri].doctor2__r && res[ri].doctor2__r.AWS_Data_Id__c){
+ awsids.push(res[ri].doctor2__r.AWS_Data_Id__c);
+ }
+ }
+ if(awsids.length > 0){
+ let awsurl = component.get('v.awsurl');
+
+ AWSService.search(awsurl.searchUrl,{
+ dataIds:awsids
+ }, function(data){
+ if(data && data.object && data.object.length){
+ let m = {};
+ for(let di in data.object){
+ if(data.object[di] && data.object[di].dataId){
+ m[data.object[di].dataId] = data.object[di];
+ }
+ }
+
+ for(let ri in res){
+ if(res[ri] && res[ri].doctor2__r && res[ri].doctor2__r.AWS_Data_Id__c && m.hasOwnProperty(res[ri].doctor2__r.AWS_Data_Id__c)){
+ res[ri].doctor2__r.Name = m[res[ri].doctor2__r.AWS_Data_Id__c].name;
+ res[ri].visitor_title__c = m[res[ri].doctor2__r.AWS_Data_Id__c].doctorDivision1;
+
+ }
+ }
+ }
+ helper.showExportDate(component, res);
+
+ component.set('v.login', false);
+ }, awsurl.token);
+ }else{
+ helper.showExportDate(component, res);
+ }
+ }
+
+
+ component.set('v.reports_date', res);
+
+ }else{
+ alert('瀵煎嚭澶辫触,璇锋鏌ユ椿鍔ㄦ棩');
+ component.set('v.login',false);
+ }
+ });
+ $A.enqueueAction(action);
+
+ },
+
+ showImport : function(component){
+ // console.log('杩涘叆');
+ // component.find('file').click();
+ var modalimport = component.find('modal_import');
+ var modalimportbg = component.find('modal_importbg');
+ $A.util.removeClass(modalimport, 'disp_none');
+ $A.util.removeClass(modalimportbg,'disp_none');
+ },
+
+ showExport : function(component) {
+ var modalimport = component.find('modal_export');
+ var modalimportbg = component.find('modal_exportbg');
+ $A.util.removeClass(modalimport, 'disp_none');
+ $A.util.removeClass(modalimportbg,'disp_none');
+ },
+
+ close_import : function(component){
+ var modalimport = component.find('modal_import');
+ var modalimportbg = component.find('modal_importbg');
+ $A.util.addClass(modalimport, 'disp_none');
+ $A.util.addClass(modalimportbg,'disp_none');
+ },
+
+ close_export : function(component){
+ var modalimport = component.find('modal_export');
+ var modalimportbg = component.find('modal_exportbg');
+ $A.util.addClass(modalimport, 'disp_none');
+ $A.util.addClass(modalimportbg,'disp_none');
+ },
+
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 start
+ CallBackAction : function(component,action_name,para,callback) {
+ var action = component.get("c." + action_name.trimStart().replace("c.",""));
+ if(para){
+ action.setParams(para);
+ }
+ if(callback){
+ action.setCallback(this,function(data){
+ callback(data);
+ });
+ }
+
+ $A.enqueueAction(action);
+ },
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 end
+
+ //zhj 瀵煎嚭閿欒淇℃伅 2023-05-16 start
+ exportErrorInfoHelper: function (component) {
+ var errorData = component.get('v.errorData');
+ var errorColumns = component.get('v.errorColumns');
+
+ var datas = [];
+ let errorColumnsArray = [];
+ for(var i in errorColumns){
+ errorColumnsArray.push(errorColumns[i].label);
+ }
+ datas.push(errorColumnsArray);
+ //datas.push(errorColumns);
+
+ for (var i in errorData) {
+ let data = [];
+ data.push(errorData[i].errorRow)
+ data.push(errorData[i].errorInfo)
+ for(var j = 0 ; j < Object.keys(errorData[i]).length - 2 ; j++){
+ data.push(errorData[i]['field' + j])
+ }
+ datas.push(data);
+ }
+
+ console.log('datas = ' + JSON.stringify(datas));
+ var csv = this.convertToCSV(component, datas);
+ console.log('csv = ' + JSON.stringify(csv))
+ this.downloadCSV(component, csv);
+ },
+
+ convertToCSV: function (component, data) {
+ console.log('enter convertToCSV')
+ console.log('data = ' + data);
+ var csv = '';
+ for (var i = 0; i < data.length; i++) {
+ var row = data[i];
+ console.log('row = ' + JSON.stringify(row));
+ for (var j = 0; j < row.length; j++) {
+ var val = '';
+ val = row[j] === null ? '' : row[j].toString();
+ console.log('val = ' + val);
+ if (val.indexOf(',') !== -1 || val.indexOf('"') !== -1 || val.indexOf('\n') !== -1) {
+ //val = '"' + val.replace(/"/g,'""') + '"';
+ }
+ if (j > 0) {
+ csv += ',';
+ }
+ csv += val;
+ }
+ csv += '\n';
+ }
+ return csv;
+ },
+
+ downloadCSV: function (component, csv) {
+ var link = document.createElement('a');
+ // 璁剧疆瀛楃闆嗗拰鏂囦欢澶�
+ var bom = "\uFEFF";
+ link.href = 'data:text/csv;charset=utf-8,' + encodeURIComponent(bom + csv);
+ link.download = 'data.csv';
+ document.body.appendChild(link);
+ link.click();
+ document.body.removeChild(link);
+ },
+ //zhj 瀵煎嚭閿欒淇℃伅 2023-05-16 end
+
+ // searchAgencyContact : function(res) {
+ // var agencyContacts = [];
+ // for (let idx = 0; idx < res.length; idx++) {
+ // agencyContacts.push(res[idx].awsid);
+ // }
+ // var action = component.get('c.getAWStoken');
+ // action.setCallback(this,function(response){
+ // var state = response.getState();
+ // console.log('state : ' + state);
+ // if(state === 'SUCCESS') {
+ // console.log('get name : ' + action.getName());
+ // }
+ // else if(state === 'INCOMPLETE') {
+ // console.log('incomplete state');
+ // } else if(state === 'ERROR') {
+ // if (errors) {
+ // if (errors[0] && errors[0].message) {
+ // console.log("Error message: " +
+ // errors[0].message);
+ // }
+ // } else {
+ // console.log("Unknown error");
+ // }
+ // }
+ // });
+ // $A.enqueueAction(action);
+ // // var requestSearchPayload = new Map();
+ // // requestSearchPayload.set("dataIds",agencyContacts);
+ // var data = '{"dataIds": ["944233643042144256", "943645353649897473"]}';
+ // var token = 'eyJhbGciOiJIUzUxMiJ9.eyJjcmVhdGVkIjoxNjQ0NzY4MTIwNjc2LCJhcHBpZCI6IjZMeml6Y1JmN2g4eUx4MjgiLCJleHAiOjE2NDk5NTIxMjB9.6vORDP8BRaf_beCt4SEXrl3DEuYZ3owotkUqh27r8YhfmKDDWrv_NpVVpjTPeFjvzlQqaJMcFobZeAmPxpmq2A';
+ // var searchUrl = 'https://52.83.101.205/api/agencycontact/search';
+ // var data = this.search(searchUrl,data,token);
+ // return data;searchUrl,requestSearchPayload,token
+ // },
+})
\ No newline at end of file
diff --git a/force-app/main/default/classes/ArriveGoodsController.cls b/force-app/main/default/classes/ArriveGoodsController.cls
index 41fa019..190bd57 100644
--- a/force-app/main/default/classes/ArriveGoodsController.cls
+++ b/force-app/main/default/classes/ArriveGoodsController.cls
@@ -1,437 +1,379 @@
public without sharing class ArriveGoodsController {
- public String barcode { get; set; }
- public Consumable_order__c coc { get; set; }
- /*****************鐢婚潰琛ㄧずBean******************/
- public List<ConsumableorderdetailsInfo> ConsumableorderdetailsRecords = new List<ConsumableorderdetailsInfo>();
- public List<ConsumableorderdetailsInfo> consumableorderdetailsRecordsUse = new List<ConsumableorderdetailsInfo>();
- public List<ConsumableorderdetailsInfo> consumableInventory { get; set; }
- public List<ConsumableorderdetailsInfo> detailsSummary { get; set; }
- public List<ConsumableorderdetailsInfo> consumableInventoryUse = new List<ConsumableorderdetailsInfo>();
- //鏇存柊鏄庣粏鍙栨秷鏃堕棿
- public List<Consumable_order_details2__c> consumableorderdetails2Cancle = new List<Consumable_order_details2__c>();
- // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 start
- Map<String, Consumable_order_details2__c> orderdetails2trMap = new Map<String, Consumable_order_details2__c>();
- // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 end
- public List<Consumable_order_details2__c> consumableorderdetails2Insert = new List<Consumable_order_details2__c>();
- public List<Consumable_order_details2__c> consumableorderdetails2Nobox = new List<Consumable_order_details2__c>();
- public List<ConsumableorderdetailsInfo> ConsumableorderdetailsRecordserror {
- get;
- set;
- }
- public transient List<ConsumableorderdetailsInfo> ConsumableorderdetailsRecordsdummy {
- get;
- set;
- }
- public List<ConsumableorderdetailsInfo> ShowGoodsofReturnList { get; set; }
- public List<ConsumableorderdetailsInfo> ShowGoodsofRemoveBoxReturnList {
- get;
- set;
- }
- //add by rentx 20210602 CHAN-C3K4ZQ
- public List<List<ConsumableorderdetailsInfo>> consumableorderdetailsRecordsview {
- get;
- set;
- }
- //add by rentx 20210602 CHAN-C3K4ZQ
+ public String barcode { get; set; }
+ public Consumable_order__c coc { get; set; }
+ /*****************鐢婚潰琛ㄧずBean******************/
+ public List<ConsumableorderdetailsInfo> ConsumableorderdetailsRecords = new List<ConsumableorderdetailsInfo>();
+ public List<ConsumableorderdetailsInfo> consumableorderdetailsRecordsUse = new List<ConsumableorderdetailsInfo>();
+ public List<ConsumableorderdetailsInfo> consumableInventory { get; set; }
+ public List<ConsumableorderdetailsInfo> detailsSummary { get; set; }
+ public List<ConsumableorderdetailsInfo> consumableInventoryUse = new List<ConsumableorderdetailsInfo>();
+ //鏇存柊鏄庣粏鍙栨秷鏃堕棿
+ public List<Consumable_order_details2__c> consumableorderdetails2Cancle = new List<Consumable_order_details2__c>();
+ // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 start
+ Map<String,Consumable_order_details2__c> orderdetails2trMap = new Map<String,Consumable_order_details2__c>();
+ // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 end
+ public List<Consumable_order_details2__c> consumableorderdetails2Insert= new List<Consumable_order_details2__c>();
+ public List<Consumable_order_details2__c> consumableorderdetails2Nobox= new List<Consumable_order_details2__c>();
+ public List<ConsumableorderdetailsInfo> ConsumableorderdetailsRecordserror { get; set; }
+ public transient List<ConsumableorderdetailsInfo> ConsumableorderdetailsRecordsdummy { get; set; }
+ public List<ConsumableorderdetailsInfo> ShowGoodsofReturnList{get;set;}
+ public List<ConsumableorderdetailsInfo> ShowGoodsofRemoveBoxReturnList{get;set;}
+ //add by rentx 20210602 CHAN-C3K4ZQ
+ public List<List<ConsumableorderdetailsInfo>> consumableorderdetailsRecordsview { get; set; }
+ //add by rentx 20210602 CHAN-C3K4ZQ
- public List<String> GrList = new List<String>();
- //瓒呭嚭瀹氳揣鏁伴噺鐨勪骇鍝�
- public List<String> cancellationProList = new List<String>();
- //閿欒淇℃伅
- public String alertMessage { get; set; }
- public integer getinventorysize() {
- return consumableInventory.size();
- }
- public integer geterrorsize() {
- return ConsumableorderdetailsRecordserror.size();
- }
- Set<String> noboxBarcodeList = new Set<String>();
- public transient Map<String, String> ExistIdMap = new Map<String, String>();
- public transient Map<String, String> ErrorIdMap = new Map<String, String>();
- public transient Map<String, String> AllMap = new Map<String, String>();
- Map<String, String> otherAgencyMap = new Map<String, String>();
- public transient Map<String, String> barMcodeMap = new Map<String, String>();
- Map<String, Integer> BarcodeCntMap = new Map<String, Integer>();
- //qi
- public transient List<String> BarCodeListP = new List<String>();
+ public List<String> GrList = new List<String>();
+ //瓒呭嚭瀹氳揣鏁伴噺鐨勪骇鍝�
+ public List<String> cancellationProList = new List<String>();
+ //閿欒淇℃伅
+ public String alertMessage {set;get;}
+ public integer getinventorysize(){
+ return consumableInventory.size();
+ }
+ public integer geterrorsize(){
+ return ConsumableorderdetailsRecordserror.size();
+ }
+ Set<String> noboxBarcodeList = new Set<String>();
+ public transient Map<String, String> ExistIdMap = new Map<String, String>();
+ public transient Map<String, String> ErrorIdMap = new Map<String, String>();
+ public transient Map<String, String> AllMap = new Map<String, String>();
+ Map<String, String> otherAgencyMap = new Map<String, String>();
+ public transient Map<String, String> barMcodeMap = new Map<String, String>();
+ Map<String, Integer> BarcodeCntMap = new Map<String, Integer>();
+ //qi
+ public transient List<String> BarCodeListP = new List<String>();
- // public transient Map<String, String> OrderAllMap = new Map<String, String>();
- Map<String, Decimal> orderProductCunMap = new Map<String, Decimal>();
- Map<String, Decimal> orderProductArrivedCunMap = new Map<String, Decimal>();
- Map<String, Decimal> orderWantArriveCunMap = new Map<String, Decimal>();
- //瓒呭嚭鍨嬪彿鍜屾暟閲�
- Map<String, Decimal> overOrderCunMap = new Map<String, Decimal>();
- //瓒呭嚭BARCODE鍜屽瀷鍙�
- Map<String, List<String>> overOrderBARcodeCunMap = new Map<String, List<String>>();
- list<String> overOrderBARcodeTTTTTT = new List<String>();
+ // public transient Map<String, String> OrderAllMap = new Map<String, String>();
+ Map<String, Decimal> orderProductCunMap = new Map<String, Decimal>();
+ Map<String, Decimal> orderProductArrivedCunMap = new Map<String, Decimal>();
+ Map<String, Decimal> orderWantArriveCunMap = new Map<String, Decimal>();
+ //瓒呭嚭鍨嬪彿鍜屾暟閲�
+ Map<String, Decimal> overOrderCunMap = new Map<String, Decimal>();
+ //瓒呭嚭BARCODE鍜屽瀷鍙�
+ Map<String, List<String>> overOrderBARcodeCunMap = new Map<String, List<String>>();
+ list<String> overOrderBARcodeTTTTTT = new list<String>();
- //涓嶇鍚堢殑barcode鍜屽瀷鍙�
- Map<String, List<String>> notEqualBARcodeCunMap = new Map<String, List<String>>();
- list<String> overOrderBARcodeSSSSSS = new List<String>();
- list<String> productList = new List<String>();
- list<String> notInlist = new List<String>();
- //涓嶉�夋嫨璁㈠崟鏃朵繚瀛樿鍗旾D銆佷骇鍝佸瀷鍙风敤
- //List<String> orderId = new List<String>();
- //List<String> prodName = new List<String>();
- //搴撳瓨鐧诲綍浣跨敤
- list<String> notInStorelist = new List<String>();
- list<String> exitBarCodeList = new List<String>();
+ //涓嶇鍚堢殑barcode鍜屽瀷鍙�
+ Map<String, List<String>> notEqualBARcodeCunMap = new Map<String, List<String>>();
+ list<String> overOrderBARcodeSSSSSS = new list<String>();
+ list<String> productList = new list<String>();
+ list<String> notInlist = new list<String>();
+ //涓嶉�夋嫨璁㈠崟鏃朵繚瀛樿鍗旾D銆佷骇鍝佸瀷鍙风敤
+ //List<String> orderId = new List<String>();
+ //List<String> prodName = new List<String>();
+ //搴撳瓨鐧诲綍浣跨敤
+ list<String> notInStorelist = new list<String>();
+ list<String> exitBarCodeList = new list<String>();
- // Map<String, Consumable_order_details2__c> reallMap = new Map<String, Consumable_order_details2__c>();
- Map<String, String> HosErrorMap = new Map<String, String>();
- List<String> HosErrorList = new List<String>();
- public String baseUrl { get; private set; }
- public String ESetId { get; set; }
- public String arriveId = '';
- private String accountid = null;
- private String accountName = null;
- //public String[] proidList =new String[]{};
- public Decimal orderCountAll = 0;
- public Decimal orderCountNotarrive = 0;
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- public id return_Order_id = null;
- public id inventory_Order_id = null;
- public boolean ReturnFLGbln { get; set; }
- public boolean saveFLGbln { get; set; }
- public String ArrType { get; set; }
- // 鐧诲綍鑰呭伐浣滃湴
- private String userWorkLocation;
- //鐢ㄦ埛浜у搧鍖哄垎
- public String userPro_Typestr = null;
- public String userPro_Type = null;
- public String product_Type = null;
- public Boolean EngFlag = false;
- public Boolean ETFlag = false;
-
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- public Boolean isLwc = false;
- public String returnError;
- public List<String> warningList;
- public List<String> errorList;
- public String urlType;
-
- public ArriveGoodsController() {
- baseUrl = URL.getSalesforceBaseUrl().toExternalForm();
- ESetId = ApexPages.currentPage().getParameters().get('esetId');
- ArrType = ApexPages.currentPage().getParameters().get('ArrType');
- ConsumableorderdetailsRecords = new List<ConsumableorderdetailsInfo>();
- ConsumableorderdetailsRecordserror = new List<ConsumableorderdetailsInfo>();
- ConsumableorderdetailsRecordsdummy = new List<ConsumableorderdetailsInfo>();
- consumableInventory = new List<ConsumableorderdetailsInfo>();
- consumableorderdetailsRecordsUse = new List<ConsumableorderdetailsInfo>();
- consumableInventoryUse = new List<ConsumableorderdetailsInfo>();
- consumableorderdetails2Cancle = new List<Consumable_order_details2__c>();
- orderdetails2trMap = new Map<String, Consumable_order_details2__c>();
- detailsSummary = new List<ConsumableorderdetailsInfo>();
- saveFLGbln = false;
- //overOrderBARcodeTTTTTT.add('');
- //add by rentx 20210602 CHAN-C3K4ZQ start
- consumableorderdetailsRecordsview = new List<List<ConsumableorderdetailsInfo>>();
- //add by rentx 20210602 CHAN-C3K4ZQ end
- // OrderAllMap = new Map<String, String>();
- }
-
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- public ArriveGoodsController(String eSetId, String arrType) {
- this.ESetId = eSetId;
- this.ArrType = arrType;
- ConsumableorderdetailsRecords = new List<ConsumableorderdetailsInfo>();
- ConsumableorderdetailsRecordserror = new List<ConsumableorderdetailsInfo>();
- ConsumableorderdetailsRecordsdummy = new List<ConsumableorderdetailsInfo>();
- consumableInventory = new List<ConsumableorderdetailsInfo>();
- consumableorderdetailsRecordsUse = new List<ConsumableorderdetailsInfo>();
- consumableInventoryUse = new List<ConsumableorderdetailsInfo>();
- consumableorderdetails2Cancle = new List<Consumable_order_details2__c>();
- orderdetails2trMap = new Map<String, Consumable_order_details2__c>();
- detailsSummary = new List<ConsumableorderdetailsInfo>();
- saveFLGbln = false;
- consumableorderdetailsRecordsview = new List<List<ConsumableorderdetailsInfo>>();
- noboxBarcodeList = new Set<String>();
+ // Map<String, Consumable_order_details2__c> reallMap = new Map<String, Consumable_order_details2__c>();
+ Map<String,String> HosErrorMap = new Map<String,String>();
+ List<String> HosErrorList = new List<String>();
+ public String baseUrl {get;private set;}
+ public String ESetId { get; set; }
+ public String arriveId = '';
+ private String accountid = null;
+ private String accountName = null;
+ //public String[] proidList =new String[]{};
+ public Decimal orderCountAll = 0;
+ public Decimal orderCountNotarrive = 0;
//LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- warningList = new List<String>();
- errorList = new List<String>();
- returnError = null;
- urlType = null;
- }
+ public id return_Order_id = null;
+ public id inventory_Order_id = null;
+ public boolean ReturnFLGbln {get;set;}
+ public boolean saveFLGbln {get;set;}
+ public String ArrType{get;set;}
+ // 鐧诲綍鑰呭伐浣滃湴
+ private String userWorkLocation;
- //add by rentx 20210602 CHAN-C3K4ZQ start 鍑洪敊鐨勫師鍥犳槸椤甸潰鏈�澶氬睍绀�1000鏉℃暟鎹�,浣嗘槸闇�瑕佸睍绀虹殑鏁版嵁瓒呰繃浜�1000鏉�,鐜板湪鎶婂睍绀轰笂绾挎敼涓�1000 * 1000
- public void makeRecordsView(List<ConsumableorderdetailsInfo> recordsdummy) {
- consumableorderdetailsRecordsview = new List<List<ConsumableorderdetailsInfo>>();
+ //鐢ㄦ埛浜у搧鍖哄垎
+ public String userPro_Typestr = null;
+ public String userPro_Type = null;
+ public String product_Type = null;
+ public Boolean EngFlag = false;
+ public Boolean ETFlag = false;
- if (recordsdummy.size() > 1000) {
- List<ConsumableorderdetailsInfo> ConsumableorderdetailsRecordsbreak = new List<ConsumableorderdetailsInfo>();
- List<ConsumableorderdetailsInfo> ConsumableorderdetailsRecordsbreakover = new List<ConsumableorderdetailsInfo>();
- ConsumableorderdetailsInfo c = null;
- ConsumableorderdetailsRecordsbreak.clear();
- ConsumableorderdetailsRecordsbreakover.clear();
- consumableorderdetailsRecordsview.clear();
- //閫夋嫨浜у搧view
- ConsumableorderdetailsRecordsbreak = new List<ConsumableorderdetailsInfo>();
- ConsumableorderdetailsRecordsbreakover = new List<ConsumableorderdetailsInfo>();
- if (recordsdummy.size() > 1000) {
- for (Integer i = 0; i < recordsdummy.size(); i++) {
- if (i < 1000) {
- c = recordsdummy.get(i);
- ConsumableorderdetailsRecordsbreak.add(c);
- } else {
- c = recordsdummy.get(i);
- ConsumableorderdetailsRecordsbreakover.add(c);
- }
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ public Boolean isLwc = false;
+ public String returnError;
+ public List<String> warningList;
+ public List<String> errorList;
+ public String urlType;
+
+ public ArriveGoodsController(){
+ baseUrl = URL.getSalesforceBaseUrl().toExternalForm();
+ ESetId = ApexPages.currentPage().getParameters().get('esetId');
+ ArrType = ApexPages.currentPage().getParameters().get('ArrType');
+ ConsumableorderdetailsRecords = new List<ConsumableorderdetailsInfo>();
+ ConsumableorderdetailsRecordserror = new List<ConsumableorderdetailsInfo>();
+ ConsumableorderdetailsRecordsdummy = new List<ConsumableorderdetailsInfo>();
+ consumableInventory = new List<ConsumableorderdetailsInfo>();
+ consumableorderdetailsRecordsUse = new List<ConsumableorderdetailsInfo>();
+ consumableInventoryUse = new List<ConsumableorderdetailsInfo>();
+ consumableorderdetails2Cancle = new List<Consumable_order_details2__c>();
+ orderdetails2trMap = new Map<String,Consumable_order_details2__c>();
+ detailsSummary = new List<ConsumableorderdetailsInfo>();
+ saveFLGbln = FALSE;
+ //overOrderBARcodeTTTTTT.add('');
+ //add by rentx 20210602 CHAN-C3K4ZQ start
+ consumableorderdetailsRecordsview = new List<List<ConsumableorderdetailsInfo>>();
+ //add by rentx 20210602 CHAN-C3K4ZQ end
+ // OrderAllMap = new Map<String, String>();
+ }
+
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ public ArriveGoodsController(String eSetId, String arrType){
+ this.ESetId = eSetId;
+ this.ArrType = arrType;
+ ConsumableorderdetailsRecords = new List<ConsumableorderdetailsInfo>();
+ ConsumableorderdetailsRecordserror = new List<ConsumableorderdetailsInfo>();
+ ConsumableorderdetailsRecordsdummy = new List<ConsumableorderdetailsInfo>();
+ consumableInventory = new List<ConsumableorderdetailsInfo>();
+ consumableorderdetailsRecordsUse = new List<ConsumableorderdetailsInfo>();
+ consumableInventoryUse = new List<ConsumableorderdetailsInfo>();
+ consumableorderdetails2Cancle = new List<Consumable_order_details2__c>();
+ orderdetails2trMap = new Map<String,Consumable_order_details2__c>();
+ detailsSummary = new List<ConsumableorderdetailsInfo>();
+ saveFLGbln = FALSE;
+ consumableorderdetailsRecordsview = new List<List<ConsumableorderdetailsInfo>>();
+ noboxBarcodeList = new Set<String>();
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ warningList = new List<String>();
+ errorList = new List<String>();
+ returnError = null;
+ urlType = null;
+ }
+
+ //add by rentx 20210602 CHAN-C3K4ZQ start 鍑洪敊鐨勫師鍥犳槸椤甸潰鏈�澶氬睍绀�1000鏉℃暟鎹�,浣嗘槸闇�瑕佸睍绀虹殑鏁版嵁瓒呰繃浜�1000鏉�,鐜板湪鎶婂睍绀轰笂绾挎敼涓�1000 * 1000
+ public void makeRecordsView(List<ConsumableorderdetailsInfo> recordsdummy){
+ consumableorderdetailsRecordsview = new List<List<ConsumableorderdetailsInfo>>();
+
+ if(recordsdummy.size() > 1000){
+ List<ConsumableorderdetailsInfo> ConsumableorderdetailsRecordsbreak = new List<ConsumableorderdetailsInfo>();
+ List<ConsumableorderdetailsInfo> ConsumableorderdetailsRecordsbreakover = new List<ConsumableorderdetailsInfo>();
+ ConsumableorderdetailsInfo c = null;
+ ConsumableorderdetailsRecordsbreak.clear();
+ ConsumableorderdetailsRecordsbreakover.clear();
+ consumableorderdetailsRecordsview.clear();
+ //閫夋嫨浜у搧view
+ ConsumableorderdetailsRecordsbreak = new List<ConsumableorderdetailsInfo>();
+ ConsumableorderdetailsRecordsbreakover = new List<ConsumableorderdetailsInfo>();
+ if(recordsdummy.size() > 1000){
+ for(Integer i = 0; i < recordsdummy.size(); i++){
+ if(i < 1000){
+ c = recordsdummy.get(i);
+ ConsumableorderdetailsRecordsbreak.add(c);
+ }else{
+ c = recordsdummy.get(i);
+ ConsumableorderdetailsRecordsbreakover.add(c);
+ }
+ }
+ consumableorderdetailsRecordsview.add(ConsumableorderdetailsRecordsbreak);
+ consumableorderdetailsRecordsview.add(ConsumableorderdetailsRecordsbreakover);
+ }else{
+ consumableorderdetailsRecordsview.add(recordsdummy);
+ }
+
+ // Integer count = recordsdummy.size() / 1000;
+ // Integer last = recordsdummy.size() - (1000*count);
+
+ // for(Integer i = 0; i < count ; i++){
+ // List<ConsumableorderdetailsInfo> tempList = new List<ConsumableorderdetailsInfo>();
+ // for(Integer j=0; j < 1000; j++){
+ // tempList.add(recordsdummy.get(i * count + j ));
+ // // itemList.add(resList.get(i*count+j));
+ // }
+ // consumableorderdetailsRecordsview.add(tempList);
+ // }
+ // if (last > 0) {
+ // List<ConsumableorderdetailsInfo> tempList = new List<ConsumableorderdetailsInfo>();
+ // for(Integer j=0; j < last; j++){
+ // tempList.add(recordsdummy.get(count * 1000 + j ));
+ // // itemList.add(resList.get(i*count+j));
+ // }
+ // consumableorderdetailsRecordsview.add(tempList);
+ // }
+ }else{
+ consumableorderdetailsRecordsview.add(recordsdummy);
}
- consumableorderdetailsRecordsview.add(
- ConsumableorderdetailsRecordsbreak
- );
- consumableorderdetailsRecordsview.add(
- ConsumableorderdetailsRecordsbreakover
- );
- } else {
- consumableorderdetailsRecordsview.add(recordsdummy);
- }
-
- // Integer count = recordsdummy.size() / 1000;
- // Integer last = recordsdummy.size() - (1000*count);
-
- // for(Integer i = 0; i < count ; i++){
- // List<ConsumableorderdetailsInfo> tempList = new List<ConsumableorderdetailsInfo>();
- // for(Integer j=0; j < 1000; j++){
- // tempList.add(recordsdummy.get(i * count + j ));
- // // itemList.add(resList.get(i*count+j));
- // }
- // consumableorderdetailsRecordsview.add(tempList);
- // }
- // if (last > 0) {
- // List<ConsumableorderdetailsInfo> tempList = new List<ConsumableorderdetailsInfo>();
- // for(Integer j=0; j < last; j++){
- // tempList.add(recordsdummy.get(count * 1000 + j ));
- // // itemList.add(resList.get(i*count+j));
- // }
- // consumableorderdetailsRecordsview.add(tempList);
- // }
- } else {
- consumableorderdetailsRecordsview.add(recordsdummy);
}
- }
- //add by rentx 20210602 CHAN-C3K4ZQ end
- public void init() {
- // String userId = '00510000007cthP';
- String userId = UserInfo.getUserId();
- List<user> Useracc = new List<user>();
- Useracc = [
- SELECT accountid, Work_Location__c, UserPro_Type__c
- FROM user
- WHERE id = :userId
- ];
- accountid = Useracc[0].accountid;
- //--------AddStart-----XHL--------------20181008-------------
- userPro_Type = Useracc[0].UserPro_Type__c;
- if (String.isBlank(userPro_Type)) {
- userPro_Type = 'ET';
- }
-
- if (userPro_Type == 'ENG') {
- product_Type = 'ET';
- EngFlag = true;
- } else {
- product_Type = 'ENG';
- ETFlag = true;
- }
- userPro_Typestr = '%' + userPro_Type + '%';
- //--------AddEnd-----XHL--------------20181008-------------
- userWorkLocation = Useracc[0].Work_Location__c;
- system.debug('userWorkLocation' + userWorkLocation);
- List<account> accountInfo = [
- SELECT Name
- FROM account
- WHERE id = :accountid
- ];
- accountName = accountInfo[0].Name;
- system.debug('accountName' + accountName);
- coc = new Consumable_order__c();
- if (ArrType == 'ReG') {
- ReturnFLGbln = true;
- } else {
- ReturnFLGbln = false;
- }
- if (ESetId != '' && ESetId != null) {
- List<Consumable_order__c> qs = new List<Consumable_order__c>();
- List<Consumable_order_details2__c> reSet1 = new List<Consumable_order_details2__c>();
- List<Consumable_Orderdetails__c> reSet = new List<Consumable_Orderdetails__c>();
- qs = [
- SELECT
- Id,
- Name,
- Order_status__c,
- Dealer_Info__c,
- Deliver_date__c,
- ReturnGs_Upload_Date__c,
- Order_Reason__c,
- Order_date__c,
- Contract_application_decision__c,
- Order_type__c,
- Total_num__c,
- OrderNumber_arrived__c,
- Delivery_detail_count__c,
- OrderNumber_notarrive__c,
- orderPattern__c
- FROM Consumable_order__c
- WHERE
- Id = :ESetId
- AND Order_Owner_WorkLocal__c = :userWorkLocation
- AND Dealer_Info__c = :accountid
- ];
- if (qs.size() > 0) {
- coc = qs[0];
- orderCountAll = coc.Total_num__c;
- orderCountNotarrive = coc.OrderNumber_notarrive__c;
- }
- //浜у搧瀹氳揣鏁伴噺
- reSet = [
- SELECT Asset_Model_No__c, Consumable_order__c, Consumable_count__c
- FROM Consumable_Orderdetails__c
- WHERE
- Consumable_order__c = :ESetId
- AND Order_Owner_WorkLocal__c = :userWorkLocation
- ];
- for (Integer i = 0; i < reSet.size(); i++) {
- productList.add(reSet[i].Asset_Model_No__c);
- orderProductCunMap.put(
- reSet[i].Asset_Model_No__c,
- reSet[i].Consumable_count__c
- );
- orderProductArrivedCunMap.put(reSet[i].Asset_Model_No__c, 0);
- orderWantArriveCunMap.put(reSet[i].Asset_Model_No__c, 0);
- overOrderCunMap.put(reSet[i].Asset_Model_No__c, 0);
- overOrderBARcodeCunMap.put(
- reSet[i].Asset_Model_No__c,
- overOrderBARcodeTTTTTT
- );
- //overOrderCunMap.put(reSet[i].Asset_Model_No__c,0);
- }
- //
- reSet1 = [
- SELECT
- Id,
- Name,
- Intra_Trade_List_RMB__c,
- Asset_Model_No__c,
- Consumable_Product__c,
- Consumable_Product__r.Name,
- Consumable_Product__r.Name__c,
- Sterilization_limit__c,
- Deliver_date__c,
- Bar_Code__c,
- Arrive_date__c,
- Send_Date__c,
- Consumable_order_minor__r.Name,
- Consumable_order_minor__c,
- Dealer_Arrive__c,
- Guarantee_period_for_products__c,
- CFDA_Status__c,
- Box_Piece__c,
- Rrturn_count__c,
- ProductPacking_list_manual__c,
- Report_Product_Approbation__c,
- Report_Product_Expiration__c,
- //add by rentx 2020-10-14 start
- ContractNo_text__c /*,ContractNo__c1*/,
- // tcm start
- Consumable_order_minor__r.ContractNo__c
- // tcm end
- //add by rentx 2020-10-14 end
- FROM Consumable_order_details2__c
- WHERE
- recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery
- AND Arrive_Owner_Work_Location__c = :userWorkLocation
- AND Consumable_order_minor__c = :ESetId
- AND Dealer_Arrive__c = TRUE
- AND Box_Piece__c != '涓�'
- ];
- for (Integer i = 0; i < reSet1.size(); i++) {
- // OrderAllMap.put(reSet1[i].Bar_Code__c,reSet1[i].Bar_Code__c);
- //init鐨勬椂鍊欎笉灞曠ず宸茬粡鍏ュ簱鐨勬槑缁� by rentx 20210617 CHAN-C3K4ZQ
- // ConsumableorderdetailsRecordsdummy.add(new ConsumableorderdetailsInfo(reSet1[i]));
- //update by rentx 20210617 end CHAN-C3K4ZQ
- if (
- orderProductArrivedCunMap.containsKey(reSet1[i].Asset_Model_No__c)
- ) {
- orderProductArrivedCunMap.put(
- reSet1[i].Asset_Model_No__c,
- orderProductArrivedCunMap.get(reSet1[i].Asset_Model_No__c) + 1
- );
+ //add by rentx 20210602 CHAN-C3K4ZQ end
+ public void init() {
+ // String userId = '00510000007cthP';
+ String userId = UserInfo.getUserId();
+ List<user> Useracc = New List<user>();
+ Useracc = [SELECT accountid, Work_Location__c,UserPro_Type__c FROM user WHERE id =:userId];
+ accountid = Useracc[0].accountid;
+ //--------AddStart-----XHL--------------20181008-------------
+ userPro_Type = Useracc[0].UserPro_Type__c;
+ if(String.isBlank(userPro_Type)){
+ userPro_Type = 'ET';
}
- }
- //add by rentx 20210602 start CHAN-C3K4ZQ
- // makeRecordsView(ConsumableorderdetailsRecordsdummy);
- //add by rentx 20210602 end CHAN-C3K4ZQ
- }
- }
- //========20160311======ADD_Start================================
- // 灏嗛〉闈㈡垨鍙栧緱BarCode鍘绘帀閲嶅鐨勶紝杞崲鎴怢ist
- //========20160311======ADD_Start================================
- public List<String> ParseBarCode(String Code) {
- String[] Cache = new List<String>{};
- Cache = Code.split('\n');
- Set<String> Buff = new Set<String>();
- for (String A : Cache) {
- Buff.add(A.toUpperCase());
- }
- List<String> outPut = new List<String>();
- for (String B : Buff) {
- B = B.trim();
- if (B.length() > 8) {
- String tracingCode = B.substring(B.length() - 5, B.length());
- barMcodeMap.put(B, tracingCode);
- }
- outPut.add(B);
- }
- system.debug('barMcodeMap绛変簬' + barMcodeMap);
- return outPut;
- }
- //========20160311======ADD_End==================================
- //鑾峰彇鏄庣粏
- public void SearchPro() {
- //浠庝笅杈圭Щ涓婃潵 by Link 2023-5-23
- if (barcode == null || barcode.trim() == '') {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- returnError = '璇疯緭鍏arCode鍙�';
- } else {
- ApexPages.addmessage(
- new ApexPages.message(ApexPages.severity.INFO, '璇疯緭鍏arCode鍙枫��')
- );
- }
- return;
+ if(userPro_Type == 'ENG'){
+ product_Type = 'ET';
+ EngFlag = true;
+ }else{
+ product_Type = 'ENG';
+ ETFlag = true;
+ }
+ userPro_Typestr = '%' + userPro_Type + '%';
+ //--------AddEnd-----XHL--------------20181008-------------
+ userWorkLocation = Useracc[0].Work_Location__c;
+ system.debug('userWorkLocation'+ userWorkLocation);
+ List<account> accountInfo = [SELECT Name FROM account WHERE id =:accountid];
+ accountName = accountInfo[0].Name;
+ system.debug('accountName'+ accountName);
+ coc = new Consumable_order__c();
+ if(ArrType=='ReG'){
+ ReturnFLGbln = true;
+ }else{
+ ReturnFLGbln = false;
+ }
+ if(ESetId != '' && ESetId !=null){
+ List<Consumable_order__c> qs = New List<Consumable_order__c>();
+ List<Consumable_order_details2__c> reSet1 = New List<Consumable_order_details2__c>();
+ List<Consumable_Orderdetails__c> reSet = New List<Consumable_Orderdetails__c>();
+ qs = [SELECT Id,Name,Order_status__c,Dealer_Info__c,Deliver_date__c,ReturnGs_Upload_Date__c,
+ Order_Reason__c,Order_date__c,
+ Contract_application_decision__c,Order_type__c,Total_num__c,
+ OrderNumber_arrived__c,Delivery_detail_count__c,OrderNumber_notarrive__c,orderPattern__c
+ FROM Consumable_order__c
+ WHERE Id =:ESetId AND Order_Owner_WorkLocal__c =: userWorkLocation
+ AND Dealer_Info__c = :accountid];
+ if (qs.size()>0){
+ coc = qs[0];
+ orderCountAll = coc.Total_num__c;
+ orderCountNotarrive = coc.OrderNumber_notarrive__c;
+ }
+ //浜у搧瀹氳揣鏁伴噺
+ reSet = [SELECT Asset_Model_No__c,
+ Consumable_order__c,
+ Consumable_count__c
+ FROM Consumable_Orderdetails__c
+ WHERE Consumable_order__c = :ESetId AND Order_Owner_WorkLocal__c =: userWorkLocation];
+ for (Integer i = 0; i < reSet.size(); i++) {
+ productList.add(reSet[i].Asset_Model_No__c);
+ orderProductCunMap.put(reSet[i].Asset_Model_No__c,reSet[i].Consumable_count__c);
+ orderProductArrivedCunMap.put(reSet[i].Asset_Model_No__c,0);
+ orderWantArriveCunMap.put(reSet[i].Asset_Model_No__c,0);
+ overOrderCunMap.put(reSet[i].Asset_Model_No__c,0);
+ overOrderBARcodeCunMap.put(reSet[i].Asset_Model_No__c,overOrderBARcodeTTTTTT);
+ //overOrderCunMap.put(reSet[i].Asset_Model_No__c,0);
+ }
+ //
+ reSet1 = [SELECT Id,
+ Name,
+ Intra_Trade_List_RMB__c,
+ Asset_Model_No__c,
+ Consumable_Product__c,
+ Consumable_Product__r.Name,
+ Consumable_Product__r.Name__c,
+ Sterilization_limit__c,
+ Deliver_date__c,
+ Bar_Code__c,
+ Arrive_date__c,
+ Send_Date__c,
+ Consumable_order_minor__r.Name,
+ Consumable_order_minor__c,
+ Dealer_Arrive__c,
+ Guarantee_period_for_products__c,
+ CFDA_Status__c,
+ Box_Piece__c,
+ Rrturn_count__c,
+ ProductPacking_list_manual__c,
+ Report_Product_Approbation__c,
+ Report_Product_Expiration__c
+ //add by rentx 2020-10-14 start
+ ,ContractNo_text__c/*,ContractNo__c1*/
+ // tcm start
+ ,Consumable_order_minor__r.ContractNo__c
+ // tcm end
+ //add by rentx 2020-10-14 end
+ FROM Consumable_order_details2__c
+ WHERE recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery
+ AND Arrive_Owner_Work_Location__c = : userWorkLocation
+ AND Consumable_order_minor__c = :ESetId
+ AND Dealer_Arrive__c = true
+ AND Box_Piece__c != '涓�' ];
+ for (Integer i = 0; i < reSet1.size(); i++) {
+ // OrderAllMap.put(reSet1[i].Bar_Code__c,reSet1[i].Bar_Code__c);
+ //init鐨勬椂鍊欎笉灞曠ず宸茬粡鍏ュ簱鐨勬槑缁� by rentx 20210617 CHAN-C3K4ZQ
+ // ConsumableorderdetailsRecordsdummy.add(new ConsumableorderdetailsInfo(reSet1[i]));
+ //update by rentx 20210617 end CHAN-C3K4ZQ
+ if(orderProductArrivedCunMap.containsKey(reSet1[i].Asset_Model_No__c)){
+ orderProductArrivedCunMap.put(reSet1[i].Asset_Model_No__c,orderProductArrivedCunMap.get(reSet1[i].Asset_Model_No__c)+1);
+ }
+ }
+ //add by rentx 20210602 start CHAN-C3K4ZQ
+ // makeRecordsView(ConsumableorderdetailsRecordsdummy);
+ //add by rentx 20210602 end CHAN-C3K4ZQ
+ }
}
- notInlist = new List<String>();
- otherAgencyMap = new Map<String, String>();
- barMcodeMap = new Map<String, String>();
- consumableInventory = new List<ConsumableorderdetailsInfo>();
- consumableInventoryUse = new List<ConsumableorderdetailsInfo>();
- consumableorderdetails2Cancle = new List<Consumable_order_details2__c>();
- orderdetails2trMap = new Map<String, Consumable_order_details2__c>();
- //update by Link 20230428
- if (isLwc) {
- noboxBarcodeList = new Set<String>();
+ //========20160311======ADD_Start================================
+ // 灏嗛〉闈㈡垨鍙栧緱BarCode鍘绘帀閲嶅鐨勶紝杞崲鎴怢ist
+ //========20160311======ADD_Start================================
+ public List<String> ParseBarCode(String Code){
+ String[] Cache = new String[]{};
+ Cache = Code.split('\n');
+ Set <String> Buff = new Set<String>();
+ for(String A : Cache){
+ Buff.add(A.toUpperCase());
+ }
+ List<String> outPut = new List<String>();
+ for(String B :Buff){
+ B = B.trim();
+ if(B.length() > 8){
+ String tracingCode = B.substring(B.length() - 5,B.length());
+ barMcodeMap.put(B,tracingCode);
+ }
+ outPut.add(B);
+ }system.debug('barMcodeMap绛変簬'+barMcodeMap);
+ return outPut;
}
- //add by rentx 2021-01-27 start
- HosErrorList = new List<String>();
- HosErrorMap = new Map<String, String>();
- //add by rentx 2021-01-27 end
- noboxBarcodeList.clear();
- //鍐嶆绱㈤」鐩竻绌�
- ConsumableorderdetailsRecordserror = new List<ConsumableorderdetailsInfo>();
- ErrorIdMap = new Map<String, String>();
- ErrorIdMap.clear();
- AllMap = new Map<String, String>();
- AllMap.clear();
- ExistIdMap = new Map<String, String>();
- ExistIdMap.clear();
- consumableorderdetails2Insert = new List<Consumable_order_details2__c>();
- ConsumableorderdetailsRecordsdummy = new List<ConsumableorderdetailsInfo>();
- /*if(EsetId != null && EsetId != ''){
+
+ //========20160311======ADD_End==================================
+ //鑾峰彇鏄庣粏
+ public void SearchPro() {
+ //浠庝笅杈圭Щ涓婃潵 by Link 2023-5-23
+ if(barcode == null || barcode.trim() ==''){
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ returnError = '璇疯緭鍏arCode鍙�';
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO,'璇疯緭鍏arCode鍙枫��'));
+ }
+ return;
+ }
+ notInlist = new list<String>();
+ otherAgencyMap = new Map<String, String>();
+ barMcodeMap = new Map<String, String>();
+ consumableInventory = new List<ConsumableorderdetailsInfo>();
+ consumableInventoryUse = new List<ConsumableorderdetailsInfo>();
+ consumableorderdetails2Cancle = new List<Consumable_order_details2__c>();
+ orderdetails2trMap = new Map<String,Consumable_order_details2__c>();
+ //update by Link 20230428
+ if(isLwc){
+ noboxBarcodeList = new Set<String>();
+ }
+ //add by rentx 2021-01-27 start
+ HosErrorList = new List<String>();
+ HosErrorMap = new Map<String,String>();
+ //add by rentx 2021-01-27 end
+
+ noboxBarcodeList.clear();
+ //鍐嶆绱㈤」鐩竻绌�
+ ConsumableorderdetailsRecordserror = new List<ConsumableorderdetailsInfo>();
+ ErrorIdMap = new Map<String, String>();
+ ErrorIdMap.clear();
+ AllMap = new Map<String, String>();
+ AllMap.clear();
+ ExistIdMap = new Map<String, String>();
+ ExistIdMap.clear();
+ consumableorderdetails2Insert = new List<Consumable_order_details2__c>();
+ ConsumableorderdetailsRecordsdummy = new List<ConsumableorderdetailsInfo>();
+ /*if(EsetId != null && EsetId != ''){
List<Consumable_order_details2__c> reSet1 = [SELECT Id,
Name,
Intra_Trade_List_RMB__c,
@@ -478,4129 +420,2478 @@
//}
}
}*/
- ConsumableorderdetailsRecords = new List<ConsumableorderdetailsInfo>();
- BarCodeListP = new List<String>();
- BarCodeListP = ParseBarCode(barcode);
- Consumable_order_details2__c p = new Consumable_order_details2__c();
- List<Consumable_order_details2__c> Ins = new List<Consumable_order_details2__c>();
- List<Consumable_order_details2__c> reSet = new List<Consumable_order_details2__c>();
- List<Consumable_order_details2__c> reSet1 = new List<Consumable_order_details2__c>();
- //绉诲埌鏈�涓婅竟 by Link 2023-5-23
- // if(barcode == null || barcode.trim() ==''){
- // //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- // if(isLwc){
- // returnError = '璇疯緭鍏arCode鍙�';
- // }else {
- // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO,'璇疯緭鍏arCode鍙枫��'));
- // }
- // return;
- // }
- //瀵规瘮鍏ㄩ儴搴撳瓨涓槸鍚﹀瓨鍦ㄧ鐞嗙紪鐮佷竴鏍凤紝barcode鍙蜂笉涓�鏍风殑浜у搧
- reSet1 = [
- SELECT Id, Name, TracingCode__c, Bar_Code__c, Report_Product_Expiration__c
- FROM Consumable_order_details2__c
- WHERE
- Dealer_Arrive__c = TRUE
- AND Dealer_Shipment__c = FALSE
- AND Dealer_Saled__c = FALSE
- AND Lose_Flag__c = FALSE
- AND Dealer_Returned__c = FALSE
- AND Cancellation_Flag__c = FALSE
- AND TracingCode__c IN :barMcodeMap.values()
- AND Bar_Code__c NOT IN :barMcodeMap.keySet()
- AND Dealer_Info_text__c = :accountName
- AND Arrive_Owner_Work_Location__c = :userWorkLocation
- ORDER BY Name
- ];
- if (reSet1.size() > 0) {
- for (Integer i = 0; i < reSet1.size(); i++) {
- if (ErrorIdMap.containsKey(reSet1[i].Bar_Code__c)) {
- // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
- continue;
- } else {
- for (String str : barMcodeMap.keySet()) {
- if (barMcodeMap.get(str) == reSet1[i].TracingCode__c) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
- str +
- ' 鐨勭鐞嗙紪鐮佸凡缁忓瓨鍦ㄤ簬绯荤粺鐨勫簱瀛樹腑锛岃纭杈撳叆淇℃伅鏄惁鏈夎銆�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- str +
- ' 鐨勭鐞嗙紪鐮佸凡缁忓瓨鍦ㄤ簬绯荤粺鐨勫簱瀛樹腑锛岃纭杈撳叆淇℃伅鏄惁鏈夎銆�'
- )
- );
+ ConsumableorderdetailsRecords = new List<ConsumableorderdetailsInfo>();
+ BarCodeListP = new List<String>();
+ BarCodeListP = ParseBarCode(barcode);
+ Consumable_order_details2__c p = new Consumable_order_details2__c();
+ List<Consumable_order_details2__c> Ins = New List<Consumable_order_details2__c>();
+ List<Consumable_order_details2__c> reSet = new List<Consumable_order_details2__c>();
+ List<Consumable_order_details2__c> reSet1 = new List<Consumable_order_details2__c>();
+ //绉诲埌鏈�涓婅竟 by Link 2023-5-23
+ // if(barcode == null || barcode.trim() ==''){
+ // //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ // if(isLwc){
+ // returnError = '璇疯緭鍏arCode鍙�';
+ // }else {
+ // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO,'璇疯緭鍏arCode鍙枫��'));
+ // }
+ // return;
+ // }
+ //瀵规瘮鍏ㄩ儴搴撳瓨涓槸鍚﹀瓨鍦ㄧ鐞嗙紪鐮佷竴鏍凤紝barcode鍙蜂笉涓�鏍风殑浜у搧
+ reSet1 = [SELECT Id, Name,TracingCode__c,Bar_Code__c,Report_Product_Expiration__c
+ FROM Consumable_order_details2__c
+ WHERE Dealer_Arrive__c = true
+ AND Dealer_Shipment__c = false
+ AND Dealer_Saled__c = false
+ AND Lose_Flag__c = false
+ AND Dealer_Returned__c = false
+ AND Cancellation_Flag__c = false
+ AND TracingCode__c in :barMcodeMap.values()
+ AND Bar_Code__c not in :barMcodeMap.keySet()
+ AND Dealer_Info_text__c = :accountName
+ AND Arrive_Owner_Work_Location__c =: userWorkLocation
+ ORDER BY Name ];
+ if(reSet1.size()>0){
+ for (Integer i = 0; i < reSet1.size(); i++) {
+ if(ErrorIdMap.containsKey(reSet1[i].Bar_Code__c)){
+ // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
+ continue;
+ }else{
+ for(String str : barMcodeMap.keySet()){
+ if(barMcodeMap.get(str) == reSet1[i].TracingCode__c){
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ errorList.add(str + ' 鐨勭鐞嗙紪鐮佸凡缁忓瓨鍦ㄤ簬绯荤粺鐨勫簱瀛樹腑锛岃纭杈撳叆淇℃伅鏄惁鏈夎銆�');
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, str + ' 鐨勭鐞嗙紪鐮佸凡缁忓瓨鍦ㄤ簬绯荤粺鐨勫簱瀛樹腑锛岃纭杈撳叆淇℃伅鏄惁鏈夎銆�'));
+ }
+ ErrorIdMap.put(str,str);
+ ErrorIdMap.put(reSet1[i].Bar_Code__c,reSet1[i].Bar_Code__c);
+ }
+ }
+ }
+ }
+ }
+ //绠＄悊缂栫爜涓虹┖鐨勪骇鍝�
+ reSet1 = [SELECT Id, Name,Consumable_Product__r.Name__c,
+ Consumable_Product__c,Consumable_Product__r.Name, Sterilization_limit__c,
+ Deliver_date__c,Bar_Code__c,Box_Piece__c,
+ Arrive_date__c,Send_Date__c,Consumable_order_minor__r.Name,Consumable_order_minor__c,
+ TracingCode__c,Report_Product_Expiration__c
+ FROM Consumable_order_details2__c
+ WHERE Bar_Code__c in :BarCodeListP
+ AND Dealer_Info_text__c = :accountName
+ //AND Arrive_Owner_Work_Location__c =: userWorkLocation
+ AND (TracingCode__c = null
+ OR TracingCode__c = '')
+ ORDER BY Name ];
+
+ if(reSet1.size()>0){
+ for (Integer i = 0; i < reSet1.size(); i++) {
+ if(ErrorIdMap.containsKey(reSet1[i].Bar_Code__c)){
+ // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
+ continue;
+ }else{
+ String str = '璇ヤ骇鍝佹病鏈夌鐞嗙紪鐮侊紝鏃犳硶鍏ュ簱';
+ ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(reSet1[i],str));
+ ErrorIdMap.put(reSet1[i].Bar_Code__c,reSet1[i].Bar_Code__c);
+ }
+ }
+ }
+ //ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO, '绠＄悊缂栫爜涓虹┖鐨勪骇鍝� ' + ErrorIdMap));
+ //鏁翠綋鍒拌揣
+ System.debug('EsetId===>'+EsetId);
+ System.debug('ArrType===>'+ArrType);
+ if(EsetId == null || EsetId == ''){
+ if(ArrType!='ReG'){
+ //鍒拌揣浣嗕骇鍝佺被鍨嬩笌鐢ㄦ埛鐨勭被鍨嬩笉绗�
+ reSet1 = [SELECT Id,Name,Intra_Trade_List_RMB__c,Asset_Model_No__c,
+ Consumable_Product__c,Consumable_Product__r.Name,
+ Consumable_Product__r.Name__c,Consumable_Product__r.Asset_Model_No__c,
+ Sterilization_limit__c,Deliver_date__c,Bar_Code__c,
+ Arrive_date__c,Send_Date__c,Consumable_order_minor__r.Name,
+ Consumable_order_minor__c,Dealer_Arrive__c,
+ Guarantee_period_for_products__c,CFDA_Status__c,
+ ProductPacking_list_manual__c,Report_Product_Approbation__c,
+ Report_Product_Expiration__c,Box_Piece__c, Rrturn_count__c,
+ Product_Type__c
+ ,ContractNo_text__c/*,ContractNo__c1*/
+ // tcm start
+ ,Consumable_order_minor__r.ContractNo__c
+ // tcm end
+ FROM Consumable_order_details2__c
+ WHERE Bar_Code__c in :BarCodeListP
+ AND ( not Product_Type__c like :userPro_Typestr)
+ AND Dealer_Info_text__c = :accountName
+ AND ((Consumable_order_minor__c != null
+ AND Consumable_order_minor__r.Order_Owner_WorkLocal__c = :userWorkLocation)
+ OR Consumable_order_minor__c = null)
+ ORDER BY Name ];
+
+ if(reSet1.size()>0){
+ for (Integer i = 0; i < reSet1.size(); i++) {
+ if(ErrorIdMap.containsKey(reSet1[i].Bar_Code__c)){
+ // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
+ continue;
+ }else{
+ String str = '浜у搧绫诲瀷['+reSet1[i].Product_Type__c+']涓庣敤鎴风殑绫诲瀷['+userPro_Type+']涓嶇';
+ ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(reSet1[i],str));
+ ErrorIdMap.put(reSet1[i].Bar_Code__c,reSet1[i].Bar_Code__c);
+ }
+ }
+ }
+ System.debug('reSet1===>'+reSet1);
+ //add by Wang Xueqin
+ //鍒拌揣浣嗕骇鍝佺被鍨嬩笌鐢ㄦ埛鐨勭被鍨嬩笉绗�
+ reSet1 = [SELECT Id,Name,Intra_Trade_List_RMB__c,Asset_Model_No__c,
+ Consumable_Product__c,Consumable_Product__r.Name,
+ Consumable_Product__r.Name__c,Consumable_Product__r.Asset_Model_No__c,
+ Sterilization_limit__c,Deliver_date__c,Bar_Code__c,
+ Arrive_date__c,Send_Date__c,Consumable_order_minor__r.Name,
+ Consumable_order_minor__c,Dealer_Arrive__c,
+ Guarantee_period_for_products__c,CFDA_Status__c,
+ ProductPacking_list_manual__c,Report_Product_Approbation__c,
+ Report_Product_Expiration__c,Box_Piece__c, Rrturn_count__c,
+ Product_Type__c
+ ,ContractNo_text__c
+ ,Consumable_order_minor__r.ContractNo__c
+ FROM Consumable_order_details2__c
+ WHERE Bar_Code__c in :BarCodeListP
+ AND ( not Product_Type__c like :userPro_Typestr)
+ ];
+
+ if(reSet1.size()>0){
+ for (Integer i = 0; i < reSet1.size(); i++) {
+ if(ErrorIdMap.containsKey(reSet1[i].Bar_Code__c)){
+ // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
+ continue;
+ }else{
+ String str = '浜у搧绫诲瀷['+reSet1[i].Product_Type__c+']涓庣敤鎴风殑绫诲瀷['+userPro_Type+']涓嶇';
+ ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(reSet1[i],str));
+ ErrorIdMap.put(reSet1[i].Bar_Code__c,reSet1[i].Bar_Code__c);
+ }
}
- ErrorIdMap.put(str, str);
- ErrorIdMap.put(reSet1[i].Bar_Code__c, reSet1[i].Bar_Code__c);
- }
}
- }
- }
- }
- //绠＄悊缂栫爜涓虹┖鐨勪骇鍝�
- reSet1 = [
- SELECT
- Id,
- Name,
- Consumable_Product__r.Name__c,
- Consumable_Product__c,
- Consumable_Product__r.Name,
- Sterilization_limit__c,
- Deliver_date__c,
- Bar_Code__c,
- Box_Piece__c,
- Arrive_date__c,
- Send_Date__c,
- Consumable_order_minor__r.Name,
- Consumable_order_minor__c,
- TracingCode__c,
- Report_Product_Expiration__c
- FROM Consumable_order_details2__c
- WHERE
- Bar_Code__c IN :BarCodeListP
- AND Dealer_Info_text__c = :accountName
- //AND Arrive_Owner_Work_Location__c =: userWorkLocation
- AND (TracingCode__c = NULL
- OR TracingCode__c = '')
- ORDER BY Name
- ];
-
- if (reSet1.size() > 0) {
- for (Integer i = 0; i < reSet1.size(); i++) {
- if (ErrorIdMap.containsKey(reSet1[i].Bar_Code__c)) {
- // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
- continue;
- } else {
- String str = '璇ヤ骇鍝佹病鏈夌鐞嗙紪鐮侊紝鏃犳硶鍏ュ簱';
- ConsumableorderdetailsRecordserror.add(
- new ConsumableorderdetailsInfo(reSet1[i], str)
- );
- ErrorIdMap.put(reSet1[i].Bar_Code__c, reSet1[i].Bar_Code__c);
- }
- }
- }
- //ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO, '绠＄悊缂栫爜涓虹┖鐨勪骇鍝� ' + ErrorIdMap));
- //鏁翠綋鍒拌揣
- System.debug('EsetId===>' + EsetId);
- System.debug('ArrType===>' + ArrType);
- if (EsetId == null || EsetId == '') {
- if (ArrType != 'ReG') {
- //鍒拌揣浣嗕骇鍝佺被鍨嬩笌鐢ㄦ埛鐨勭被鍨嬩笉绗�
- reSet1 = [
- SELECT
- Id,
- Name,
- Intra_Trade_List_RMB__c,
- Asset_Model_No__c,
- Consumable_Product__c,
- Consumable_Product__r.Name,
- Consumable_Product__r.Name__c,
- Consumable_Product__r.Asset_Model_No__c,
- Sterilization_limit__c,
- Deliver_date__c,
- Bar_Code__c,
- Arrive_date__c,
- Send_Date__c,
- Consumable_order_minor__r.Name,
- Consumable_order_minor__c,
- Dealer_Arrive__c,
- Guarantee_period_for_products__c,
- CFDA_Status__c,
- ProductPacking_list_manual__c,
- Report_Product_Approbation__c,
- Report_Product_Expiration__c,
- Box_Piece__c,
- Rrturn_count__c,
- Product_Type__c,
- ContractNo_text__c /*,ContractNo__c1*/,
- // tcm start
- Consumable_order_minor__r.ContractNo__c
- // tcm end
- FROM Consumable_order_details2__c
- WHERE
- Bar_Code__c IN :BarCodeListP
- AND (NOT Product_Type__c LIKE :userPro_Typestr)
- AND Dealer_Info_text__c = :accountName
- AND ((Consumable_order_minor__c != NULL
- AND Consumable_order_minor__r.Order_Owner_WorkLocal__c = :userWorkLocation)
- OR Consumable_order_minor__c = NULL)
- ORDER BY Name
- ];
-
- if (reSet1.size() > 0) {
- for (Integer i = 0; i < reSet1.size(); i++) {
- if (ErrorIdMap.containsKey(reSet1[i].Bar_Code__c)) {
- // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
- continue;
- } else {
- String str =
- '浜у搧绫诲瀷[' +
- reSet1[i].Product_Type__c +
- ']涓庣敤鎴风殑绫诲瀷[' +
- userPro_Type +
- ']涓嶇';
- ConsumableorderdetailsRecordserror.add(
- new ConsumableorderdetailsInfo(reSet1[i], str)
- );
- ErrorIdMap.put(reSet1[i].Bar_Code__c, reSet1[i].Bar_Code__c);
- }
- }
- }
- System.debug('reSet1===>' + reSet1);
- //add by Wang Xueqin
- //鍒拌揣浣嗕骇鍝佺被鍨嬩笌鐢ㄦ埛鐨勭被鍨嬩笉绗�
- reSet1 = [
- SELECT
- Id,
- Name,
- Intra_Trade_List_RMB__c,
- Asset_Model_No__c,
- Consumable_Product__c,
- Consumable_Product__r.Name,
- Consumable_Product__r.Name__c,
- Consumable_Product__r.Asset_Model_No__c,
- Sterilization_limit__c,
- Deliver_date__c,
- Bar_Code__c,
- Arrive_date__c,
- Send_Date__c,
- Consumable_order_minor__r.Name,
- Consumable_order_minor__c,
- Dealer_Arrive__c,
- Guarantee_period_for_products__c,
- CFDA_Status__c,
- ProductPacking_list_manual__c,
- Report_Product_Approbation__c,
- Report_Product_Expiration__c,
- Box_Piece__c,
- Rrturn_count__c,
- Product_Type__c,
- ContractNo_text__c,
- Consumable_order_minor__r.ContractNo__c
- FROM Consumable_order_details2__c
- WHERE
- Bar_Code__c IN :BarCodeListP
- AND (NOT Product_Type__c LIKE :userPro_Typestr)
- ];
-
- if (reSet1.size() > 0) {
- for (Integer i = 0; i < reSet1.size(); i++) {
- if (ErrorIdMap.containsKey(reSet1[i].Bar_Code__c)) {
- // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
- continue;
- } else {
- String str =
- '浜у搧绫诲瀷[' +
- reSet1[i].Product_Type__c +
- ']涓庣敤鎴风殑绫诲瀷[' +
- userPro_Type +
- ']涓嶇';
- ConsumableorderdetailsRecordserror.add(
- new ConsumableorderdetailsInfo(reSet1[i], str)
- );
- ErrorIdMap.put(reSet1[i].Bar_Code__c, reSet1[i].Bar_Code__c);
- }
- }
- }
- System.debug('reSet1===>1' + reSet1);
+ System.debug('reSet1===>1'+reSet1);
//end
- //閿�鍞骇鍝�
- reSet1 = [
- SELECT
- Id,
- Name,
- Consumable_Product__r.Name__c,
- Consumable_Product__c,
- Consumable_Product__r.Name,
- Sterilization_limit__c,
- Deliver_date__c,
- Bar_Code__c,
- Box_Piece__c,
- Arrive_date__c,
- Send_Date__c,
- Consumable_order_minor__r.Name,
- Consumable_order_minor__c,
- recordtypeid,
- Consumable_order_minor__r.Arrive_Order__c,
- OwnerId,
- Report_Product_Expiration__c
- FROM Consumable_order_details2__c
- WHERE
- Dealer_Saled__c = TRUE
- AND Dealer_Returned__c = FALSE
- AND Bar_Code__c IN :BarCodeListP
- AND Dealer_Info_text__c = :accountName
- AND (Arrive_Owner_Work_Location__c = :userWorkLocation
- OR OwnerId = :System.Label.User_OlympusSystem)
- ORDER BY Name
- ];
- if (reSet1.size() > 0) {
- for (Integer i = 0; i < reSet1.size(); i++) {
- if (ErrorIdMap.containsKey(reSet1[i].Bar_Code__c)) {
- // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
- continue;
- } else {
- String str = '';
- if (reSet1[i].OwnerId == System.Label.User_OlympusSystem) {
- str = '璇ュ晢鍝佹槸鐩撮攢浜у搧璇峰厛杩斿搧';
- } else {
- str = '璇ュ晢鍝佸凡缁忛攢鍞�';
- }
- ConsumableorderdetailsRecordserror.add(
- new ConsumableorderdetailsInfo(reSet1[i], str)
- );
- ErrorIdMap.put(reSet1[i].Bar_Code__c, reSet1[i].Bar_Code__c);
- }
- }
- }
- //鍑哄簱浜у搧
- reSet1 = [
- SELECT
- Id,
- Name,
- Consumable_Product__r.Name__c,
- Consumable_Product__c,
- Consumable_Product__r.Name,
- Sterilization_limit__c,
- Deliver_date__c,
- Bar_Code__c,
- Box_Piece__c,
- Arrive_date__c,
- Send_Date__c,
- Consumable_order_minor__r.Name,
- Consumable_order_minor__c,
- recordtypeid,
- Consumable_order_minor__r.Arrive_Order__c,
- Report_Product_Expiration__c
- FROM Consumable_order_details2__c
- WHERE
- Dealer_Shipment__c = TRUE
- AND Dealer_Returned__c = FALSE
- AND Bar_Code__c IN :BarCodeListP
- AND Dealer_Info_text__c = :accountName
- AND Arrive_Owner_Work_Location__c = :userWorkLocation
- ORDER BY Name
- ];
- if (reSet1.size() > 0) {
- for (Integer i = 0; i < reSet1.size(); i++) {
- if (ErrorIdMap.containsKey(reSet1[i].Bar_Code__c)) {
- // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
- continue;
- } else {
- String str = '璇ュ晢鍝佸凡缁忓嚭搴�';
- ConsumableorderdetailsRecordserror.add(
- new ConsumableorderdetailsInfo(reSet1[i], str)
- );
- ErrorIdMap.put(reSet1[i].Bar_Code__c, reSet1[i].Bar_Code__c);
- }
- }
- }
- //宸插埌璐т骇鍝�
- reSet1 = [
- SELECT
- Id,
- Name,
- Consumable_Product__r.Name__c,
- Consumable_Product__c,
- Consumable_Product__r.Name,
- Sterilization_limit__c,
- Deliver_date__c,
- Bar_Code__c,
- Lose_Flag__c,
- Box_Piece__c,
- Arrive_date__c,
- Send_Date__c,
- Consumable_order_minor__r.Name,
- Consumable_order_minor__c,
- recordtypeid,
- Consumable_order_minor__r.Arrive_Order__c,
- Report_Product_Expiration__c
- FROM Consumable_order_details2__c
- WHERE
- Dealer_Arrive__c = TRUE
- AND Dealer_Returned__c = FALSE
- AND Bar_Code__c IN :BarCodeListP
- AND Dealer_Info_text__c = :accountName
- AND Arrive_Owner_Work_Location__c = :userWorkLocation
- ORDER BY Name
- ];
- if (reSet1.size() > 0) {
- for (Integer i = 0; i < reSet1.size(); i++) {
- if (ErrorIdMap.containsKey(reSet1[i].Bar_Code__c)) {
- // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
- continue;
- } else {
- String str = '璇ュ晢鍝佸凡缁忓埌璐�';
- if (reSet1[i].Lose_Flag__c == true) {
- str = '璇ュ晢鍝佸凡缁忎涪澶�';
- }
- ConsumableorderdetailsRecordserror.add(
- new ConsumableorderdetailsInfo(reSet1[i], str)
- );
- ErrorIdMap.put(reSet1[i].Bar_Code__c, reSet1[i].Bar_Code__c);
- }
- }
- }
- //宸叉媶鐩掍骇鍝�
- reSet1 = [
- SELECT
- Id,
- Name,
- Consumable_Product__r.Name__c,
- Consumable_Product__c,
- Consumable_Product__r.Name,
- Sterilization_limit__c,
- Deliver_date__c,
- Bar_Code__c,
- Box_Piece__c,
- Arrive_date__c,
- Send_Date__c,
- Consumable_order_minor__r.Name,
- Consumable_order_minor__c,
- recordtypeid,
- Consumable_order_minor__r.Arrive_Order__c,
- Report_Product_Expiration__c
- FROM Consumable_order_details2__c
- WHERE
- Dealer_Arrive__c = TRUE
- AND Bar_Code__c IN :BarCodeListP
- AND (Dealer_Info_text__c != :accountName
- OR (Dealer_Info_text__c = :accountName
- AND Arrive_Owner_Work_Location__c != :userWorkLocation))
- AND Box_Piece__c = '涓�'
- ORDER BY Name
- ];
- if (reSet1.size() > 0) {
- for (Integer i = 0; i < reSet1.size(); i++) {
- if (ErrorIdMap.containsKey(reSet1[i].Bar_Code__c)) {
- // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
- continue;
- } else {
- String str = '宸叉媶鐩掔殑浜у搧涓嶈兘鍏ュ簱';
- ConsumableorderdetailsRecordserror.add(
- new ConsumableorderdetailsInfo(reSet1[i], str)
- );
- ErrorIdMap.put(reSet1[i].Bar_Code__c, reSet1[i].Bar_Code__c);
- }
- }
- }
-
- // 缁忛攢鍟嗕箣闂存垨鑰呭悓涓�缁忛攢鍟嗕笉鍚屽伐浣滃湴璋冭揣
- reSet1 = [
- SELECT
- Id,
- Name,
- Consumable_Product__r.Name__c,
- Asset_Model_No__c,
- Arrive_Owner_Work_Location__c,
- Consumable_Product__c,
- Consumable_Product__r.Name,
- Sterilization_limit__c,
- Box_Piece__c,
- Deliver_date__c,
- Bar_Code__c,
- TracingCode__c,
- Dealer_Info_text__c,
- OwnerId,
- Lose_Flag__c,
- Arrive_date__c,
- Send_Date__c,
- Consumable_order_minor__r.Name,
- Consumable_order_minor__c,
- recordtypeid,
- Consumable_order_minor__r.Arrive_Order__c,
- SerialLotNo__c,
- Dealer_Arrive__c,
- Consumable_Arrived_order__r.Dealer_Info__c,
- Consumable_Arrived_order__r.Dealer_Info__r.Name,
- Intra_Trade_List_RMB__c,
- Dealer_Shipment__c,
- Dealer_Saled__c,
- Consumable_Product__r.Asset_Model_No__c,
- // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 start
- SummonsForDirction_det__c,
- Transfer_Time__c,
- Frist_Transfer_Agency__c,
- Agency_Transfer__c,
- // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 start
- // 棣栨鍏ュ簱缁忛攢鍟嗕俊鎭� add by gzw 2020-04-27 start
- Agencyinfo_fromSAP__c,
- Frist_Storage_Agency__c,
- // 棣栨鍏ュ簱缁忛攢鍟嗕俊鎭� add by gzw 2020-04-27 end
-
- //add by rentx 2020-10-13 start 浜掔浉璋冭揣鏃�,鍊熷叆鏂硅褰昐AP鍚堝悓鍙�
- ContractNo_text__c /*,ContractNo__c */,
- // tcm start
- Consumable_order_minor__r.ContractNo__c,
- // tcm end
- //add by rentx 2020-10-13 end
- //add by rentx 2021-03-22 start
- hospitalSpecialOffer__c,
- exchangeOutPattern__c,
- Report_Product_Expiration__c
- //add by rentx 2021-03-22 end
- FROM Consumable_order_details2__c
- WHERE
- Dealer_Arrive__c = TRUE
- //AND Dealer_Shipment__c= false
- //AND Dealer_Saled__c = FALSE
- AND Dealer_Returned__c = FALSE
- AND Cancellation_Flag__c = FALSE
- AND Bar_Code__c IN :BarCodeListP
- //AND (Dealer_Shipment__c = FALSE
- // OR (Dealer_Shipment__c = TRUE
- // AND Consumable_Shipment_order__r.SummonsForDirction__c != '浜掔浉璋冭揣'))
- AND (Dealer_Info_text__c != :accountName
- OR (Dealer_Info_text__c = :accountName
- AND Arrive_Owner_Work_Location__c != :userWorkLocation))
- // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 start
- ORDER BY Bar_Code__c, Transfer_Time__c DESC
- // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 end
- ];
- if (reSet1.size() > 0) {
- for (Integer i = 0; i < reSet1.size(); i++) {
- if (ErrorIdMap.containsKey(reSet1[i].Bar_Code__c)) {
- // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
- continue;
- } else {
- if (otherAgencyMap.containsKey(reSet1[i].Bar_Code__c)) {
- continue;
- } else {
- //鍏朵粬缁忛攢鍟嗗嚭搴撲骇鍝佸彲浠ュ叆搴�
- List<String> barcodedetList = new List<String>();
- barcodedetList.add(reSet1[i].Bar_Code__c);
- barcodedetList.add(
- String.valueOf(reSet1[i].Sterilization_limit__c)
- );
- barcodedetList.add(reSet1[i].SerialLotNo__c);
- barcodedetList.add(reSet1[i].TracingCode__c);
- if (reSet1[i].Lose_Flag__c == false) {
- //&& reSet1[i].Dealer_Info_text__c == accountName
- consumableorderdetails2Cancle.add(reSet1[i]);
+ //閿�鍞骇鍝�
+ reSet1 = [SELECT Id, Name,Consumable_Product__r.Name__c,
+ Consumable_Product__c,Consumable_Product__r.Name, Sterilization_limit__c,
+ Deliver_date__c,Bar_Code__c,Box_Piece__c,
+ Arrive_date__c,Send_Date__c,Consumable_order_minor__r.Name,Consumable_order_minor__c,
+ recordtypeid,Consumable_order_minor__r.Arrive_Order__c,OwnerId,Report_Product_Expiration__c
+ FROM Consumable_order_details2__c
+ WHERE Dealer_Saled__c = true
+ AND Dealer_Returned__c = false
+ AND Bar_Code__c in :BarCodeListP
+ AND Dealer_Info_text__c = :accountName
+ AND (Arrive_Owner_Work_Location__c =: userWorkLocation
+ OR OwnerId = :System.Label.User_OlympusSystem)
+ ORDER BY Name ];
+ if(reSet1.size()>0){
+ for (Integer i = 0; i < reSet1.size(); i++) {
+ if(ErrorIdMap.containsKey(reSet1[i].Bar_Code__c)){
+ // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
+ continue;
+ }else{
+ String str = '';
+ if (reSet1[i].OwnerId == System.Label.User_OlympusSystem) {
+ str = '璇ュ晢鍝佹槸鐩撮攢浜у搧璇峰厛杩斿搧';
+ }else{
+ str = '璇ュ晢鍝佸凡缁忛攢鍞�';
+ }
+ ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(reSet1[i],str));
+ ErrorIdMap.put(reSet1[i].Bar_Code__c,reSet1[i].Bar_Code__c);
+
+ }
+ }
}
- // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 start
- if (
- reSet1[i].SummonsForDirction_det__c == '浜掔浉璋冭揣' &&
- !orderdetails2trMap.containsKey(reSet1[i].Bar_Code__c)
- ) {
- orderdetails2trMap.put(reSet1[i].Bar_Code__c, reSet1[i]);
+ //鍑哄簱浜у搧
+ reSet1 = [SELECT Id, Name,Consumable_Product__r.Name__c,
+ Consumable_Product__c,Consumable_Product__r.Name, Sterilization_limit__c,
+ Deliver_date__c,Bar_Code__c,Box_Piece__c,
+ Arrive_date__c,Send_Date__c,Consumable_order_minor__r.Name,Consumable_order_minor__c,
+ recordtypeid,Consumable_order_minor__r.Arrive_Order__c,Report_Product_Expiration__c
+ FROM Consumable_order_details2__c
+ WHERE Dealer_Shipment__c = true
+ AND Dealer_Returned__c = false
+ AND Bar_Code__c in :BarCodeListP
+ AND Dealer_Info_text__c = :accountName
+ AND Arrive_Owner_Work_Location__c =: userWorkLocation
+ ORDER BY Name ];
+ if(reSet1.size()>0){
+ for (Integer i = 0; i < reSet1.size(); i++) {
+ if(ErrorIdMap.containsKey(reSet1[i].Bar_Code__c)){
+ // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
+ continue;
+ }else{
+ String str = '璇ュ晢鍝佸凡缁忓嚭搴�';
+ ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(reSet1[i],str));
+ ErrorIdMap.put(reSet1[i].Bar_Code__c,reSet1[i].Bar_Code__c);
+ }
+ }
}
- // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 end
- consumableInventory.add(
- new ConsumableorderdetailsInfo(reSet1[i], barcodedetList)
- );
- Consumable_order_details2__c codsIns = new Consumable_order_details2__c();
-
- codsIns.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
- codsIns.Intra_Trade_List_RMB__c = reSet1[i]
- .Intra_Trade_List_RMB__c;
- //gzw 鎵嬪姩鍏ュ簱 榛樿浜у搧鍗曚环 20230307
- codsIns.Asset_Model_No__c = reSet1[i].Asset_Model_No__c;
- codsIns.Direct_Arrive_Product__c = true;
- codsIns.Sterilization_limit__c = reSet1[i]
- .Sterilization_limit__c;
- codsIns.Consumable_Product__c = reSet1[i].Consumable_Product__c;
- codsIns.Bar_Code__c = reSet1[i].Bar_Code__c;
- codsIns.SerialLotNo__c = reSet1[i].SerialLotNo__c;
- codsIns.TracingCode__c = reSet1[i].TracingCode__c;
- // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 start
- codsIns.Transfer_Time__c = reSet1[i].Transfer_Time__c == null
- ? 1
- : reSet1[i].Transfer_Time__c;
- codsIns.Frist_Transfer_Agency__c = reSet1[i]
- .Frist_Transfer_Agency__c == null
- ? reSet1[i].Dealer_Info_text__c
- : reSet1[i].Frist_Transfer_Agency__c;
- codsIns.Agency_Transfer__c = true;
- // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 end
-
- // 杩藉姞棣栨鍏ュ簱缁忛攢鍟� add by gzw 2020-04-27 start
- codsIns.Agencyinfo_fromSAP__c = reSet1[i].Agencyinfo_fromSAP__c;
- codsIns.Frist_Storage_Agency__c = reSet1[i]
- .Frist_Storage_Agency__c;
- // 杩藉姞棣栨鍏ュ簱缁忛攢鍟� add by gzw 2020-04-27 end
-
- //add by rentx 2020-10-13 start 浜掔浉璋冭揣鏃�,璁板綍SAP鍚堝悓鍙�
- // update tcm start
- if (
- String.isBlank(
- reSet1[i].Consumable_order_minor__r.ContractNo__c
- )
- ) {
- codsIns.ContractNo_text__c = reSet1[i].ContractNo_text__c;
- } else {
- codsIns.ContractNo_text__c = reSet1[i]
- .Consumable_order_minor__r.ContractNo__c;
+ //宸插埌璐т骇鍝�
+ reSet1 = [SELECT Id, Name,Consumable_Product__r.Name__c,
+ Consumable_Product__c,Consumable_Product__r.Name, Sterilization_limit__c,
+ Deliver_date__c,Bar_Code__c,Lose_Flag__c,Box_Piece__c,
+ Arrive_date__c,Send_Date__c,Consumable_order_minor__r.Name,Consumable_order_minor__c,
+ recordtypeid,Consumable_order_minor__r.Arrive_Order__c,Report_Product_Expiration__c
+ FROM Consumable_order_details2__c
+ WHERE Dealer_Arrive__c = true
+ AND Dealer_Returned__c = false
+ AND Bar_Code__c in :BarCodeListP
+ AND Dealer_Info_text__c = :accountName
+ AND Arrive_Owner_Work_Location__c =: userWorkLocation
+ ORDER BY Name ];
+ if(reSet1.size()>0){
+ for (Integer i = 0; i < reSet1.size(); i++) {
+ if(ErrorIdMap.containsKey(reSet1[i].Bar_Code__c)){
+ // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
+ continue;
+ }else{
+ String str = '璇ュ晢鍝佸凡缁忓埌璐�';
+ if (reSet1[i].Lose_Flag__c == TRUE) {
+ str = '璇ュ晢鍝佸凡缁忎涪澶�';
+ }
+ ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(reSet1[i],str));
+ ErrorIdMap.put(reSet1[i].Bar_Code__c,reSet1[i].Bar_Code__c);
+ }
+ }
}
- // update tcm end
- //add by rentx 2020-10-13 end
- //add by rentx 2021-03-22 start
- // if (reSet1[i].Lose_Flag__c == true){
- if (
- reSet1[i].hospitalSpecialOffer__c == true &&
- reSet1[i].SummonsForDirction_det__c == '浜掔浉璋冭揣'
- ) {
- codsIns.exchangeOutPattern__c = true;
+ //宸叉媶鐩掍骇鍝�
+ reSet1 = [SELECT Id, Name,Consumable_Product__r.Name__c,
+ Consumable_Product__c,Consumable_Product__r.Name, Sterilization_limit__c,
+ Deliver_date__c,Bar_Code__c,Box_Piece__c,
+ Arrive_date__c,Send_Date__c,Consumable_order_minor__r.Name,Consumable_order_minor__c,
+ recordtypeid,Consumable_order_minor__r.Arrive_Order__c,Report_Product_Expiration__c
+ FROM Consumable_order_details2__c
+ WHERE Dealer_Arrive__c = true
+ AND Bar_Code__c in :BarCodeListP
+ AND (Dealer_Info_text__c != :accountName
+ OR (Dealer_Info_text__c = :accountName
+ AND Arrive_Owner_Work_Location__c !=: userWorkLocation))
+ AND Box_Piece__c = '涓�'
+ ORDER BY Name ];
+ if(reSet1.size()>0){
+ for (Integer i = 0; i < reSet1.size(); i++) {
+ if(ErrorIdMap.containsKey(reSet1[i].Bar_Code__c)){
+ // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
+ continue;
+ }else{
+ String str = '宸叉媶鐩掔殑浜у搧涓嶈兘鍏ュ簱';
+ ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(reSet1[i],str));
+ ErrorIdMap.put(reSet1[i].Bar_Code__c,reSet1[i].Bar_Code__c);
+ }
+ }
}
- //add by rentx 2021-03-22 end
- consumableorderdetails2Insert.add(codsIns);
- otherAgencyMap.put(
- reSet1[i].Bar_Code__c,
- reSet1[i].Bar_Code__c
- );
- //String str = '璇ュ晢鍝佸湪鍏朵粬缁忛攢鍟嗗簱瀛�';
- //ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(reSet1[i],str));
- //ErrorIdMap.put(reSet1[i].Bar_Code__c,reSet1[i].Bar_Code__c);
- }
+ // 缁忛攢鍟嗕箣闂存垨鑰呭悓涓�缁忛攢鍟嗕笉鍚屽伐浣滃湴璋冭揣
+ reSet1 = [SELECT Id, Name,Consumable_Product__r.Name__c,Asset_Model_No__c, Arrive_Owner_Work_Location__c,
+ Consumable_Product__c,Consumable_Product__r.Name, Sterilization_limit__c,Box_Piece__c,
+ Deliver_date__c,Bar_Code__c,TracingCode__c, Dealer_Info_text__c, OwnerId, Lose_Flag__c,
+ Arrive_date__c,Send_Date__c,Consumable_order_minor__r.Name,Consumable_order_minor__c,
+ recordtypeid,Consumable_order_minor__r.Arrive_Order__c,SerialLotNo__c, Dealer_Arrive__c,
+ Consumable_Arrived_order__r.Dealer_Info__c, Consumable_Arrived_order__r.Dealer_Info__r.Name,
+ Intra_Trade_List_RMB__c, Dealer_Shipment__c, Dealer_Saled__c,Consumable_Product__r.Asset_Model_No__c
+ // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 start
+ ,SummonsForDirction_det__c,Transfer_Time__c,Frist_Transfer_Agency__c,Agency_Transfer__c
+ // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 start
+ // 棣栨鍏ュ簱缁忛攢鍟嗕俊鎭� add by gzw 2020-04-27 start
+ ,Agencyinfo_fromSAP__c,Frist_Storage_Agency__c
+ // 棣栨鍏ュ簱缁忛攢鍟嗕俊鎭� add by gzw 2020-04-27 end
+
+ //add by rentx 2020-10-13 start 浜掔浉璋冭揣鏃�,鍊熷叆鏂硅褰昐AP鍚堝悓鍙�
+ ,ContractNo_text__c/*,ContractNo__c */
+ // tcm start
+ ,Consumable_order_minor__r.ContractNo__c
+ // tcm end
+ //add by rentx 2020-10-13 end
+ //add by rentx 2021-03-22 start
+ ,hospitalSpecialOffer__c
+ ,exchangeOutPattern__c
+ ,Report_Product_Expiration__c
+ //add by rentx 2021-03-22 end
+ FROM Consumable_order_details2__c
+ WHERE Dealer_Arrive__c = TRUE
+ //AND Dealer_Shipment__c= false
+ //AND Dealer_Saled__c = FALSE
+ AND Dealer_Returned__c = FALSE
+ AND Cancellation_Flag__c = FALSE
+ AND Bar_Code__c in :BarCodeListP
+ //AND (Dealer_Shipment__c = FALSE
+ // OR (Dealer_Shipment__c = TRUE
+ // AND Consumable_Shipment_order__r.SummonsForDirction__c != '浜掔浉璋冭揣'))
+ AND (Dealer_Info_text__c != :accountName
+ OR (Dealer_Info_text__c = :accountName
+ AND Arrive_Owner_Work_Location__c != :userWorkLocation)
+ )
+ // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 start
+ order by Bar_Code__c, Transfer_Time__c desc
+ // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 end
+ ];
+ if(reSet1.size()>0){
+ for (Integer i = 0; i < reSet1.size(); i++) {
+ if(ErrorIdMap.containsKey(reSet1[i].Bar_Code__c)){
+ // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
+ continue;
+ }else{
+ if(otherAgencyMap.containsKey(reSet1[i].Bar_Code__c)){
+ continue;
+ }else{
+ //鍏朵粬缁忛攢鍟嗗嚭搴撲骇鍝佸彲浠ュ叆搴�
+ List<String> barcodedetList = new List<String>();
+ barcodedetList.add(reSet1[i].Bar_Code__c);
+ barcodedetList.add(String.valueOf(reSet1[i].Sterilization_limit__c));
+ barcodedetList.add(reSet1[i].SerialLotNo__c);
+ barcodedetList.add(reSet1[i].TracingCode__c);
+ if (reSet1[i].Lose_Flag__c == false
+ //&& reSet1[i].Dealer_Info_text__c == accountName
+ ) {
+ consumableorderdetails2Cancle.add(reSet1[i]);
+ }
+ // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 start
+ if (reSet1[i].SummonsForDirction_det__c == '浜掔浉璋冭揣' && !orderdetails2trMap.containsKey(reSet1[i].Bar_Code__c)) {
+ orderdetails2trMap.put(reSet1[i].Bar_Code__c, reSet1[i]);
+ }
+ // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 end
+ consumableInventory.add(new ConsumableorderdetailsInfo(reSet1[i],barcodedetList));
+ Consumable_order_details2__c codsIns = new Consumable_order_details2__c();
+
+ codsIns.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
+ codsIns.Intra_Trade_List_RMB__c = reSet1[i].Intra_Trade_List_RMB__c;
+ //gzw 鎵嬪姩鍏ュ簱 榛樿浜у搧鍗曚环 20230307
+ codsIns.Asset_Model_No__c = reSet1[i].Asset_Model_No__c;
+ codsIns.Direct_Arrive_Product__c = true;
+ codsIns.Sterilization_limit__c = reSet1[i].Sterilization_limit__c;
+ codsIns.Consumable_Product__c = reSet1[i].Consumable_Product__c;
+ codsIns.Bar_Code__c = reSet1[i].Bar_Code__c;
+ codsIns.SerialLotNo__c = reSet1[i].SerialLotNo__c;
+ codsIns.TracingCode__c = reSet1[i].TracingCode__c;
+ // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 start
+ codsIns.Transfer_Time__c = reSet1[i].Transfer_Time__c == null? 1 : reSet1[i].Transfer_Time__c;
+ codsIns.Frist_Transfer_Agency__c = reSet1[i].Frist_Transfer_Agency__c == null ? reSet1[i].Dealer_Info_text__c : reSet1[i].Frist_Transfer_Agency__c;
+ codsIns.Agency_Transfer__c = true;
+ // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 end
+
+ // 杩藉姞棣栨鍏ュ簱缁忛攢鍟� add by gzw 2020-04-27 start
+ codsIns.Agencyinfo_fromSAP__c = reSet1[i].Agencyinfo_fromSAP__c;
+ codsIns.Frist_Storage_Agency__c = reSet1[i].Frist_Storage_Agency__c;
+ // 杩藉姞棣栨鍏ュ簱缁忛攢鍟� add by gzw 2020-04-27 end
+
+ //add by rentx 2020-10-13 start 浜掔浉璋冭揣鏃�,璁板綍SAP鍚堝悓鍙�
+ // update tcm start
+ if (String.isBlank(reSet1[i].Consumable_order_minor__r.ContractNo__c)) {
+ codsIns.ContractNo_text__c= reSet1[i].ContractNo_text__c;
+ }else {
+ codsIns.ContractNo_text__c= reSet1[i].Consumable_order_minor__r.ContractNo__c;
+ }
+ // update tcm end
+ //add by rentx 2020-10-13 end
+
+ //add by rentx 2021-03-22 start
+ // if (reSet1[i].Lose_Flag__c == true){
+ if (reSet1[i].hospitalSpecialOffer__c == true && reSet1[i].SummonsForDirction_det__c == '浜掔浉璋冭揣'){
+ codsIns.exchangeOutPattern__c = true;
+ }
+ //add by rentx 2021-03-22 end
+
+ consumableorderdetails2Insert.add(codsIns);
+ otherAgencyMap.put(reSet1[i].Bar_Code__c,reSet1[i].Bar_Code__c);
+ //String str = '璇ュ晢鍝佸湪鍏朵粬缁忛攢鍟嗗簱瀛�';
+ //ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(reSet1[i],str));
+ //ErrorIdMap.put(reSet1[i].Bar_Code__c,reSet1[i].Bar_Code__c);
+ }
+ }
+ }
+ }
+
+ //鍙戦敊搴� 鏈埌璐�
+ reSet1 = [SELECT Id, Name,Consumable_Product__r.Name__c,Asset_Model_No__c,
+ Consumable_Product__c,Consumable_Product__r.Name, Sterilization_limit__c,
+ Deliver_date__c,Bar_Code__c,TracingCode__c,Box_Piece__c,
+ Arrive_date__c,Send_Date__c,Consumable_order_minor__r.Name,Consumable_order_minor__c,
+ recordtypeid,Consumable_order_minor__r.Arrive_Order__c,SerialLotNo__c,Dealer_Arrive__c,
+ Dealer_Shipment__c, Dealer_Saled__c,Consumable_Product__r.Asset_Model_No__c
+ // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 start
+ ,SummonsForDirction_det__c,Transfer_Time__c,Frist_Transfer_Agency__c,Agency_Transfer__c,
+ Dealer_Info_text__c,Intra_Trade_List_RMB__c
+ // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 start
+ // 棣栨鍏ュ簱缁忛攢鍟嗕俊鎭� add by gzw 2020-04-27 start
+ ,Agencyinfo_fromSAP__c,Frist_Storage_Agency__c
+ // 棣栨鍏ュ簱缁忛攢鍟嗕俊鎭� add by gzw 2020-04-27 end
+ //add by rentx 2020-10-13 start 浜掔浉璋冭揣鏃�,鍊熷叆鏂硅褰昐AP鍚堝悓鍙�
+ ,ContractNo_text__c/*,ContractNo__c*/
+ // tcm start
+ ,Consumable_order_minor__r.ContractNo__c
+ // tcm end
+ //add by rentx 2020-10-13 end 浜掔浉璋冭揣鏃�,鍊熷叆鏂硅褰昐AP鍚堝悓鍙�
+ ,hospitalSpecialOffer__c
+ ,exchangeOutPattern__c
+ ,Lose_Flag__c,Report_Product_Expiration__c
+ FROM Consumable_order_details2__c
+ WHERE Dealer_Arrive__c = FALSE
+ AND Dealer_Shipment__c= FALSE
+ AND Dealer_Saled__c = FALSE
+ //AND Cancellation_Flag__c = FALSE
+ AND Bar_Code__c in :BarCodeListP
+ AND (Dealer_Info_text__c != :accountName
+ OR (Dealer_Info_text__c = :accountName
+ AND ((Consumable_order_minor__c != null
+ AND (Consumable_order_minor__r.Order_Owner_WorkLocal__c != :userWorkLocation
+ OR (Consumable_order_minor__r.Order_Owner_WorkLocal__c = :userWorkLocation
+ AND Cancellation_Flag__c = TRUE)))
+ OR (Consumable_order_minor__c = null AND Cancellation_Flag__c = TRUE)))
+ )
+ // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 start
+ order by Bar_Code__c, Transfer_Time__c desc
+ // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 end
+ ];
+ if(reSet1.size()>0){
+ for (Integer i = 0; i < reSet1.size(); i++) {
+ if(ErrorIdMap.containsKey(reSet1[i].Bar_Code__c)){
+ // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
+ continue;
+ }else{
+ if(otherAgencyMap.containsKey(reSet1[i].Bar_Code__c)){
+ continue;
+ }else{
+ //鍙栨秷鏄庣粏
+ List<String> barcodedetList = new List<String>();
+ barcodedetList.add(reSet1[i].Bar_Code__c);
+ barcodedetList.add(String.valueOf(reSet1[i].Sterilization_limit__c));
+ barcodedetList.add(reSet1[i].SerialLotNo__c);
+ barcodedetList.add(reSet1[i].TracingCode__c);
+ // 鍙戦敊搴撳瓨鏃讹紝鑷姩鍙栨秷 update by gzw 2020-04-15 start
+ //if (reSet1[i].Consumable_order_minor__c == null) {
+ consumableorderdetails2Cancle.add(reSet1[i]);
+ //}
+ // 鍙戦敊搴撳瓨鏃讹紝鑷姩鍙栨秷 update by gzw 2020-04-15 start
+ // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 start
+ if (reSet1[i].SummonsForDirction_det__c == '浜掔浉璋冭揣' && !orderdetails2trMap.containsKey(reSet1[i].Bar_Code__c)) {
+
+ orderdetails2trMap.put(reSet1[i].Bar_Code__c, reSet1[i]);
+ }
+ // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 end
+ consumableInventory.add(new ConsumableorderdetailsInfo(reSet1[i],barcodedetList));
+ Consumable_order_details2__c codsIns = new Consumable_order_details2__c();
+
+ codsIns.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
+ codsIns.Intra_Trade_List_RMB__c = reSet1[i].Intra_Trade_List_RMB__c;
+ //gzw 鎵嬪姩鍏ュ簱 榛樿浜у搧鍗曚环 20230307
+ codsIns.Asset_Model_No__c = reSet1[i].Asset_Model_No__c;
+ codsIns.Direct_Arrive_Product__c = true;
+ codsIns.Sterilization_limit__c = reSet1[i].Sterilization_limit__c;
+ codsIns.Consumable_Product__c = reSet1[i].Consumable_Product__c;
+ codsIns.Bar_Code__c = reSet1[i].Bar_Code__c;
+ codsIns.SerialLotNo__c = reSet1[i].SerialLotNo__c;
+ codsIns.TracingCode__c = reSet1[i].TracingCode__c;
+ // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 start
+ // 娌℃湁鍏ュ簱鏃讹紝娌℃湁鍊熻皟淇℃伅
+ codsIns.Transfer_Time__c = reSet1[i].Transfer_Time__c;
+ codsIns.Frist_Transfer_Agency__c = reSet1[i].Frist_Transfer_Agency__c;
+ codsIns.Agency_Transfer__c = reSet1[i].Agency_Transfer__c;
+ // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 end
+
+ // 杩藉姞棣栨鍏ュ簱缁忛攢鍟� add by gzw 2020-04-27 start
+ codsIns.Agencyinfo_fromSAP__c = reSet1[i].Agencyinfo_fromSAP__c;
+ codsIns.Frist_Storage_Agency__c = reSet1[i].Frist_Storage_Agency__c;
+ // 杩藉姞棣栨鍏ュ簱缁忛攢鍟� add by gzw 2020-04-27 end
+
+ //add by rentx 2020-10-13 start 浜掔浉璋冭揣鏃�,鍊熷叆鏂硅褰昐AP鍚堝悓鍙�
+ // update tcm start
+ if (String.isBlank(reSet1[i].Consumable_order_minor__r.ContractNo__c)) {
+ codsIns.ContractNo_text__c= reSet1[i].ContractNo_text__c;
+ }else {
+ codsIns.ContractNo_text__c= reSet1[i].Consumable_order_minor__r.ContractNo__c;
+ }
+ // update tcm end
+ //add by rentx 2020-10-13 end 浜掔浉璋冭揣鏃�,鍊熷叆鏂硅褰昐AP鍚堝悓鍙�
+
+ //add by rentx 2021-03-22 start
+ // if (reSet1[i].Lose_Flag__c == true){
+ if (reSet1[i].hospitalSpecialOffer__c == true && reSet1[i].SummonsForDirction_det__c == '浜掔浉璋冭揣'){
+ codsIns.exchangeOutPattern__c = true;
+ }
+ //add by rentx 2021-03-22 end
+
+ consumableorderdetails2Insert.add(codsIns);
+ otherAgencyMap.put(reSet1[i].Bar_Code__c,reSet1[i].Bar_Code__c);
+ }
+ }
+ }
+ }
+ }else{
+ //杩斿搧妫�鏌�
+ //鍒拌揣浣嗕骇鍝佺被鍨嬩笌鐢ㄦ埛鐨勭被鍨嬩笉绗�
+ reSet1 = [SELECT Id,Name,Intra_Trade_List_RMB__c,Asset_Model_No__c,
+ Consumable_Product__c,Consumable_Product__r.Name,
+ Consumable_Product__r.Name__c,Consumable_Product__r.Asset_Model_No__c,
+ Sterilization_limit__c,Deliver_date__c,Bar_Code__c,
+ Arrive_date__c,Send_Date__c,Consumable_order_minor__r.Name,
+ Consumable_order_minor__c,Dealer_Arrive__c,
+ Guarantee_period_for_products__c,CFDA_Status__c,
+ ProductPacking_list_manual__c,Report_Product_Approbation__c,
+ Report_Product_Expiration__c,Box_Piece__c, Rrturn_count__c,
+ Product_Type__c
+ //add by rentx 2020-10-14 start
+ ,ContractNo_text__c/*,ContractNo__c*/
+ // tcm start
+ ,Consumable_order_minor__r.ContractNo__c
+ // tcm end
+ //add by rentx 2020-10-14 end
+ FROM Consumable_order_details2__c
+ WHERE Bar_Code__c in :BarCodeListP
+ AND ( not Product_Type__c like :userPro_Typestr)
+ AND Dealer_Info_text__c = :accountName
+ AND ((Consumable_order_minor__c != null
+ AND Consumable_order_minor__r.Order_Owner_WorkLocal__c = :userWorkLocation)
+ OR Consumable_order_minor__c = null)
+ ORDER BY Name ];
+
+ if(reSet1.size()>0){
+ for (Integer i = 0; i < reSet1.size(); i++) {
+ if(ErrorIdMap.containsKey(reSet1[i].Bar_Code__c)){
+ // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
+ continue;
+ }else{
+ String str = '浜у搧绫诲瀷['+reSet1[i].Product_Type__c+']涓庣敤鎴风殑绫诲瀷['+userPro_Type+']涓嶇';
+ ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(reSet1[i],str));
+ ErrorIdMap.put(reSet1[i].Bar_Code__c,reSet1[i].Bar_Code__c);
+ }
+ }
+ }
+ reSet1 = [SELECT Id, Name,Consumable_Product__r.Name__c,
+ Consumable_Product__c,Consumable_Product__r.Name, Sterilization_limit__c,
+ Deliver_date__c,Bar_Code__c,Box_Piece__c,
+ Arrive_date__c,Send_Date__c,Consumable_order_minor__r.Name,Consumable_order_minor__c,
+ recordtypeid,Consumable_order_minor__r.Arrive_Order__c
+ //add by rentx 2020-10-14 start
+ ,ContractNo_text__c/*,ContractNo__c*/
+ // tcm start
+ ,Consumable_order_minor__r.ContractNo__c
+ // tcm end
+ ,Report_Product_Expiration__c
+ //add by rentx 2020-10-14 end
+ FROM Consumable_order_details2__c
+ WHERE Dealer_Arrive__c = FALSE
+ AND Dealer_Shipment__c= FALSE
+ AND Dealer_Saled__c = FALSE
+ // gzw fix 鍙栨秷浜у搧鍒ゆ柇涓烘湭鍏ュ簱 20230323
+ AND Cancellation_Flag__c = false
+ AND Dealer_Returned__c = false
+ AND Bar_Code__c in :BarCodeListP
+ AND Dealer_Info_text__c = :accountName
+ ORDER BY Name ];//娌″埌璐�
+ if(reSet1.size()>0){
+ for (Integer i = 0; i < reSet1.size(); i++) {
+ if(ErrorIdMap.containsKey(reSet1[i].Bar_Code__c)){
+ // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
+ continue;
+ }else{
+ String str = '璇ュ晢鍝佸皻鏈叆搴�';
+ ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(reSet1[i],str));
+ ErrorIdMap.put(reSet1[i].Bar_Code__c,reSet1[i].Bar_Code__c);
+ }
+ }
+ }
+ reSet1 = [SELECT Id, Name,Consumable_Product__r.Name__c,ToDueDateDays__c,
+ Consumable_Product__c,Consumable_Product__r.Name, Sterilization_limit__c,
+ Deliver_date__c,Bar_Code__c,Lose_Flag__c,Box_Piece__c,
+ Arrive_date__c,Send_Date__c,Consumable_order_minor__r.Name,Consumable_order_minor__c,
+ recordtypeid,Consumable_order_minor__r.Arrive_Order__c
+ //add by rentx 2020-10-14 start
+ ,ContractNo_text__c/*,ContractNo__c*/
+ // tcm start
+ ,Consumable_order_minor__r.ContractNo__c
+ // tcm end
+ , Report_Product_Expiration__c
+ //add by rentx 2020-10-14 end
+ FROM Consumable_order_details2__c
+ WHERE Dealer_Arrive__c = true
+ AND Dealer_Shipment__c= FALSE
+ AND Dealer_Saled__c = FALSE
+ AND Bar_Code__c in :BarCodeListP
+ AND Dealer_Returned__c = false
+ // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 start
+ //AND Lose_Flag__c = FALSE
+ // AND Lose_Flag__c = FALSE
+ // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 start
+ AND Dealer_Info_text__c = :accountName
+ AND Arrive_Owner_Work_Location__c =: userWorkLocation
+ // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 start
+ // Gzw 20201215淇锛屾媶鐩掍骇鍝佷笉鍒ゆ柇
+ AND Box_Piece__c = '鐩�'
+ // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 end
+ ORDER BY Name ];//娌″嚭搴擄紝娌￠攢鍞紝灏辨槸鍦ㄥ簱
+ if(reSet1.size()>0){
+ for (Integer i = 0; i < reSet1.size(); i++) {
+ if(ErrorIdMap.containsKey(reSet1[i].Bar_Code__c)){
+ // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
+ continue;
+ }else{
+
+ // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 start
+ // String str = '璇ュ晢鍝佸湪搴�';
+ // if (reSet1[i].Lose_Flag__c) {
+ // str = '璇ュ晢鍝佷涪澶�';
+ // }
+ String str = '';
+ if(reSet1[i].Lose_Flag__c == false){
+ str = '璇ュ晢鍝佸湪搴�';//娌″嚭搴� 锛屾病閿�鍞紝娌′涪澶卞氨鏄湪搴撱��
+ }
+ if(reSet1[i].Lose_Flag__c == true && reSet1[i].ToDueDateDays__c >= 0){
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ warningList.add('浜у搧'+reSet1[i].Consumable_Product__r.Name+'瀛樺湪涓㈠け璁板綍');
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.WARNING, '浜у搧'+reSet1[i].Consumable_Product__r.Name+'瀛樺湪涓㈠け璁板綍'));//濡傛灉涓㈠け浜у搧灏辩粰鎻愮ず銆�
+ }
+ }
+ if (reSet1[i].Lose_Flag__c == true && reSet1[i].ToDueDateDays__c < 0) {
+ str = '杩囨湡宸查攢瀛樹骇鍝侊紝涓嶅厑璁歌繑鍝�';
+ }
+ if(str != ''){
+ ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(reSet1[i],str));
+ ErrorIdMap.put(reSet1[i].Bar_Code__c,reSet1[i].Bar_Code__c);
+ }
+ // ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(reSet1[i],str));
+ // ErrorIdMap.put(reSet1[i].Bar_Code__c,reSet1[i].Bar_Code__c);
+ // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 end
+ }
+ }
+ }
}
- }
- }
- //鍙戦敊搴� 鏈埌璐�
- reSet1 = [
- SELECT
- Id,
- Name,
- Consumable_Product__r.Name__c,
- Asset_Model_No__c,
- Consumable_Product__c,
- Consumable_Product__r.Name,
- Sterilization_limit__c,
- Deliver_date__c,
- Bar_Code__c,
- TracingCode__c,
- Box_Piece__c,
- Arrive_date__c,
- Send_Date__c,
- Consumable_order_minor__r.Name,
- Consumable_order_minor__c,
- recordtypeid,
- Consumable_order_minor__r.Arrive_Order__c,
- SerialLotNo__c,
- Dealer_Arrive__c,
- Dealer_Shipment__c,
- Dealer_Saled__c,
- Consumable_Product__r.Asset_Model_No__c,
- // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 start
- SummonsForDirction_det__c,
- Transfer_Time__c,
- Frist_Transfer_Agency__c,
- Agency_Transfer__c,
- Dealer_Info_text__c,
- Intra_Trade_List_RMB__c,
- // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 start
- // 棣栨鍏ュ簱缁忛攢鍟嗕俊鎭� add by gzw 2020-04-27 start
- Agencyinfo_fromSAP__c,
- Frist_Storage_Agency__c,
- // 棣栨鍏ュ簱缁忛攢鍟嗕俊鎭� add by gzw 2020-04-27 end
- //add by rentx 2020-10-13 start 浜掔浉璋冭揣鏃�,鍊熷叆鏂硅褰昐AP鍚堝悓鍙�
- ContractNo_text__c /*,ContractNo__c*/,
- // tcm start
- Consumable_order_minor__r.ContractNo__c,
- // tcm end
- //add by rentx 2020-10-13 end 浜掔浉璋冭揣鏃�,鍊熷叆鏂硅褰昐AP鍚堝悓鍙�
- hospitalSpecialOffer__c,
- exchangeOutPattern__c,
- Lose_Flag__c,
- Report_Product_Expiration__c
- FROM Consumable_order_details2__c
- WHERE
- Dealer_Arrive__c = FALSE
- AND Dealer_Shipment__c = FALSE
- AND Dealer_Saled__c = FALSE
- //AND Cancellation_Flag__c = FALSE
- AND Bar_Code__c IN :BarCodeListP
- AND (Dealer_Info_text__c != :accountName
- OR (Dealer_Info_text__c = :accountName
- AND ((Consumable_order_minor__c != NULL
- AND (Consumable_order_minor__r.Order_Owner_WorkLocal__c != :userWorkLocation
- OR (Consumable_order_minor__r.Order_Owner_WorkLocal__c = :userWorkLocation
- AND Cancellation_Flag__c = TRUE)))
- OR (Consumable_order_minor__c = NULL
- AND Cancellation_Flag__c = TRUE))))
- // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 start
- ORDER BY Bar_Code__c, Transfer_Time__c DESC
- // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 end
- ];
- if (reSet1.size() > 0) {
- for (Integer i = 0; i < reSet1.size(); i++) {
- if (ErrorIdMap.containsKey(reSet1[i].Bar_Code__c)) {
- // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
- continue;
- } else {
- if (otherAgencyMap.containsKey(reSet1[i].Bar_Code__c)) {
- continue;
- } else {
- //鍙栨秷鏄庣粏
- List<String> barcodedetList = new List<String>();
- barcodedetList.add(reSet1[i].Bar_Code__c);
- barcodedetList.add(
- String.valueOf(reSet1[i].Sterilization_limit__c)
- );
- barcodedetList.add(reSet1[i].SerialLotNo__c);
- barcodedetList.add(reSet1[i].TracingCode__c);
- // 鍙戦敊搴撳瓨鏃讹紝鑷姩鍙栨秷 update by gzw 2020-04-15 start
- //if (reSet1[i].Consumable_order_minor__c == null) {
- consumableorderdetails2Cancle.add(reSet1[i]);
- //}
- // 鍙戦敊搴撳瓨鏃讹紝鑷姩鍙栨秷 update by gzw 2020-04-15 start
- // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 start
- if (
- reSet1[i].SummonsForDirction_det__c == '浜掔浉璋冭揣' &&
- !orderdetails2trMap.containsKey(reSet1[i].Bar_Code__c)
- ) {
- orderdetails2trMap.put(reSet1[i].Bar_Code__c, reSet1[i]);
+
+
+
+ //鍒拌揣姝ｇ‘淇℃伅
+ reSet = [SELECT Id,
+ Name,
+ Intra_Trade_List_RMB__c,
+ Asset_Model_No__c,
+ Consumable_Product__c,
+ Consumable_Product__r.Name,
+ Consumable_Product__r.Name__c,
+ Consumable_Product__r.Asset_Model_No__c,
+ Sterilization_limit__c,
+ Deliver_date__c,
+ Bar_Code__c,
+ Arrive_date__c,
+ Send_Date__c,
+ Box_Piece__c,
+ Rrturn_count__c,
+ Consumable_order_minor__r.Name,
+ Consumable_order_minor__c,
+ Dealer_Arrive__c,
+ Guarantee_period_for_products__c,
+ CFDA_Status__c,
+ ProductPacking_list_manual__c,
+ Report_Product_Approbation__c,
+ Report_Product_Expiration__c,
+ Consumable_Product__r.Pro2_Dealer_ENG__c,
+ Consumable_Product__r.Pro2_Dealer_Object__c,
+ TracingCode__c,
+ Agencyinfo_fromSAP__c,
+ Frist_Storage_Agency__c,
+ Dealer_Info_text__c
+ //add by rentx 2020-10-14 start
+ ,ContractNo_text__c/*,ContractNo__c*/
+ // tcm start
+ ,Consumable_order_minor__r.ContractNo__c
+ // tcm end
+ //add by rentx 2020-10-14 end
+ FROM Consumable_order_details2__c
+ WHERE recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery
+ AND Cancellation_Date__c = null
+ AND Dealer_Arrive__c = false
+ AND Product_Type__c like :userPro_Typestr
+ AND Bar_Code__c in :BarCodeListP
+ AND Dealer_Info_text__c = :accountName
+ AND ((Consumable_order_minor__c != null
+ AND Consumable_order_minor__r.Order_Owner_WorkLocal__c = :userWorkLocation)
+ OR Consumable_order_minor__c = null)
+ ORDER BY Name ];
+
+ if(reSet.size()>0){
+ //ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'ErrorIdMap+++ '+ ErrorIdMap.keyset()));
+ Map<String,String> errorMap = new Map<String,String>();
+ for (Integer i = 0; i < reSet.size(); i++) {
+
+ if(ExistIdMap.containsKey(reSet[i].Bar_Code__c) || ErrorIdMap.containsKey(reSet[i].Bar_Code__c)){
+ // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
+ continue;
+ }else{
+ Matcher n = Pattern.compile('[0-9]').matcher(reSet[i].TracingCode__c);
+ if(n.find()){
+ // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 start
+ if (reSet[i].TracingCode__c.length() == 5) {
+ String tr = reSet[i].TracingCode__c;
+ String Ctr = tr.substring(tr.length() - 3,tr.length());
+ String Btr = tr.substring(tr.length() - 4,tr.length()-3);
+ String Atr = tr.substring(tr.length() - 5,tr.length()-4);
+ if (Pattern.compile('[0-9]').matcher(Atr).find() || Pattern.compile('[0-9]').matcher(Ctr).find()) {
+ String str = '绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�';
+ ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(reSet[i],str));
+ ErrorIdMap.put(reSet[i].Bar_Code__c,reSet[i].Bar_Code__c);
+ continue;
+ }
+ }
+ // String str = '绠＄悊缂栫爜涓湁鏁板瓧锛岃涓庣鐞嗗憳纭鏄惁閿欒銆�';
+ // ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(reSet[i],str));
+ // ErrorIdMap.put(reSet[i].Bar_Code__c,reSet[i].Bar_Code__c);
+ // continue;
+ // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 end
+ }
+ if(otherAgencyMap.containsKey(reSet[i].Bar_Code__c)){
+ for (Integer j=0; j<consumableInventory.size(); j++) {
+ ConsumableorderdetailsInfo codInfo = consumableInventory.get(j);
+ if (codInfo.barCodeNo == reSet[i].Bar_Code__c) {
+ consumableInventory.remove(j);
+ break;
+ }
+ }
+ for (Integer m=0; m<consumableorderdetails2Insert.size(); m++) {
+ Consumable_order_details2__c cod2 = consumableorderdetails2Insert.get(m);
+ if (cod2.Bar_Code__c == reSet[i].Bar_Code__c) {
+ consumableorderdetails2Insert.remove(m);
+ break;
+ }
+ }
+ }
+ //orderId.add(reSet[i].Consumable_order_minor__c);
+ //prodName.add(reSet[i].Consumable_Product__r.Name);
+ ConsumableorderdetailsRecordsdummy.add(new ConsumableorderdetailsInfo(reSet[i]));
+ ConsumableorderdetailsRecords.add(new ConsumableorderdetailsInfo(reSet[i]));
+ ExistIdMap.put(reSet[i].Bar_Code__c,reSet[i].Bar_Code__c);
+ }
}
- // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 end
- consumableInventory.add(
- new ConsumableorderdetailsInfo(reSet1[i], barcodedetList)
- );
- Consumable_order_details2__c codsIns = new Consumable_order_details2__c();
-
- codsIns.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
- codsIns.Intra_Trade_List_RMB__c = reSet1[i]
- .Intra_Trade_List_RMB__c;
- //gzw 鎵嬪姩鍏ュ簱 榛樿浜у搧鍗曚环 20230307
- codsIns.Asset_Model_No__c = reSet1[i].Asset_Model_No__c;
- codsIns.Direct_Arrive_Product__c = true;
- codsIns.Sterilization_limit__c = reSet1[i]
- .Sterilization_limit__c;
- codsIns.Consumable_Product__c = reSet1[i].Consumable_Product__c;
- codsIns.Bar_Code__c = reSet1[i].Bar_Code__c;
- codsIns.SerialLotNo__c = reSet1[i].SerialLotNo__c;
- codsIns.TracingCode__c = reSet1[i].TracingCode__c;
- // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 start
- // 娌℃湁鍏ュ簱鏃讹紝娌℃湁鍊熻皟淇℃伅
- codsIns.Transfer_Time__c = reSet1[i].Transfer_Time__c;
- codsIns.Frist_Transfer_Agency__c = reSet1[i]
- .Frist_Transfer_Agency__c;
- codsIns.Agency_Transfer__c = reSet1[i].Agency_Transfer__c;
- // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 end
-
- // 杩藉姞棣栨鍏ュ簱缁忛攢鍟� add by gzw 2020-04-27 start
- codsIns.Agencyinfo_fromSAP__c = reSet1[i].Agencyinfo_fromSAP__c;
- codsIns.Frist_Storage_Agency__c = reSet1[i]
- .Frist_Storage_Agency__c;
- // 杩藉姞棣栨鍏ュ簱缁忛攢鍟� add by gzw 2020-04-27 end
-
- //add by rentx 2020-10-13 start 浜掔浉璋冭揣鏃�,鍊熷叆鏂硅褰昐AP鍚堝悓鍙�
- // update tcm start
- if (
- String.isBlank(
- reSet1[i].Consumable_order_minor__r.ContractNo__c
- )
- ) {
- codsIns.ContractNo_text__c = reSet1[i].ContractNo_text__c;
- } else {
- codsIns.ContractNo_text__c = reSet1[i]
- .Consumable_order_minor__r.ContractNo__c;
- }
- // update tcm end
- //add by rentx 2020-10-13 end 浜掔浉璋冭揣鏃�,鍊熷叆鏂硅褰昐AP鍚堝悓鍙�
-
- //add by rentx 2021-03-22 start
- // if (reSet1[i].Lose_Flag__c == true){
- if (
- reSet1[i].hospitalSpecialOffer__c == true &&
- reSet1[i].SummonsForDirction_det__c == '浜掔浉璋冭揣'
- ) {
- codsIns.exchangeOutPattern__c = true;
- }
- //add by rentx 2021-03-22 end
-
- consumableorderdetails2Insert.add(codsIns);
- otherAgencyMap.put(
- reSet1[i].Bar_Code__c,
- reSet1[i].Bar_Code__c
- );
- }
}
- }
- }
- } else {
- //杩斿搧妫�鏌�
- //鍒拌揣浣嗕骇鍝佺被鍨嬩笌鐢ㄦ埛鐨勭被鍨嬩笉绗�
- reSet1 = [
- SELECT
- Id,
- Name,
- Intra_Trade_List_RMB__c,
- Asset_Model_No__c,
- Consumable_Product__c,
- Consumable_Product__r.Name,
- Consumable_Product__r.Name__c,
- Consumable_Product__r.Asset_Model_No__c,
- Sterilization_limit__c,
- Deliver_date__c,
- Bar_Code__c,
- Arrive_date__c,
- Send_Date__c,
- Consumable_order_minor__r.Name,
- Consumable_order_minor__c,
- Dealer_Arrive__c,
- Guarantee_period_for_products__c,
- CFDA_Status__c,
- ProductPacking_list_manual__c,
- Report_Product_Approbation__c,
- Report_Product_Expiration__c,
- Box_Piece__c,
- Rrturn_count__c,
- Product_Type__c,
- //add by rentx 2020-10-14 start
- ContractNo_text__c /*,ContractNo__c*/,
- // tcm start
- Consumable_order_minor__r.ContractNo__c
- // tcm end
- //add by rentx 2020-10-14 end
- FROM Consumable_order_details2__c
- WHERE
- Bar_Code__c IN :BarCodeListP
- AND (NOT Product_Type__c LIKE :userPro_Typestr)
- AND Dealer_Info_text__c = :accountName
- AND ((Consumable_order_minor__c != NULL
- AND Consumable_order_minor__r.Order_Owner_WorkLocal__c = :userWorkLocation)
- OR Consumable_order_minor__c = NULL)
- ORDER BY Name
- ];
+ //barcode涓嶄竴鑷达紝绠＄悊缂栫爜涓�鑷�
+ reSet = [SELECT Id,
+ Name,
+ Intra_Trade_List_RMB__c,
+ Asset_Model_No__c,
+ Consumable_Product__c,
+ Consumable_Product__r.Name,
+ Consumable_Product__r.Name__c,
+ Consumable_Product__r.Asset_Model_No__c,
+ Sterilization_limit__c,
+ Deliver_date__c,
+ Bar_Code__c,
+ Arrive_date__c,
+ Send_Date__c,
+ Consumable_order_minor__r.Name,
+ Consumable_order_minor__c,
+ Dealer_Arrive__c,
+ Guarantee_period_for_products__c,
+ CFDA_Status__c,
+ ProductPacking_list_manual__c,
+ Report_Product_Approbation__c,
+ Report_Product_Expiration__c,
+ Box_Piece__c,
+ Rrturn_count__c,
+ TracingCode__c
+ ,Agencyinfo_fromSAP__c
+ ,Frist_Storage_Agency__c
+ //add by rentx 2020-10-14 start
+ ,ContractNo_text__c/*,ContractNo__c */
+ // tcm start
+ ,Consumable_order_minor__r.ContractNo__c
+ // tcm end
+ //add by rentx 2020-10-14 end
+ FROM Consumable_order_details2__c
+ WHERE recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery
+ AND Dealer_Info_text__c = :accountName
+ //update by rentx 2021-01-04 start CHAN-BWX3XW
+ // AND Consumable_order_minor__c != null
+ // AND Consumable_order_minor__r.Order_Owner_WorkLocal__c = :userWorkLocation
+ AND ((Consumable_order_minor__c != null AND Consumable_order_minor__r.Order_Owner_WorkLocal__c = :userWorkLocation) OR Consumable_order_minor__c = null)
+ //update by rentx 2021-01-04 end CHAN-BWX3XW
+ AND Dealer_Arrive__c = false
+ AND Cancellation_Date__c = null
+ AND TracingCode__c in :barMcodeMap.values()
+ AND Bar_Code__c not in :barMcodeMap.keySet()
+ ORDER BY Name ];
- if (reSet1.size() > 0) {
- for (Integer i = 0; i < reSet1.size(); i++) {
- if (ErrorIdMap.containsKey(reSet1[i].Bar_Code__c)) {
- // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
- continue;
- } else {
- String str =
- '浜у搧绫诲瀷[' +
- reSet1[i].Product_Type__c +
- ']涓庣敤鎴风殑绫诲瀷[' +
- userPro_Type +
- ']涓嶇';
- ConsumableorderdetailsRecordserror.add(
- new ConsumableorderdetailsInfo(reSet1[i], str)
- );
- ErrorIdMap.put(reSet1[i].Bar_Code__c, reSet1[i].Bar_Code__c);
- }
- }
- }
- reSet1 = [
- SELECT
- Id,
- Name,
- Consumable_Product__r.Name__c,
- Consumable_Product__c,
- Consumable_Product__r.Name,
- Sterilization_limit__c,
- Deliver_date__c,
- Bar_Code__c,
- Box_Piece__c,
- Arrive_date__c,
- Send_Date__c,
- Consumable_order_minor__r.Name,
- Consumable_order_minor__c,
- recordtypeid,
- Consumable_order_minor__r.Arrive_Order__c,
- //add by rentx 2020-10-14 start
- ContractNo_text__c /*,ContractNo__c*/,
- // tcm start
- Consumable_order_minor__r.ContractNo__c,
- // tcm end
- Report_Product_Expiration__c
- //add by rentx 2020-10-14 end
- FROM Consumable_order_details2__c
- WHERE
- Dealer_Arrive__c = FALSE
- AND Dealer_Shipment__c = FALSE
- AND Dealer_Saled__c = FALSE
- // gzw fix 鍙栨秷浜у搧鍒ゆ柇涓烘湭鍏ュ簱 20230323
- AND Cancellation_Flag__c = FALSE
- AND Dealer_Returned__c = FALSE
- AND Bar_Code__c IN :BarCodeListP
- AND Dealer_Info_text__c = :accountName
- ORDER BY Name
- ]; //娌″埌璐�
- if (reSet1.size() > 0) {
- for (Integer i = 0; i < reSet1.size(); i++) {
- if (ErrorIdMap.containsKey(reSet1[i].Bar_Code__c)) {
- // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
- continue;
- } else {
- String str = '璇ュ晢鍝佸皻鏈叆搴�';
- ConsumableorderdetailsRecordserror.add(
- new ConsumableorderdetailsInfo(reSet1[i], str)
- );
- ErrorIdMap.put(reSet1[i].Bar_Code__c, reSet1[i].Bar_Code__c);
- }
- }
- }
- reSet1 = [
- SELECT
- Id,
- Name,
- Consumable_Product__r.Name__c,
- ToDueDateDays__c,
- Consumable_Product__c,
- Consumable_Product__r.Name,
- Sterilization_limit__c,
- Deliver_date__c,
- Bar_Code__c,
- Lose_Flag__c,
- Box_Piece__c,
- Arrive_date__c,
- Send_Date__c,
- Consumable_order_minor__r.Name,
- Consumable_order_minor__c,
- recordtypeid,
- Consumable_order_minor__r.Arrive_Order__c,
- //add by rentx 2020-10-14 start
- ContractNo_text__c /*,ContractNo__c*/,
- // tcm start
- Consumable_order_minor__r.ContractNo__c,
- // tcm end
- Report_Product_Expiration__c
- //add by rentx 2020-10-14 end
- FROM Consumable_order_details2__c
- WHERE
- Dealer_Arrive__c = TRUE
- AND Dealer_Shipment__c = FALSE
- AND Dealer_Saled__c = FALSE
- AND Bar_Code__c IN :BarCodeListP
- AND Dealer_Returned__c = FALSE
- // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 start
- //AND Lose_Flag__c = FALSE
- // AND Lose_Flag__c = FALSE
- // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 start
- AND Dealer_Info_text__c = :accountName
- AND Arrive_Owner_Work_Location__c = :userWorkLocation
- // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 start
- // Gzw 20201215淇锛屾媶鐩掍骇鍝佷笉鍒ゆ柇
- AND Box_Piece__c = '鐩�'
- // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 end
- ORDER BY Name
- ]; //娌″嚭搴擄紝娌￠攢鍞紝灏辨槸鍦ㄥ簱
- if (reSet1.size() > 0) {
- for (Integer i = 0; i < reSet1.size(); i++) {
- if (ErrorIdMap.containsKey(reSet1[i].Bar_Code__c)) {
- // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
- continue;
- } else {
- // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 start
- // String str = '璇ュ晢鍝佸湪搴�';
- // if (reSet1[i].Lose_Flag__c) {
- // str = '璇ュ晢鍝佷涪澶�';
- // }
- String str = '';
- if (reSet1[i].Lose_Flag__c == false) {
- str = '璇ュ晢鍝佸湪搴�'; //娌″嚭搴� 锛屾病閿�鍞紝娌′涪澶卞氨鏄湪搴撱��
- }
- if (
- reSet1[i].Lose_Flag__c == true &&
- reSet1[i].ToDueDateDays__c >= 0
- ) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- warningList.add(
- '浜у搧' +
- reSet1[i].Consumable_Product__r.Name +
- '瀛樺湪涓㈠け璁板綍'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.WARNING,
- '浜у搧' +
- reSet1[i].Consumable_Product__r.Name +
- '瀛樺湪涓㈠け璁板綍'
- )
- ); //濡傛灉涓㈠け浜у搧灏辩粰鎻愮ず銆�
+ if(reSet.size()>0){
+ for (Integer i = 0; i < reSet.size(); i++) {
+ if(ExistIdMap.containsKey(reSet[i].Bar_Code__c) || ErrorIdMap.containsKey(reSet[i].Bar_Code__c)){
+ // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
+ continue;
+ }else{
+ Matcher n = Pattern.compile('[0-9]').matcher(reSet[i].TracingCode__c);
+ if(n.find()){// gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 start
+ if (reSet[i].TracingCode__c.length() == 5) {
+ String tr = reSet[i].TracingCode__c;
+ String Ctr = tr.substring(tr.length() - 3,tr.length());
+ String Btr = tr.substring(tr.length() - 4,tr.length()-3);
+ String Atr = tr.substring(tr.length() - 5,tr.length()-4);
+ if (Pattern.compile('[0-9]').matcher(Atr).find() || Pattern.compile('[0-9]').matcher(Ctr).find()) {
+ String str = '绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�';
+ ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(reSet[i],str));
+ ErrorIdMap.put(reSet[i].Bar_Code__c,reSet[i].Bar_Code__c);
+ continue;
+ }
+ }
+ // String str = '绠＄悊缂栫爜涓湁鏁板瓧锛岃涓庣鐞嗗憳纭鏄惁閿欒銆�';
+ // ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(reSet[i],str));
+ // ErrorIdMap.put(reSet[i].Bar_Code__c,reSet[i].Bar_Code__c);
+ // continue;
+ // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 end
+ }
+ ExistIdMap.put(reSet[i].Bar_Code__c,reSet[i].Bar_Code__c);
+ for(String str : barMcodeMap.keySet()){
+ // BarCode涓嶄竴鑷存椂鐨勮鍛婁俊鎭�
+ if(reSet[i].Bar_Code__c != str && reSet[i].TracingCode__c == barMcodeMap.get(str)){
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ warningList.add('鏉″舰鐮佷负('+ str +')鐨勫叆搴撴暟鎹笌鍙戣揣鏁版嵁涓嶄竴鑷�');
+ }else {
+ // 20220815 ljh SWAG-CH65B7 start
+ // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.WARNING,'姝ょ鐞嗙紪鐮佷笌瀹為檯鍙戣揣BarCode涓嶄竴鑷达紝璇锋牳瀵圭鐞嗙紪鐮�('+ str +')鐨勫叆搴撳強搴撳瓨鏁版嵁銆�'));
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.WARNING,'鏉″舰鐮佷负('+ str +')鐨勫叆搴撴暟鎹笌鍙戣揣鏁版嵁涓嶄竴鑷�'));
+ // 20220815 ljh SWAG-CH65B7 end
+ }
+ }
+ if(barMcodeMap.get(str) == reSet[i].TracingCode__c){
+ reSet[i].Bar_Code__c = str;
+ //=====================================
+ // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.WARNING,'鍏ュ簱BarCode('+ str +')鍜屽簱瀛樻潯鐮佷笉涓�鑷淬��'));
+ ExistIdMap.put(str,str);
+ }
+ }
+ ConsumableorderdetailsRecordsdummy.add(new ConsumableorderdetailsInfo(reSet[i]));
+ ConsumableorderdetailsRecords.add(new ConsumableorderdetailsInfo(reSet[i]));
+ }
}
- }
- if (
- reSet1[i].Lose_Flag__c == true &&
- reSet1[i].ToDueDateDays__c < 0
- ) {
- str = '杩囨湡宸查攢瀛樹骇鍝侊紝涓嶅厑璁歌繑鍝�';
- }
- if (str != '') {
- ConsumableorderdetailsRecordserror.add(
- new ConsumableorderdetailsInfo(reSet1[i], str)
- );
- ErrorIdMap.put(reSet1[i].Bar_Code__c, reSet1[i].Bar_Code__c);
- }
- // ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(reSet1[i],str));
- // ErrorIdMap.put(reSet1[i].Bar_Code__c,reSet1[i].Bar_Code__c);
- // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 end
}
- }
- }
- }
- //鍒拌揣姝ｇ‘淇℃伅
- reSet = [
- SELECT
- Id,
- Name,
- Intra_Trade_List_RMB__c,
- Asset_Model_No__c,
- Consumable_Product__c,
- Consumable_Product__r.Name,
- Consumable_Product__r.Name__c,
- Consumable_Product__r.Asset_Model_No__c,
- Sterilization_limit__c,
- Deliver_date__c,
- Bar_Code__c,
- Arrive_date__c,
- Send_Date__c,
- Box_Piece__c,
- Rrturn_count__c,
- Consumable_order_minor__r.Name,
- Consumable_order_minor__c,
- Dealer_Arrive__c,
- Guarantee_period_for_products__c,
- CFDA_Status__c,
- ProductPacking_list_manual__c,
- Report_Product_Approbation__c,
- Report_Product_Expiration__c,
- Consumable_Product__r.Pro2_Dealer_ENG__c,
- Consumable_Product__r.Pro2_Dealer_Object__c,
- TracingCode__c,
- Agencyinfo_fromSAP__c,
- Frist_Storage_Agency__c,
- Dealer_Info_text__c,
- //add by rentx 2020-10-14 start
- ContractNo_text__c /*,ContractNo__c*/,
- // tcm start
- Consumable_order_minor__r.ContractNo__c
- // tcm end
- //add by rentx 2020-10-14 end
- FROM Consumable_order_details2__c
- WHERE
- recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery
- AND Cancellation_Date__c = NULL
- AND Dealer_Arrive__c = FALSE
- AND Product_Type__c LIKE :userPro_Typestr
- AND Bar_Code__c IN :BarCodeListP
- AND Dealer_Info_text__c = :accountName
- AND ((Consumable_order_minor__c != NULL
- AND Consumable_order_minor__r.Order_Owner_WorkLocal__c = :userWorkLocation)
- OR Consumable_order_minor__c = NULL)
- ORDER BY Name
- ];
- if (reSet.size() > 0) {
- //ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'ErrorIdMap+++ '+ ErrorIdMap.keyset()));
- Map<String, String> errorMap = new Map<String, String>();
- for (Integer i = 0; i < reSet.size(); i++) {
- if (
- ExistIdMap.containsKey(reSet[i].Bar_Code__c) ||
- ErrorIdMap.containsKey(reSet[i].Bar_Code__c)
- ) {
- // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
- continue;
- } else {
- Matcher n = Pattern.compile('[0-9]')
- .matcher(reSet[i].TracingCode__c);
- if (n.find()) {
- // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 start
- if (reSet[i].TracingCode__c.length() == 5) {
- String tr = reSet[i].TracingCode__c;
- String Ctr = tr.substring(tr.length() - 3, tr.length());
- String Btr = tr.substring(tr.length() - 4, tr.length() - 3);
- String Atr = tr.substring(tr.length() - 5, tr.length() - 4);
- if (
- Pattern.compile('[0-9]').matcher(Atr).find() ||
- Pattern.compile('[0-9]').matcher(Ctr).find()
- ) {
- String str = '绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�';
- ConsumableorderdetailsRecordserror.add(
- new ConsumableorderdetailsInfo(reSet[i], str)
- );
- ErrorIdMap.put(reSet[i].Bar_Code__c, reSet[i].Bar_Code__c);
- continue;
+ // CHAN-BD43NK 鍏抽棴鐩存帴杩斿搧鍔熻兘 杩藉姞 barcode涓嶄竴鑷村垽鏂�
+ reSet1 = [SELECT Id,Name,TracingCode__c,Bar_Code__c,Sale_orderName__c,Report_Product_Expiration__c
+ FROM Consumable_order_details2__c
+ WHERE Dealer_Arrive__c = true
+ AND (Dealer_Shipment__c = true
+ OR Dealer_Saled__c = true)
+ AND TracingCode__c in :barMcodeMap.values()
+ AND Bar_Code__c not in :barMcodeMap.keySet()
+ AND Dealer_Info_text__c = :accountName
+ AND Arrive_Owner_Work_Location__c =: userWorkLocation
+ ORDER BY Name ];
+ if(reSet1.size()>0){
+ for (Integer i = 0; i < reSet1.size(); i++) {
+ if(ErrorIdMap.containsKey(reSet1[i].Bar_Code__c)){
+ // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
+ continue;
+ }else{
+ for(String str : barMcodeMap.keySet()){
+ if(barMcodeMap.get(str) == reSet1[i].TracingCode__c){
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ errorList.add('barcode' +str + '涓庡嚭搴撳崟' + reSet1[i].Sale_orderName__c + ' 涓殑绠＄悊缂栫爜涓�鑷达紝浣咮arcode涓嶅悓锛岃纭鍏蜂綋鏁版嵁銆�');
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, 'barcode' +str + '涓庡嚭搴撳崟' + reSet1[i].Sale_orderName__c + ' 涓殑绠＄悊缂栫爜涓�鑷达紝浣咮arcode涓嶅悓锛岃纭鍏蜂綋鏁版嵁銆�'));
+ }
+ ErrorIdMap.put(str,str);
+ ErrorIdMap.put(reSet1[i].Bar_Code__c,reSet1[i].Bar_Code__c);
+ }
+ }
+ }
}
- }
- // String str = '绠＄悊缂栫爜涓湁鏁板瓧锛岃涓庣鐞嗗憳纭鏄惁閿欒銆�';
- // ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(reSet[i],str));
- // ErrorIdMap.put(reSet[i].Bar_Code__c,reSet[i].Bar_Code__c);
- // continue;
- // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 end
}
- if (otherAgencyMap.containsKey(reSet[i].Bar_Code__c)) {
- for (Integer j = 0; j < consumableInventory.size(); j++) {
- ConsumableorderdetailsInfo codInfo = consumableInventory.get(j);
- if (codInfo.barCodeNo == reSet[i].Bar_Code__c) {
- consumableInventory.remove(j);
- break;
+ integer RGcnt = GoodsReturnCheck();
+ AllMap.putAll(ErrorIdMap);
+ AllMap.putAll(ExistIdMap);
+ if(RGcnt>0){
+ for(String str:GrList){
+ AllMap.put(str,str);
}
- }
- for (
- Integer m = 0; m < consumableorderdetails2Insert.size(); m++
- ) {
- Consumable_order_details2__c cod2 = consumableorderdetails2Insert.get(
- m
- );
- if (cod2.Bar_Code__c == reSet[i].Bar_Code__c) {
- consumableorderdetails2Insert.remove(m);
- break;
- }
- }
}
- //orderId.add(reSet[i].Consumable_order_minor__c);
- //prodName.add(reSet[i].Consumable_Product__r.Name);
- ConsumableorderdetailsRecordsdummy.add(
- new ConsumableorderdetailsInfo(reSet[i])
- );
- ConsumableorderdetailsRecords.add(
- new ConsumableorderdetailsInfo(reSet[i])
- );
- ExistIdMap.put(reSet[i].Bar_Code__c, reSet[i].Bar_Code__c);
- }
- }
- }
- //barcode涓嶄竴鑷达紝绠＄悊缂栫爜涓�鑷�
- reSet = [
- SELECT
- Id,
- Name,
- Intra_Trade_List_RMB__c,
- Asset_Model_No__c,
- Consumable_Product__c,
- Consumable_Product__r.Name,
- Consumable_Product__r.Name__c,
- Consumable_Product__r.Asset_Model_No__c,
- Sterilization_limit__c,
- Deliver_date__c,
- Bar_Code__c,
- Arrive_date__c,
- Send_Date__c,
- Consumable_order_minor__r.Name,
- Consumable_order_minor__c,
- Dealer_Arrive__c,
- Guarantee_period_for_products__c,
- CFDA_Status__c,
- ProductPacking_list_manual__c,
- Report_Product_Approbation__c,
- Report_Product_Expiration__c,
- Box_Piece__c,
- Rrturn_count__c,
- TracingCode__c,
- Agencyinfo_fromSAP__c,
- Frist_Storage_Agency__c,
- //add by rentx 2020-10-14 start
- ContractNo_text__c /*,ContractNo__c */,
- // tcm start
- Consumable_order_minor__r.ContractNo__c
- // tcm end
- //add by rentx 2020-10-14 end
- FROM Consumable_order_details2__c
- WHERE
- recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery
- AND Dealer_Info_text__c = :accountName
- //update by rentx 2021-01-04 start CHAN-BWX3XW
- // AND Consumable_order_minor__c != null
- // AND Consumable_order_minor__r.Order_Owner_WorkLocal__c = :userWorkLocation
- AND ((Consumable_order_minor__c != NULL
- AND Consumable_order_minor__r.Order_Owner_WorkLocal__c = :userWorkLocation)
- OR Consumable_order_minor__c = NULL)
- //update by rentx 2021-01-04 end CHAN-BWX3XW
- AND Dealer_Arrive__c = FALSE
- AND Cancellation_Date__c = NULL
- AND TracingCode__c IN :barMcodeMap.values()
- AND Bar_Code__c NOT IN :barMcodeMap.keySet()
- ORDER BY Name
- ];
+ //寰楀埌涓嶅瓨鍦ㄧ殑BarCode
+ //return;
+ for(Integer i = 0; i < BarCodeListP.size(); i++){
+ if(AllMap.containsKey(BarCodeListP[i])){
+ continue;
+ }else if(otherAgencyMap.containsKey(BarCodeListP[i])){
+ continue;
+ }
+ //add by rentx 2021-01-27 start
+ else if (coc!= null && coc.orderPattern__c == 'hospitalorder') {
+ HosErrorList.add(BarCodeListP[i]);
+ continue;
+ }
+ //add by rentx 2021-01-27 end
+ else{
+ notInlist.add(BarCodeListP[i]);
+ otherAgencyMap.put(BarCodeListP[i],BarCodeListP[i]);
+ }
+ }
+ // CHAN-BD43NK 鍏抽棴鐩存帴杩斿搧鍔熻兘
+ if(notInlist.size()>0){
+ if(ArrType!='ReG'){
+ inventoryEntryNoESetId(notInlist);
+ if(notInStorelist.size() > 0){
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ returnError = 'BarCode鍙�'+ notInStorelist + '涓嶅瓨鍦�';
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'BarCode鍙�'+ notInStorelist + '涓嶅瓨鍦ㄣ��'));
+ }
+ return;
+ }
+ }else{
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ returnError = 'BarCode鍙�'+ notInlist + '涓嶅瓨鍦紝鏃犲搴旂殑鍑哄簱鍗曪紝璇峰厛鎿嶄綔浜у搧鍏ュ簱';
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'BarCode鍙�'+ notInlist + '涓嶅瓨鍦紝鏃犲搴旂殑鍑哄簱鍗曪紝璇峰厛鎿嶄綔浜у搧鍏ュ簱銆�'));
+ }
+ return;
+ }
+ }
- if (reSet.size() > 0) {
- for (Integer i = 0; i < reSet.size(); i++) {
- if (
- ExistIdMap.containsKey(reSet[i].Bar_Code__c) ||
- ErrorIdMap.containsKey(reSet[i].Bar_Code__c)
- ) {
- // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
- continue;
- } else {
- Matcher n = Pattern.compile('[0-9]')
- .matcher(reSet[i].TracingCode__c);
- if (n.find()) {
- // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 start
- if (reSet[i].TracingCode__c.length() == 5) {
- String tr = reSet[i].TracingCode__c;
- String Ctr = tr.substring(tr.length() - 3, tr.length());
- String Btr = tr.substring(tr.length() - 4, tr.length() - 3);
- String Atr = tr.substring(tr.length() - 5, tr.length() - 4);
- if (
- Pattern.compile('[0-9]').matcher(Atr).find() ||
- Pattern.compile('[0-9]').matcher(Ctr).find()
- ) {
- String str = '绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�';
- ConsumableorderdetailsRecordserror.add(
- new ConsumableorderdetailsInfo(reSet[i], str)
- );
- ErrorIdMap.put(reSet[i].Bar_Code__c, reSet[i].Bar_Code__c);
- continue;
- }
- }
- // String str = '绠＄悊缂栫爜涓湁鏁板瓧锛岃涓庣鐞嗗憳纭鏄惁閿欒銆�';
- // ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(reSet[i],str));
- // ErrorIdMap.put(reSet[i].Bar_Code__c,reSet[i].Bar_Code__c);
- // continue;
- // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 end
- }
- ExistIdMap.put(reSet[i].Bar_Code__c, reSet[i].Bar_Code__c);
- for (String str : barMcodeMap.keySet()) {
- // BarCode涓嶄竴鑷存椂鐨勮鍛婁俊鎭�
- if (
- reSet[i].Bar_Code__c != str &&
- reSet[i].TracingCode__c == barMcodeMap.get(str)
- ) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- warningList.add(
- '鏉″舰鐮佷负(' + str + ')鐨勫叆搴撴暟鎹笌鍙戣揣鏁版嵁涓嶄竴鑷�'
- );
- } else {
- // 20220815 ljh SWAG-CH65B7 start
- // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.WARNING,'姝ょ鐞嗙紪鐮佷笌瀹為檯鍙戣揣BarCode涓嶄竴鑷达紝璇锋牳瀵圭鐞嗙紪鐮�('+ str +')鐨勫叆搴撳強搴撳瓨鏁版嵁銆�'));
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.WARNING,
- '鏉″舰鐮佷负(' + str + ')鐨勫叆搴撴暟鎹笌鍙戣揣鏁版嵁涓嶄竴鑷�'
- )
- );
- // 20220815 ljh SWAG-CH65B7 end
- }
- }
- if (barMcodeMap.get(str) == reSet[i].TracingCode__c) {
- reSet[i].Bar_Code__c = str;
- //=====================================
- // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.WARNING,'鍏ュ簱BarCode('+ str +')鍜屽簱瀛樻潯鐮佷笉涓�鑷淬��'));
- ExistIdMap.put(str, str);
- }
- }
- ConsumableorderdetailsRecordsdummy.add(
- new ConsumableorderdetailsInfo(reSet[i])
- );
- ConsumableorderdetailsRecords.add(
- new ConsumableorderdetailsInfo(reSet[i])
- );
- }
- }
- }
-
- // CHAN-BD43NK 鍏抽棴鐩存帴杩斿搧鍔熻兘 杩藉姞 barcode涓嶄竴鑷村垽鏂�
- reSet1 = [
- SELECT
- Id,
- Name,
- TracingCode__c,
- Bar_Code__c,
- Sale_orderName__c,
- Report_Product_Expiration__c
- FROM Consumable_order_details2__c
- WHERE
- Dealer_Arrive__c = TRUE
- AND (Dealer_Shipment__c = TRUE
- OR Dealer_Saled__c = TRUE)
- AND TracingCode__c IN :barMcodeMap.values()
- AND Bar_Code__c NOT IN :barMcodeMap.keySet()
- AND Dealer_Info_text__c = :accountName
- AND Arrive_Owner_Work_Location__c = :userWorkLocation
- ORDER BY Name
- ];
- if (reSet1.size() > 0) {
- for (Integer i = 0; i < reSet1.size(); i++) {
- if (ErrorIdMap.containsKey(reSet1[i].Bar_Code__c)) {
- // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
- continue;
- } else {
- for (String str : barMcodeMap.keySet()) {
- if (barMcodeMap.get(str) == reSet1[i].TracingCode__c) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
- 'barcode' +
- str +
- '涓庡嚭搴撳崟' +
- reSet1[i].Sale_orderName__c +
- ' 涓殑绠＄悊缂栫爜涓�鑷达紝浣咮arcode涓嶅悓锛岃纭鍏蜂綋鏁版嵁銆�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- 'barcode' +
- str +
- '涓庡嚭搴撳崟' +
- reSet1[i].Sale_orderName__c +
- ' 涓殑绠＄悊缂栫爜涓�鑷达紝浣咮arcode涓嶅悓锛岃纭鍏蜂綋鏁版嵁銆�'
- )
- );
- }
- ErrorIdMap.put(str, str);
- ErrorIdMap.put(reSet1[i].Bar_Code__c, reSet1[i].Bar_Code__c);
- }
- }
- }
- }
- }
- integer RGcnt = GoodsReturnCheck();
- AllMap.putAll(ErrorIdMap);
- AllMap.putAll(ExistIdMap);
- if (RGcnt > 0) {
- for (String str : GrList) {
- AllMap.put(str, str);
- }
- }
- //寰楀埌涓嶅瓨鍦ㄧ殑BarCode
- //return;
- for (Integer i = 0; i < BarCodeListP.size(); i++) {
- if (AllMap.containsKey(BarCodeListP[i])) {
- continue;
- } else if (otherAgencyMap.containsKey(BarCodeListP[i])) {
- continue;
- }
//add by rentx 2021-01-27 start
- else if (coc != null && coc.orderPattern__c == 'hospitalorder') {
- HosErrorList.add(BarCodeListP[i]);
- continue;
+ if (HosErrorList.size() > 0) {
+ for (String str : HosErrorList) {
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ errorList.add('BarCode鍙�:' + str + HosErrorMap.get(str)+'');
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'BarCode鍙�:' + str + HosErrorMap.get(str)+''));
+ }
+ }
}
//add by rentx 2021-01-27 end
- else {
- notInlist.add(BarCodeListP[i]);
- otherAgencyMap.put(BarCodeListP[i], BarCodeListP[i]);
- }
- }
- // CHAN-BD43NK 鍏抽棴鐩存帴杩斿搧鍔熻兘
- if (notInlist.size() > 0) {
- if (ArrType != 'ReG') {
- inventoryEntryNoESetId(notInlist);
- if (notInStorelist.size() > 0) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- returnError = 'BarCode鍙�' + notInStorelist + '涓嶅瓨鍦�';
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- 'BarCode鍙�' + notInStorelist + '涓嶅瓨鍦ㄣ��'
- )
- );
- }
- return;
- }
- } else {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- returnError =
- 'BarCode鍙�' +
- notInlist +
- '涓嶅瓨鍦紝鏃犲搴旂殑鍑哄簱鍗曪紝璇峰厛鎿嶄綔浜у搧鍏ュ簱';
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- 'BarCode鍙�' +
- notInlist +
- '涓嶅瓨鍦紝鏃犲搴旂殑鍑哄簱鍗曪紝璇峰厛鎿嶄綔浜у搧鍏ュ簱銆�'
- )
- );
- }
- return;
- }
- }
- //add by rentx 2021-01-27 start
- if (HosErrorList.size() > 0) {
- for (String str : HosErrorList) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add('BarCode鍙�:' + str + HosErrorMap.get(str) + '');
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- 'BarCode鍙�:' + str + HosErrorMap.get(str) + ''
- )
- );
- }
- }
- }
- //add by rentx 2021-01-27 end
- } else {
- //宸插彇娑堜骇鍝�
- reSet1 = [
- SELECT
- Id,
- Name,
- Consumable_Product__r.Name__c,
- Consumable_Product__c,
- Consumable_Product__r.Name,
- Sterilization_limit__c,
- Deliver_date__c,
- Bar_Code__c,
- Box_Piece__c,
- Arrive_date__c,
- Send_Date__c,
- Consumable_order_minor__r.Name,
- Consumable_order_minor__c,
- recordtypeid,
- Consumable_order_minor__r.Arrive_Order__c,
- Report_Product_Expiration__c
- FROM Consumable_order_details2__c
- WHERE
- Dealer_Arrive__c = FALSE
- AND Dealer_Shipment__c = FALSE
- AND Dealer_Saled__c = FALSE
- AND Dealer_Returned__c = FALSE
- AND Cancellation_Date__c != NULL
- AND Bar_Code__c IN :BarCodeListP
- AND Dealer_Info_text__c = :accountName
- ORDER BY Name
- ]; //娌″埌璐�
- if (reSet1.size() > 0) {
- for (Integer i = 0; i < reSet1.size(); i++) {
- if (ErrorIdMap.containsKey(reSet1[i].Bar_Code__c)) {
- // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
- continue;
- } else {
- String str = '璇ュ晢鍝佸彇娑�';
- ConsumableorderdetailsRecordserror.add(
- new ConsumableorderdetailsInfo(reSet1[i], str)
- );
- ErrorIdMap.put(reSet1[i].Bar_Code__c, reSet1[i].Bar_Code__c);
- }
- }
- }
- //宸茬粡閿�鍞�
- reSet1 = [
- SELECT
- Id,
- Name,
- Consumable_Product__r.Name__c,
- Consumable_Product__c,
- Consumable_Product__r.Name,
- Sterilization_limit__c,
- Deliver_date__c,
- Bar_Code__c,
- Box_Piece__c,
- Arrive_date__c,
- Send_Date__c,
- Consumable_order_minor__r.Name,
- Consumable_order_minor__c,
- recordtypeid,
- Consumable_order_minor__r.Arrive_Order__c,
- Report_Product_Expiration__c
- FROM Consumable_order_details2__c
- WHERE
- Dealer_Saled__c = TRUE
- AND Dealer_Returned__c = FALSE
- AND Dealer_Info_text__c = :accountName
- AND Bar_Code__c IN :BarCodeListP
- AND Arrive_Owner_Work_Location__c = :userWorkLocation
- ORDER BY Name
- ];
- if (reSet1.size() > 0) {
- for (Integer i = 0; i < reSet1.size(); i++) {
- if (ErrorIdMap.containsKey(reSet1[i].Bar_Code__c)) {
- // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
- continue;
- } else {
- String str = '璇ュ晢鍝佸凡缁忛攢鍞�';
- ConsumableorderdetailsRecordserror.add(
- new ConsumableorderdetailsInfo(reSet1[i], str)
- );
- ErrorIdMap.put(reSet1[i].Bar_Code__c, reSet1[i].Bar_Code__c);
- }
- }
- }
- //宸茬粡鍑哄簱浜у搧
- reSet1 = [
- SELECT
- Id,
- Name,
- Consumable_Product__r.Name__c,
- Consumable_Product__c,
- Consumable_Product__r.Name,
- Sterilization_limit__c,
- Deliver_date__c,
- Bar_Code__c,
- Box_Piece__c,
- Arrive_date__c,
- Send_Date__c,
- Consumable_order_minor__r.Name,
- Consumable_order_minor__c,
- recordtypeid,
- Consumable_order_minor__r.Arrive_Order__c,
- Report_Product_Expiration__c
- FROM Consumable_order_details2__c
- WHERE
- Dealer_Shipment__c = TRUE
- AND Dealer_Returned__c = FALSE
- AND Dealer_Info_text__c = :accountName
- AND Arrive_Owner_Work_Location__c = :userWorkLocation
- AND Bar_Code__c IN :BarCodeListP
- ORDER BY Name
- ];
- if (reSet1.size() > 0) {
- for (Integer i = 0; i < reSet1.size(); i++) {
- if (ErrorIdMap.containsKey(reSet1[i].Bar_Code__c)) {
- // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
- continue;
- } else {
- String str = '璇ュ晢鍝佸凡缁忓嚭搴�';
- ConsumableorderdetailsRecordserror.add(
- new ConsumableorderdetailsInfo(reSet1[i], str)
- );
- ErrorIdMap.put(reSet1[i].Bar_Code__c, reSet1[i].Bar_Code__c);
- }
- }
- }
- //宸茬粡鍒拌揣浜у搧
- reSet1 = [
- SELECT
- Id,
- Name,
- Consumable_Product__r.Name__c,
- Consumable_Product__c,
- Consumable_Product__r.Name,
- Sterilization_limit__c,
- Deliver_date__c,
- Bar_Code__c,
- Lose_Flag__c,
- Box_Piece__c,
- Arrive_date__c,
- Send_Date__c,
- Consumable_order_minor__r.Name,
- Consumable_order_minor__c,
- recordtypeid,
- Consumable_order_minor__r.Arrive_Order__c,
- Report_Product_Expiration__c
- FROM Consumable_order_details2__c
- WHERE
- Dealer_Arrive__c = TRUE
- AND Dealer_Returned__c = FALSE
- AND Bar_Code__c IN :BarCodeListP
- AND Dealer_Info_text__c = :accountName
- AND Arrive_Owner_Work_Location__c = :userWorkLocation
- ORDER BY Name
- ];
- if (reSet1.size() > 0) {
- for (Integer i = 0; i < reSet1.size(); i++) {
- if (ErrorIdMap.containsKey(reSet1[i].Bar_Code__c)) {
- // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
- continue;
- } else {
- String str = '璇ュ晢鍝佸凡缁忓埌璐�';
- if (reSet1[i].Lose_Flag__c == true) {
- str = '璇ュ晢鍝佸凡缁忎涪澶�';
- }
- ConsumableorderdetailsRecordserror.add(
- new ConsumableorderdetailsInfo(reSet1[i], str)
- );
- ErrorIdMap.put(reSet1[i].Bar_Code__c, reSet1[i].Bar_Code__c);
- }
- }
- }
- //涓嶅睘浜庢湰璁㈠崟
- reSet1 = [
- SELECT
- Id,
- Name,
- Consumable_Product__r.Name__c,
- Consumable_Product__c,
- Consumable_Product__r.Name,
- Sterilization_limit__c,
- Deliver_date__c,
- Bar_Code__c,
- Box_Piece__c,
- Arrive_date__c,
- Send_Date__c,
- Consumable_order_minor__r.Name,
- Consumable_order_minor__c,
- recordtypeid,
- Consumable_order_minor__r.Arrive_Order__c,
- Report_Product_Expiration__c
- FROM Consumable_order_details2__c
- WHERE
- Consumable_order_minor__c != :ESetId
- AND Bar_Code__c IN :BarCodeListP
- //AND Dealer_Info_text__c = :accountName
- ORDER BY Name
- ];
- if (reSet1.size() > 0) {
- for (Integer i = 0; i < reSet1.size(); i++) {
- if (ErrorIdMap.containsKey(reSet1[i].Bar_Code__c)) {
- // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
- continue;
- } else {
- String str = '璇ユ秷鑰楀搧涓嶅睘浜庢湰璁㈠崟';
- ConsumableorderdetailsRecordserror.add(
- new ConsumableorderdetailsInfo(reSet1[i], str)
- );
- ErrorIdMap.put(reSet1[i].Bar_Code__c, reSet1[i].Bar_Code__c);
- }
- }
- }
- //鍒拌揣浣嗕骇鍝佺被鍨嬩笌鐢ㄦ埛鐨勭被鍨嬩笉绗�
- reSet1 = [
- SELECT
- Id,
- Name,
- Intra_Trade_List_RMB__c,
- Asset_Model_No__c,
- Consumable_Product__c,
- Consumable_Product__r.Name,
- Consumable_Product__r.Name__c,
- Consumable_Product__r.Asset_Model_No__c,
- Sterilization_limit__c,
- Deliver_date__c,
- Bar_Code__c,
- Arrive_date__c,
- Send_Date__c,
- Consumable_order_minor__r.Name,
- Consumable_order_minor__c,
- Dealer_Arrive__c,
- Guarantee_period_for_products__c,
- CFDA_Status__c,
- ProductPacking_list_manual__c,
- Report_Product_Approbation__c,
- Report_Product_Expiration__c,
- Box_Piece__c,
- Rrturn_count__c,
- Product_Type__c,
- ContractNo_text__c /*,ContractNo__c*/,
- // tcm start
- Consumable_order_minor__r.ContractNo__c
- // tcm end
- FROM Consumable_order_details2__c
- WHERE
- recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery
- AND Dealer_Info_text__c = :accountName
- AND (NOT Product_Type__c LIKE :userPro_Typestr)
- AND Consumable_order_minor__c = :ESetId
- AND Consumable_order_minor__r.Order_Owner_WorkLocal__c = :userWorkLocation
- AND Dealer_Arrive__c = FALSE
- AND Cancellation_Date__c = NULL
- AND Bar_Code__c IN :BarCodeListP
- ORDER BY Name
- ];
- if (reSet1.size() > 0) {
- for (Integer i = 0; i < reSet1.size(); i++) {
- if (ErrorIdMap.containsKey(reSet1[i].Bar_Code__c)) {
- // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
- continue;
- } else {
- String str =
- '浜у搧绫诲瀷[' +
- reSet1[i].Product_Type__c +
- ']涓庣敤鎴风殑绫诲瀷[' +
- userPro_Type +
- ']涓嶇';
- ConsumableorderdetailsRecordserror.add(
- new ConsumableorderdetailsInfo(reSet1[i], str)
- );
- ErrorIdMap.put(reSet1[i].Bar_Code__c, reSet1[i].Bar_Code__c);
- }
- }
- }
-
- //鍒拌揣姝ｇ‘淇℃伅
- reSet = [
- SELECT
- Id,
- Name,
- Intra_Trade_List_RMB__c,
- Asset_Model_No__c,
- Consumable_Product__c,
- Consumable_Product__r.Name,
- Consumable_Product__r.Name__c,
- Consumable_Product__r.Asset_Model_No__c,
- Sterilization_limit__c,
- Deliver_date__c,
- Bar_Code__c,
- Arrive_date__c,
- Send_Date__c,
- Consumable_order_minor__r.Name,
- Consumable_order_minor__c,
- Dealer_Arrive__c,
- Guarantee_period_for_products__c,
- CFDA_Status__c,
- ProductPacking_list_manual__c,
- Report_Product_Approbation__c,
- Report_Product_Expiration__c,
- Box_Piece__c,
- Rrturn_count__c,
- TracingCode__c,
- Agencyinfo_fromSAP__c,
- Frist_Storage_Agency__c,
- Dealer_Info_text__c,
- ContractNo_text__c /*,ContractNo__c*/,
- // tcm start
- Consumable_order_minor__r.ContractNo__c
- // tcm end
- FROM Consumable_order_details2__c
- WHERE
- recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery
- AND Dealer_Info_text__c = :accountName
- AND Product_Type__c LIKE :userPro_Typestr
- AND Consumable_order_minor__c = :ESetId
- AND Consumable_order_minor__r.Order_Owner_WorkLocal__c = :userWorkLocation
- AND Dealer_Arrive__c = FALSE
- AND Cancellation_Date__c = NULL
- AND Bar_Code__c IN :BarCodeListP
- ORDER BY Name
- ];
- if (reSet.size() > 0) {
- Map<String, String> errorMap = new Map<String, String>();
- for (Integer i = 0; i < reSet.size(); i++) {
- if (
- ExistIdMap.containsKey(reSet[i].Bar_Code__c) ||
- ErrorIdMap.containsKey(reSet[i].Bar_Code__c)
- ) {
- // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
- continue;
- } else {
- Matcher n = Pattern.compile('[0-9]')
- .matcher(reSet[i].TracingCode__c);
- if (n.find()) {
- // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 start
- if (reSet[i].TracingCode__c.length() == 5) {
- String tr = reSet[i].TracingCode__c;
- String Ctr = tr.substring(tr.length() - 3, tr.length());
- String Btr = tr.substring(tr.length() - 4, tr.length() - 3);
- String Atr = tr.substring(tr.length() - 5, tr.length() - 4);
- if (
- Pattern.compile('[0-9]').matcher(Atr).find() ||
- Pattern.compile('[0-9]').matcher(Ctr).find()
- ) {
- String str = '绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�';
- ConsumableorderdetailsRecordserror.add(
- new ConsumableorderdetailsInfo(reSet[i], str)
- );
- ErrorIdMap.put(reSet[i].Bar_Code__c, reSet[i].Bar_Code__c);
- continue;
+ }else{
+ //宸插彇娑堜骇鍝�
+ reSet1 = [SELECT Id, Name,Consumable_Product__r.Name__c,
+ Consumable_Product__c,Consumable_Product__r.Name, Sterilization_limit__c,
+ Deliver_date__c,Bar_Code__c,Box_Piece__c,
+ Arrive_date__c,Send_Date__c,Consumable_order_minor__r.Name,Consumable_order_minor__c,
+ recordtypeid,Consumable_order_minor__r.Arrive_Order__c,Report_Product_Expiration__c
+ FROM Consumable_order_details2__c
+ WHERE Dealer_Arrive__c = FALSE
+ AND Dealer_Shipment__c= FALSE
+ AND Dealer_Saled__c = FALSE
+ AND Dealer_Returned__c = false
+ AND Cancellation_Date__c != null
+ AND Bar_Code__c in :BarCodeListP
+ AND Dealer_Info_text__c = :accountName
+ ORDER BY Name ];//娌″埌璐�
+ if(reSet1.size()>0){
+ for (Integer i = 0; i < reSet1.size(); i++) {
+ if(ErrorIdMap.containsKey(reSet1[i].Bar_Code__c)){
+ // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
+ continue;
+ }else{
+ String str = '璇ュ晢鍝佸彇娑�';
+ ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(reSet1[i],str));
+ ErrorIdMap.put(reSet1[i].Bar_Code__c,reSet1[i].Bar_Code__c);
+ }
+ }
}
- }
- // String str = '绠＄悊缂栫爜涓湁鏁板瓧锛岃涓庣鐞嗗憳纭鏄惁閿欒銆�';
- // ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(reSet[i],str));
- // ErrorIdMap.put(reSet[i].Bar_Code__c,reSet[i].Bar_Code__c);
- // continue;
- // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 end
- }
- ConsumableorderdetailsRecordsdummy.add(
- new ConsumableorderdetailsInfo(reSet[i])
- );
- ConsumableorderdetailsRecords.add(
- new ConsumableorderdetailsInfo(reSet[i])
- );
- ExistIdMap.put(reSet[i].Bar_Code__c, reSet[i].Bar_Code__c);
- }
- }
- }
-
- //barcode涓嶄竴鑷达紝绠＄悊缂栫爜涓�鑷�
- reSet = [
- SELECT
- Id,
- Name,
- Intra_Trade_List_RMB__c,
- Asset_Model_No__c,
- Consumable_Product__c,
- Consumable_Product__r.Name,
- Consumable_Product__r.Name__c,
- Consumable_Product__r.Asset_Model_No__c,
- Sterilization_limit__c,
- Deliver_date__c,
- Bar_Code__c,
- Arrive_date__c,
- Send_Date__c,
- Box_Piece__c,
- Rrturn_count__c,
- Consumable_order_minor__r.Name,
- Consumable_order_minor__c,
- Dealer_Arrive__c,
- Guarantee_period_for_products__c,
- CFDA_Status__c,
- ProductPacking_list_manual__c,
- Report_Product_Approbation__c,
- Report_Product_Expiration__c,
- TracingCode__c,
- Agencyinfo_fromSAP__c,
- Frist_Storage_Agency__c,
- ContractNo_text__c /*,ContractNo__c*/,
- // tcm start
- Consumable_order_minor__r.ContractNo__c
- // tcm end
- FROM Consumable_order_details2__c
- WHERE
- recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery
- AND Cancellation_Date__c = NULL
- AND Dealer_Arrive__c = FALSE
- AND TracingCode__c IN :barMcodeMap.values()
- AND Bar_Code__c NOT IN :barMcodeMap.keySet()
- AND Dealer_Info_text__c = :accountName
- AND ((Consumable_order_minor__c != NULL
- AND Consumable_order_minor__r.Order_Owner_WorkLocal__c = :userWorkLocation)
- OR Consumable_order_minor__c = NULL)
- ORDER BY Name
- ];
- if (reSet.size() > 0) {
- for (Integer i = 0; i < reSet.size(); i++) {
- if (
- ExistIdMap.containsKey(reSet[i].Bar_Code__c) ||
- ErrorIdMap.containsKey(reSet[i].Bar_Code__c)
- ) {
- // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
- continue;
- } else {
- Matcher n = Pattern.compile('[0-9]')
- .matcher(reSet[i].TracingCode__c);
- if (n.find()) {
- // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 start
- if (reSet[i].TracingCode__c.length() == 5) {
- String tr = reSet[i].TracingCode__c;
- String Ctr = tr.substring(tr.length() - 3, tr.length());
- String Btr = tr.substring(tr.length() - 4, tr.length() - 3);
- String Atr = tr.substring(tr.length() - 5, tr.length() - 4);
- if (
- Pattern.compile('[0-9]').matcher(Atr).find() ||
- Pattern.compile('[0-9]').matcher(Ctr).find()
- ) {
- String str = '绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�';
- ConsumableorderdetailsRecordserror.add(
- new ConsumableorderdetailsInfo(reSet[i], str)
- );
- ErrorIdMap.put(reSet[i].Bar_Code__c, reSet[i].Bar_Code__c);
- continue;
+ //宸茬粡閿�鍞�
+ reSet1 = [SELECT Id, Name,Consumable_Product__r.Name__c,
+ Consumable_Product__c,Consumable_Product__r.Name, Sterilization_limit__c,
+ Deliver_date__c,Bar_Code__c,Box_Piece__c,
+ Arrive_date__c,Send_Date__c,Consumable_order_minor__r.Name,Consumable_order_minor__c,
+ recordtypeid,Consumable_order_minor__r.Arrive_Order__c,Report_Product_Expiration__c
+ FROM Consumable_order_details2__c
+ WHERE Dealer_Saled__c = true
+ AND Dealer_Returned__c =false
+ AND Dealer_Info_text__c = :accountName
+ AND Bar_Code__c in :BarCodeListP
+ AND Arrive_Owner_Work_Location__c =: userWorkLocation
+ ORDER BY Name ];
+ if(reSet1.size()>0){
+ for (Integer i = 0; i < reSet1.size(); i++) {
+ if(ErrorIdMap.containsKey(reSet1[i].Bar_Code__c)){
+ // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
+ continue;
+ }else{
+ String str = '璇ュ晢鍝佸凡缁忛攢鍞�';
+ ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(reSet1[i],str));
+ ErrorIdMap.put(reSet1[i].Bar_Code__c,reSet1[i].Bar_Code__c);
+ }
+ }
}
- }
- // String str = '绠＄悊缂栫爜涓湁鏁板瓧锛岃涓庣鐞嗗憳纭鏄惁閿欒銆�';
- // ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(reSet[i],str));
- // ErrorIdMap.put(reSet[i].Bar_Code__c,reSet[i].Bar_Code__c);
- // continue;
- // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 end
+ //宸茬粡鍑哄簱浜у搧
+ reSet1 = [SELECT Id, Name,Consumable_Product__r.Name__c,
+ Consumable_Product__c,Consumable_Product__r.Name, Sterilization_limit__c,
+ Deliver_date__c,Bar_Code__c,Box_Piece__c,
+ Arrive_date__c,Send_Date__c,Consumable_order_minor__r.Name,Consumable_order_minor__c,
+ recordtypeid,Consumable_order_minor__r.Arrive_Order__c,Report_Product_Expiration__c
+ FROM Consumable_order_details2__c
+ WHERE Dealer_Shipment__c = true
+ AND Dealer_Returned__c =false
+ AND Dealer_Info_text__c = :accountName
+ AND Arrive_Owner_Work_Location__c =: userWorkLocation
+ AND Bar_Code__c in :BarCodeListP
+ ORDER BY Name ];
+ if(reSet1.size()>0){
+ for (Integer i = 0; i < reSet1.size(); i++) {
+ if(ErrorIdMap.containsKey(reSet1[i].Bar_Code__c)){
+ // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
+ continue;
+ }else{
+ String str = '璇ュ晢鍝佸凡缁忓嚭搴�';
+ ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(reSet1[i],str));
+ ErrorIdMap.put(reSet1[i].Bar_Code__c,reSet1[i].Bar_Code__c);
+ }
+ }
+ }
+ //宸茬粡鍒拌揣浜у搧
+ reSet1 = [SELECT Id, Name,Consumable_Product__r.Name__c,
+ Consumable_Product__c,Consumable_Product__r.Name, Sterilization_limit__c,
+ Deliver_date__c,Bar_Code__c,Lose_Flag__c,Box_Piece__c,
+ Arrive_date__c,Send_Date__c,Consumable_order_minor__r.Name,Consumable_order_minor__c,
+ recordtypeid,Consumable_order_minor__r.Arrive_Order__c,Report_Product_Expiration__c
+ FROM Consumable_order_details2__c
+ WHERE Dealer_Arrive__c = true
+ AND Dealer_Returned__c =false
+ AND Bar_Code__c in :BarCodeListP
+ AND Dealer_Info_text__c = :accountName
+ AND Arrive_Owner_Work_Location__c =: userWorkLocation
+ ORDER BY Name ];
+ if(reSet1.size()>0){
+ for (Integer i = 0; i < reSet1.size(); i++) {
+ if(ErrorIdMap.containsKey(reSet1[i].Bar_Code__c)){
+ // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
+ continue;
+ }else{
+ String str = '璇ュ晢鍝佸凡缁忓埌璐�';
+ if (reSet1[i].Lose_Flag__c == TRUE) {
+ str = '璇ュ晢鍝佸凡缁忎涪澶�';
+ }
+ ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(reSet1[i],str));
+ ErrorIdMap.put(reSet1[i].Bar_Code__c,reSet1[i].Bar_Code__c);
+ }
+ }
+ }
+ //涓嶅睘浜庢湰璁㈠崟
+ reSet1 = [SELECT Id, Name,Consumable_Product__r.Name__c,
+ Consumable_Product__c,Consumable_Product__r.Name, Sterilization_limit__c,
+ Deliver_date__c,Bar_Code__c,Box_Piece__c,
+ Arrive_date__c,Send_Date__c,Consumable_order_minor__r.Name,Consumable_order_minor__c,
+ recordtypeid,Consumable_order_minor__r.Arrive_Order__c,Report_Product_Expiration__c
+ FROM Consumable_order_details2__c
+ WHERE Consumable_order_minor__c != :ESetId
+ AND Bar_Code__c in :BarCodeListP
+ //AND Dealer_Info_text__c = :accountName
+ ORDER BY Name ];
+ if(reSet1.size()>0){
+ for (Integer i = 0; i < reSet1.size(); i++) {
+ if(ErrorIdMap.containsKey(reSet1[i].Bar_Code__c)){
+ // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
+ continue;
+ }else{
+ String str = '璇ユ秷鑰楀搧涓嶅睘浜庢湰璁㈠崟';
+ ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(reSet1[i],str));
+ ErrorIdMap.put(reSet1[i].Bar_Code__c,reSet1[i].Bar_Code__c);
+ }
+ }
+ }
+ //鍒拌揣浣嗕骇鍝佺被鍨嬩笌鐢ㄦ埛鐨勭被鍨嬩笉绗�
+ reSet1 = [SELECT Id,Name,Intra_Trade_List_RMB__c,Asset_Model_No__c,
+ Consumable_Product__c,Consumable_Product__r.Name,
+ Consumable_Product__r.Name__c,Consumable_Product__r.Asset_Model_No__c,
+ Sterilization_limit__c,Deliver_date__c,Bar_Code__c,
+ Arrive_date__c,Send_Date__c,Consumable_order_minor__r.Name,
+ Consumable_order_minor__c,Dealer_Arrive__c,
+ Guarantee_period_for_products__c,CFDA_Status__c,
+ ProductPacking_list_manual__c,Report_Product_Approbation__c,
+ Report_Product_Expiration__c,Box_Piece__c, Rrturn_count__c,
+ Product_Type__c
+ ,ContractNo_text__c/*,ContractNo__c*/
+ // tcm start
+ ,Consumable_order_minor__r.ContractNo__c
+ // tcm end
+ FROM Consumable_order_details2__c
+ WHERE recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery
+ AND Dealer_Info_text__c = :accountName
+ AND ( not Product_Type__c like :userPro_Typestr)
+ AND Consumable_order_minor__c = :ESetId
+ AND Consumable_order_minor__r.Order_Owner_WorkLocal__c = :userWorkLocation
+ AND Dealer_Arrive__c = false
+ AND Cancellation_Date__c = null
+ AND Bar_Code__c in :BarCodeListP
+ ORDER BY Name ];
+ if(reSet1.size()>0){
+ for (Integer i = 0; i < reSet1.size(); i++) {
+ if(ErrorIdMap.containsKey(reSet1[i].Bar_Code__c)){
+ // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
+ continue;
+ }else{
+ String str = '浜у搧绫诲瀷['+reSet1[i].Product_Type__c+']涓庣敤鎴风殑绫诲瀷['+userPro_Type+']涓嶇';
+ ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(reSet1[i],str));
+ ErrorIdMap.put(reSet1[i].Bar_Code__c,reSet1[i].Bar_Code__c);
+ }
+ }
+ }
+
+ //鍒拌揣姝ｇ‘淇℃伅
+ reSet = [SELECT Id,Name,Intra_Trade_List_RMB__c,Asset_Model_No__c,
+ Consumable_Product__c,Consumable_Product__r.Name,
+ Consumable_Product__r.Name__c,Consumable_Product__r.Asset_Model_No__c,
+ Sterilization_limit__c,Deliver_date__c,Bar_Code__c,
+ Arrive_date__c,Send_Date__c,Consumable_order_minor__r.Name,
+ Consumable_order_minor__c,Dealer_Arrive__c,
+ Guarantee_period_for_products__c,CFDA_Status__c,
+ ProductPacking_list_manual__c,Report_Product_Approbation__c,
+ Report_Product_Expiration__c,Box_Piece__c, Rrturn_count__c,
+ TracingCode__c,
+ Agencyinfo_fromSAP__c,
+ Frist_Storage_Agency__c,
+ Dealer_Info_text__c
+ ,ContractNo_text__c/*,ContractNo__c*/
+ // tcm start
+ ,Consumable_order_minor__r.ContractNo__c
+ // tcm end
+ FROM Consumable_order_details2__c
+ WHERE recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery
+ AND Dealer_Info_text__c = :accountName
+ AND Product_Type__c like :userPro_Typestr
+ AND Consumable_order_minor__c = :ESetId
+ AND Consumable_order_minor__r.Order_Owner_WorkLocal__c = :userWorkLocation
+ AND Dealer_Arrive__c = false
+ AND Cancellation_Date__c = null
+ AND Bar_Code__c in :BarCodeListP
+ ORDER BY Name ];
+ if(reSet.size()>0){
+ Map<String,String> errorMap = new Map<String,String>();
+ for (Integer i = 0; i < reSet.size(); i++) {
+ if(ExistIdMap.containsKey(reSet[i].Bar_Code__c) || ErrorIdMap.containsKey(reSet[i].Bar_Code__c)){
+ // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
+ continue;
+ }else{
+ Matcher n = Pattern.compile('[0-9]').matcher(reSet[i].TracingCode__c);
+ if(n.find()){
+ // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 start
+ if (reSet[i].TracingCode__c.length() == 5) {
+ String tr = reSet[i].TracingCode__c;
+ String Ctr = tr.substring(tr.length() - 3,tr.length());
+ String Btr = tr.substring(tr.length() - 4,tr.length()-3);
+ String Atr = tr.substring(tr.length() - 5,tr.length()-4);
+ if (Pattern.compile('[0-9]').matcher(Atr).find() || Pattern.compile('[0-9]').matcher(Ctr).find()) {
+ String str = '绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�';
+ ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(reSet[i],str));
+ ErrorIdMap.put(reSet[i].Bar_Code__c,reSet[i].Bar_Code__c);
+ continue;
+ }
+ }
+ // String str = '绠＄悊缂栫爜涓湁鏁板瓧锛岃涓庣鐞嗗憳纭鏄惁閿欒銆�';
+ // ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(reSet[i],str));
+ // ErrorIdMap.put(reSet[i].Bar_Code__c,reSet[i].Bar_Code__c);
+ // continue;
+ // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 end
+ }
+ ConsumableorderdetailsRecordsdummy.add(new ConsumableorderdetailsInfo(reSet[i]));
+ ConsumableorderdetailsRecords.add(new ConsumableorderdetailsInfo(reSet[i]));
+ ExistIdMap.put(reSet[i].Bar_Code__c,reSet[i].Bar_Code__c);
+ }
+ }
}
- ExistIdMap.put(reSet[i].Bar_Code__c, reSet[i].Bar_Code__c);
- for (String str : barMcodeMap.keySet()) {
- if (barMcodeMap.get(str) == reSet[i].TracingCode__c) {
- reSet[i].Bar_Code__c = str;
- ExistIdMap.put(str, str);
- }
+
+ //barcode涓嶄竴鑷达紝绠＄悊缂栫爜涓�鑷�
+ reSet = [SELECT Id,
+ Name,
+ Intra_Trade_List_RMB__c,
+ Asset_Model_No__c,
+ Consumable_Product__c,
+ Consumable_Product__r.Name,
+ Consumable_Product__r.Name__c,
+ Consumable_Product__r.Asset_Model_No__c,
+ Sterilization_limit__c,
+ Deliver_date__c,
+ Bar_Code__c,
+ Arrive_date__c,
+ Send_Date__c,
+ Box_Piece__c,
+ Rrturn_count__c,
+ Consumable_order_minor__r.Name,
+ Consumable_order_minor__c,
+ Dealer_Arrive__c,
+ Guarantee_period_for_products__c,
+ CFDA_Status__c,
+ ProductPacking_list_manual__c,
+ Report_Product_Approbation__c,
+ Report_Product_Expiration__c,
+ TracingCode__c
+ ,Agencyinfo_fromSAP__c
+ ,Frist_Storage_Agency__c
+ ,ContractNo_text__c/*,ContractNo__c*/
+ // tcm start
+ ,Consumable_order_minor__r.ContractNo__c
+ // tcm end
+ FROM Consumable_order_details2__c
+ WHERE recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery
+ AND Cancellation_Date__c = null
+ AND Dealer_Arrive__c = false
+ AND TracingCode__c in :barMcodeMap.values()
+ AND Bar_Code__c not in :barMcodeMap.keySet()
+ AND Dealer_Info_text__c = :accountName
+ AND ((Consumable_order_minor__c != null
+ AND Consumable_order_minor__r.Order_Owner_WorkLocal__c = :userWorkLocation)
+ OR Consumable_order_minor__c = null)
+ ORDER BY Name ];
+ if(reSet.size()>0){
+ for (Integer i = 0; i < reSet.size(); i++) {
+ if(ExistIdMap.containsKey(reSet[i].Bar_Code__c) || ErrorIdMap.containsKey(reSet[i].Bar_Code__c)){
+ // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
+ continue;
+ }else{
+ Matcher n = Pattern.compile('[0-9]').matcher(reSet[i].TracingCode__c);
+ if(n.find()){
+ // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 start
+ if (reSet[i].TracingCode__c.length() == 5) {
+ String tr = reSet[i].TracingCode__c;
+ String Ctr = tr.substring(tr.length() - 3,tr.length());
+ String Btr = tr.substring(tr.length() - 4,tr.length()-3);
+ String Atr = tr.substring(tr.length() - 5,tr.length()-4);
+ if (Pattern.compile('[0-9]').matcher(Atr).find() || Pattern.compile('[0-9]').matcher(Ctr).find()) {
+ String str = '绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�';
+ ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(reSet[i],str));
+ ErrorIdMap.put(reSet[i].Bar_Code__c,reSet[i].Bar_Code__c);
+ continue;
+ }
+ }
+ // String str = '绠＄悊缂栫爜涓湁鏁板瓧锛岃涓庣鐞嗗憳纭鏄惁閿欒銆�';
+ // ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(reSet[i],str));
+ // ErrorIdMap.put(reSet[i].Bar_Code__c,reSet[i].Bar_Code__c);
+ // continue;
+ // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 end
+ }
+ ExistIdMap.put(reSet[i].Bar_Code__c,reSet[i].Bar_Code__c);
+ for(String str : barMcodeMap.keySet()){
+ if(barMcodeMap.get(str) == reSet[i].TracingCode__c){
+ reSet[i].Bar_Code__c = str;
+ ExistIdMap.put(str,str);
+ }
+ }
+ ConsumableorderdetailsRecordsdummy.add(new ConsumableorderdetailsInfo(reSet[i]));
+ ConsumableorderdetailsRecords.add(new ConsumableorderdetailsInfo(reSet[i]));
+ }
+ }
}
- ConsumableorderdetailsRecordsdummy.add(
- new ConsumableorderdetailsInfo(reSet[i])
- );
- ConsumableorderdetailsRecords.add(
- new ConsumableorderdetailsInfo(reSet[i])
- );
- }
+ AllMap.putAll(ErrorIdMap);
+ AllMap.putAll(ExistIdMap);
+ //寰楀埌涓嶅瓨鍦ㄧ殑BarCode
+ for(Integer i = 0; i < BarCodeListP.size(); i++){
+ if(AllMap.containsKey(BarCodeListP[i])){
+ continue;
+ }else if(otherAgencyMap.containsKey(BarCodeListP[i])){
+ continue;
+ }
+ //add by rentx 2021-01-27 start
+ else if (coc!= null && coc.orderPattern__c == 'hospitalorder') {
+ HosErrorList.add(BarCodeListP[i]);
+ continue;
+
+ }
+ //add by rentx 2021-01-27 end
+ else{
+ notInlist.add(BarCodeListP[i]);
+ otherAgencyMap.put(BarCodeListP[i],BarCodeListP[i]);
+ }
+ }
+ if(notInlist.size()>0){
+ inventoryEntry(notInlist);
+ if(notInStorelist.size() > 0){
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ returnError = 'BarCode鍙�'+ notInStorelist + '涓嶅瓨鍦�';
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'BarCode鍙�'+ notInStorelist + '涓嶅瓨鍦ㄣ��'));
+ }
+ return;
+ }
+ }
}
- }
- AllMap.putAll(ErrorIdMap);
- AllMap.putAll(ExistIdMap);
- //寰楀埌涓嶅瓨鍦ㄧ殑BarCode
- for (Integer i = 0; i < BarCodeListP.size(); i++) {
- if (AllMap.containsKey(BarCodeListP[i])) {
- continue;
- } else if (otherAgencyMap.containsKey(BarCodeListP[i])) {
- continue;
- }
- //add by rentx 2021-01-27 start
- else if (coc != null && coc.orderPattern__c == 'hospitalorder') {
- HosErrorList.add(BarCodeListP[i]);
- continue;
+
+ //add by rentx 2021-01-27 start 褰撹鍗曚负鍖婚櫌鐗逛环绫诲瀷鐨勮鍗曟椂,濡傛灉鎵句笉鍒癰arcode,涓嶈В鏋�,骞朵笖榛樿璇arcode瀵瑰簲鐨勬槑缁�2涓洪潪鍖婚櫌鐗逛环浜у搧,鐩存帴鎶ラ敊
+ if (HosErrorList.size() > 0) {
+ for (String str : HosErrorList) {
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ errorList.add('BarCode鍙�:' + str +'鏄潪鍖婚櫌鐗逛环浜у搧');
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'BarCode鍙�:' + str +'鏄潪鍖婚櫌鐗逛环浜у搧'));
+ }
+
+ }
}
//add by rentx 2021-01-27 end
- else {
- notInlist.add(BarCodeListP[i]);
- otherAgencyMap.put(BarCodeListP[i], BarCodeListP[i]);
- }
- }
- if (notInlist.size() > 0) {
- inventoryEntry(notInlist);
- if (notInStorelist.size() > 0) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- returnError = 'BarCode鍙�' + notInStorelist + '涓嶅瓨鍦�';
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- 'BarCode鍙�' + notInStorelist + '涓嶅瓨鍦ㄣ��'
- )
- );
- }
- return;
- }
- }
+
+ makeArrivedSummary();
+
+
+ //add by rentx 20210602 start CHAN-C3K4ZQ
+ makeRecordsView(ConsumableorderdetailsRecordsdummy);
+ //add by rentx 20210602 end CHAN-C3K4ZQ
}
- //add by rentx 2021-01-27 start 褰撹鍗曚负鍖婚櫌鐗逛环绫诲瀷鐨勮鍗曟椂,濡傛灉鎵句笉鍒癰arcode,涓嶈В鏋�,骞朵笖榛樿璇arcode瀵瑰簲鐨勬槑缁�2涓洪潪鍖婚櫌鐗逛环浜у搧,鐩存帴鎶ラ敊
- if (HosErrorList.size() > 0) {
- for (String str : HosErrorList) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add('BarCode鍙�:' + str + '鏄潪鍖婚櫌鐗逛环浜у搧');
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- 'BarCode鍙�:' + str + '鏄潪鍖婚櫌鐗逛环浜у搧'
- )
- );
- }
- }
- }
- //add by rentx 2021-01-27 end
- makeArrivedSummary();
-
- //add by rentx 20210602 start CHAN-C3K4ZQ
- makeRecordsView(ConsumableorderdetailsRecordsdummy);
- //add by rentx 20210602 end CHAN-C3K4ZQ
- }
-
- public void inventoryEntryNoESetId(List<String> barCodeList) {
- //鎵�鏈塨arcode瑙ｆ瀽鍒扮殑Jancode
- List<String> alljanCodeList = new List<String>();
- List<String> allotCodeList = new List<String>();
- List<String> barCode01List = new List<String>();
- List<String> barCode241List = new List<String>();
- Map<String, Map<String, String>> barJancodeMap = new Map<String, Map<String, String>>();
- Map<String, Map<String, String>> barOtcodeMap = new Map<String, Map<String, String>>();
- Map<String, List<String>> barcodeinfoMap = new Map<String, List<String>>();
- Map<String, String> barcoderightMap = new Map<String, String>();
- notInStorelist.clear();
- for (Integer i = 0; i < barCodeList.size(); i++) {
- Date expirationDate = null;
- String serialNoorLotNo = '';
- String tracingCode = '';
- String productDateStr = '';
- Date productionDate = null;
- String expirationDateStr = '';
- if (barCodeList[i].length() >= 3) {
- if (barCodeList[i].substring(0, 2) == '01') {
- String janCodeMark = '';
- //鐢熶骇鏃ユ湡
- List<String> janCode = new List<String>();
- if (barCodeList[i].length() < 16) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
- '浜у搧BarCode(' +
- barCodeList[i] +
- ')鐨勪綅鏁颁笉瓒�16锛屼笉绗﹀悎瑕佹眰閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- barCodeList[i] +
- ')鐨勪綅鏁颁笉瓒�16锛屼笉绗﹀悎瑕佹眰閿欒锛�'
- )
- );
- }
- continue;
- } else {
- //if(barCodeList[i].substring(0,2) !='01'){
- // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + barCodeList[i] + ')娌℃湁janCode锛屼笉绗﹀悎瑕佹眰锛�'));
- // return;
- //}
- janCodeMark = barCodeList[i].substring(2, 16);
- try {
- Decimal test = Decimal.valueOf(janCodeMark);
- } catch (Exception e) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
- '浜у搧BarCode(' + barCodeList[i] + ')鐨刯anCode閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' + barCodeList[i] + ')鐨刯anCode閿欒锛�'
- )
- );
- }
- continue;
- }
- }
- if (barCodeList[i].length() >= 22) {
- if (
- barCodeList[i]
- .substring(
- barCodeList[i].length() - 8,
- barCodeList[i].length() - 5
- ) != '250'
- ) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
- '浜у搧BarCode(' + barCodeList[i] + ')娌℃湁绠＄悊缂栫爜锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' + barCodeList[i] + ')娌℃湁绠＄悊缂栫爜锛�'
- )
- );
- }
- continue;
- }
- if (barCodeList[i].substring(16, 18) == '11') {
- try {
- productDateStr =
- '20' +
- barCodeList[i].substring(18, 20) +
- '-' +
- barCodeList[i].substring(20, 22) +
- '-01';
- productionDate = Date.valueOf(productDateStr);
- } catch (Exception e) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
- '浜у搧BarCode(' +
- barCodeList[i] +
- ')鐨勭敓浜ф棩鏈�' +
- productDateStr +
- '閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- barCodeList[i] +
- ')鐨勭敓浜ф棩鏈�' +
- productDateStr +
- '閿欒锛�'
- )
- );
- }
- continue;
- }
- if (barCodeList[i].length() >= 32) {
- if (barCodeList[i].substring(24, 26) == '17') {
- try {
- if (barCodeList[i].substring(30, 32) == '00') {
- expirationDateStr =
- '20' +
- barCodeList[i].substring(26, 28) +
- '-' +
- barCodeList[i].substring(28, 30) +
- '-' +
- '01';
- expirationDate = Date.valueOf(expirationDateStr);
- expirationDate = expirationDate.addMonths(1)
- .toStartofMonth()
- .addDays(-1);
- } else {
- expirationDateStr =
- '20' +
- barCodeList[i].substring(26, 28) +
- '-' +
- barCodeList[i].substring(28, 30) +
- '-' +
- barCodeList[i].substring(30, 32);
- expirationDate = Date.valueOf(expirationDateStr);
- }
- } catch (Exception e) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
- '浜у搧BarCode(' +
- barCodeList[i] +
- ')鐨勬粎鑿屾湁鍔规湡闄�' +
- expirationDateStr +
- '閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- barCodeList[i] +
- ')鐨勬粎鑿屾湁鍔规湡闄�' +
- expirationDateStr +
- '閿欒锛�'
- )
- );
- }
- continue;
- }
- if (barCodeList[i].length() >= 42) {
- if (
- barCodeList[i].substring(32, 34) == '10' ||
- barCodeList[i].substring(32, 34) == '21'
- ) {
- serialNoorLotNo = barCodeList[i]
- .substring(34, barCodeList[i].length() - 8);
- }
- }
- } else if (
- barCodeList[i].substring(24, 26) == '10' ||
- barCodeList[i].substring(24, 26) == '21'
- ) {
- serialNoorLotNo = barCodeList[i]
- .substring(26, barCodeList[i].length() - 8);
- }
- }
- } else if (barCodeList[i].substring(16, 18) == '17') {
- try {
- if (barCodeList[i].substring(22, 24) == '00') {
- expirationDateStr =
- '20' +
- barCodeList[i].substring(18, 20) +
- '-' +
- barCodeList[i].substring(20, 22) +
- '-01';
- //ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧expirationDateStr' + expirationDateStr));
- expirationDate = Date.valueOf(expirationDateStr);
- expirationDate = expirationDate.addMonths(1)
- .toStartofMonth()
- .addDays(-1);
- } else {
- expirationDateStr =
- '20' +
- barCodeList[i].substring(18, 20) +
- '-' +
- barCodeList[i].substring(20, 22) +
- '-' +
- barCodeList[i].substring(22, 24);
- expirationDate = Date.valueOf(expirationDateStr);
- }
- } catch (Exception e) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
- '浜у搧BarCode(' +
- barCodeList[i] +
- ')鐨勬粎鑿屾湁鍔规湡闄�' +
- expirationDateStr +
- '閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- barCodeList[i] +
- ')鐨勬粎鑿屾湁鍔规湡闄�' +
- expirationDateStr +
- '閿欒锛�'
- )
- );
- }
- continue;
- }
- if (barCodeList[i].length() >= 34) {
- if (
- barCodeList[i].substring(24, 26) == '10' ||
- barCodeList[i].substring(24, 26) == '21'
- ) {
- serialNoorLotNo = barCodeList[i]
- .substring(26, barCodeList[i].length() - 8);
- }
- }
- } else if (barCodeList[i].length() >= 26) {
- if (
- barCodeList[i].substring(16, 18) == '10' ||
- barCodeList[i].substring(16, 18) == '21'
- ) {
- serialNoorLotNo = barCodeList[i]
- .substring(18, barCodeList[i].length() - 8);
- }
- }
- }
- if (
- barCodeList[i].length() >= 24 &&
- barCodeList[i]
- .substring(
- barCodeList[i].length() - 8,
- barCodeList[i].length() - 5
- ) == '250'
- ) {
- if (
- barCodeList[i]
- .substring(
- barCodeList[i].length() - 8,
- barCodeList[i].length() - 5
- ) == '250'
- ) {
- tracingCode = barCodeList[i]
- .substring(
- barCodeList[i].length() - 5,
- barCodeList[i].length()
- );
- Matcher n = Pattern.compile('[0-9]').matcher(tracingCode);
- if (n.find()) {
- // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 start
- if (tracingCode.length() == 5) {
- String tr = tracingCode;
- String Ctr = tr.substring(tr.length() - 3, tr.length());
- String Btr = tr.substring(tr.length() - 4, tr.length() - 3);
- String Atr = tr.substring(tr.length() - 5, tr.length() - 4);
- if (
- Pattern.compile('[0-9]').matcher(Atr).find() ||
- Pattern.compile('[0-9]').matcher(Ctr).find()
- ) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- String str = '绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�';
- if (isLwc) {
- errorList.add(
- '浜у搧BarCode(' +
- barCodeList[i] +
- ')绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- barCodeList[i] +
- ')绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�'
- )
- );
- }
- continue;
- }
- }
- }
- } else {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
- '浜у搧BarCode(' + barCodeList[i] + ')鐨則racingCode閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' + barCodeList[i] + ')鐨則racingCode閿欒锛�'
- )
- );
- }
- continue;
- }
- }
- List<String> barcodedetList = new List<String>();
- barcodedetList.add(barCodeList[i]);
- barcodedetList.add(String.valueOf(expirationDate));
- barcodedetList.add(serialNoorLotNo);
- barcodedetList.add(tracingCode);
- Integer jan1 = Integer.valueOf(janCodeMark.substring(0, 1));
- Integer jan2 = Integer.valueOf(janCodeMark.substring(1, 2));
- Integer jan3 = Integer.valueOf(janCodeMark.substring(2, 3));
- Integer jan4 = Integer.valueOf(janCodeMark.substring(3, 4));
- Integer jan5 = Integer.valueOf(janCodeMark.substring(4, 5));
- Integer jan6 = Integer.valueOf(janCodeMark.substring(5, 6));
- Integer jan7 = Integer.valueOf(janCodeMark.substring(6, 7));
- Integer jan8 = Integer.valueOf(janCodeMark.substring(7, 8));
- Integer jan9 = Integer.valueOf(janCodeMark.substring(8, 9));
- Integer jan10 = Integer.valueOf(janCodeMark.substring(9, 10));
- Integer jan11 = Integer.valueOf(janCodeMark.substring(10, 11));
- Integer jan12 = Integer.valueOf(janCodeMark.substring(11, 12));
- Integer jan13 = Integer.valueOf(janCodeMark.substring(12, 13));
-
- Integer count12 =
- jan2 +
- jan3 * 3 +
- jan4 +
- jan5 * 3 +
- jan6 +
- jan7 * 3 +
- jan8 +
- jan9 * 3 +
- jan10 +
- jan11 * 3 +
- jan12 +
- jan13 * 3;
- Integer count13 =
- jan1 * 3 +
- jan2 +
- jan3 * 3 +
- jan4 +
- jan5 * 3 +
- jan6 +
- jan7 * 3 +
- jan8 +
- jan9 * 3 +
- jan10 +
- jan11 * 3 +
- jan12 +
- jan13 * 3;
- String frost12 = (String.valueOf(count12))
- .substring((String.valueOf(count12)).length() - 1);
- String frost13 = (String.valueOf(count13))
- .substring((String.valueOf(count13)).length() - 1);
- //鍑忓幓12浣嶄釜浣�
- frost12 = (String.valueOf(10 - Integer.valueOf(frost12)))
- .substring(
- (String.valueOf(10 - Integer.valueOf(frost12))).length() - 1
- );
- frost13 = (String.valueOf(10 - Integer.valueOf(frost13)))
- .substring(
- (String.valueOf(10 - Integer.valueOf(frost13))).length() - 1
- );
- janCode.add(janCodeMark.substring(1, 13) + frost12);
- janCode.add(janCodeMark.substring(0, 13) + frost12);
- janCode.add(janCodeMark.substring(1, 13) + frost13);
- janCode.add(janCodeMark.substring(0, 13) + frost13);
- alljanCodeList.addAll(janCode);
- Map<String, String> janCodeMap = new Map<String, String>();
- janCodeMap.put(
- janCodeMark.substring(1, 13) + frost12,
- barCodeList[i]
- );
- janCodeMap.put(
- janCodeMark.substring(0, 13) + frost12,
- barCodeList[i]
- );
- janCodeMap.put(
- janCodeMark.substring(1, 13) + frost13,
- barCodeList[i]
- );
- janCodeMap.put(
- janCodeMark.substring(0, 13) + frost13,
- barCodeList[i]
- );
- barJancodeMap.put(barCodeList[i], janCodeMap);
- barcodeinfoMap.put(barCodeList[i], barcodedetList);
- barCode01List.add(barCodeList[i]);
- } else if (barCodeList[i].substring(0, 3) == '241') {
- if (
- barCodeList[i].length() > 8 &&
- barCodeList[i]
- .substring(
- barCodeList[i].length() - 8,
- barCodeList[i].length() - 5
- ) != '250'
- ) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
- '浜у搧BarCode(' + barCodeList[i] + ')娌℃湁绠＄悊缂栫爜锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' + barCodeList[i] + ')娌℃湁绠＄悊缂栫爜锛�'
- )
- );
- }
- continue;
- }
- List<String> otCodeList = new List<String>();
- Map<String, String> otCodeMap = new Map<String, String>();
- if (barCodeList[i].length() < 7) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
- '浜у搧BarCode(' +
- barCodeList[i] +
- ')鐨勪綅鏁颁笉瓒�16锛屼笉绗﹀悎瑕佹眰閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- barCodeList[i] +
- ')鐨勪綅鏁颁笉瓒�16锛屼笉绗﹀悎瑕佹眰閿欒锛�'
- )
- );
- }
- continue;
- } else if (barCodeList[i].length() == 11) {
- String otCode4 = barCodeList[i].substring(3, 7);
- String otCode5 = barCodeList[i].substring(3, 8);
- String otCode6 = barCodeList[i].substring(3, 9);
- String otCode7 = barCodeList[i].substring(3, 10);
- String otCode8 = barCodeList[i].substring(3, 11);
- otCodeList.add(otCode4);
- otCodeList.add(otCode5);
- otCodeList.add(otCode6);
- otCodeList.add(otCode7);
- otCodeList.add(otCode8);
- otCodeMap.put(otCode4, barCodeList[i]);
- otCodeMap.put(otCode5, barCodeList[i]);
- otCodeMap.put(otCode6, barCodeList[i]);
- otCodeMap.put(otCode7, barCodeList[i]);
- otCodeMap.put(otCode8, barCodeList[i]);
- } else if (barCodeList[i].length() >= 12) {
- String otCode4 = barCodeList[i].substring(3, 7);
- String otCode5 = barCodeList[i].substring(3, 8);
- String otCode6 = barCodeList[i].substring(3, 9);
- String otCode7 = barCodeList[i].substring(3, 10);
- String otCode8 = barCodeList[i].substring(3, 11);
- String otCode9 = barCodeList[i].substring(3, 12);
- otCodeList.add(otCode4);
- otCodeList.add(otCode5);
- otCodeList.add(otCode6);
- otCodeList.add(otCode7);
- otCodeList.add(otCode8);
- otCodeList.add(otCode9);
- otCodeMap.put(otCode4, barCodeList[i]);
- otCodeMap.put(otCode5, barCodeList[i]);
- otCodeMap.put(otCode6, barCodeList[i]);
- otCodeMap.put(otCode7, barCodeList[i]);
- otCodeMap.put(otCode8, barCodeList[i]);
- otCodeMap.put(otCode9, barCodeList[i]);
- }
- allotCodeList.addAll(otCodeList);
- barOtcodeMap.put(barCodeList[i], otCodeMap);
- barCode241List.add(barCodeList[i]);
- } else {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add('浜у搧BarCode(' + barCodeList[i] + ')涓嶇鍚堣姹傦紒');
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' + barCodeList[i] + ')涓嶇鍚堣姹傦紒'
- )
- );
- }
- continue;
- }
- } else {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add('浜у搧BarCode(' + barCodeList[i] + ')涓嶇鍚堣姹傦紒');
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' + barCodeList[i] + ')涓嶇鍚堣姹傦紒'
- )
- );
- }
- continue;
- }
- }
- //01閫氳繃妫�绱骇鍝佹槸鍚﹀瓨鍦�
- //-----------XHL--------------UpdateSTART----------------20181010------
- if (alljanCodeList.size() > 0) {
- List<Product2__c> product2InStore = [
- SELECT
- Id,
- Name,
- Name__c,
- Intra_Trade_List_RMB__c,
- Asset_Model_No__c,
- OT_CODE__c,
- Product2_Jancode__c,
- Pro2_Dealer_ENG__c,
- Pro2_Dealer_Object__c
- FROM Product2__c
- WHERE Product2_Jancode__c IN :alljanCodeList
- ORDER BY SFDA_Expiration_Date__c DESC
- ];
- if (product2InStore.size() > 0) {
- // CHAN-AVSAST
- Map<String, String> rightBar = new Map<String, String>();
- Map<String, String> errorMap = new Map<String, String>();
- for (String bar : barJancodeMap.keySet()) {
- Integer cou = 0;
- for (Product2__c produ : product2InStore) {
- if (
- barJancodeMap.get(bar).containsKey(produ.Product2_Jancode__c) &&
- !rightBar.containsKey(bar)
- ) {
- cou++;
- if (EngFlag == true && produ.Pro2_Dealer_ENG__c == true) {
- consumableInventory.add(
- new ConsumableorderdetailsInfo(produ, barcodeinfoMap.get(bar))
- );
- consumableInventoryUse.add(
- new ConsumableorderdetailsInfo(produ, barcodeinfoMap.get(bar))
- );
- rightBar.put(bar, bar);
- } else if (
- ETFlag == true &&
- produ.Pro2_Dealer_Object__c == true
- ) {
- consumableInventory.add(
- new ConsumableorderdetailsInfo(produ, barcodeinfoMap.get(bar))
- );
- consumableInventoryUse.add(
- new ConsumableorderdetailsInfo(produ, barcodeinfoMap.get(bar))
- );
- rightBar.put(bar, bar);
- } else {
- errorMap.put(bar, bar);
- }
- }
- }
- if (cou <= 0) {
- notInStorelist.add(bar);
- }
- }
- if (errorMap.size() > 0) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
- 'BarCode鍙穂' +
- errorMap.values() +
- ']浜у搧绫诲瀷[' +
- product_Type +
- ']涓庣敤鎴风被鍨媅' +
- userPro_Type +
- ']涓嶇'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- 'BarCode鍙穂' +
- errorMap.values() +
- ']浜у搧绫诲瀷[' +
- product_Type +
- ']涓庣敤鎴风被鍨媅' +
- userPro_Type +
- ']涓嶇'
- )
- );
- }
- }
- }
- }
-
- //241閫氳繃妫�绱骇鍝佹槸鍚﹀瓨鍦�
- if (allotCodeList.size() > 0) {
- Map<String, String> errorMap = new Map<String, String>();
- Map<String, String> exitBarCodeMap = new Map<String, String>();
- List<Product2__c> product2InStore = [
- SELECT
- Id,
- Name,
- Name__c,
- Intra_Trade_List_RMB__c,
- Asset_Model_No__c,
- OT_CODE__c,
- Product2_Jancode__c,
- Pro2_Dealer_ENG__c,
- Pro2_Dealer_Object__c
- FROM Product2__c
- WHERE
- OT_CODE__c IN :allotCodeList
- AND (NOT Product_Type__c LIKE :userPro_Typestr)
- ];
- if (product2InStore.size() > 0) {
- for (Product2__c produ : product2InStore) {
- for (String bar : barOtcodeMap.keySet()) {
- if (barOtcodeMap.get(bar).containsKey(produ.OT_CODE__c)) {
- exitBarCodeMap.put(bar, bar);
- errorMap.put(bar, bar);
- }
- }
- }
- }
- if (errorMap.size() > 0) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
- 'BarCode鍙穂' +
- errorMap.values() +
- ']浜у搧绫诲瀷[' +
- product_Type +
- ']涓庣敤鎴穂' +
- userPro_Type +
- ']绫诲瀷涓嶇'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- 'BarCode鍙穂' +
- errorMap.values() +
- ']浜у搧绫诲瀷[' +
- product_Type +
- ']涓庣敤鎴穂' +
- userPro_Type +
- ']绫诲瀷涓嶇'
- )
- );
- }
- }
- product2InStore = [
- SELECT
- Id,
- Name,
- Name__c,
- Intra_Trade_List_RMB__c,
- Asset_Model_No__c,
- OT_CODE__c,
- Product2_Jancode__c,
- Pro2_Dealer_ENG__c,
- Pro2_Dealer_Object__c
- FROM Product2__c
- WHERE
- OT_CODE__c IN :allotCodeList
- AND Product_Type__c LIKE :userPro_Typestr
- ];
-
- if (product2InStore.size() > 0) {
- for (Product2__c produ : product2InStore) {
- for (String bar : barOtcodeMap.keySet()) {
- Date expirationDate = null;
+ public void inventoryEntryNoESetId (List<String> barCodeList){
+ //鎵�鏈塨arcode瑙ｆ瀽鍒扮殑Jancode
+ List<String> alljanCodeList = new List<String>();
+ List<String> allotCodeList = new List<String>();
+ List<String> barCode01List = new List<String>();
+ List<String> barCode241List = new List<String>();
+ Map<String,Map<String,String>> barJancodeMap = new Map<String,Map<String,String>>();
+ Map<String,Map<String,String>> barOtcodeMap = new Map<String,Map<String,String>>();
+ Map<String,List<String>> barcodeinfoMap = new Map<String,List<String>>();
+ Map<String,String> barcoderightMap = new Map<String,String>();
+ notInStorelist.clear();
+ for(Integer i = 0; i < barCodeList.size(); i++){
+ Date expirationDate = null ;
String serialNoorLotNo = '';
String tracingCode = '';
String productDateStr = '';
- Date productionDate = null;
+ Date productionDate = null ;
String expirationDateStr = '';
- if (barOtcodeMap.get(bar).containsKey(produ.OT_CODE__c)) {
- Integer oTcodeLength = produ.OT_CODE__c.length();
- if (bar.length() >= oTcodeLength + 11) {
- if (bar.substring(oTcodeLength + 3, oTcodeLength + 5) == '11') {
- try {
- productDateStr =
- '20' +
- bar.substring(oTcodeLength + 5, oTcodeLength + 7) +
- '-' +
- bar.substring(oTcodeLength + 7, oTcodeLength + 9) +
- '-01';
- productionDate = Date.valueOf(productDateStr);
- } catch (Exception e) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
- '浜у搧BarCode(' +
- bar +
- ')鐨勭敓浜ф棩鏈�' +
- productDateStr +
- '閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- bar +
- ')鐨勭敓浜ф棩鏈�' +
- productDateStr +
- '閿欒锛�'
- )
- );
- }
- continue;
- }
- if (bar.length() >= oTcodeLength + 3 + 16) {
- if (
- bar.substring(
- oTcodeLength + 3 + 8,
- oTcodeLength + 3 + 10
- ) == '17'
- ) {
- try {
- if (
- bar.substring(
- oTcodeLength + 3 + 14,
- oTcodeLength + 3 + 16
- ) == '00'
- ) {
- expirationDateStr =
- '20' +
- bar.substring(
- oTcodeLength + 3 + 10,
- oTcodeLength + 3 + 12
- ) +
- '-' +
- bar.substring(
- oTcodeLength + 3 + 12,
- oTcodeLength + 3 + 14
- ) +
- '-' +
- '01';
- expirationDate = Date.valueOf(expirationDateStr);
- expirationDate = expirationDate.addMonths(1)
- .toStartofMonth()
- .addDays(-1);
- } else {
- expirationDateStr =
- '20' +
- bar.substring(
- oTcodeLength + 3 + 10,
- oTcodeLength + 3 + 12
- ) +
- '-' +
- bar.substring(
- oTcodeLength + 3 + 12,
- oTcodeLength + 3 + 14
- ) +
- '-' +
- bar.substring(
- oTcodeLength + 3 + 14,
- oTcodeLength + 3 + 16
- );
- expirationDate = Date.valueOf(expirationDateStr);
- }
- } catch (Exception e) {
+ if(barCodeList[i].length() >= 3){
+ if(barCodeList[i].substring(0,2) =='01'){
+ String janCodeMark = '';
+ //鐢熶骇鏃ユ湡
+ List<String> janCode = new List<String>();
+ if(barCodeList[i].length() < 16){
//LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
- '浜у搧BarCode(' +
- bar +
- ')鐨勬粎鑿屾湁鍔规湡闄�' +
- expirationDateStr +
- '閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- bar +
- ')鐨勬粎鑿屾湁鍔规湡闄�' +
- expirationDateStr +
- '閿欒锛�'
- )
- );
+ if(isLwc){
+ errorList.add('浜у搧BarCode(' + barCodeList[i] + ')鐨勪綅鏁颁笉瓒�16锛屼笉绗﹀悎瑕佹眰閿欒锛�');
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + barCodeList[i] + ')鐨勪綅鏁颁笉瓒�16锛屼笉绗﹀悎瑕佹眰閿欒锛�'));
}
continue;
- }
- if (bar.length() >= oTcodeLength + 3 + 25) {
- if (
- bar.substring(
- oTcodeLength + 3 + 16,
- oTcodeLength + 3 + 18
- ) == '10' ||
- bar.substring(
- oTcodeLength + 3 + 16,
- oTcodeLength + 3 + 18
- ) == '21'
- ) {
- serialNoorLotNo = bar.substring(
- oTcodeLength + 3 + 18,
- bar.length() - 8
- );
- //ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, 'serialNoorLotNo' + serialNoorLotNo));
+ }else {
+ //if(barCodeList[i].substring(0,2) !='01'){
+ // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + barCodeList[i] + ')娌℃湁janCode锛屼笉绗﹀悎瑕佹眰锛�'));
+ // return;
+ //}
+ janCodeMark = barCodeList[i].substring(2,16);
+ try{
+ Decimal test = Decimal.valueOf(janCodeMark);
+ }catch(Exception e){
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ errorList.add('浜у搧BarCode(' + barCodeList[i] + ')鐨刯anCode閿欒锛�');
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + barCodeList[i] + ')鐨刯anCode閿欒锛�'));
+ }
+ continue;
}
- }
- } else if (
- bar.substring(
- oTcodeLength + 3 + 8,
- oTcodeLength + 3 + 10
- ) == '10' ||
- bar.substring(
- oTcodeLength + 3 + 8,
- oTcodeLength + 3 + 10
- ) == '21'
- ) {
- serialNoorLotNo = bar.substring(
- oTcodeLength + 3 + 10,
- bar.length() - 8
- );
- //ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, 'serialNoorLotNo' + serialNoorLotNo));
}
- }
- } else if (
- bar.substring(oTcodeLength + 3, oTcodeLength + 5) == '17'
- ) {
- try {
- if (
- bar.substring(
- oTcodeLength + 3 + 6,
- oTcodeLength + 3 + 8
- ) == '00'
- ) {
- expirationDateStr =
- '20' +
- bar.substring(
- oTcodeLength + 3 + 2,
- oTcodeLength + 3 + 4
- ) +
- '-' +
- bar.substring(
- oTcodeLength + 3 + 4,
- oTcodeLength + 3 + 6
- ) +
- '-01';
- expirationDate = Date.valueOf(expirationDateStr);
- expirationDate = expirationDate.addMonths(1)
- .toStartofMonth()
- .addDays(-1);
- } else {
- expirationDateStr =
- '20' +
- bar.substring(
- oTcodeLength + 3 + 2,
- oTcodeLength + 3 + 4
- ) +
- '-' +
- bar.substring(
- oTcodeLength + 3 + 4,
- oTcodeLength + 3 + 6
- ) +
- '-' +
- bar.substring(
- oTcodeLength + 3 + 6,
- oTcodeLength + 3 + 8
- );
- expirationDate = Date.valueOf(expirationDateStr);
+ if(barCodeList[i].length() >= 22){
+ if(barCodeList[i].substring(barCodeList[i].length() - 8,barCodeList[i].length()-5)!='250'){
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ errorList.add('浜у搧BarCode(' + barCodeList[i] + ')娌℃湁绠＄悊缂栫爜锛�');
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, '浜у搧BarCode(' + barCodeList[i] + ')娌℃湁绠＄悊缂栫爜锛�'));
+ }
+ continue;
+ }
+ if( barCodeList[i].substring(16,18) =='11'){
+ try{
+ productDateStr = '20' + barCodeList[i].substring(18,20) + '-' + barCodeList[i].substring(20,22) + '-01' ;
+ productionDate = Date.valueOf(productDateStr);
+ }catch(Exception e){
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ errorList.add('浜у搧BarCode(' + barCodeList[i] + ')鐨勭敓浜ф棩鏈�' + productDateStr + '閿欒锛�');
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, '浜у搧BarCode(' + barCodeList[i] + ')鐨勭敓浜ф棩鏈�' + productDateStr + '閿欒锛�'));
+ }
+ continue;
+ }
+ if(barCodeList[i].length() >=32){
+ if( barCodeList[i].substring(24,26) =='17'){
+ try{
+ if(barCodeList[i].substring(30,32)=='00'){
+ expirationDateStr = '20' + barCodeList[i].substring(26,28) + '-' + barCodeList[i].substring(28,30) + '-' + '01' ;
+ expirationDate = Date.valueOf(expirationDateStr);
+ expirationDate = expirationDate.addMonths(1).toStartofMonth().addDays(-1);
+ }else{
+ expirationDateStr = '20' + barCodeList[i].substring(26,28) + '-' + barCodeList[i].substring(28,30) + '-' +barCodeList[i].substring(30,32) ;
+ expirationDate = Date.valueOf(expirationDateStr);
+ }
+ }catch(Exception e){
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ errorList.add('浜у搧BarCode(' + barCodeList[i] + ')鐨勬粎鑿屾湁鍔规湡闄�' + expirationDateStr + '閿欒锛�');
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + barCodeList[i] + ')鐨勬粎鑿屾湁鍔规湡闄�' + expirationDateStr + '閿欒锛�'));
+ }
+ continue;
+ }
+ if(barCodeList[i].length() >= 42){
+ if(barCodeList[i].substring(32,34) =='10' || barCodeList[i].substring(32,34) =='21'){
+ serialNoorLotNo = barCodeList[i].substring(34,barCodeList[i].length() - 8) ;
+ }
+ }
+ }else if(barCodeList[i].substring(24,26) =='10' || barCodeList[i].substring(24,26) =='21'){
+ serialNoorLotNo = barCodeList[i].substring(26,barCodeList[i].length() - 8) ;
+ }
+ }
+ }else if(barCodeList[i].substring(16,18) =='17'){
+ try{
+ if(barCodeList[i].substring(22,24)=='00'){
+ expirationDateStr = '20' + barCodeList[i].substring(18,20) + '-' + barCodeList[i].substring(20,22) + '-01';
+ //ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧expirationDateStr' + expirationDateStr));
+ expirationDate = Date.valueOf(expirationDateStr);
+ expirationDate = expirationDate.addMonths(1).toStartofMonth().addDays(-1);
+ }else{
+ expirationDateStr = '20' + barCodeList[i].substring(18,20) + '-' + barCodeList[i].substring(20,22) + '-' +barCodeList[i].substring(22,24);
+ expirationDate = Date.valueOf(expirationDateStr);
+ }
+ }catch(Exception e){
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ errorList.add('浜у搧BarCode(' + barCodeList[i] + ')鐨勬粎鑿屾湁鍔规湡闄�' + expirationDateStr + '閿欒锛�');
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + barCodeList[i] + ')鐨勬粎鑿屾湁鍔规湡闄�' + expirationDateStr + '閿欒锛�'));
+ }
+ continue;
+ }
+ if(barCodeList[i].length() >= 34){
+ if(barCodeList[i].substring(24,26) =='10' || barCodeList[i].substring(24,26) =='21'){
+ serialNoorLotNo = barCodeList[i].substring(26,barCodeList[i].length() - 8) ;
+ }
+ }
+
+ }else if(barCodeList[i].length() >= 26){
+ if(barCodeList[i].substring(16,18) =='10' || barCodeList[i].substring(16,18) =='21'){
+ serialNoorLotNo = barCodeList[i].substring(18,barCodeList[i].length() - 8) ;
+ }
+ }
}
- } catch (Exception e) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
- '浜у搧BarCode(' +
- bar +
- ')鐨勬粎鑿屾湁鍔规湡闄�' +
- expirationDateStr +
- '閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- bar +
- ')鐨勬粎鑿屾湁鍔规湡闄�' +
- expirationDateStr +
- '閿欒锛�'
- )
- );
+ if(barCodeList[i].length() >= 24 && barCodeList[i].substring(barCodeList[i].length() - 8,barCodeList[i].length()-5)=='250'){
+ if(barCodeList[i].substring(barCodeList[i].length() - 8,barCodeList[i].length()-5)=='250'){
+ tracingCode = barCodeList[i].substring(barCodeList[i].length() - 5,barCodeList[i].length());
+ Matcher n = Pattern.compile('[0-9]').matcher(tracingCode);
+ if(n.find()){
+ // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 start
+ if (tracingCode.length() == 5) {
+ String tr = tracingCode;
+ String Ctr = tr.substring(tr.length() - 3,tr.length());
+ String Btr = tr.substring(tr.length() - 4,tr.length()-3);
+ String Atr = tr.substring(tr.length() - 5,tr.length()-4);
+ if (Pattern.compile('[0-9]').matcher(Atr).find() || Pattern.compile('[0-9]').matcher(Ctr).find()) {
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ String str = '绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�';
+ if(isLwc){
+ errorList.add('浜у搧BarCode(' + barCodeList[i] + ')绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�');
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + barCodeList[i] + ')绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�'));
+ }
+ continue;
+ }
+ }
+ }
+ }else{
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ errorList.add('浜у搧BarCode(' + barCodeList[i] + ')鐨則racingCode閿欒锛�');
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + barCodeList[i] + ')鐨則racingCode閿欒锛�'));
+ }
+ continue;
+ }
}
- continue;
- }
- if (bar.length() >= oTcodeLength + 20) {
- if (
- bar.substring(
- oTcodeLength + 3 + 8,
- oTcodeLength + 3 + 10
- ) == '10' ||
- bar.substring(
- oTcodeLength + 3 + 8,
- oTcodeLength + 3 + 10
- ) == '21'
- ) {
- serialNoorLotNo = bar.substring(
- oTcodeLength + 3 + 10,
- bar.length() - 8
- );
- }
- }
- } else if (bar.length() >= oTcodeLength + 12) {
- if (
- bar.substring(oTcodeLength + 3, oTcodeLength + 5) == '10' ||
- bar.substring(oTcodeLength + 3, oTcodeLength + 5) == '21'
- ) {
- serialNoorLotNo = bar.substring(
- oTcodeLength + 3 + 2,
- bar.length() - 8
- );
- }
- }
- }
- if (
- bar.length() >= oTcodeLength + 3 + 8 &&
- bar.substring(bar.length() - 8, bar.length() - 5) == '250'
- ) {
- if (
- bar.substring(bar.length() - 8, bar.length() - 5) == '250'
- ) {
- tracingCode = bar.substring(bar.length() - 5, bar.length());
- Matcher n = Pattern.compile('[0-9]').matcher(tracingCode);
- if (n.find()) {
- // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 start
- if (tracingCode.length() == 5) {
- String tr = tracingCode;
- String Ctr = tr.substring(tr.length() - 3, tr.length());
- String Btr = tr.substring(
- tr.length() - 4,
- tr.length() - 3
- );
- String Atr = tr.substring(
- tr.length() - 5,
- tr.length() - 4
- );
- if (
- Pattern.compile('[0-9]').matcher(Atr).find() ||
- Pattern.compile('[0-9]').matcher(Ctr).find()
- ) {
- String str = '绠＄悊缂栫爜涓嶆纭紝璇蜂笌绠＄悊鍛樼‘璁ゆ槸鍚﹂敊璇��';
+ List<String> barcodedetList = new List<String>();
+ barcodedetList.add(barCodeList[i]);
+ barcodedetList.add(String.valueOf(expirationDate));
+ barcodedetList.add(serialNoorLotNo);
+ barcodedetList.add(tracingCode);
+ Integer jan1 = Integer.valueOf(janCodeMark.substring(0, 1));
+ Integer jan2 = Integer.valueOf(janCodeMark.substring(1, 2));
+ Integer jan3 = Integer.valueOf(janCodeMark.substring(2, 3));
+ Integer jan4 = Integer.valueOf(janCodeMark.substring(3, 4));
+ Integer jan5 = Integer.valueOf(janCodeMark.substring(4, 5));
+ Integer jan6 = Integer.valueOf(janCodeMark.substring(5, 6));
+ Integer jan7 = Integer.valueOf(janCodeMark.substring(6, 7));
+ Integer jan8 = Integer.valueOf(janCodeMark.substring(7, 8));
+ Integer jan9 = Integer.valueOf(janCodeMark.substring(8, 9));
+ Integer jan10 = Integer.valueOf(janCodeMark.substring(9, 10));
+ Integer jan11 = Integer.valueOf(janCodeMark.substring(10, 11));
+ Integer jan12 = Integer.valueOf(janCodeMark.substring(11, 12));
+ Integer jan13 = Integer.valueOf(janCodeMark.substring(12, 13));
+
+ Integer count12 = jan2 + jan3*3 + jan4 + jan5*3 + jan6 + jan7*3 + jan8 + jan9*3 + jan10 + jan11*3 +jan12 + jan13*3;
+ Integer count13 = jan1*3 + jan2 + jan3*3 + jan4 + jan5*3 + jan6 + jan7*3 + jan8 + jan9*3 + jan10 + jan11*3 +jan12 + jan13*3;
+ String frost12 = (String.valueOf(count12)).substring((String.valueOf(count12)).length()-1);
+ String frost13 = (String.valueOf(count13)).substring((String.valueOf(count13)).length()-1);
+ //鍑忓幓12浣嶄釜浣�
+ frost12 = (String.valueOf(10 - Integer.valueOf(frost12))).substring((String.valueOf(10 - Integer.valueOf(frost12))).length()-1);
+ frost13 = (String.valueOf(10 - Integer.valueOf(frost13))).substring((String.valueOf(10 - Integer.valueOf(frost13))).length()-1);
+ janCode.add(janCodeMark.substring(1, 13) + frost12);
+ janCode.add(janCodeMark.substring(0, 13) + frost12);
+ janCode.add(janCodeMark.substring(1, 13) + frost13);
+ janCode.add(janCodeMark.substring(0, 13) + frost13);
+ alljanCodeList.addAll(janCode);
+ Map<String,String> janCodeMap = new Map<String,String>();
+ janCodeMap.put(janCodeMark.substring(1, 13) + frost12,barCodeList[i]);
+ janCodeMap.put(janCodeMark.substring(0, 13) + frost12,barCodeList[i]);
+ janCodeMap.put(janCodeMark.substring(1, 13) + frost13,barCodeList[i]);
+ janCodeMap.put(janCodeMark.substring(0, 13) + frost13,barCodeList[i]);
+ barJancodeMap.put(barCodeList[i], janCodeMap);
+ barcodeinfoMap.put(barCodeList[i], barcodedetList);
+ barCode01List.add(barCodeList[i]);
+ }else if(barCodeList[i].substring(0,3) =='241'){
+ if(barCodeList[i].length() > 8 && barCodeList[i].substring(barCodeList[i].length() - 8,barCodeList[i].length()-5)!='250'){
//LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
- '浜у搧BarCode(' +
- bar +
- ')绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- bar +
- ')绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�'
- )
- );
+ if(isLwc){
+ errorList.add('浜у搧BarCode(' + barCodeList[i] + ')娌℃湁绠＄悊缂栫爜锛�');
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, '浜у搧BarCode(' + barCodeList[i] + ')娌℃湁绠＄悊缂栫爜锛�'));
}
continue;
- }
}
- // String str = '绠＄悊缂栫爜涓嶆纭紝璇蜂笌绠＄悊鍛樼‘璁ゆ槸鍚﹂敊璇��';
- // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + bar + ')绠＄悊缂栫爜涓湁鏁板瓧锛岃涓庣鐞嗗憳纭鏄惁閿欒锛�'));
- // continue;
- // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 end
- }
- } else {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
- '浜у搧BarCode(' + bar + ')鐨則racingCode閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' + bar + ')鐨則racingCode閿欒锛�'
- )
- );
- }
- continue;
+ List<String> otCodeList = new List<String>();
+ Map<String,String> otCodeMap = new Map<String,String>();
+ if(barCodeList[i].length() < 7){
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ errorList.add('浜у搧BarCode(' + barCodeList[i] + ')鐨勪綅鏁颁笉瓒�16锛屼笉绗﹀悎瑕佹眰閿欒锛�');
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + barCodeList[i] + ')鐨勪綅鏁颁笉瓒�16锛屼笉绗﹀悎瑕佹眰閿欒锛�'));
+ }
+ continue;
+ }else if(barCodeList[i].length() == 11){
+ String otCode4 = barCodeList[i].substring(3,7);
+ String otCode5 = barCodeList[i].substring(3,8);
+ String otCode6 = barCodeList[i].substring(3,9);
+ String otCode7 = barCodeList[i].substring(3,10);
+ String otCode8 = barCodeList[i].substring(3,11);
+ otCodeList.add(otCode4);
+ otCodeList.add(otCode5);
+ otCodeList.add(otCode6);
+ otCodeList.add(otCode7);
+ otCodeList.add(otCode8);
+ otCodeMap.put(otCode4,barCodeList[i]);
+ otCodeMap.put(otCode5,barCodeList[i]);
+ otCodeMap.put(otCode6,barCodeList[i]);
+ otCodeMap.put(otCode7,barCodeList[i]);
+ otCodeMap.put(otCode8,barCodeList[i]);
+ }else if(barCodeList[i].length() >= 12){
+ String otCode4 = barCodeList[i].substring(3,7);
+ String otCode5 = barCodeList[i].substring(3,8);
+ String otCode6 = barCodeList[i].substring(3,9);
+ String otCode7 = barCodeList[i].substring(3,10);
+ String otCode8 = barCodeList[i].substring(3,11);
+ String otCode9 = barCodeList[i].substring(3,12);
+ otCodeList.add(otCode4);
+ otCodeList.add(otCode5);
+ otCodeList.add(otCode6);
+ otCodeList.add(otCode7);
+ otCodeList.add(otCode8);
+ otCodeList.add(otCode9);
+ otCodeMap.put(otCode4,barCodeList[i]);
+ otCodeMap.put(otCode5,barCodeList[i]);
+ otCodeMap.put(otCode6,barCodeList[i]);
+ otCodeMap.put(otCode7,barCodeList[i]);
+ otCodeMap.put(otCode8,barCodeList[i]);
+ otCodeMap.put(otCode9,barCodeList[i]);
+ }
+ allotCodeList.addAll(otCodeList);
+ barOtcodeMap.put(barCodeList[i], otCodeMap);
+ barCode241List.add(barCodeList[i]);
+ }else{
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ errorList.add('浜у搧BarCode(' + barCodeList[i] + ')涓嶇鍚堣姹傦紒');
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + barCodeList[i] + ')涓嶇鍚堣姹傦紒'));
+ }
+ continue;
}
- }
- exitBarCodeMap.put(bar, bar);
- List<String> barcodedetList = new List<String>();
- barcodedetList.add(bar);
- barcodedetList.add(String.valueOf(expirationDate));
- barcodedetList.add(serialNoorLotNo);
- barcodedetList.add(tracingCode);
- consumableInventory.add(
- new ConsumableorderdetailsInfo(produ, barcodedetList)
- );
- consumableInventoryUse.add(
- new ConsumableorderdetailsInfo(produ, barcodedetList)
- );
+ }else{
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ errorList.add('浜у搧BarCode(' + barCodeList[i] + ')涓嶇鍚堣姹傦紒');
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + barCodeList[i] + ')涓嶇鍚堣姹傦紒'));
+ }
+ continue;
}
- }
}
- }
- for (String bartxt : barCode241List) {
- if (!exitBarCodeMap.containsKey(bartxt)) {
- if (!errorMap.containsKey(bartxt)) {
- notInStorelist.add(bartxt);
- }
+ //01閫氳繃妫�绱骇鍝佹槸鍚﹀瓨鍦�
+ //-----------XHL--------------UpdateSTART----------------20181010------
+ if(alljanCodeList.size() > 0){
+ List<Product2__c> product2InStore = [SELECT Id, Name,Name__c,Intra_Trade_List_RMB__c,Asset_Model_No__c,OT_CODE__c,Product2_Jancode__c,
+ Pro2_Dealer_ENG__c,Pro2_Dealer_Object__c
+ FROM Product2__c
+ WHERE Product2_Jancode__c in :alljanCodeList
+ order by SFDA_Expiration_Date__c desc ] ;
+ if(product2InStore.size() > 0){
+ // CHAN-AVSAST
+ Map<String,String> rightBar = new Map<String,String>();
+ Map<String,String> errorMap = new Map<String,String>();
+ for(String bar: barJancodeMap.keySet() ){
+ Integer cou = 0;
+ for(Product2__c produ: product2InStore){
+ if(barJancodeMap.get(bar).containsKey(produ.Product2_Jancode__c) && !rightBar.containsKey(bar)){
+ cou ++;
+ if(EngFlag == TRUE && produ.Pro2_Dealer_ENG__c == TRUE){
+ consumableInventory.add(new ConsumableorderdetailsInfo(produ,barcodeinfoMap.get(bar)));
+ consumableInventoryUse.add(new ConsumableorderdetailsInfo(produ,barcodeinfoMap.get(bar)));
+ rightBar.put(bar, bar);
+ }else if(ETFlag == TRUE && produ.Pro2_Dealer_Object__c == TRUE){
+ consumableInventory.add(new ConsumableorderdetailsInfo(produ,barcodeinfoMap.get(bar)));
+ consumableInventoryUse.add(new ConsumableorderdetailsInfo(produ,barcodeinfoMap.get(bar)));
+ rightBar.put(bar, bar);
+ }else{
+ errorMap.put(bar, bar);
+ }
+ }
+
+ }
+ if(cou <= 0 ){
+ notInStorelist.add(bar);
+ }
+ }
+ if(errorMap.size() > 0){
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ errorList.add('BarCode鍙穂'+ errorMap.values() +']浜у搧绫诲瀷['+product_Type+']涓庣敤鎴风被鍨媅'+userPro_Type+']涓嶇');
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'BarCode鍙穂'+ errorMap.values() +']浜у搧绫诲瀷['+product_Type+']涓庣敤鎴风被鍨媅'+userPro_Type+']涓嶇'));
+ }
+ }
+ }
}
- }
- }
- }
+
+ //241閫氳繃妫�绱骇鍝佹槸鍚﹀瓨鍦�
+ if(allotCodeList.size() > 0){
+ Map<String,String> errorMap = new Map<String,String>();
+ Map<String,String> exitBarCodeMap = new Map<String,String>();
+ List<Product2__c> product2InStore = [SELECT Id, Name,Name__c,Intra_Trade_List_RMB__c,Asset_Model_No__c,OT_CODE__c,Product2_Jancode__c,
+ Pro2_Dealer_ENG__c,Pro2_Dealer_Object__c
+ FROM Product2__c
+ WHERE OT_CODE__c in :allotCodeList
+ AND (not Product_Type__c like :userPro_Typestr)] ;
+ if(product2InStore.size() > 0){
+
+ for(Product2__c produ: product2InStore){
+ for(String bar: barOtcodeMap.keySet() ){
+ if(barOtcodeMap.get(bar).containsKey(produ.OT_CODE__c)){
+ exitBarCodeMap.put(bar,bar);
+ errorMap.put(bar, bar);
+ }
+ }
+ }
+ }
+ if(errorMap.size() > 0){
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ errorList.add('BarCode鍙穂'+ errorMap.values() +']浜у搧绫诲瀷['+product_Type+']涓庣敤鎴穂'+userPro_Type+']绫诲瀷涓嶇');
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'BarCode鍙穂'+ errorMap.values() +']浜у搧绫诲瀷['+product_Type+']涓庣敤鎴穂'+userPro_Type+']绫诲瀷涓嶇'));
+ }
+ }
+ product2InStore = [SELECT Id, Name,Name__c,Intra_Trade_List_RMB__c,Asset_Model_No__c,OT_CODE__c,Product2_Jancode__c,
+ Pro2_Dealer_ENG__c,Pro2_Dealer_Object__c
+ FROM Product2__c
+ WHERE OT_CODE__c in :allotCodeList
+ AND Product_Type__c like :userPro_Typestr] ;
+
+ if(product2InStore.size() > 0){
+
+ for(Product2__c produ: product2InStore){
+ for(String bar: barOtcodeMap.keySet() ){
+ Date expirationDate = null ;
+ String serialNoorLotNo = '';
+ String tracingCode = '';
+ String productDateStr = '';
+ Date productionDate = null ;
+ String expirationDateStr = '';
+ if(barOtcodeMap.get(bar).containsKey(produ.OT_CODE__c)){
+ Integer oTcodeLength = produ.OT_CODE__c.length();
+ if(bar.length() >= oTcodeLength + 11){
+ if( bar.substring(oTcodeLength + 3,oTcodeLength + 5) =='11'){
+ try{
+ productDateStr = '20' + bar.substring(oTcodeLength + 5,oTcodeLength + 7) + '-' + bar.substring(oTcodeLength + 7,oTcodeLength + 9) + '-01' ;
+ productionDate = Date.valueOf(productDateStr);
+ }catch(Exception e){
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ errorList.add('浜у搧BarCode(' + bar + ')鐨勭敓浜ф棩鏈�' + productDateStr + '閿欒锛�');
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, '浜у搧BarCode(' + bar + ')鐨勭敓浜ф棩鏈�' + productDateStr + '閿欒锛�'));
+ }
+ continue;
+ }
+ if(bar.length() >=oTcodeLength + 3 + 16){
+ if( bar.substring(oTcodeLength + 3 + 8,oTcodeLength + 3 + 10) =='17'){
+ try{
+ if(bar.substring(oTcodeLength + 3 + 14,oTcodeLength + 3 + 16)=='00'){
+ expirationDateStr = '20' + bar.substring(oTcodeLength + 3 + 10,oTcodeLength + 3 + 12) + '-' + bar.substring(oTcodeLength + 3 + 12,oTcodeLength + 3 + 14) + '-' + '01' ;
+ expirationDate = Date.valueOf(expirationDateStr);
+ expirationDate = expirationDate.addMonths(1).toStartofMonth().addDays(-1);
+ }else{
+ expirationDateStr = '20' + bar.substring(oTcodeLength + 3 + 10,oTcodeLength + 3 + 12) + '-' + bar.substring(oTcodeLength + 3 + 12,oTcodeLength + 3 + 14) + '-' +bar.substring(oTcodeLength + 3 + 14,oTcodeLength + 3 + 16) ;
+ expirationDate = Date.valueOf(expirationDateStr);
+ }
+ }catch(Exception e){
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ errorList.add('浜у搧BarCode(' + bar + ')鐨勬粎鑿屾湁鍔规湡闄�' + expirationDateStr + '閿欒锛�');
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + bar + ')鐨勬粎鑿屾湁鍔规湡闄�' + expirationDateStr + '閿欒锛�'));
+ }
+ continue;
+ }
+ if(bar.length() >= oTcodeLength + 3 + 25){
+ if(bar.substring(oTcodeLength + 3 + 16,oTcodeLength + 3 + 18) =='10' || bar.substring(oTcodeLength + 3 + 16,oTcodeLength + 3 + 18) =='21'){
+ serialNoorLotNo = bar.substring(oTcodeLength + 3 + 18,bar.length() - 8) ;
+ //ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, 'serialNoorLotNo' + serialNoorLotNo));
+ }
+ }
+ }else if(bar.substring(oTcodeLength + 3 + 8,oTcodeLength + 3 + 10) =='10' || bar.substring(oTcodeLength + 3 + 8,oTcodeLength + 3 + 10) =='21'){
+ serialNoorLotNo = bar.substring(oTcodeLength + 3 + 10,bar.length() - 8) ;
+ //ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, 'serialNoorLotNo' + serialNoorLotNo));
+ }
+ }
+ }else if(bar.substring(oTcodeLength + 3,oTcodeLength + 5) =='17'){
+ try{
+ if(bar.substring(oTcodeLength + 3 + 6,oTcodeLength + 3 + 8)=='00'){
+ expirationDateStr = '20' + bar.substring(oTcodeLength + 3 + 2,oTcodeLength + 3 + 4) + '-' + bar.substring(oTcodeLength + 3 + 4,oTcodeLength + 3 + 6) + '-01';
+ expirationDate = Date.valueOf(expirationDateStr);
+ expirationDate = expirationDate.addMonths(1).toStartofMonth().addDays(-1);
+ }else{
+ expirationDateStr = '20' + bar.substring(oTcodeLength + 3 + 2,oTcodeLength + 3 + 4) + '-' + bar.substring(oTcodeLength + 3 + 4,oTcodeLength + 3 + 6) + '-' +bar.substring(oTcodeLength + 3 + 6,oTcodeLength + 3 + 8);
+ expirationDate = Date.valueOf(expirationDateStr);
+ }
+ }catch(Exception e){
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ errorList.add('浜у搧BarCode(' + bar + ')鐨勬粎鑿屾湁鍔规湡闄�' + expirationDateStr + '閿欒锛�');
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + bar + ')鐨勬粎鑿屾湁鍔规湡闄�' + expirationDateStr + '閿欒锛�'));
+ }
+ continue;
+ }
+ if(bar.length() >=oTcodeLength + 20){
+ if(bar.substring(oTcodeLength + 3 + 8,oTcodeLength + 3 + 10) =='10' || bar.substring(oTcodeLength + 3 + 8,oTcodeLength + 3 + 10) =='21'){
+ serialNoorLotNo = bar.substring(oTcodeLength + 3 + 10,bar.length() - 8) ;
+ }
+ }
- public void inventoryEntry(List<String> barCodeList) {
- //鎵�鏈塨arcode瑙ｆ瀽鍒扮殑Jancode
- List<String> alljanCodeList = new List<String>();
- List<String> allotCodeList = new List<String>();
- List<String> barCode01List = new List<String>();
- List<String> barCode241List = new List<String>();
- Map<String, Map<String, String>> barJancodeMap = new Map<String, Map<String, String>>();
- Map<String, Map<String, String>> barOtcodeMap = new Map<String, Map<String, String>>();
- Map<String, List<String>> barcodeinfoMap = new Map<String, List<String>>();
- notInStorelist.clear();
- notEqualBARcodeCunMap.clear();
- Map<String, String> orderdetailMap = new Map<String, String>();
- List<Consumable_Orderdetails__c> orderdetail = [
- SELECT
- Id,
- Name,
- Consumable_order__c,
- Consumable_Product__c,
- Asset_Model_No__c
- FROM Consumable_Orderdetails__c
- WHERE
- Consumable_order__r.Dealer_Info__c = :accountid
- AND Consumable_order__c != NULL
- AND Consumable_order__c = :ESetId
- AND Order_Owner_WorkLocal__c = :userWorkLocation
- ORDER BY Name
- ];
- for (Integer i = 0; i < orderdetail.size(); i++) {
- orderdetailMap.put(
- orderdetail[i].Consumable_Product__c,
- orderdetail[i].Consumable_Product__c
- );
+ }else if(bar.length() >= oTcodeLength + 12){
+ if(bar.substring(oTcodeLength + 3,oTcodeLength + 5) =='10' || bar.substring(oTcodeLength + 3,oTcodeLength + 5) =='21'){
+ serialNoorLotNo = bar.substring(oTcodeLength + 3 + 2,bar.length() - 8) ;
+ }
+ }
+ }
+ if(bar.length() >= oTcodeLength + 3 + 8 && bar.substring(bar.length() - 8,bar.length()-5)=='250'){
+ if(bar.substring(bar.length() - 8,bar.length()-5)=='250'){
+ tracingCode = bar.substring(bar.length() - 5,bar.length());
+ Matcher n = Pattern.compile('[0-9]').matcher(tracingCode);
+ if(n.find()){
+ // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 start
+ if (tracingCode.length() == 5) {
+ String tr = tracingCode;
+ String Ctr = tr.substring(tr.length() - 3,tr.length());
+ String Btr = tr.substring(tr.length() - 4,tr.length()-3);
+ String Atr = tr.substring(tr.length() - 5,tr.length()-4);
+ if (Pattern.compile('[0-9]').matcher(Atr).find() || Pattern.compile('[0-9]').matcher(Ctr).find()) {
+ String str = '绠＄悊缂栫爜涓嶆纭紝璇蜂笌绠＄悊鍛樼‘璁ゆ槸鍚﹂敊璇��';
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ errorList.add('浜у搧BarCode(' + bar + ')绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�');
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + bar + ')绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�'));
+ }
+ continue;
+ }
+ }
+ // String str = '绠＄悊缂栫爜涓嶆纭紝璇蜂笌绠＄悊鍛樼‘璁ゆ槸鍚﹂敊璇��';
+ // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + bar + ')绠＄悊缂栫爜涓湁鏁板瓧锛岃涓庣鐞嗗憳纭鏄惁閿欒锛�'));
+ // continue;
+ // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 end
+ }
+ }else{
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ errorList.add('浜у搧BarCode(' + bar + ')鐨則racingCode閿欒锛�');
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + bar + ')鐨則racingCode閿欒锛�'));
+ }
+ continue;
+ }
+ }
+ exitBarCodeMap.put(bar,bar);
+ List<String> barcodedetList = new List<String>();
+ barcodedetList.add(bar);
+ barcodedetList.add(String.valueOf(expirationDate));
+ barcodedetList.add(serialNoorLotNo);
+ barcodedetList.add(tracingCode);
+ consumableInventory.add(new ConsumableorderdetailsInfo(produ,barcodedetList));
+ consumableInventoryUse.add(new ConsumableorderdetailsInfo(produ,barcodedetList));
+
+ }
+ }
+
+ }
+ }
+ for(String bartxt :barCode241List){
+ if(!exitBarCodeMap.containsKey(bartxt)){
+ if(!errorMap.containsKey(bartxt)){
+ notInStorelist.add(bartxt);
+ }
+ }
+ }
+ }
+
}
- for (Integer i = 0; i < barCodeList.size(); i++) {
- Date expirationDate = null;
- String serialNoorLotNo = '';
- String tracingCode = '';
- String productDateStr = '';
- Date productionDate = null;
- String expirationDateStr = '';
- if (barCodeList[i].substring(0, 2) == '01') {
- String janCodeMark = '';
- //鐢熶骇鏃ユ湡
- List<String> janCode = new List<String>();
- if (barCodeList[i].length() < 16) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
- '浜у搧BarCode(' +
- barCodeList[i] +
- ')鐨勪綅鏁颁笉瓒�16锛屼笉绗﹀悎瑕佹眰閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- barCodeList[i] +
- ')鐨勪綅鏁颁笉瓒�16锛屼笉绗﹀悎瑕佹眰閿欒锛�'
- )
- );
- }
- continue;
- } else {
- janCodeMark = barCodeList[i].substring(2, 16);
- try {
- Decimal test = Decimal.valueOf(janCodeMark);
- } catch (Exception e) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
- '浜у搧BarCode(' + barCodeList[i] + ')鐨刯anCode閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' + barCodeList[i] + ')鐨刯anCode閿欒锛�'
- )
- );
- }
- continue;
- }
+ public void inventoryEntry (List<String> barCodeList){
+ //鎵�鏈塨arcode瑙ｆ瀽鍒扮殑Jancode
+ List<String> alljanCodeList = new List<String>();
+ List<String> allotCodeList = new List<String>();
+ List<String> barCode01List = new List<String>();
+ List<String> barCode241List = new List<String>();
+ Map<String,Map<String,String>> barJancodeMap = new Map<String,Map<String,String>>();
+ Map<String,Map<String,String>> barOtcodeMap = new Map<String,Map<String,String>>();
+ Map<String,List<String>> barcodeinfoMap = new Map<String,List<String>>();
+ notInStorelist.clear();
+ notEqualBARcodeCunMap.clear();
+ Map<String,String> orderdetailMap = new Map<String,String>();
+ List<Consumable_Orderdetails__c> orderdetail = [SELECT Id, Name, Consumable_order__c,
+ Consumable_Product__c,Asset_Model_No__c
+ FROM Consumable_Orderdetails__c
+ WHERE Consumable_order__r.Dealer_Info__c = :accountid
+ AND Consumable_order__c != null
+ AND Consumable_order__c = :ESetId
+ AND Order_Owner_WorkLocal__c = :userWorkLocation
+ ORDER BY Name ];
+ for(Integer i = 0; i < orderdetail.size(); i++){
+ orderdetailMap.put(orderdetail[i].Consumable_Product__c, orderdetail[i].Consumable_Product__c);
}
- if (barCodeList[i].length() >= 22) {
- if (
- barCodeList[i]
- .substring(
- barCodeList[i].length() - 8,
- barCodeList[i].length() - 5
- ) != '250'
- ) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
- '浜у搧BarCode(' + barCodeList[i] + ')娌℃湁绠＄悊缂栫爜锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' + barCodeList[i] + ')娌℃湁绠＄悊缂栫爜锛�'
- )
- );
- }
- continue;
- }
- if (barCodeList[i].substring(16, 18) == '11') {
- try {
- productDateStr =
- '20' +
- barCodeList[i].substring(18, 20) +
- '-' +
- barCodeList[i].substring(20, 22) +
- '-01';
- productionDate = Date.valueOf(productDateStr);
- } catch (Exception e) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
- '浜у搧BarCode(' +
- barCodeList[i] +
- ')鐨勭敓浜ф棩鏈�' +
- productDateStr +
- '閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- barCodeList[i] +
- ')鐨勭敓浜ф棩鏈�' +
- productDateStr +
- '閿欒锛�'
- )
- );
- }
- continue;
- }
- if (barCodeList[i].length() >= 32) {
- if (barCodeList[i].substring(24, 26) == '17') {
- try {
- if (barCodeList[i].substring(30, 32) == '00') {
- expirationDateStr =
- '20' +
- barCodeList[i].substring(26, 28) +
- '-' +
- barCodeList[i].substring(28, 30) +
- '-' +
- '01';
- expirationDate = Date.valueOf(expirationDateStr);
- expirationDate = expirationDate.addMonths(1)
- .toStartofMonth()
- .addDays(-1);
- } else {
- expirationDateStr =
- '20' +
- barCodeList[i].substring(26, 28) +
- '-' +
- barCodeList[i].substring(28, 30) +
- '-' +
- barCodeList[i].substring(30, 32);
- expirationDate = Date.valueOf(expirationDateStr);
- }
- } catch (Exception e) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
- '浜у搧BarCode(' +
- barCodeList[i] +
- ')鐨勬粎鑿屾湁鍔规湡闄�' +
- expirationDateStr +
- '閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- barCodeList[i] +
- ')鐨勬粎鑿屾湁鍔规湡闄�' +
- expirationDateStr +
- '閿欒锛�'
- )
- );
- }
- continue;
- }
- if (barCodeList[i].length() >= 42) {
- if (
- barCodeList[i].substring(32, 34) == '10' ||
- barCodeList[i].substring(32, 34) == '21'
- ) {
- serialNoorLotNo = barCodeList[i]
- .substring(34, barCodeList[i].length() - 8);
- }
- }
- } else if (
- barCodeList[i].substring(24, 26) == '10' ||
- barCodeList[i].substring(24, 26) == '21'
- ) {
- serialNoorLotNo = barCodeList[i]
- .substring(26, barCodeList[i].length() - 8);
- }
- }
- } else if (barCodeList[i].substring(16, 18) == '17') {
- try {
- if (barCodeList[i].substring(22, 24) == '00') {
- expirationDateStr =
- '20' +
- barCodeList[i].substring(18, 20) +
- '-' +
- barCodeList[i].substring(20, 22) +
- '-01';
- //ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧expirationDateStr' + expirationDateStr));
- expirationDate = Date.valueOf(expirationDateStr);
- expirationDate = expirationDate.addMonths(1)
- .toStartofMonth()
- .addDays(-1);
- } else {
- expirationDateStr =
- '20' +
- barCodeList[i].substring(18, 20) +
- '-' +
- barCodeList[i].substring(20, 22) +
- '-' +
- barCodeList[i].substring(22, 24);
- expirationDate = Date.valueOf(expirationDateStr);
- }
- } catch (Exception e) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
- '浜у搧BarCode(' +
- barCodeList[i] +
- ')鐨勬粎鑿屾湁鍔规湡闄�' +
- expirationDateStr +
- '閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- barCodeList[i] +
- ')鐨勬粎鑿屾湁鍔规湡闄�' +
- expirationDateStr +
- '閿欒锛�'
- )
- );
- }
- continue;
- }
- if (barCodeList[i].length() >= 34) {
- if (
- barCodeList[i].substring(24, 26) == '10' ||
- barCodeList[i].substring(24, 26) == '21'
- ) {
- serialNoorLotNo = barCodeList[i]
- .substring(26, barCodeList[i].length() - 8);
- }
- }
- } else if (barCodeList[i].length() >= 26) {
- if (
- barCodeList[i].substring(16, 18) == '10' ||
- barCodeList[i].substring(16, 18) == '21'
- ) {
- serialNoorLotNo = barCodeList[i]
- .substring(18, barCodeList[i].length() - 8);
- }
- }
- }
- if (
- barCodeList[i].length() >= 24 &&
- barCodeList[i]
- .substring(
- barCodeList[i].length() - 8,
- barCodeList[i].length() - 5
- ) == '250'
- ) {
- if (
- barCodeList[i]
- .substring(
- barCodeList[i].length() - 8,
- barCodeList[i].length() - 5
- ) == '250'
- ) {
- tracingCode = barCodeList[i]
- .substring(barCodeList[i].length() - 5, barCodeList[i].length());
- Matcher n = Pattern.compile('[0-9]').matcher(tracingCode);
- if (n.find()) {
- // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 start
- if (tracingCode.length() == 5) {
- String tr = tracingCode;
- String Ctr = tr.substring(tr.length() - 3, tr.length());
- String Btr = tr.substring(tr.length() - 4, tr.length() - 3);
- String Atr = tr.substring(tr.length() - 5, tr.length() - 4);
- if (
- Pattern.compile('[0-9]').matcher(Atr).find() ||
- Pattern.compile('[0-9]').matcher(Ctr).find()
- ) {
- String str = '绠＄悊缂栫爜涓嶆纭紝璇蜂笌绠＄悊鍛樼‘璁ゆ槸鍚﹂敊璇��';
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
- '浜у搧BarCode(' +
- barCodeList[i] +
- ')绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- barCodeList[i] +
- ')绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�'
- )
- );
- }
- continue;
- }
- }
- // String str = '绠＄悊缂栫爜涓嶆纭紝璇蜂笌绠＄悊鍛樼‘璁ゆ槸鍚﹂敊璇��';
- // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + barCodeList[i] + ')绠＄悊缂栫爜涓湁鏁板瓧锛岃涓庣鐞嗗憳纭鏄惁閿欒锛�'));
- // continue;
- // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 end
- }
- } else {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
- '浜у搧BarCode(' + barCodeList[i] + ')鐨則racingCode閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' + barCodeList[i] + ')鐨則racingCode閿欒锛�'
- )
- );
- }
- continue;
- }
- }
- List<String> barcodedetList = new List<String>();
- barcodedetList.add(barCodeList[i]);
- barcodedetList.add(String.valueOf(expirationDate));
- barcodedetList.add(serialNoorLotNo);
- barcodedetList.add(tracingCode);
- Integer jan1 = Integer.valueOf(janCodeMark.substring(0, 1));
- Integer jan2 = Integer.valueOf(janCodeMark.substring(1, 2));
- Integer jan3 = Integer.valueOf(janCodeMark.substring(2, 3));
- Integer jan4 = Integer.valueOf(janCodeMark.substring(3, 4));
- Integer jan5 = Integer.valueOf(janCodeMark.substring(4, 5));
- Integer jan6 = Integer.valueOf(janCodeMark.substring(5, 6));
- Integer jan7 = Integer.valueOf(janCodeMark.substring(6, 7));
- Integer jan8 = Integer.valueOf(janCodeMark.substring(7, 8));
- Integer jan9 = Integer.valueOf(janCodeMark.substring(8, 9));
- Integer jan10 = Integer.valueOf(janCodeMark.substring(9, 10));
- Integer jan11 = Integer.valueOf(janCodeMark.substring(10, 11));
- Integer jan12 = Integer.valueOf(janCodeMark.substring(11, 12));
- Integer jan13 = Integer.valueOf(janCodeMark.substring(12, 13));
- Integer count12 =
- jan2 +
- jan3 * 3 +
- jan4 +
- jan5 * 3 +
- jan6 +
- jan7 * 3 +
- jan8 +
- jan9 * 3 +
- jan10 +
- jan11 * 3 +
- jan12 +
- jan13 * 3;
- Integer count13 =
- jan1 * 3 +
- jan2 +
- jan3 * 3 +
- jan4 +
- jan5 * 3 +
- jan6 +
- jan7 * 3 +
- jan8 +
- jan9 * 3 +
- jan10 +
- jan11 * 3 +
- jan12 +
- jan13 * 3;
- String frost12 = (String.valueOf(count12))
- .substring((String.valueOf(count12)).length() - 1);
- String frost13 = (String.valueOf(count13))
- .substring((String.valueOf(count13)).length() - 1);
- //鍑忓幓12浣嶄釜浣�4
- frost12 = (String.valueOf(10 - Integer.valueOf(frost12)))
- .substring(
- (String.valueOf(10 - Integer.valueOf(frost12))).length() - 1
- );
- frost13 = (String.valueOf(10 - Integer.valueOf(frost13)))
- .substring(
- (String.valueOf(10 - Integer.valueOf(frost13))).length() - 1
- );
-
- janCode.add(janCodeMark.substring(1, 13) + frost12);
- janCode.add(janCodeMark.substring(0, 13) + frost12);
- janCode.add(janCodeMark.substring(1, 13) + frost13);
- janCode.add(janCodeMark.substring(0, 13) + frost13);
- alljanCodeList.addAll(janCode);
- Map<String, String> janCodeMap = new Map<String, String>();
- janCodeMap.put(janCodeMark.substring(1, 13) + frost12, barCodeList[i]);
- janCodeMap.put(janCodeMark.substring(0, 13) + frost12, barCodeList[i]);
- janCodeMap.put(janCodeMark.substring(1, 13) + frost13, barCodeList[i]);
- janCodeMap.put(janCodeMark.substring(0, 13) + frost13, barCodeList[i]);
- barJancodeMap.put(barCodeList[i], janCodeMap);
- barcodeinfoMap.put(barCodeList[i], barcodedetList);
- barCode01List.add(barCodeList[i]);
- } else if (barCodeList[i].substring(0, 3) == '241') {
- if (
- barCodeList[i].length() > 8 &&
- barCodeList[i]
- .substring(
- barCodeList[i].length() - 8,
- barCodeList[i].length() - 5
- ) != '250'
- ) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add('浜у搧BarCode(' + barCodeList[i] + ')娌℃湁绠＄悊缂栫爜锛�');
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' + barCodeList[i] + ')娌℃湁绠＄悊缂栫爜锛�'
- )
- );
- }
- continue;
- }
- List<String> otCodeList = new List<String>();
- Map<String, String> otCodeMap = new Map<String, String>();
- if (barCodeList[i].length() < 7) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
- '浜у搧BarCode(' +
- barCodeList[i] +
- ')鐨勪綅鏁颁笉瓒�16锛屼笉绗﹀悎瑕佹眰閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- barCodeList[i] +
- ')鐨勪綅鏁颁笉瓒�16锛屼笉绗﹀悎瑕佹眰閿欒锛�'
- )
- );
- }
- continue;
- } else if (barCodeList[i].length() == 11) {
- String otCode4 = barCodeList[i].substring(3, 7);
- String otCode5 = barCodeList[i].substring(3, 8);
- String otCode6 = barCodeList[i].substring(3, 9);
- String otCode7 = barCodeList[i].substring(3, 10);
- String otCode8 = barCodeList[i].substring(3, 11);
- otCodeList.add(otCode4);
- otCodeList.add(otCode5);
- otCodeList.add(otCode6);
- otCodeList.add(otCode7);
- otCodeList.add(otCode8);
- otCodeMap.put(otCode4, barCodeList[i]);
- otCodeMap.put(otCode5, barCodeList[i]);
- otCodeMap.put(otCode6, barCodeList[i]);
- otCodeMap.put(otCode7, barCodeList[i]);
- otCodeMap.put(otCode8, barCodeList[i]);
- } else if (barCodeList[i].length() >= 12) {
- String otCode4 = barCodeList[i].substring(3, 7);
- String otCode5 = barCodeList[i].substring(3, 8);
- String otCode6 = barCodeList[i].substring(3, 9);
- String otCode7 = barCodeList[i].substring(3, 10);
- String otCode8 = barCodeList[i].substring(3, 11);
- String otCode9 = barCodeList[i].substring(3, 12);
- otCodeList.add(otCode4);
- otCodeList.add(otCode5);
- otCodeList.add(otCode6);
- otCodeList.add(otCode7);
- otCodeList.add(otCode8);
- otCodeList.add(otCode9);
- otCodeMap.put(otCode4, barCodeList[i]);
- otCodeMap.put(otCode5, barCodeList[i]);
- otCodeMap.put(otCode6, barCodeList[i]);
- otCodeMap.put(otCode7, barCodeList[i]);
- otCodeMap.put(otCode8, barCodeList[i]);
- otCodeMap.put(otCode9, barCodeList[i]);
- }
- allotCodeList.addAll(otCodeList);
- barOtcodeMap.put(barCodeList[i], otCodeMap);
- barCode241List.add(barCodeList[i]);
- } else {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
- '浜у搧BarCode(' +
- barCodeList[i] +
- ')娌℃湁janCode鎴朞Tcode锛屼笉绗﹀悎瑕佹眰锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- barCodeList[i] +
- ')娌℃湁janCode鎴朞Tcode锛屼笉绗﹀悎瑕佹眰锛�'
- )
- );
- }
- continue;
- }
- }
- //01閫氳繃妫�绱骇鍝佹槸鍚﹀瓨鍦�
- Map<String, String> rightBar = new Map<String, String>();
- if (alljanCodeList.size() > 0) {
- Map<String, String> exitBarCodeMap = new Map<String, String>();
- List<Product2__c> product2InStore = [
- SELECT
- Id,
- Name,
- Name__c,
- Intra_Trade_List_RMB__c,
- Asset_Model_No__c,
- OT_CODE__c,
- Product2_Jancode__c,
- Pro2_Dealer_ENG__c,
- Pro2_Dealer_Object__c,
- Product_Type__c
- FROM Product2__c
- WHERE
- Product2_Jancode__c IN :alljanCodeList
- AND (NOT Product_Type__c LIKE :userPro_Typestr)
- ORDER BY SFDA_Expiration_Date__c DESC
- ];
- if (product2InStore.size() > 0) {
- Map<String, String> errorMap = new Map<String, String>();
- for (Product2__c produ : product2InStore) {
- for (String bar : barJancodeMap.keySet()) {
- if (
- barJancodeMap.get(bar).containsKey(produ.Product2_Jancode__c) &&
- !rightBar.containsKey(bar)
- ) {
- exitBarCodeMap.put(bar, bar);
- errorMap.put(bar, bar);
- }
- }
- }
- if (errorMap.size() > 0) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
- 'BarCode鍙穂' +
- errorMap.values() +
- ']浜у搧绫诲瀷[' +
- product_Type +
- ']涓庣敤鎴风殑绫诲瀷[' +
- userPro_Type +
- ']涓嶇'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- 'BarCode鍙穂' +
- errorMap.values() +
- ']浜у搧绫诲瀷[' +
- product_Type +
- ']涓庣敤鎴风殑绫诲瀷[' +
- userPro_Type +
- ']涓嶇'
- )
- );
- }
- }
- }
- product2InStore = [
- SELECT
- Id,
- Name,
- Name__c,
- Intra_Trade_List_RMB__c,
- Asset_Model_No__c,
- OT_CODE__c,
- Product2_Jancode__c,
- Pro2_Dealer_ENG__c,
- Pro2_Dealer_Object__c,
- Product_Type__c
- FROM Product2__c
- WHERE
- Product2_Jancode__c IN :alljanCodeList
- AND Product_Type__c LIKE :userPro_Typestr
- ORDER BY SFDA_Expiration_Date__c DESC
- ];
- if (product2InStore.size() > 0) {
- Map<String, String> errorMap = new Map<String, String>();
- for (Product2__c produ : product2InStore) {
- for (String bar : barJancodeMap.keySet()) {
- if (
- barJancodeMap.get(bar).containsKey(produ.Product2_Jancode__c) &&
- !rightBar.containsKey(bar)
- ) {
- exitBarCodeMap.put(bar, bar);
- if (orderdetailMap.containsKey(produ.Id)) {
- consumableInventory.add(
- new ConsumableorderdetailsInfo(produ, barcodeinfoMap.get(bar))
- );
- rightBar.put(bar, bar);
- } else {
- consumableInventory.add(
- new ConsumableorderdetailsInfo(produ, barcodeinfoMap.get(bar))
- );
- rightBar.put(bar, bar);
- list<String> overOrderBARcodeCunList = new List<String>();
- if (notEqualBARcodeCunMap.containsKey(produ.Id)) {
- overOrderBARcodeCunList = notEqualBARcodeCunMap.get(produ.Id)
- .clone();
- overOrderBARcodeCunList.add(bar);
- notEqualBARcodeCunMap.put(produ.Id, overOrderBARcodeCunList);
- } else {
- overOrderBARcodeCunList.add(bar);
- notEqualBARcodeCunMap.put(produ.Id, overOrderBARcodeCunList);
- }
- }
- }
- }
- }
- }
- for (String bartxt : barCode01List) {
- if (!exitBarCodeMap.containsKey(bartxt)) {
- notInStorelist.add(bartxt);
- }
- }
- }
-
- //241閫氳繃妫�绱骇鍝佹槸鍚﹀瓨鍦�
- if (allotCodeList.size() > 0) {
- Map<String, String> exitBarCodeMap = new Map<String, String>();
- Map<String, String> errorMap = new Map<String, String>();
- List<Product2__c> product2InStore = [
- SELECT
- Id,
- Name,
- Name__c,
- Intra_Trade_List_RMB__c,
- Asset_Model_No__c,
- OT_CODE__c,
- Pro2_Dealer_Object__c,
- Pro2_Dealer_ENG__c
- FROM Product2__c
- WHERE
- OT_CODE__c IN :allotCodeList
- AND (NOT Product_Type__c LIKE :userPro_Typestr)
- ];
- if (product2InStore.size() > 0) {
- for (Product2__c produ : product2InStore) {
- for (String bar : barOtcodeMap.keySet()) {
- if (barOtcodeMap.get(bar).containsKey(produ.OT_CODE__c)) {
- exitBarCodeMap.put(bar, bar);
- errorMap.put(bar, bar);
- }
- }
- }
- }
- if (errorMap.size() > 0) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
- 'BarCode鍙穂' +
- errorMap.values() +
- ']浜у搧绫诲瀷[' +
- product_Type +
- ']涓庣敤鎴穂' +
- userPro_Type +
- ']绫诲瀷涓嶇'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- 'BarCode鍙穂' +
- errorMap.values() +
- ']浜у搧绫诲瀷[' +
- product_Type +
- ']涓庣敤鎴穂' +
- userPro_Type +
- ']绫诲瀷涓嶇'
- )
- );
- }
- }
- product2InStore = [
- SELECT
- Id,
- Name,
- Name__c,
- Intra_Trade_List_RMB__c,
- Asset_Model_No__c,
- OT_CODE__c,
- Pro2_Dealer_Object__c,
- Pro2_Dealer_ENG__c
- FROM Product2__c
- WHERE
- OT_CODE__c IN :allotCodeList
- AND Product_Type__c LIKE :userPro_Typestr
- ];
-
- if (product2InStore.size() > 0) {
- for (Product2__c produ : product2InStore) {
- for (String bar : barOtcodeMap.keySet()) {
- Date expirationDate = null;
+ for(Integer i = 0; i < barCodeList.size(); i++){
+ Date expirationDate = null ;
String serialNoorLotNo = '';
String tracingCode = '';
String productDateStr = '';
- Date productionDate = null;
+ Date productionDate = null ;
String expirationDateStr = '';
- Integer oTcodeLength = produ.OT_CODE__c.length();
- if (bar.length() >= oTcodeLength + 11) {
- if (bar.substring(oTcodeLength + 3, oTcodeLength + 5) == '11') {
- try {
- productDateStr =
- '20' +
- bar.substring(oTcodeLength + 5, oTcodeLength + 7) +
- '-' +
- bar.substring(oTcodeLength + 7, oTcodeLength + 9) +
- '-01';
- productionDate = Date.valueOf(productDateStr);
- } catch (Exception e) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
- '浜у搧BarCode(' +
- bar +
- ')鐨勭敓浜ф棩鏈�' +
- productDateStr +
- '閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- bar +
- ')鐨勭敓浜ф棩鏈�' +
- productDateStr +
- '閿欒锛�'
- )
- );
- }
- continue;
- }
- if (bar.length() >= oTcodeLength + 3 + 16) {
- //ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode17' + bar.substring(oTcodeLength + 3 + 8,oTcodeLength + 3 + 10)));
- if (
- bar.substring(
- oTcodeLength + 3 + 8,
- oTcodeLength + 3 + 10
- ) == '17'
- ) {
- try {
- if (
- bar.substring(
- oTcodeLength + 3 + 14,
- oTcodeLength + 3 + 16
- ) == '00'
- ) {
- expirationDateStr =
- '20' +
- bar.substring(
- oTcodeLength + 3 + 10,
- oTcodeLength + 3 + 12
- ) +
- '-' +
- bar.substring(
- oTcodeLength + 3 + 12,
- oTcodeLength + 3 + 14
- ) +
- '-' +
- '01';
- expirationDate = Date.valueOf(expirationDateStr);
- expirationDate = expirationDate.addMonths(1)
- .toStartofMonth()
- .addDays(-1);
- } else {
- expirationDateStr =
- '20' +
- bar.substring(
- oTcodeLength + 3 + 10,
- oTcodeLength + 3 + 12
- ) +
- '-' +
- bar.substring(
- oTcodeLength + 3 + 12,
- oTcodeLength + 3 + 14
- ) +
- '-' +
- bar.substring(
- oTcodeLength + 3 + 14,
- oTcodeLength + 3 + 16
- );
- expirationDate = Date.valueOf(expirationDateStr);
- }
- } catch (Exception e) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
- '浜у搧BarCode(' +
- bar +
- ')鐨勬粎鑿屾湁鍔规湡闄�' +
- expirationDateStr +
- '閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- bar +
- ')鐨勬粎鑿屾湁鍔规湡闄�' +
- expirationDateStr +
- '閿欒锛�'
- )
- );
- }
- continue;
+ if(barCodeList[i].substring(0,2) =='01'){
+ String janCodeMark = '';
+ //鐢熶骇鏃ユ湡
+ List<String> janCode = new List<String>();
+ if(barCodeList[i].length() < 16){
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ errorList.add('浜у搧BarCode(' + barCodeList[i] + ')鐨勪綅鏁颁笉瓒�16锛屼笉绗﹀悎瑕佹眰閿欒锛�');
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + barCodeList[i] + ')鐨勪綅鏁颁笉瓒�16锛屼笉绗﹀悎瑕佹眰閿欒锛�'));
}
- if (bar.length() >= oTcodeLength + 3 + 25) {
- if (
- bar.substring(
- oTcodeLength + 3 + 16,
- oTcodeLength + 3 + 18
- ) == '10' ||
- bar.substring(
- oTcodeLength + 3 + 16,
- oTcodeLength + 3 + 18
- ) == '21'
- ) {
- serialNoorLotNo = bar.substring(
- oTcodeLength + 3 + 18,
- bar.length() - 8
- );
- //ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, 'serialNoorLotNo' + serialNoorLotNo));
- }
+ continue;
+ }else {
+ janCodeMark = barCodeList[i].substring(2,16);
+ try{
+ Decimal test = Decimal.valueOf(janCodeMark);
+ }catch(Exception e){
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ errorList.add('浜у搧BarCode(' + barCodeList[i] + ')鐨刯anCode閿欒锛�');
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + barCodeList[i] + ')鐨刯anCode閿欒锛�'));
+ }
+ continue;
}
- } else if (
- bar.substring(
- oTcodeLength + 3 + 8,
- oTcodeLength + 3 + 10
- ) == '10' ||
- bar.substring(
- oTcodeLength + 3 + 8,
- oTcodeLength + 3 + 10
- ) == '21'
- ) {
- serialNoorLotNo = bar.substring(
- oTcodeLength + 3 + 10,
- bar.length() - 8
- );
- //ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, 'serialNoorLotNo' + serialNoorLotNo));
- }
}
- } else if (
- bar.substring(oTcodeLength + 3, oTcodeLength + 5) == '17'
- ) {
- try {
- if (
- bar.substring(oTcodeLength + 3 + 6, oTcodeLength + 3 + 8) ==
- '00'
- ) {
- expirationDateStr =
- '20' +
- bar.substring(
- oTcodeLength + 3 + 2,
- oTcodeLength + 3 + 4
- ) +
- '-' +
- bar.substring(
- oTcodeLength + 3 + 4,
- oTcodeLength + 3 + 6
- ) +
- '-01';
- expirationDate = Date.valueOf(expirationDateStr);
- expirationDate = expirationDate.addMonths(1)
- .toStartofMonth()
- .addDays(-1);
- } else {
- expirationDateStr =
- '20' +
- bar.substring(
- oTcodeLength + 3 + 2,
- oTcodeLength + 3 + 4
- ) +
- '-' +
- bar.substring(
- oTcodeLength + 3 + 4,
- oTcodeLength + 3 + 6
- ) +
- '-' +
- bar.substring(oTcodeLength + 3 + 6, oTcodeLength + 3 + 8);
- expirationDate = Date.valueOf(expirationDateStr);
- }
- } catch (Exception e) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
- '浜у搧BarCode(' +
- bar +
- ')鐨勬粎鑿屾湁鍔规湡闄�' +
- expirationDateStr +
- '閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- bar +
- ')鐨勬粎鑿屾湁鍔规湡闄�' +
- expirationDateStr +
- '閿欒锛�'
- )
- );
- }
- continue;
- }
- if (bar.length() >= oTcodeLength + 20) {
- if (
- bar.substring(
- oTcodeLength + 3 + 8,
- oTcodeLength + 3 + 10
- ) == '10' ||
- bar.substring(
- oTcodeLength + 3 + 8,
- oTcodeLength + 3 + 10
- ) == '21'
- ) {
- serialNoorLotNo = bar.substring(
- oTcodeLength + 3 + 10,
- bar.length() - 8
- );
- }
- }
- } else if (bar.length() >= oTcodeLength + 12) {
- if (
- bar.substring(oTcodeLength + 3, oTcodeLength + 5) == '10' ||
- bar.substring(oTcodeLength + 3, oTcodeLength + 5) == '21'
- ) {
- serialNoorLotNo = bar.substring(
- oTcodeLength + 3 + 2,
- bar.length() - 8
- );
- }
- }
- }
- if (
- bar.length() >= oTcodeLength + 3 + 8 &&
- bar.substring(bar.length() - 8, bar.length() - 5) == '250'
- ) {
- if (bar.substring(bar.length() - 8, bar.length() - 5) == '250') {
- tracingCode = bar.substring(bar.length() - 5, bar.length());
- Matcher n = Pattern.compile('[0-9]').matcher(tracingCode);
- if (n.find()) {
- // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 start
- if (tracingCode.length() == 5) {
- String tr = tracingCode;
- String Ctr = tr.substring(tr.length() - 3, tr.length());
- String Btr = tr.substring(tr.length() - 4, tr.length() - 3);
- String Atr = tr.substring(tr.length() - 5, tr.length() - 4);
- if (
- Pattern.compile('[0-9]').matcher(Atr).find() ||
- Pattern.compile('[0-9]').matcher(Ctr).find()
- ) {
- String str = '绠＄悊缂栫爜涓嶆纭紝璇蜂笌绠＄悊鍛樼‘璁ゆ槸鍚﹂敊璇��';
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
- '浜у搧BarCode(' +
- bar +
- ')绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- bar +
- ')绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�'
- )
- );
- }
- continue;
+ if(barCodeList[i].length() >= 22){
+ if(barCodeList[i].substring(barCodeList[i].length() - 8,barCodeList[i].length()-5)!='250'){
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ errorList.add('浜у搧BarCode(' + barCodeList[i] + ')娌℃湁绠＄悊缂栫爜锛�');
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, '浜у搧BarCode(' + barCodeList[i] + ')娌℃湁绠＄悊缂栫爜锛�'));
+ }
+ continue;
}
- }
- // String str = '绠＄悊缂栫爜涓嶆纭紝璇蜂笌绠＄悊鍛樼‘璁ゆ槸鍚﹂敊璇��';
- // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + bar + ')绠＄悊缂栫爜涓湁鏁板瓧锛岃涓庣鐞嗗憳纭鏄惁閿欒锛�'));
- // continue;
- // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 end
+ if( barCodeList[i].substring(16,18) =='11'){
+ try{
+ productDateStr = '20' + barCodeList[i].substring(18,20) + '-' + barCodeList[i].substring(20,22) + '-01' ;
+ productionDate = Date.valueOf(productDateStr);
+ }catch(Exception e){
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ errorList.add('浜у搧BarCode(' + barCodeList[i] + ')鐨勭敓浜ф棩鏈�' + productDateStr + '閿欒锛�');
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, '浜у搧BarCode(' + barCodeList[i] + ')鐨勭敓浜ф棩鏈�' + productDateStr + '閿欒锛�'));
+ }
+ continue;
+ }
+ if(barCodeList[i].length() >=32){
+ if( barCodeList[i].substring(24,26) =='17'){
+ try{
+ if(barCodeList[i].substring(30,32)=='00'){
+ expirationDateStr = '20' + barCodeList[i].substring(26,28) + '-' + barCodeList[i].substring(28,30) + '-' + '01' ;
+ expirationDate = Date.valueOf(expirationDateStr);
+ expirationDate = expirationDate.addMonths(1).toStartofMonth().addDays(-1);
+ }else{
+ expirationDateStr = '20' + barCodeList[i].substring(26,28) + '-' + barCodeList[i].substring(28,30) + '-' +barCodeList[i].substring(30,32) ;
+ expirationDate = Date.valueOf(expirationDateStr);
+ }
+ }catch(Exception e){
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ errorList.add('浜у搧BarCode(' + barCodeList[i] + ')鐨勬粎鑿屾湁鍔规湡闄�' + expirationDateStr + '閿欒锛�');
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + barCodeList[i] + ')鐨勬粎鑿屾湁鍔规湡闄�' + expirationDateStr + '閿欒锛�'));
+ }
+ continue;
+ }
+ if(barCodeList[i].length() >= 42){
+ if(barCodeList[i].substring(32,34) =='10' || barCodeList[i].substring(32,34) =='21'){
+ serialNoorLotNo = barCodeList[i].substring(34,barCodeList[i].length() - 8) ;
+ }
+ }
+ }else if(barCodeList[i].substring(24,26) =='10' || barCodeList[i].substring(24,26) =='21'){
+ serialNoorLotNo = barCodeList[i].substring(26,barCodeList[i].length() - 8) ;
+ }
+ }
+ }else if(barCodeList[i].substring(16,18) =='17'){
+ try{
+ if(barCodeList[i].substring(22,24)=='00'){
+ expirationDateStr = '20' + barCodeList[i].substring(18,20) + '-' + barCodeList[i].substring(20,22) + '-01';
+ //ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧expirationDateStr' + expirationDateStr));
+ expirationDate = Date.valueOf(expirationDateStr);
+ expirationDate = expirationDate.addMonths(1).toStartofMonth().addDays(-1);
+ }else{
+ expirationDateStr = '20' + barCodeList[i].substring(18,20) + '-' + barCodeList[i].substring(20,22) + '-' +barCodeList[i].substring(22,24);
+ expirationDate = Date.valueOf(expirationDateStr);
+ }
+ }catch(Exception e){
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ errorList.add('浜у搧BarCode(' + barCodeList[i] + ')鐨勬粎鑿屾湁鍔规湡闄�' + expirationDateStr + '閿欒锛�');
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + barCodeList[i] + ')鐨勬粎鑿屾湁鍔规湡闄�' + expirationDateStr + '閿欒锛�'));
+ }
+ continue;
+ }
+ if(barCodeList[i].length() >= 34){
+ if(barCodeList[i].substring(24,26) =='10' || barCodeList[i].substring(24,26) =='21'){
+ serialNoorLotNo = barCodeList[i].substring(26,barCodeList[i].length() - 8) ;
+ }
+ }
+
+ }else if(barCodeList[i].length() >= 26){
+ if(barCodeList[i].substring(16,18) =='10' || barCodeList[i].substring(16,18) =='21'){
+ serialNoorLotNo = barCodeList[i].substring(18,barCodeList[i].length() - 8) ;
+ }
+ }
}
- } else {
+ if(barCodeList[i].length() >= 24 && barCodeList[i].substring(barCodeList[i].length() - 8,barCodeList[i].length()-5)=='250'){
+ if(barCodeList[i].substring(barCodeList[i].length() - 8,barCodeList[i].length()-5)=='250'){
+ tracingCode = barCodeList[i].substring(barCodeList[i].length() - 5,barCodeList[i].length());
+ Matcher n = Pattern.compile('[0-9]').matcher(tracingCode);
+ if(n.find()){
+ // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 start
+ if (tracingCode.length() == 5) {
+ String tr = tracingCode;
+ String Ctr = tr.substring(tr.length() - 3,tr.length());
+ String Btr = tr.substring(tr.length() - 4,tr.length()-3);
+ String Atr = tr.substring(tr.length() - 5,tr.length()-4);
+ if (Pattern.compile('[0-9]').matcher(Atr).find() || Pattern.compile('[0-9]').matcher(Ctr).find()) {
+ String str = '绠＄悊缂栫爜涓嶆纭紝璇蜂笌绠＄悊鍛樼‘璁ゆ槸鍚﹂敊璇��';
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ errorList.add('浜у搧BarCode(' + barCodeList[i] + ')绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�');
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + barCodeList[i] + ')绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�'));
+ }
+ continue;
+ }
+ }
+ // String str = '绠＄悊缂栫爜涓嶆纭紝璇蜂笌绠＄悊鍛樼‘璁ゆ槸鍚﹂敊璇��';
+ // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + barCodeList[i] + ')绠＄悊缂栫爜涓湁鏁板瓧锛岃涓庣鐞嗗憳纭鏄惁閿欒锛�'));
+ // continue;
+ // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 end
+ }
+ }else{
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ errorList.add('浜у搧BarCode(' + barCodeList[i] + ')鐨則racingCode閿欒锛�');
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + barCodeList[i] + ')鐨則racingCode閿欒锛�'));
+ }
+ continue;
+ }
+ }
+ List<String> barcodedetList = new List<String>();
+ barcodedetList.add(barCodeList[i]);
+ barcodedetList.add(String.valueOf(expirationDate));
+ barcodedetList.add(serialNoorLotNo);
+ barcodedetList.add(tracingCode);
+ Integer jan1 = Integer.valueOf(janCodeMark.substring(0, 1));
+ Integer jan2 = Integer.valueOf(janCodeMark.substring(1, 2));
+ Integer jan3 = Integer.valueOf(janCodeMark.substring(2, 3));
+ Integer jan4 = Integer.valueOf(janCodeMark.substring(3, 4));
+ Integer jan5 = Integer.valueOf(janCodeMark.substring(4, 5));
+ Integer jan6 = Integer.valueOf(janCodeMark.substring(5, 6));
+ Integer jan7 = Integer.valueOf(janCodeMark.substring(6, 7));
+ Integer jan8 = Integer.valueOf(janCodeMark.substring(7, 8));
+ Integer jan9 = Integer.valueOf(janCodeMark.substring(8, 9));
+ Integer jan10 = Integer.valueOf(janCodeMark.substring(9, 10));
+ Integer jan11 = Integer.valueOf(janCodeMark.substring(10, 11));
+ Integer jan12 = Integer.valueOf(janCodeMark.substring(11, 12));
+ Integer jan13 = Integer.valueOf(janCodeMark.substring(12, 13));
+ Integer count12 = jan2 + jan3*3 + jan4 + jan5*3 + jan6 + jan7*3 + jan8 + jan9*3 + jan10 + jan11*3 +jan12 + jan13*3;
+
+ Integer count13 = jan1*3 + jan2 + jan3*3 + jan4 + jan5*3 + jan6 + jan7*3 + jan8 + jan9*3 + jan10 + jan11*3 +jan12 + jan13*3;
+ String frost12 = (String.valueOf(count12)).substring((String.valueOf(count12)).length()-1);
+ String frost13 = (String.valueOf(count13)).substring((String.valueOf(count13)).length()-1);
+ //鍑忓幓12浣嶄釜浣�4
+ frost12 = (String.valueOf(10 - Integer.valueOf(frost12))).substring((String.valueOf(10 - Integer.valueOf(frost12))).length()-1);
+ frost13 = (String.valueOf(10 - Integer.valueOf(frost13))).substring((String.valueOf(10 - Integer.valueOf(frost13))).length()-1);
+
+ janCode.add(janCodeMark.substring(1, 13) + frost12);
+ janCode.add(janCodeMark.substring(0, 13) + frost12);
+ janCode.add(janCodeMark.substring(1, 13) + frost13);
+ janCode.add(janCodeMark.substring(0, 13) + frost13);
+ alljanCodeList.addAll(janCode);
+ Map<String,String> janCodeMap = new Map<String,String>();
+ janCodeMap.put(janCodeMark.substring(1, 13) + frost12,barCodeList[i]);
+ janCodeMap.put(janCodeMark.substring(0, 13) + frost12,barCodeList[i]);
+ janCodeMap.put(janCodeMark.substring(1, 13) + frost13,barCodeList[i]);
+ janCodeMap.put(janCodeMark.substring(0, 13) + frost13,barCodeList[i]);
+ barJancodeMap.put(barCodeList[i], janCodeMap);
+ barcodeinfoMap.put(barCodeList[i], barcodedetList);
+ barCode01List.add(barCodeList[i]);
+ }else if(barCodeList[i].substring(0,3) =='241'){
+ if(barCodeList[i].length() > 8 && barCodeList[i].substring(barCodeList[i].length() - 8,barCodeList[i].length()-5)!='250'){
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ errorList.add('浜у搧BarCode(' + barCodeList[i] + ')娌℃湁绠＄悊缂栫爜锛�');
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, '浜у搧BarCode(' + barCodeList[i] + ')娌℃湁绠＄悊缂栫爜锛�'));
+ }
+ continue;
+ }
+ List<String> otCodeList = new List<String>();
+ Map<String,String> otCodeMap = new Map<String,String>();
+ if(barCodeList[i].length() < 7){
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ errorList.add('浜у搧BarCode(' + barCodeList[i] + ')鐨勪綅鏁颁笉瓒�16锛屼笉绗﹀悎瑕佹眰閿欒锛�');
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + barCodeList[i] + ')鐨勪綅鏁颁笉瓒�16锛屼笉绗﹀悎瑕佹眰閿欒锛�'));
+ }
+ continue;
+ }else if(barCodeList[i].length() == 11){
+ String otCode4 = barCodeList[i].substring(3,7);
+ String otCode5 = barCodeList[i].substring(3,8);
+ String otCode6 = barCodeList[i].substring(3,9);
+ String otCode7 = barCodeList[i].substring(3,10);
+ String otCode8 = barCodeList[i].substring(3,11);
+ otCodeList.add(otCode4);
+ otCodeList.add(otCode5);
+ otCodeList.add(otCode6);
+ otCodeList.add(otCode7);
+ otCodeList.add(otCode8);
+ otCodeMap.put(otCode4,barCodeList[i]);
+ otCodeMap.put(otCode5,barCodeList[i]);
+ otCodeMap.put(otCode6,barCodeList[i]);
+ otCodeMap.put(otCode7,barCodeList[i]);
+ otCodeMap.put(otCode8,barCodeList[i]);
+ }else if(barCodeList[i].length() >= 12){
+ String otCode4 = barCodeList[i].substring(3,7);
+ String otCode5 = barCodeList[i].substring(3,8);
+ String otCode6 = barCodeList[i].substring(3,9);
+ String otCode7 = barCodeList[i].substring(3,10);
+ String otCode8 = barCodeList[i].substring(3,11);
+ String otCode9 = barCodeList[i].substring(3,12);
+ otCodeList.add(otCode4);
+ otCodeList.add(otCode5);
+ otCodeList.add(otCode6);
+ otCodeList.add(otCode7);
+ otCodeList.add(otCode8);
+ otCodeList.add(otCode9);
+ otCodeMap.put(otCode4,barCodeList[i]);
+ otCodeMap.put(otCode5,barCodeList[i]);
+ otCodeMap.put(otCode6,barCodeList[i]);
+ otCodeMap.put(otCode7,barCodeList[i]);
+ otCodeMap.put(otCode8,barCodeList[i]);
+ otCodeMap.put(otCode9,barCodeList[i]);
+ }
+ allotCodeList.addAll(otCodeList);
+ barOtcodeMap.put(barCodeList[i], otCodeMap);
+ barCode241List.add(barCodeList[i]);
+ }else{
//LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add('浜у搧BarCode(' + bar + ')鐨則racingCode閿欒锛�');
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' + bar + ')鐨則racingCode閿欒锛�'
- )
- );
+ if(isLwc){
+ errorList.add('浜у搧BarCode(' + barCodeList[i] + ')娌℃湁janCode鎴朞Tcode锛屼笉绗﹀悎瑕佹眰锛�');
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + barCodeList[i] + ')娌℃湁janCode鎴朞Tcode锛屼笉绗﹀悎瑕佹眰锛�'));
}
continue;
- }
}
- List<String> barcodedetList = new List<String>();
- barcodedetList.add(bar);
- barcodedetList.add(String.valueOf(expirationDate));
- barcodedetList.add(serialNoorLotNo);
- barcodedetList.add(tracingCode);
- if (barOtcodeMap.get(bar).containsKey(produ.OT_CODE__c)) {
- exitBarCodeMap.put(bar, bar);
+ }
+ //01閫氳繃妫�绱骇鍝佹槸鍚﹀瓨鍦�
+ Map<String,String> rightBar = new Map<String,String>();
+ if(alljanCodeList.size() > 0){
+ Map<String,String> exitBarCodeMap = new Map<String,String>();
+ List<Product2__c> product2InStore = [SELECT Id, Name,Name__c,Intra_Trade_List_RMB__c,Asset_Model_No__c,OT_CODE__c,Product2_Jancode__c,
+ Pro2_Dealer_ENG__c,Pro2_Dealer_Object__c,
+ Product_Type__c
+ FROM Product2__c
+ WHERE Product2_Jancode__c in :alljanCodeList
+ AND (not Product_Type__c like :userPro_Typestr)
+ order by SFDA_Expiration_Date__c desc ] ;
+ if(product2InStore.size() > 0){
+ Map<String,String> errorMap = new Map<String,String>();
+ for(Product2__c produ: product2InStore){
+ for(String bar: barJancodeMap.keySet() ){
+ if(barJancodeMap.get(bar).containsKey(produ.Product2_Jancode__c) && !rightBar.containsKey(bar)){
+ exitBarCodeMap.put(bar,bar);
+ errorMap.put(bar, bar);
+ }
- if (orderdetailMap.containsKey(produ.Id)) {
- consumableInventory.add(
- new ConsumableorderdetailsInfo(produ, barcodedetList)
- );
- } else {
- consumableInventory.add(
- new ConsumableorderdetailsInfo(produ, barcodedetList)
- );
- list<String> overOrderBARcodeCunList = new List<String>();
- if (notEqualBARcodeCunMap.containsKey(produ.Id)) {
- overOrderBARcodeCunList = notEqualBARcodeCunMap.get(produ.Id)
- .clone();
- overOrderBARcodeCunList.add(bar);
- notEqualBARcodeCunMap.put(produ.Id, overOrderBARcodeCunList);
- } else {
- overOrderBARcodeCunList.add(bar);
- notEqualBARcodeCunMap.put(produ.Id, overOrderBARcodeCunList);
+ }
}
- }
+ if(errorMap.size() > 0){
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ errorList.add('BarCode鍙穂'+ errorMap.values() +']浜у搧绫诲瀷['+product_Type+']涓庣敤鎴风殑绫诲瀷['+userPro_Type+']涓嶇');
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'BarCode鍙穂'+ errorMap.values() +']浜у搧绫诲瀷['+product_Type+']涓庣敤鎴风殑绫诲瀷['+userPro_Type+']涓嶇'));
+ }
+ }
+ }
+ product2InStore = [SELECT Id, Name,Name__c,Intra_Trade_List_RMB__c,Asset_Model_No__c,OT_CODE__c,Product2_Jancode__c,
+ Pro2_Dealer_ENG__c,Pro2_Dealer_Object__c,
+ Product_Type__c
+ FROM Product2__c
+ WHERE Product2_Jancode__c in :alljanCodeList
+ AND Product_Type__c like :userPro_Typestr
+ order by SFDA_Expiration_Date__c desc ] ;
+ if(product2InStore.size() > 0){
+ Map<String,String> errorMap = new Map<String,String>();
+ for(Product2__c produ: product2InStore){
+ for(String bar: barJancodeMap.keySet() ){
+ if(barJancodeMap.get(bar).containsKey(produ.Product2_Jancode__c) && !rightBar.containsKey(bar)){
+ exitBarCodeMap.put(bar,bar);
+ if(orderdetailMap.containsKey(produ.Id)){
+ consumableInventory.add(new ConsumableorderdetailsInfo(produ,barcodeinfoMap.get(bar)));
+ rightBar.put(bar, bar);
+ }else{
+ consumableInventory.add(new ConsumableorderdetailsInfo(produ,barcodeinfoMap.get(bar)));
+ rightBar.put(bar, bar);
+ list<String> overOrderBARcodeCunList = new list<String>();
+ if(notEqualBARcodeCunMap.containsKey(produ.Id)){
+ overOrderBARcodeCunList = notEqualBARcodeCunMap.get(produ.Id).clone();
+ overOrderBARcodeCunList.add(bar);
+ notEqualBARcodeCunMap.put(produ.Id,overOrderBARcodeCunList);
+ }else{
+ overOrderBARcodeCunList.add(bar);
+ notEqualBARcodeCunMap.put(produ.Id,overOrderBARcodeCunList);
+ }
+ }
+
+ }
+ }
+ }
}
- }
- }
- }
-
- for (String bartxt : barCode241List) {
- if (!exitBarCodeMap.containsKey(bartxt)) {
- if (!errorMap.containsKey(bartxt)) {
- notInStorelist.add(bartxt);
- }
- }
- }
- }
- //鍒ゆ柇浜у搧鏄惁涓�鑷�
- if (notEqualBARcodeCunMap.size() > 0) {
- for (String widget : notEqualBARcodeCunMap.keySet()) {
- if (notEqualBARcodeCunMap.get(widget).size() > 0) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- warningList.add('浠ヤ笅barcode浜у搧涓庤璐т骇鍝佷笉涓�鑷淬��');
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.INFO,
- '浠ヤ笅barcode浜у搧涓庤璐т骇鍝佷笉涓�鑷淬��'
- )
- );
- }
- for (
- String barcodeListTTT : (List<String>) notEqualBARcodeCunMap.get(
- widget
- )
- ) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- warningList.add(barcodeListTTT);
- } else {
- ApexPages.addmessage(
- new ApexPages.message(ApexPages.severity.INFO, barcodeListTTT)
- );
+ for(String bartxt :barCode01List){
+ if(!exitBarCodeMap.containsKey(bartxt)){
+ notInStorelist.add(bartxt);
+ }
}
- }
+
}
- }
- }
- }
- public String ConfimResult() {
- list<String> overOrderproList = new List<String>();
- list<String> overOrderBARcodeCunList = new List<String>();
- list<String> overOrderBARcodeCunListTest = new List<String>();
- //overOrderBARcodeCunMap.clear();
- for (ConsumableorderdetailsInfo ass : ConsumableorderdetailsRecords) {
- if (
- orderWantArriveCunMap.get(ass.esd.Asset_Model_No__c) +
- orderProductArrivedCunMap.get(ass.esd.Asset_Model_No__c) >
- orderProductCunMap.get(ass.esd.Asset_Model_No__c) - 1
- ) {
- // 鑾峰彇瓒呰繃瀹氳揣鏁伴噺鐨勬秷鑰楀搧淇℃伅
- overOrderBARcodeCunList = new List<String>();
- overOrderBARcodeCunList = overOrderBARcodeCunMap.get(
- ass.esd.Asset_Model_No__c
- )
- .clone();
- overOrderBARcodeCunList.add(ass.esd.Bar_Code__c);
- overOrderBARcodeCunMap.put(
- ass.esd.Asset_Model_No__c,
- overOrderBARcodeCunList
- );
- overOrderCunMap.put(
- ass.esd.Asset_Model_No__c,
- overOrderCunMap.get(ass.esd.Asset_Model_No__c) + 1
- );
- cancellationProList.add(ass.esd.Asset_Model_No__c);
- } else if (
- orderWantArriveCunMap.get(ass.esd.Asset_Model_No__c) +
- orderProductArrivedCunMap.get(ass.esd.Asset_Model_No__c) ==
- orderProductCunMap.get(ass.esd.Asset_Model_No__c) - 1
- ) {
- consumableorderdetailsRecordsUse.add(ass);
- cancellationProList.add(ass.esd.Asset_Model_No__c);
- } else {
- consumableorderdetailsRecordsUse.add(ass);
- }
- orderWantArriveCunMap.put(
- ass.esd.Asset_Model_No__c,
- orderWantArriveCunMap.get(ass.esd.Asset_Model_No__c) + 1
- );
- }
- for (ConsumableorderdetailsInfo ass : consumableInventory) {
- if (!orderWantArriveCunMap.containsKey(ass.Prod.Asset_Model_No__c)) {
- consumableInventoryUse.add(ass);
- continue;
- }
- if (
- orderWantArriveCunMap.get(ass.Prod.Asset_Model_No__c) +
- orderProductArrivedCunMap.get(ass.Prod.Asset_Model_No__c) >
- orderProductCunMap.get(ass.Prod.Asset_Model_No__c) - 1
- ) {
- //鍙栧緱鍘熸湁list
- overOrderBARcodeCunList = new List<String>();
- overOrderBARcodeCunList = overOrderBARcodeCunMap.get(
- ass.Prod.Asset_Model_No__c
- )
- .clone();
- //鏇存柊list
- overOrderBARcodeCunList.add(ass.barCodeNo);
- //鏇存柊map
- overOrderBARcodeCunMap.put(
- ass.Prod.Asset_Model_No__c,
- overOrderBARcodeCunList
- );
- overOrderCunMap.put(
- ass.Prod.Asset_Model_No__c,
- overOrderCunMap.get(ass.Prod.Asset_Model_No__c) + 1
- );
- cancellationProList.add(ass.Prod.Asset_Model_No__c);
- } else if (
- orderWantArriveCunMap.get(ass.Prod.Asset_Model_No__c) +
- orderProductArrivedCunMap.get(ass.Prod.Asset_Model_No__c) ==
- orderProductCunMap.get(ass.Prod.Asset_Model_No__c) - 1
- ) {
- consumableInventoryUse.add(ass);
- cancellationProList.add(ass.Prod.Asset_Model_No__c);
- } else {
- consumableInventoryUse.add(ass);
- }
- orderWantArriveCunMap.put(
- ass.Prod.Asset_Model_No__c,
- orderWantArriveCunMap.get(ass.Prod.Asset_Model_No__c) + 1
- );
- }
- for (Integer i = 0; i < productList.size(); i++) {
- if (overOrderBARcodeCunMap.get(productList[i]).size() > 0) {
- // 鑾峰彇瓒呰繃瀹氳揣鏁伴噺鐨勬秷鑰楀搧淇℃伅
- overOrderproList.add(productList[i]);
- }
- }
- if (overOrderproList.size() > 0) {
- return '浜у搧' +
- overOrderproList +
- '鏈鍒拌揣鏁伴噺鍜屽凡鍒拌揣鏁伴噺宸茬粡瓒呰繃璁㈣揣鏁伴噺!';
- } else {
- return '';
- }
- }
+ //241閫氳繃妫�绱骇鍝佹槸鍚﹀瓨鍦�
+ if(allotCodeList.size() > 0){
+ Map<String,String> exitBarCodeMap = new Map<String,String>();
+ Map<String,String> errorMap = new Map<String,String>();
+ List<Product2__c> product2InStore = [SELECT Id, Name,Name__c,Intra_Trade_List_RMB__c,Asset_Model_No__c,OT_CODE__c,
+ Pro2_Dealer_Object__c,Pro2_Dealer_ENG__c
+ FROM Product2__c
+ WHERE OT_CODE__c in :allotCodeList
+ AND (not Product_Type__c like :userPro_Typestr)] ;
+ if(product2InStore.size() > 0){
+ for(Product2__c produ: product2InStore){
+ for(String bar: barOtcodeMap.keySet() ){
+ if(barOtcodeMap.get(bar).containsKey(produ.OT_CODE__c)){
+ exitBarCodeMap.put(bar,bar);
+ errorMap.put(bar, bar);
+ }
+ }
+ }
+ }
+ if(errorMap.size() > 0){
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ errorList.add('BarCode鍙穂'+ errorMap.values() +']浜у搧绫诲瀷['+product_Type+']涓庣敤鎴穂'+userPro_Type+']绫诲瀷涓嶇');
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'BarCode鍙穂'+ errorMap.values() +']浜у搧绫诲瀷['+product_Type+']涓庣敤鎴穂'+userPro_Type+']绫诲瀷涓嶇'));
+ }
+ }
+ product2InStore = [SELECT Id, Name,Name__c,Intra_Trade_List_RMB__c,Asset_Model_No__c,OT_CODE__c,
+ Pro2_Dealer_Object__c,Pro2_Dealer_ENG__c
+ FROM Product2__c
+ WHERE OT_CODE__c in :allotCodeList
+ AND Product_Type__c like :userPro_Typestr] ;
+
+ if(product2InStore.size() > 0){
+ for(Product2__c produ: product2InStore){
+ for(String bar: barOtcodeMap.keySet() ){
+ Date expirationDate = null ;
+ String serialNoorLotNo = '';
+ String tracingCode = '';
+ String productDateStr = '';
+ Date productionDate = null ;
+ String expirationDateStr = '';
+ Integer oTcodeLength = produ.OT_CODE__c.length();
- public void confimResultWithoutOrder() {
- /*list<String> overOrderproList = new list<String>();
+ if(bar.length() >= oTcodeLength + 11){
+ if( bar.substring(oTcodeLength + 3,oTcodeLength + 5) =='11'){
+ try{
+ productDateStr = '20' + bar.substring(oTcodeLength + 5,oTcodeLength + 7) + '-' + bar.substring(oTcodeLength + 7,oTcodeLength + 9) + '-01' ;
+ productionDate = Date.valueOf(productDateStr);
+ }catch(Exception e){
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ errorList.add('浜у搧BarCode(' + bar + ')鐨勭敓浜ф棩鏈�' + productDateStr + '閿欒锛�');
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, '浜у搧BarCode(' + bar + ')鐨勭敓浜ф棩鏈�' + productDateStr + '閿欒锛�'));
+ }
+ continue;
+ }
+ if(bar.length() >=oTcodeLength + 3 + 16){
+ //ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode17' + bar.substring(oTcodeLength + 3 + 8,oTcodeLength + 3 + 10)));
+ if( bar.substring(oTcodeLength + 3 + 8,oTcodeLength + 3 + 10) =='17'){
+ try{
+ if(bar.substring(oTcodeLength + 3 + 14,oTcodeLength + 3 + 16)=='00'){
+ expirationDateStr = '20' + bar.substring(oTcodeLength + 3 + 10,oTcodeLength + 3 + 12) + '-' + bar.substring(oTcodeLength + 3 + 12,oTcodeLength + 3 + 14) + '-' + '01' ;
+ expirationDate = Date.valueOf(expirationDateStr);
+ expirationDate = expirationDate.addMonths(1).toStartofMonth().addDays(-1);
+ }else{
+ expirationDateStr = '20' + bar.substring(oTcodeLength + 3 + 10,oTcodeLength + 3 + 12) + '-' + bar.substring(oTcodeLength + 3 + 12,oTcodeLength + 3 + 14) + '-' +bar.substring(oTcodeLength + 3 + 14,oTcodeLength + 3 + 16) ;
+ expirationDate = Date.valueOf(expirationDateStr);
+ }
+ }catch(Exception e){
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ errorList.add('浜у搧BarCode(' + bar + ')鐨勬粎鑿屾湁鍔规湡闄�' + expirationDateStr + '閿欒锛�');
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + bar + ')鐨勬粎鑿屾湁鍔规湡闄�' + expirationDateStr + '閿欒锛�'));
+ }
+ continue;
+ }
+ if(bar.length() >= oTcodeLength + 3 + 25){
+ if(bar.substring(oTcodeLength + 3 + 16,oTcodeLength + 3 + 18) =='10' || bar.substring(oTcodeLength + 3 + 16,oTcodeLength + 3 + 18) =='21'){
+ serialNoorLotNo = bar.substring(oTcodeLength + 3 + 18,bar.length() - 8) ;
+ //ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, 'serialNoorLotNo' + serialNoorLotNo));
+ }
+ }
+ }else if(bar.substring(oTcodeLength + 3 + 8,oTcodeLength + 3 + 10) =='10' || bar.substring(oTcodeLength + 3 + 8,oTcodeLength + 3 + 10) =='21'){
+ serialNoorLotNo = bar.substring(oTcodeLength + 3 + 10,bar.length() - 8) ;
+ //ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, 'serialNoorLotNo' + serialNoorLotNo));
+ }
+ }
+ }else if(bar.substring(oTcodeLength + 3,oTcodeLength + 5) =='17'){
+ try{
+ if(bar.substring(oTcodeLength + 3 + 6,oTcodeLength + 3 + 8)=='00'){
+ expirationDateStr = '20' + bar.substring(oTcodeLength + 3 + 2,oTcodeLength + 3 + 4) + '-' + bar.substring(oTcodeLength + 3 + 4,oTcodeLength + 3 + 6) + '-01';
+ expirationDate = Date.valueOf(expirationDateStr);
+ expirationDate = expirationDate.addMonths(1).toStartofMonth().addDays(-1);
+ }else{
+ expirationDateStr = '20' + bar.substring(oTcodeLength + 3 + 2,oTcodeLength + 3 + 4) + '-' + bar.substring(oTcodeLength + 3 + 4,oTcodeLength + 3 + 6) + '-' +bar.substring(oTcodeLength + 3 + 6,oTcodeLength + 3 + 8);
+ expirationDate = Date.valueOf(expirationDateStr);
+ }
+ }catch(Exception e){
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ errorList.add('浜у搧BarCode(' + bar + ')鐨勬粎鑿屾湁鍔规湡闄�' + expirationDateStr + '閿欒锛�');
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + bar + ')鐨勬粎鑿屾湁鍔规湡闄�' + expirationDateStr + '閿欒锛�'));
+ }
+ continue;
+ }
+ if(bar.length() >=oTcodeLength + 20){
+ if(bar.substring(oTcodeLength + 3 + 8,oTcodeLength + 3 + 10) =='10' || bar.substring(oTcodeLength + 3 + 8,oTcodeLength + 3 + 10) =='21'){
+ serialNoorLotNo = bar.substring(oTcodeLength + 3 + 10,bar.length() - 8) ;
+ }
+ }
+
+ }else if(bar.length() >= oTcodeLength + 12){
+ if(bar.substring(oTcodeLength + 3,oTcodeLength + 5) =='10' || bar.substring(oTcodeLength + 3,oTcodeLength + 5) =='21'){
+ serialNoorLotNo = bar.substring(oTcodeLength + 3 + 2,bar.length() - 8) ;
+ }
+ }
+ }
+ if(bar.length() >= oTcodeLength + 3 + 8 && bar.substring(bar.length() - 8,bar.length()-5)=='250'){
+ if(bar.substring(bar.length() - 8,bar.length()-5)=='250'){
+ tracingCode = bar.substring(bar.length() - 5,bar.length());
+ Matcher n = Pattern.compile('[0-9]').matcher(tracingCode);
+ if(n.find()){
+ // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 start
+ if (tracingCode.length() == 5) {
+ String tr = tracingCode;
+ String Ctr = tr.substring(tr.length() - 3,tr.length());
+ String Btr = tr.substring(tr.length() - 4,tr.length()-3);
+ String Atr = tr.substring(tr.length() - 5,tr.length()-4);
+ if (Pattern.compile('[0-9]').matcher(Atr).find() || Pattern.compile('[0-9]').matcher(Ctr).find()) {
+ String str = '绠＄悊缂栫爜涓嶆纭紝璇蜂笌绠＄悊鍛樼‘璁ゆ槸鍚﹂敊璇��';
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ errorList.add('浜у搧BarCode(' + bar + ')绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�');
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + bar + ')绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�'));
+ }
+ continue;
+ }
+ }
+ // String str = '绠＄悊缂栫爜涓嶆纭紝璇蜂笌绠＄悊鍛樼‘璁ゆ槸鍚﹂敊璇��';
+ // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + bar + ')绠＄悊缂栫爜涓湁鏁板瓧锛岃涓庣鐞嗗憳纭鏄惁閿欒锛�'));
+ // continue;
+ // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 end
+ }
+ }else{
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ errorList.add('浜у搧BarCode(' + bar + ')鐨則racingCode閿欒锛�');
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + bar + ')鐨則racingCode閿欒锛�'));
+ }
+ continue;
+ }
+ }
+ List<String> barcodedetList = new List<String>();
+ barcodedetList.add(bar);
+ barcodedetList.add(String.valueOf(expirationDate));
+ barcodedetList.add(serialNoorLotNo);
+ barcodedetList.add(tracingCode);
+ if(barOtcodeMap.get(bar).containsKey(produ.OT_CODE__c)){
+ exitBarCodeMap.put(bar,bar);
+
+ if(orderdetailMap.containsKey(produ.Id)){
+ consumableInventory.add(new ConsumableorderdetailsInfo(produ,barcodedetList));
+ }else{
+ consumableInventory.add(new ConsumableorderdetailsInfo(produ,barcodedetList));
+ list<String> overOrderBARcodeCunList = new list<String>();
+ if(notEqualBARcodeCunMap.containsKey(produ.Id)){
+ overOrderBARcodeCunList = notEqualBARcodeCunMap.get(produ.Id).clone();
+ overOrderBARcodeCunList.add(bar);
+ notEqualBARcodeCunMap.put(produ.Id,overOrderBARcodeCunList);
+ }else{
+ overOrderBARcodeCunList.add(bar);
+ notEqualBARcodeCunMap.put(produ.Id,overOrderBARcodeCunList);
+ }
+ }
+
+ }
+ }
+ }
+ }
+
+ for(String bartxt :barCode241List){
+ if(!exitBarCodeMap.containsKey(bartxt)){
+ if(!errorMap.containsKey(bartxt)){
+ notInStorelist.add(bartxt);
+ }
+ }
+ }
+ }
+ //鍒ゆ柇浜у搧鏄惁涓�鑷�
+ if(notEqualBARcodeCunMap.size() > 0){
+ for(String widget : notEqualBARcodeCunMap.keySet()) {
+ if(notEqualBARcodeCunMap.get(widget).size() >0){
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ warningList.add('浠ヤ笅barcode浜у搧涓庤璐т骇鍝佷笉涓�鑷淬��');
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO, '浠ヤ笅barcode浜у搧涓庤璐т骇鍝佷笉涓�鑷淬��'));
+ }
+ for(String barcodeListTTT : (List<String>)notEqualBARcodeCunMap.get(widget)) {
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ warningList.add(barcodeListTTT);
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO, barcodeListTTT));
+ }
+ }
+ }
+ }
+ }
+ }
+
+ public String ConfimResult() {
+ list<String> overOrderproList = new list<String>();
+ list<String> overOrderBARcodeCunList = new list<String>();
+ list<String> overOrderBARcodeCunListTest = new list<String>();
+ //overOrderBARcodeCunMap.clear();
+ for (ConsumableorderdetailsInfo ass : ConsumableorderdetailsRecords) {
+ if(orderWantArriveCunMap.get(ass.esd.Asset_Model_No__c) + orderProductArrivedCunMap.get(ass.esd.Asset_Model_No__c) > orderProductCunMap.get(ass.esd.Asset_Model_No__c)-1){
+ // 鑾峰彇瓒呰繃瀹氳揣鏁伴噺鐨勬秷鑰楀搧淇℃伅
+ overOrderBARcodeCunList = new list<String>();
+ overOrderBARcodeCunList = overOrderBARcodeCunMap.get(ass.esd.Asset_Model_No__c).clone();
+ overOrderBARcodeCunList.add(ass.esd.Bar_Code__c);
+ overOrderBARcodeCunMap.put(ass.esd.Asset_Model_No__c,overOrderBARcodeCunList);
+ overOrderCunMap.put(ass.esd.Asset_Model_No__c,overOrderCunMap.get(ass.esd.Asset_Model_No__c)+1);
+ cancellationProList.add(ass.esd.Asset_Model_No__c);
+ }else if(orderWantArriveCunMap.get(ass.esd.Asset_Model_No__c) + orderProductArrivedCunMap.get(ass.esd.Asset_Model_No__c) == orderProductCunMap.get(ass.esd.Asset_Model_No__c)-1){
+ consumableorderdetailsRecordsUse.add(ass);
+ cancellationProList.add(ass.esd.Asset_Model_No__c);
+ }else{
+ consumableorderdetailsRecordsUse.add(ass);
+ }
+ orderWantArriveCunMap.put(ass.esd.Asset_Model_No__c,orderWantArriveCunMap.get(ass.esd.Asset_Model_No__c)+1);
+ }
+ for(ConsumableorderdetailsInfo ass : consumableInventory){
+ if (!orderWantArriveCunMap.containsKey(ass.Prod.Asset_Model_No__c)) {
+ consumableInventoryUse.add(ass);
+ continue;
+ }
+ if(orderWantArriveCunMap.get(ass.Prod.Asset_Model_No__c) + orderProductArrivedCunMap.get(ass.Prod.Asset_Model_No__c) > orderProductCunMap.get(ass.Prod.Asset_Model_No__c)-1){
+
+ //鍙栧緱鍘熸湁list
+ overOrderBARcodeCunList = new list<String>();
+ overOrderBARcodeCunList = overOrderBARcodeCunMap.get(ass.Prod.Asset_Model_No__c).clone();
+ //鏇存柊list
+ overOrderBARcodeCunList.add(ass.barCodeNo);
+ //鏇存柊map
+ overOrderBARcodeCunMap.put(ass.Prod.Asset_Model_No__c,overOrderBARcodeCunList);
+ overOrderCunMap.put(ass.Prod.Asset_Model_No__c,overOrderCunMap.get(ass.Prod.Asset_Model_No__c)+1);
+ cancellationProList.add(ass.Prod.Asset_Model_No__c);
+ }else if(orderWantArriveCunMap.get(ass.Prod.Asset_Model_No__c) + orderProductArrivedCunMap.get(ass.Prod.Asset_Model_No__c) == orderProductCunMap.get(ass.Prod.Asset_Model_No__c)-1){
+
+ consumableInventoryUse.add(ass);
+ cancellationProList.add(ass.Prod.Asset_Model_No__c);
+ }else{
+ consumableInventoryUse.add(ass);
+ }
+ orderWantArriveCunMap.put(ass.Prod.Asset_Model_No__c,orderWantArriveCunMap.get(ass.Prod.Asset_Model_No__c)+1);
+ }
+ for (Integer i = 0; i < productList.size(); i++) {
+ if(overOrderBARcodeCunMap.get(productList[i]).size() > 0){
+ // 鑾峰彇瓒呰繃瀹氳揣鏁伴噺鐨勬秷鑰楀搧淇℃伅
+ overOrderproList.add(productList[i]);
+ }
+ }
+ if(overOrderproList.size() > 0){
+ return '浜у搧' + overOrderproList + '鏈鍒拌揣鏁伴噺鍜屽凡鍒拌揣鏁伴噺宸茬粡瓒呰繃璁㈣揣鏁伴噺!';
+ }else{
+ return '';
+ }
+
+ }
+
+ public void confimResultWithoutOrder() {
+ /*list<String> overOrderproList = new list<String>();
list<String> overOrderBARcodeCunList = new list<String>();
orderProductCunMap.clear();
orderProductArrivedCunMap.clear();
@@ -4636,9 +2927,9 @@
}
}*/
- //瑕佸埌璐т骇鍝佹暟閲�
- for (ConsumableorderdetailsInfo ass : ConsumableorderdetailsRecords) {
- /*if(orderWantArriveCunMap.get(ass.esd.Consumable_order_minor__c + ass.esd.Asset_Model_No__c) + orderProductArrivedCunMap.get(ass.esd.Consumable_order_minor__c + ass.esd.Asset_Model_No__c) > orderProductCunMap.get(ass.esd.Consumable_order_minor__c + ass.esd.Asset_Model_No__c)-1){
+ //瑕佸埌璐т骇鍝佹暟閲�
+ for (ConsumableorderdetailsInfo ass : ConsumableorderdetailsRecords) {
+ /*if(orderWantArriveCunMap.get(ass.esd.Consumable_order_minor__c + ass.esd.Asset_Model_No__c) + orderProductArrivedCunMap.get(ass.esd.Consumable_order_minor__c + ass.esd.Asset_Model_No__c) > orderProductCunMap.get(ass.esd.Consumable_order_minor__c + ass.esd.Asset_Model_No__c)-1){
// 鑾峰彇瓒呰繃瀹氳揣鏁伴噺鐨勬秷鑰楀搧淇℃伅
overOrderproList.add('浜у搧' + ass.esd.Asset_Model_No__c + '鍦ㄨ鍗�' + ass.esd.Consumable_order_minor__r.Name + '涓秴杩囪璐ф暟閲�!\n');
overOrderBARcodeCunList = new list<String>();
@@ -4649,1606 +2940,1363 @@
consumableorderdetailsRecordsUse.add(ass);
orderWantArriveCunMap.put(ass.esd.Consumable_order_minor__c + ass.esd.Asset_Model_No__c,orderWantArriveCunMap.get(ass.esd.Consumable_order_minor__c + ass.esd.Asset_Model_No__c)+1);
}else{*/
- consumableorderdetailsRecordsUse.add(ass);
- }
- /*orderWantArriveCunMap.put(ass.esd.Consumable_order_minor__c + ass.esd.Asset_Model_No__c,orderWantArriveCunMap.get(ass.esd.Consumable_order_minor__c + ass.esd.Asset_Model_No__c)+1);
+ consumableorderdetailsRecordsUse.add(ass);
+ }
+ /*orderWantArriveCunMap.put(ass.esd.Consumable_order_minor__c + ass.esd.Asset_Model_No__c,orderWantArriveCunMap.get(ass.esd.Consumable_order_minor__c + ass.esd.Asset_Model_No__c)+1);
}
return overOrderproList;*/
- }
+ }
- // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 start
- // 铏氭嫙鐩樼偣鍗曟秷鑰楀搧鏄庣粏1鍒涘缓宸″洖
- public void addInventoryDetails1(List<Consumable_order_details2__c> addList) {
- Map<String, List<Consumable_order_details2__c>> accountGroupMap = new Map<String, List<Consumable_order_details2__c>>();
- Map<String, Map<Id, Integer>> productMap = new Map<String, Map<Id, Integer>>();
- List<Id> orderIdList = new List<Id>();
- // 浠ョ粡閿�鍟嗗悕灏嗚鐢熸垚鍑哄簱鍗曠殑鏁版嵁鍒嗙粍
- for (Consumable_order_details2__c cod : addList) {
- List<Consumable_order_details2__c> accGroupList = new List<Consumable_order_details2__c>();
- Map<Id, Integer> pNumMap = new Map<Id, Integer>();
- Integer num = 1;
- if (
- accountGroupMap.containsKey(
- cod.Dealer_Info_text__c + cod.Arrive_Owner_Work_Location__c
- )
- ) {
- accGroupList = accountGroupMap.get(
- cod.Dealer_Info_text__c + cod.Arrive_Owner_Work_Location__c
- );
- pNumMap = productMap.get(
- cod.Dealer_Info_text__c + cod.Arrive_Owner_Work_Location__c
- );
- if (pNumMap.containsKey(cod.Consumable_Product__c)) {
- num = pNumMap.get(cod.Consumable_Product__c) + 1;
+ // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 start
+ // 铏氭嫙鐩樼偣鍗曟秷鑰楀搧鏄庣粏1鍒涘缓宸″洖
+ public void addInventoryDetails1(List<Consumable_order_details2__c> addList){
+ Map<String, List<Consumable_order_details2__c>> accountGroupMap = new Map<String, List<Consumable_order_details2__c>>();
+ Map<String, Map<Id, Integer>> productMap = new Map<String, Map<Id, Integer>> ();
+ List<Id> orderIdList = new List<Id> ();
+ // 浠ョ粡閿�鍟嗗悕灏嗚鐢熸垚鍑哄簱鍗曠殑鏁版嵁鍒嗙粍
+ for (Consumable_order_details2__c cod : addList) {
+ List<Consumable_order_details2__c> accGroupList = new List<Consumable_order_details2__c> ();
+ Map<Id, Integer> pNumMap = new Map<Id, Integer> ();
+ Integer num = 1;
+ if (accountGroupMap.containsKey(cod.Dealer_Info_text__c + cod.Arrive_Owner_Work_Location__c)) {
+ accGroupList = accountGroupMap.get(cod.Dealer_Info_text__c + cod.Arrive_Owner_Work_Location__c);
+ pNumMap = productMap.get(cod.Dealer_Info_text__c + cod.Arrive_Owner_Work_Location__c);
+ if (pNumMap.containsKey(cod.Consumable_Product__c)) {
+ num = pNumMap.get(cod.Consumable_Product__c) + 1;
+ }
+ }
+ orderIdList.add(cod.Consumable_Inventory_order__c);
+ pNumMap.put(cod.Consumable_Product__c, num);
+ accGroupList.add(cod);
+ productMap.put(cod.Dealer_Info_text__c + cod.Arrive_Owner_Work_Location__c, pNumMap);
+ accountGroupMap.put(cod.Dealer_Info_text__c + cod.Arrive_Owner_Work_Location__c, accGroupList);
+ System.debug('======accGroupList'+accGroupList);
}
- }
- orderIdList.add(cod.Consumable_Inventory_order__c);
- pNumMap.put(cod.Consumable_Product__c, num);
- accGroupList.add(cod);
- productMap.put(
- cod.Dealer_Info_text__c + cod.Arrive_Owner_Work_Location__c,
- pNumMap
- );
- accountGroupMap.put(
- cod.Dealer_Info_text__c + cod.Arrive_Owner_Work_Location__c,
- accGroupList
- );
- System.debug('======accGroupList' + accGroupList);
- }
+
+ System.debug('======accountGroupMap'+accountGroupMap);
+ List<Consumable_order__c> orderList = [select Id, Name, Dealer_Info__r.Name, Order_Owner_WorkLocal__c from Consumable_order__c where id in : orderIdList];
- System.debug('======accountGroupMap' + accountGroupMap);
- List<Consumable_order__c> orderList = [
- SELECT Id, Name, Dealer_Info__r.Name, Order_Owner_WorkLocal__c
- FROM Consumable_order__c
- WHERE id IN :orderIdList
- ];
+ // 鐢熸垚鍚勭粡閿�鍟嗗嚭搴撹鍗昄ist
+ // List<Consumable_order__c> orderList = new List<Consumable_order__c> ();
+ Map<String, List<Consumable_orderdetails__c>> insDetail1Map = new Map<String, List<Consumable_orderdetails__c>>();
+ for (String acc : accountGroupMap.keySet()) {
+ Consumable_order_details2__c arriveAccount = accountGroupMap.get(acc)[0];
+ List<Consumable_order_details2__c> prodPriceList = accountGroupMap.get(acc);
+ Map<Id, Integer> pNumMap = new Map<Id, Integer> ();
+ pNumMap = productMap.get(acc);
+ List<Consumable_orderdetails__c> insDetail1 = New List<Consumable_orderdetails__c>();
+ for (Id id : pNumMap.keySet()) {
+ Consumable_orderdetails__c ins = new Consumable_orderdetails__c();
+
+ //InsAfterDel.Consumable_order__c = p.id;
+ ins.Product_Refind__c = pNumMap.get(id);
+ ins.inventory_sum__c = pNumMap.get(id);
+ ins.Consumable_Product__c = id;
+ for (Consumable_order_details2__c pri : prodPriceList) {
+ if (pri.Consumable_Product__c == id) {
+ ins.Intra_Trade_List_RMB__c =pri.Intra_Trade_List_RMB__c;
+ break;
+ }
+ }
+ ins.Box_Piece__c = '鐩�';
+ ins.Out_unit__c = '鐩�';
+ //ins.Delivery_List_RMB__c = ass.orderdetails1.Delivery_List_RMB__c;
+ //ins.Unitprice_To_agency__c = ass.orderdetails1.Unitprice_To_agency__c;
+ //ins.Dealer_Custom_Price__c = ass.orderdetails1.Dealer_Custom_Price__c;
+ ins.RecordTypeId = System.Label.RT_ConOrderDetail1_Inventory;
+ ins.Used_date__c = Date.today();
+ ins.OwnerId = arriveAccount.OwnerId;
- // 鐢熸垚鍚勭粡閿�鍟嗗嚭搴撹鍗昄ist
- // List<Consumable_order__c> orderList = new List<Consumable_order__c> ();
- Map<String, List<Consumable_orderdetails__c>> insDetail1Map = new Map<String, List<Consumable_orderdetails__c>>();
- for (String acc : accountGroupMap.keySet()) {
- Consumable_order_details2__c arriveAccount = accountGroupMap.get(acc)[0];
- List<Consumable_order_details2__c> prodPriceList = accountGroupMap.get(
- acc
- );
- Map<Id, Integer> pNumMap = new Map<Id, Integer>();
- pNumMap = productMap.get(acc);
- List<Consumable_orderdetails__c> insDetail1 = new List<Consumable_orderdetails__c>();
- for (Id id : pNumMap.keySet()) {
- Consumable_orderdetails__c ins = new Consumable_orderdetails__c();
-
- //InsAfterDel.Consumable_order__c = p.id;
- ins.Product_Refind__c = pNumMap.get(id);
- ins.inventory_sum__c = pNumMap.get(id);
- ins.Consumable_Product__c = id;
- for (Consumable_order_details2__c pri : prodPriceList) {
- if (pri.Consumable_Product__c == id) {
- ins.Intra_Trade_List_RMB__c = pri.Intra_Trade_List_RMB__c;
- break;
- }
+ insDetail1.add(ins);
+ }
+ System.debug('======insDetail1'+insDetail1);
+ insDetail1Map.put(acc, insDetail1);
+ System.debug('======insDetail1Map'+insDetail1Map);
}
- ins.Box_Piece__c = '鐩�';
- ins.Out_unit__c = '鐩�';
- //ins.Delivery_List_RMB__c = ass.orderdetails1.Delivery_List_RMB__c;
- //ins.Unitprice_To_agency__c = ass.orderdetails1.Unitprice_To_agency__c;
- //ins.Dealer_Custom_Price__c = ass.orderdetails1.Dealer_Custom_Price__c;
- ins.RecordTypeId = System.Label.RT_ConOrderDetail1_Inventory;
- ins.Used_date__c = Date.today();
- ins.OwnerId = arriveAccount.OwnerId;
-
- insDetail1.add(ins);
- }
- System.debug('======insDetail1' + insDetail1);
- insDetail1Map.put(acc, insDetail1);
- System.debug('======insDetail1Map' + insDetail1Map);
+ List<Consumable_orderdetails__c> insDetail1List = new List<Consumable_orderdetails__c> ();
+ for (Consumable_order__c setId : orderList) {
+ // 鏄庣粏1
+ List<Consumable_orderdetails__c> d1list = insDetail1Map.get(setId.Dealer_Info__r.Name + setId.Order_Owner_WorkLocal__c);
+ Integer i = 1;
+ for (Consumable_orderdetails__c dtl1 : d1list) {
+ String str = ('000' + i).right(4);
+ dtl1.Consumable_order__c = setId.Id;
+ dtl1.Name = setId.Name + '-'+ str;
+ insDetail1List.add(dtl1);
+ }
+ }
+ System.debug('======insDetail1List'+insDetail1List);
+ insert insDetail1List;
}
- List<Consumable_orderdetails__c> insDetail1List = new List<Consumable_orderdetails__c>();
- for (Consumable_order__c setId : orderList) {
- // 鏄庣粏1
- List<Consumable_orderdetails__c> d1list = insDetail1Map.get(
- setId.Dealer_Info__r.Name + setId.Order_Owner_WorkLocal__c
- );
- Integer i = 1;
- for (Consumable_orderdetails__c dtl1 : d1list) {
- String str = ('000' + i).right(4);
- dtl1.Consumable_order__c = setId.Id;
- dtl1.Name = setId.Name + '-' + str;
- insDetail1List.add(dtl1);
- }
- }
- System.debug('======insDetail1List' + insDetail1List);
- insert insDetail1List;
- }
- // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 end
+ // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 end
- // 缁忛攢鍟嗙殑涓嶅悓宸ヤ綔鍦拌皟璐ц嚜鍔ㄧ敓鎴愬嚭搴撳崟
- public void addSaleOrderAuto(List<Consumable_order_details2__c> addList) {
- Map<String, List<Consumable_order_details2__c>> accountGroupMap = new Map<String, List<Consumable_order_details2__c>>();
- Map<String, Map<Id, Integer>> productMap = new Map<String, Map<Id, Integer>>();
- // 浠ョ粡閿�鍟嗗悕灏嗚鐢熸垚鍑哄簱鍗曠殑鏁版嵁鍒嗙粍
- for (Consumable_order_details2__c cod : addList) {
- List<Consumable_order_details2__c> accGroupList = new List<Consumable_order_details2__c>();
- Map<Id, Integer> pNumMap = new Map<Id, Integer>();
- Integer num = 1;
- if (
- accountGroupMap.containsKey(
- cod.Dealer_Info_text__c + cod.Arrive_Owner_Work_Location__c
- )
- ) {
- accGroupList = accountGroupMap.get(
- cod.Dealer_Info_text__c + cod.Arrive_Owner_Work_Location__c
- );
- pNumMap = productMap.get(
- cod.Dealer_Info_text__c + cod.Arrive_Owner_Work_Location__c
- );
- if (pNumMap.containsKey(cod.Consumable_Product__c)) {
- num = pNumMap.get(cod.Consumable_Product__c) + 1;
+
+ // 缁忛攢鍟嗙殑涓嶅悓宸ヤ綔鍦拌皟璐ц嚜鍔ㄧ敓鎴愬嚭搴撳崟
+ public void addSaleOrderAuto (List<Consumable_order_details2__c> addList) {
+ Map<String, List<Consumable_order_details2__c>> accountGroupMap = new Map<String, List<Consumable_order_details2__c>>();
+ Map<String, Map<Id, Integer>> productMap = new Map<String, Map<Id, Integer>> ();
+ // 浠ョ粡閿�鍟嗗悕灏嗚鐢熸垚鍑哄簱鍗曠殑鏁版嵁鍒嗙粍
+ for (Consumable_order_details2__c cod : addList) {
+ List<Consumable_order_details2__c> accGroupList = new List<Consumable_order_details2__c> ();
+ Map<Id, Integer> pNumMap = new Map<Id, Integer> ();
+ Integer num = 1;
+ if (accountGroupMap.containsKey(cod.Dealer_Info_text__c + cod.Arrive_Owner_Work_Location__c)) {
+ accGroupList = accountGroupMap.get(cod.Dealer_Info_text__c + cod.Arrive_Owner_Work_Location__c);
+ pNumMap = productMap.get(cod.Dealer_Info_text__c + cod.Arrive_Owner_Work_Location__c);
+ if (pNumMap.containsKey(cod.Consumable_Product__c)) {
+ num = pNumMap.get(cod.Consumable_Product__c) + 1;
+ }
+ }
+ pNumMap.put(cod.Consumable_Product__c, num);
+ accGroupList.add(cod);
+ productMap.put(cod.Dealer_Info_text__c + cod.Arrive_Owner_Work_Location__c, pNumMap);
+ accountGroupMap.put(cod.Dealer_Info_text__c + cod.Arrive_Owner_Work_Location__c, accGroupList);
}
- }
- pNumMap.put(cod.Consumable_Product__c, num);
- accGroupList.add(cod);
- productMap.put(
- cod.Dealer_Info_text__c + cod.Arrive_Owner_Work_Location__c,
- pNumMap
- );
- accountGroupMap.put(
- cod.Dealer_Info_text__c + cod.Arrive_Owner_Work_Location__c,
- accGroupList
- );
- }
- // 鐢熸垚鍚勭粡閿�鍟嗗嚭搴撹鍗昄ist
- List<Consumable_order__c> orderList = new List<Consumable_order__c>();
- Map<String, List<Consumable_orderdetails__c>> insDetail1Map = new Map<String, List<Consumable_orderdetails__c>>();
- for (String acc : accountGroupMap.keySet()) {
- Consumable_order_details2__c arriveAccount = accountGroupMap.get(acc)[0];
- Consumable_order__c autoOrder = new Consumable_order__c();
- autoOrder.Name = '*';
- autoOrder.Dealer_Info__c = arriveAccount.Consumable_Arrived_order__r.Dealer_Info__c;
- autoOrder.OwnerId = arriveAccount.OwnerId;
- autoOrder.Order_type__c = '浼犵エ';
- autoOrder.SummonsStatus_c__c = '宸插畬鎴�';
- autoOrder.Order_ForDealerText__c = accountName;
- autoOrder.SummonsForDirction__c = '浜掔浉璋冭揣';
- autoOrder.RecordTypeid = System.Label.RT_ConOrder_Shipment;
- autoOrder.Outbound_Date__c = Date.today();
- autoOrder.Order_date__c = Date.today();
- autoOrder.AutoShipment__c = true;
- orderList.add(autoOrder);
+ // 鐢熸垚鍚勭粡閿�鍟嗗嚭搴撹鍗昄ist
+ List<Consumable_order__c> orderList = new List<Consumable_order__c> ();
+ Map<String, List<Consumable_orderdetails__c>> insDetail1Map = new Map<String, List<Consumable_orderdetails__c>>();
+ for (String acc : accountGroupMap.keySet()) {
+ Consumable_order_details2__c arriveAccount = accountGroupMap.get(acc)[0];
+ Consumable_order__c autoOrder = new Consumable_order__c();
+ autoOrder.Name = '*';
+ autoOrder.Dealer_Info__c = arriveAccount.Consumable_Arrived_order__r.Dealer_Info__c;
+ autoOrder.OwnerId = arriveAccount.OwnerId;
+ autoOrder.Order_type__c = '浼犵エ';
+ autoOrder.SummonsStatus_c__c = '宸插畬鎴�';
+ autoOrder.Order_ForDealerText__c = accountName;
+ autoOrder.SummonsForDirction__c = '浜掔浉璋冭揣';
+ autoOrder.RecordTypeid = System.Label.RT_ConOrder_Shipment;
+ autoOrder.Outbound_Date__c = Date.today();
+ autoOrder.Order_date__c = Date.today();
+ autoOrder.AutoShipment__c = TRUE;
+ orderList.add(autoOrder);
- List<Consumable_order_details2__c> prodPriceList = accountGroupMap.get(
- acc
- );
- Map<Id, Integer> pNumMap = new Map<Id, Integer>();
- pNumMap = productMap.get(acc);
- List<Consumable_orderdetails__c> insDetail1 = new List<Consumable_orderdetails__c>();
- for (Id id : pNumMap.keySet()) {
- Consumable_orderdetails__c ins = new Consumable_orderdetails__c();
+ List<Consumable_order_details2__c> prodPriceList = accountGroupMap.get(acc);
+ Map<Id, Integer> pNumMap = new Map<Id, Integer> ();
+ pNumMap = productMap.get(acc);
+ List<Consumable_orderdetails__c> insDetail1 = New List<Consumable_orderdetails__c>();
+ for (Id id : pNumMap.keySet()) {
+ Consumable_orderdetails__c ins = new Consumable_orderdetails__c();
+
+ //InsAfterDel.Consumable_order__c = p.id;
+ ins.Shipment_Count__c = pNumMap.get(id);
+ ins.Consumable_Product__c = id;
+ for (Consumable_order_details2__c pri : prodPriceList) {
+ if (pri.Consumable_Product__c == id) {
+ ins.Intra_Trade_List_RMB__c =pri.Intra_Trade_List_RMB__c;
+ break;
+ }
+ }
+ ins.Box_Piece__c = '鐩�';
+ ins.Out_unit__c = '鐩�';
+ //ins.Delivery_List_RMB__c = ass.orderdetails1.Delivery_List_RMB__c;
+ //ins.Unitprice_To_agency__c = ass.orderdetails1.Unitprice_To_agency__c;
+ //ins.Dealer_Custom_Price__c = ass.orderdetails1.Dealer_Custom_Price__c;
+ ins.RecordTypeId = System.Label.RT_ConOrderDetail1_Shipment;
+ ins.Used_date__c = Date.today();
+ ins.OwnerId = arriveAccount.OwnerId;
- //InsAfterDel.Consumable_order__c = p.id;
- ins.Shipment_Count__c = pNumMap.get(id);
- ins.Consumable_Product__c = id;
- for (Consumable_order_details2__c pri : prodPriceList) {
- if (pri.Consumable_Product__c == id) {
- ins.Intra_Trade_List_RMB__c = pri.Intra_Trade_List_RMB__c;
- break;
- }
+ insDetail1.add(ins);
+ }
+ insDetail1Map.put(acc, insDetail1);
}
- ins.Box_Piece__c = '鐩�';
- ins.Out_unit__c = '鐩�';
- //ins.Delivery_List_RMB__c = ass.orderdetails1.Delivery_List_RMB__c;
- //ins.Unitprice_To_agency__c = ass.orderdetails1.Unitprice_To_agency__c;
- //ins.Dealer_Custom_Price__c = ass.orderdetails1.Dealer_Custom_Price__c;
- ins.RecordTypeId = System.Label.RT_ConOrderDetail1_Shipment;
- ins.Used_date__c = Date.today();
- ins.OwnerId = arriveAccount.OwnerId;
+ insert orderList;
- insDetail1.add(ins);
- }
- insDetail1Map.put(acc, insDetail1);
- }
- insert orderList;
+ List<Id> orderIdList = new List<Id> ();
+ for (Consumable_order__c co : orderList) {
+ orderIdList.add(co.Id);
+ }
- List<Id> orderIdList = new List<Id>();
- for (Consumable_order__c co : orderList) {
- orderIdList.add(co.Id);
+ orderList = new List<Consumable_order__c> ();
+ orderList = [select Id, Name, Dealer_Info__r.Name, Order_Owner_WorkLocal__c from Consumable_order__c where id in : orderIdList];
+
+ // 璁剧疆鏄庣粏1 鍜� 鏄庣粏2 鐨� 璁㈠崟ID
+ List<Consumable_orderdetails__c> insDetail1List = new List<Consumable_orderdetails__c> ();
+ List<Consumable_order_details2__c> updDetail2List = new List<Consumable_order_details2__c> ();
+ for (Consumable_order__c setId : orderList) {
+ // 鏄庣粏1
+ List<Consumable_orderdetails__c> d1list = insDetail1Map.get(setId.Dealer_Info__r.Name + setId.Order_Owner_WorkLocal__c);
+ Integer i = 1;
+ for (Consumable_orderdetails__c dtl1 : d1list) {
+ String str = ('000' + i).right(4);
+ // if(str.length() == 1){
+ // str = '0' + str;
+ // }
+ dtl1.Consumable_order__c = setId.Id;
+ dtl1.Name = setId.Name + '-'+ str;
+ insDetail1List.add(dtl1);
+ }
+
+ // 鏄庣粏2
+ List<Consumable_order_details2__c> d2list = accountGroupMap.get(setId.Dealer_Info__r.Name + setId.Order_Owner_WorkLocal__c);
+ for (Consumable_order_details2__c dtl2 : d2list) {
+ dtl2.Send_Date__c = Date.today();
+ dtl2.Consumable_Sale_order__c = null;
+ dtl2.Consumable_Return_order__c = null;
+ dtl2.Consumable_ZS_order__c = setId.Id;
+ //dtl2.Delivery_List_RMB__c = null;
+ dtl2.Return_date__c = null;
+ dtl2.Return_reason__c = null;
+ dtl2.Consumable_Shipment_order__c = setId.Id;
+ // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 start
+ dtl2.Transfer_Time__c = 1;
+ dtl2.Agency_Transfer__c = true;
+ dtl2.Frist_Transfer_Agency__c = dtl2.Dealer_Info_text__c;
+ // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 end
+ updDetail2List.add(dtl2);
+ }
+ }
+
+ insert insDetail1List;
+ update updDetail2List;
}
- orderList = new List<Consumable_order__c>();
- orderList = [
- SELECT Id, Name, Dealer_Info__r.Name, Order_Owner_WorkLocal__c
- FROM Consumable_order__c
- WHERE id IN :orderIdList
- ];
+ //鍒拌揣纭
+ public PageReference ArriveGoodsConfim() {
+ //add by rentx 20210618 start CHAN-C3K4ZQ 璺宠繃涓嶅繀瑕佺殑鏌ヨ
+ StaticParameter.ConsumableOrderTrigger = true;
+ //add by rentx 20210618 end CHAN-C3K4ZQ 璺宠繃涓嶅繀瑕佺殑鏌ヨ
+ cancellationProList = new List<String>();
+ List<Consumable_order_details2__c> ins = New List<Consumable_order_details2__c>();
+ String resultcheck = '';
+ List<String> resultcheckWithoutOrder = new List<String>();
+ Savepoint sp = Database.setSavepoint();
- // 璁剧疆鏄庣粏1 鍜� 鏄庣粏2 鐨� 璁㈠崟ID
- List<Consumable_orderdetails__c> insDetail1List = new List<Consumable_orderdetails__c>();
- List<Consumable_order_details2__c> updDetail2List = new List<Consumable_order_details2__c>();
- for (Consumable_order__c setId : orderList) {
- // 鏄庣粏1
- List<Consumable_orderdetails__c> d1list = insDetail1Map.get(
- setId.Dealer_Info__r.Name + setId.Order_Owner_WorkLocal__c
- );
- Integer i = 1;
- for (Consumable_orderdetails__c dtl1 : d1list) {
- String str = ('000' + i).right(4);
- // if(str.length() == 1){
- // str = '0' + str;
- // }
- dtl1.Consumable_order__c = setId.Id;
- dtl1.Name = setId.Name + '-' + str;
- insDetail1List.add(dtl1);
- }
-
- // 鏄庣粏2
- List<Consumable_order_details2__c> d2list = accountGroupMap.get(
- setId.Dealer_Info__r.Name + setId.Order_Owner_WorkLocal__c
- );
- for (Consumable_order_details2__c dtl2 : d2list) {
- dtl2.Send_Date__c = Date.today();
- dtl2.Consumable_Sale_order__c = null;
- dtl2.Consumable_Return_order__c = null;
- dtl2.Consumable_ZS_order__c = setId.Id;
- //dtl2.Delivery_List_RMB__c = null;
- dtl2.Return_date__c = null;
- dtl2.Return_reason__c = null;
- dtl2.Consumable_Shipment_order__c = setId.Id;
- // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 start
- dtl2.Transfer_Time__c = 1;
- dtl2.Agency_Transfer__c = true;
- dtl2.Frist_Transfer_Agency__c = dtl2.Dealer_Info_text__c;
- // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 end
- updDetail2List.add(dtl2);
- }
- }
-
- insert insDetail1List;
- update updDetail2List;
- }
-
- //鍒拌揣纭
- public PageReference ArriveGoodsConfim() {
- //add by rentx 20210618 start CHAN-C3K4ZQ 璺宠繃涓嶅繀瑕佺殑鏌ヨ
- StaticParameter.ConsumableOrderTrigger = true;
- //add by rentx 20210618 end CHAN-C3K4ZQ 璺宠繃涓嶅繀瑕佺殑鏌ヨ
- cancellationProList = new List<String>();
- List<Consumable_order_details2__c> ins = new List<Consumable_order_details2__c>();
- String resultcheck = '';
- List<String> resultcheckWithoutOrder = new List<String>();
- Savepoint sp = Database.setSavepoint();
-
- if (
- ConsumableorderdetailsRecords.size() < 1 &&
- consumableInventory.size() < 1
- ) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- returnError = '涓嶅瓨鍦ㄥ埌璐ф槑缁�';
- } else {
- ApexPages.addmessage(
- new ApexPages.message(ApexPages.severity.ERROR, '涓嶅瓨鍦ㄥ埌璐ф槑缁�')
- );
- }
- return null;
- }
- if (EsetId != null && EsetId != '') {
- resultcheck = ConfimResult();
- if (resultcheck.length() > 0) {
- for (String widget : overOrderBARcodeCunMap.keySet()) {
- if (overOrderBARcodeCunMap.get(widget).size() > 0) {
+ if(ConsumableorderdetailsRecords.size()<1 && consumableInventory.size()<1){
//LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- warningList.add(
- '浜у搧' +
- widget +
- '鏈鍒拌揣鏁伴噺瓒呰繃' +
- overOrderBARcodeCunMap.get(widget).size() +
- '涓璐х殑鏁伴噺銆�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.INFO,
- '浜у搧' +
- widget +
- '鏈鍒拌揣鏁伴噺瓒呰繃' +
- overOrderBARcodeCunMap.get(widget).size() +
- '涓璐х殑鏁伴噺銆�'
- )
- );
- }
- for (
- String barcodeListTTT : (List<String>) overOrderBARcodeCunMap.get(
- widget
- )
- ) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- warningList.add(barcodeListTTT);
- } else {
- ApexPages.addmessage(
- new ApexPages.message(ApexPages.severity.INFO, barcodeListTTT)
- );
- }
- }
- }
- }
- }
- } else {
- confimResultWithoutOrder();
- }
- try {
- Consumable_order__c orderMain = new Consumable_order__c();
- List<Consumable_order_details2__c> orderdetails = new List<Consumable_order_details2__c>();
- //鍒拌揣姝ｇ‘淇℃伅
- orderMain.Name = '*';
- orderMain.Order_status__c = '鎵瑰噯';
- orderMain.Dealer_Info__c = accountid;
- orderMain.Deliver_date__c = Date.today();
- orderMain.Order_date__c = Date.today();
- orderMain.Order_type__c = '鍒拌揣';
- orderMain.Order_ProType__c = userPro_Type;
- if (EsetId != null && EsetId != '') {
- orderMain.Arrive_Order__c = coc.Id;
- }
- orderMain.RecordTypeid = System.Label.RT_ConOrder_Arrive;
- insert orderMain;
-
- List<Consumable_order__c> consumable_order = [
- SELECT Name
- FROM Consumable_order__c
- WHERE id = :orderMain.id
- ];
- arriveId = orderMain.id;
- Decimal arriveAmount = 0;
- for (ConsumableorderdetailsInfo ass : consumableorderdetailsRecordsUse) {
- //ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'------1------'));
- Consumable_order_details2__c insDetails = new Consumable_order_details2__c();
- insDetails.Id = ass.esd.Id;
- insDetails.Consumable_Arrived_order__c = orderMain.id;
- insDetails.Arrive_date__c = Date.today();
- insDetails.Bar_Code__c = ass.esd.Bar_Code__c;
- insDetails.OwnerId = UserInfo.getUserId();
- // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 start
- if (orderdetails2trMap.containsKey(ass.esd.Bar_Code__c)) {
- insDetails.Transfer_Time__c = ass.esd.Transfer_Time__c == null
- ? 1
- : ass.esd.Transfer_Time__c;
- insDetails.Agency_Transfer__c = true;
- insDetails.Frist_Transfer_Agency__c = ass.esd.Frist_Transfer_Agency__c ==
- null
- ? ass.esd.Dealer_Info_text__c
- : ass.esd.Frist_Transfer_Agency__c;
- }
- // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 end
-
- // 杩藉姞棣栨鍏ュ簱缁忛攢鍟� add by gzw 2020-04-27 start
- insDetails.Agencyinfo_fromSAP__c = ass.esd.Agencyinfo_fromSAP__c;
- insDetails.Frist_Storage_Agency__c = ass.esd.Frist_Storage_Agency__c ==
- null
- ? ass.esd.Dealer_Info_text__c
- : ass.esd.Frist_Storage_Agency__c;
- // 杩藉姞棣栨鍏ュ簱缁忛攢鍟� add by gzw 2020-04-27 end
- arriveAmount += ass.esd.Intra_Trade_List_RMB__c;
- orderdetails.add(insDetails);
- }
- Integer i = 1;
- for (ConsumableorderdetailsInfo ass : consumableInventoryUse) {
- //ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'------2------'));
- Consumable_order_details2__c insAfterDel = new Consumable_order_details2__c();
- String str = ('000' + i).right(4);
- // if(str.length() == 1){
- // str = '0' + str;
- // }
- insAfterDel.Name = consumable_order[0].Name + '-' + str;
- insAfterDel.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
- // gzw 鎵嬪姩鍏ュ簱 榛樿浜у搧鍗曚环 20230307
- // if(EsetId != null && EsetId != ''){
- // insAfterDel.Intra_Trade_List_RMB__c = ass.Prod.Intra_Trade_List_RMB__c;
- // }else{
- // insAfterDel.Intra_Trade_List_RMB__c = 0;
- // }
- insAfterDel.Intra_Trade_List_RMB__c = ass.Prod.Intra_Trade_List_RMB__c;
- //gzw 鎵嬪姩鍏ュ簱 榛樿浜у搧鍗曚环 20230307
- insAfterDel.Asset_Model_No__c = ass.Prod.Asset_Model_No__c;
- if (EsetId != null && EsetId != '') {
- insAfterDel.Consumable_order_minor__c = ESetId;
- }
- insAfterDel.Deliver_date__c = Date.today();
- insAfterDel.Direct_Arrive_Product__c = true;
- //TODO寰呯‘璁�
- insAfterDel.Sterilization_limit__c = ass.sterilizationlimitDate;
- insAfterDel.Consumable_Product__c = ass.Prod.id;
- insAfterDel.Bar_Code__c = ass.barCodeNo;
- insAfterDel.Used_account__c = accountid;
- //TODO寰呯‘璁�
- insAfterDel.SerialLotNo__c = ass.serialNoorLotNo;
- insAfterDel.TracingCode__c = ass.tracingCodeNo;
-
- //insAfterDel.Dealer_Arrive__c = true;
- insAfterDel.Consumable_Arrived_order__c = orderMain.id;
- insAfterDel.Arrive_date__c = Date.today();
- insAfterDel.OwnerId = UserInfo.getUserId();
- // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 start
- if (orderdetails2trMap.containsKey(ass.esd.Bar_Code__c)) {
- insAfterDel.Transfer_Time__c = ass.esd.Transfer_Time__c == null
- ? 1
- : ass.esd.Transfer_Time__c;
- insAfterDel.Agency_Transfer__c = true;
- insAfterDel.Frist_Transfer_Agency__c = ass.esd.Frist_Transfer_Agency__c ==
- null
- ? accountName
- : ass.esd.Frist_Transfer_Agency__c;
- }
- // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 end
-
- // 杩藉姞棣栨鍏ュ簱缁忛攢鍟� add by gzw 2020-04-27 start
- insAfterDel.Agencyinfo_fromSAP__c = ass.esd.Agencyinfo_fromSAP__c;
- insAfterDel.Frist_Storage_Agency__c = ass.esd.Frist_Storage_Agency__c ==
- null
- ? accountName
- : ass.esd.Frist_Storage_Agency__c;
- // 杩藉姞棣栨鍏ュ簱缁忛攢鍟� add by gzw 2020-04-27 end
- arriveAmount += insAfterDel.Intra_Trade_List_RMB__c;
- //add by rentx 2020-10-14 strat
- //insAfterDel.ContractNo_text__c = /*ass.esd.ContractNo__c*/;
- // tcm start
- if (String.isBlank(ass.esd.Consumable_order_minor__r.ContractNo__c)) {
- insAfterDel.ContractNo_text__c = ass.esd.ContractNo_text__c;
- } else {
- insAfterDel.ContractNo_text__c = ass.esd.Consumable_order_minor__r.ContractNo__c;
- }
- // tcm end
- //add by rentx 2020-10-14 end
- i++;
-
- ins.add(insAfterDel);
- }
- orderMain.Arrive_total_amount__c = arriveAmount;
- update orderMain;
- List<Consumable_order_details2__c> updateconsumableorderdetails2 = new List<Consumable_order_details2__c>();
- //鏇存柊鏄庣粏鍙栨秷鏃堕棿 => 鏈埌璐у彇娑堬紝鍒拌揣鑷姩鐢熸垚鍑哄簱娴佺▼
- List<Consumable_order_details2__c> addSaleOrderList = new List<Consumable_order_details2__c>();
- for (Consumable_order_details2__c Cod : consumableorderdetails2Cancle) {
- //ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'------3------'));
- if (Cod.Dealer_Arrive__c) {
- if (Cod.Dealer_Shipment__c == false && Cod.Dealer_Saled__c == false) {
- addSaleOrderList.add(Cod);
- }
- } else {
- Cod.Cancellation_Date__c = Date.today();
- Cod.Cancellation_Flag__c = true;
- updateconsumableorderdetails2.add(Cod);
- }
- }
-
- if (addSaleOrderList.size() > 0) {
- addSaleOrderAuto(addSaleOrderList);
- }
-
- if (updateconsumableorderdetails2.size() > 0) {
- update updateconsumableorderdetails2;
- }
-
- List<Consumable_order_details2__c> insertconsumableorderdetails2 = new List<Consumable_order_details2__c>();
- for (Consumable_order_details2__c Cod2 : consumableorderdetails2Insert) {
- //ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'------4------'));
- String str = ('000' + i).right(4);
- // if(str.length() == 1){
- // str = '0' + str;
- // }
- Cod2.Name = consumable_order[0].Name + '-' + str;
- Cod2.Consumable_order_minor__c = null;
- Cod2.Deliver_date__c = Date.today();
- Cod2.Used_account__c = accountid;
- Cod2.Consumable_Arrived_order__c = orderMain.id;
- Cod2.Arrive_date__c = Date.today();
- // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 start
- if (orderdetails2trMap.containsKey(Cod2.Bar_Code__c)) {
- //ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'------4++++++' + Cod2.Frist_Storage_Agency__c));
- Cod2.Transfer_Time__c = Cod2.Transfer_Time__c == null
- ? 1
- : Cod2.Transfer_Time__c;
- Cod2.Agency_Transfer__c = true;
- Cod2.Frist_Transfer_Agency__c = Cod2.Frist_Transfer_Agency__c == null
- ? accountName
- : Cod2.Frist_Transfer_Agency__c;
- }
- // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 end
-
- // 杩藉姞棣栨鍏ュ簱缁忛攢鍟� add by gzw 2020-04-27 start
- Cod2.Agencyinfo_fromSAP__c = Cod2.Agencyinfo_fromSAP__c;
- //ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'------4------' + Cod2.Frist_Storage_Agency__c));
- Cod2.Frist_Storage_Agency__c = Cod2.Frist_Storage_Agency__c == null
- ? accountName
- : Cod2.Frist_Storage_Agency__c;
- // 杩藉姞棣栨鍏ュ簱缁忛攢鍟� add by gzw 2020-04-27 end
- insertconsumableorderdetails2.add(Cod2);
- i++;
- }
-
- //return null;
-
- if (insertconsumableorderdetails2.size() > 0) {
- insert insertconsumableorderdetails2;
- }
-
- if (ins.size() > 0) {
- insert ins;
- }
- if (orderdetails.size() > 0) {
- ControllerUtil.updateOrderDetailsSatus(orderdetails);
- }
- //瓒呭嚭鍒拌揣鏁伴噺浜у搧鍙栨秷鏃ユ湡鏇存柊
- List<Consumable_order_details2__c> needcanceldet = new List<Consumable_order_details2__c>();
- if (cancellationProList.size() > 0) {
- needcanceldet = [
- SELECT Id, Cancellation_Date__c
- FROM Consumable_order_details2__c
- WHERE
- Asset_Model_No__c IN :cancellationProList
- AND Consumable_order_minor__c = :ESetId
- AND Dealer_Arrive__c = FALSE
- AND Cancellation_Date__c = NULL
- ];
- if (needcanceldet.size() > 0) {
- for (Integer a = 0; a < needcanceldet.size(); a++) {
- needcanceldet[a].Cancellation_Date__c = Date.today();
- needcanceldet[a].Cancellation_Flag__c = true;
- }
- ControllerUtil.updateOrderDetailsSatus(needcanceldet);
- }
- }
- List<Consumable_order__c> qs = new List<Consumable_order__c>();
- qs = [
- SELECT
- Id,
- Name,
- Order_status__c,
- Dealer_Info__c,
- Deliver_date__c,
- ReturnGs_Upload_Date__c,
- Order_Reason__c,
- Order_date__c,
- Contract_application_decision__c,
- Order_type__c,
- Total_num__c,
- OrderNumber_arrived__c,
- Delivery_detail_count__c,
- OrderNumber_notarrive__c
- FROM Consumable_order__c
- WHERE Id = :ESetId AND Dealer_Info__c = :accountid
- ];
- if (qs.size() > 0) {
- coc = qs[0];
- }
- saveFLGbln = true;
- alertMessage = '鍒拌揣瀹屾垚銆�';
- // Integer a = 1/0;
- } catch (Exception e) {
- Database.rollback(sp);
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- returnError = e.getLineNumber() + '---' + e.getMessage();
- } else {
- ApexPages.addMessages(e);
- }
- return null;
- }
- if (resultcheck.length() > 0) {
- return null;
- } else if (resultcheckWithoutOrder.size() > 0) {
- return null;
- } else {
- urlType = 'UnabletoEdit';
- return UnabletoEdit();
- // return null;
- }
- }
-
- // 杩斿搧妫�鏌ワ紝鍚庡洖搴�
- public integer GoodsReturnCheck() {
- List<String> GrListIn = ParseBarCode(barcode);
- GrList = new List<String>();
- Map<String, String> CheckBarcodeResult = new Map<String, String>();
- for (String Str : GrListIn) {
- CheckBarcodeResult.put(str, 'UnFind');
- }
- List<Consumable_order_details2__c> BarcodeRetrunResult = [
- SELECT
- Id,
- Name,
- Intra_Trade_List_RMB__c,
- Asset_Model_No__c,
- Consumable_Product__c,
- Consumable_Product__r.Name,
- Consumable_Product__r.Name__c,
- Consumable_Product__r.Asset_Model_No__c,
- Sterilization_limit__c,
- Deliver_date__c,
- Bar_Code__c,
- Arrive_date__c,
- Send_Date__c,
- Consumable_order_minor__r.Name,
- Consumable_order_minor__c,
- Dealer_Arrive__c,
- Guarantee_period_for_products__c,
- CFDA_Status__c,
- ProductPacking_list_manual__c,
- Report_Product_Approbation__c,
- Report_Product_Expiration__c,
- Box_Piece__c,
- Rrturn_count__c,
- Product_Type__c,
- //add by rentx 2020-10-14 start
- ContractNo_text__c /*,ContractNo__c*/,
- // tcm start
- Consumable_order_minor__r.ContractNo__c
- // tcm end
- //add by rentx 2020-10-14 end
- FROM Consumable_order_details2__c
- WHERE
- Dealer_Arrive__c = TRUE
- AND (Dealer_Shipment__c = TRUE
- //AND Consumable_Shipment_order__r.SummonsForDirction__c != '浜掔浉璋冭揣')
- OR Dealer_Saled__c = TRUE)
- AND Dealer_Info_text__c = :accountName
- AND Bar_Code__c IN :GrListIn
- AND (NOT Product_Type__c LIKE :userPro_Typestr)
- AND Dealer_Returned__c = FALSE
- AND Arrive_Owner_Work_Location__c = :userWorkLocation
- ORDER BY Box_Piece__c DESC, Name
- ];
- if (BarcodeRetrunResult.size() > 0) {
- for (Integer i = 0; i < BarcodeRetrunResult.size(); i++) {
- if (
- ErrorIdMap.containsKey(BarcodeRetrunResult[i].Bar_Code__c) ||
- ExistIdMap.containsKey(BarcodeRetrunResult[i].Bar_Code__c)
- ) {
- // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
- continue;
- } else {
- String str =
- '浜у搧绫诲瀷[' +
- BarcodeRetrunResult[i].Product_Type__c +
- ']涓庣敤鎴风殑绫诲瀷[' +
- userPro_Type +
- ']涓嶇';
- ConsumableorderdetailsRecordserror.add(
- new ConsumableorderdetailsInfo(BarcodeRetrunResult[i], str)
- );
- ErrorIdMap.put(
- BarcodeRetrunResult[i].Bar_Code__c,
- BarcodeRetrunResult[i].Bar_Code__c
- );
- }
- }
- }
- AllMap.putAll(ErrorIdMap);
- BarcodeRetrunResult = [
- SELECT
- Id,
- Consumable_order_minor__c,
- Deliver_date__c,
- Asset_Model_No__c,
- Consumable_Product__c,
- Consumable_Product__r.Name,
- Consumable_Product__r.Name__c,
- Name,
- Bar_Code__c,
- Arrive_date__c,
- Dealer_Shipment__c,
- Lose_Flag__c,
- Dealer_Saled__c,
- Return_reason__c,
- Consumable_Shipment_order__c,
- Consumable_Shipment_order__r.Name,
- Send_date__c,
- Consumable_Sale_order__c,
- Consumable_Sale_order__r.Name,
- Used_date__c,
- SerialLotNo__c,
- TracingCode__c,
- Sterilization_limit__c,
- Consumable_ZS_order__c,
- Consumable_ZS_order__r.Name,
- Product_OutDate__c,
- Invoice_Date__c,
- recordtypeid,
- Consumable_Arrived_order__c,
- Box_Piece__c,
- Rrturn_count__c,
- Intra_Trade_List_RMB__c,
- OwnerId,
- SummonsForDirction_det__c,
- Order_Dealer_Info__c,
- HospItal_Name__c,
- Agencyinfo_fromSAP__c,
- Frist_Storage_Agency__c,
- Dealer_Info_text__c,
- Used_account__c,
- Transfer_Time__c,
- Frist_Transfer_Agency__c,
- Arrive_Owner_Work_Location__c,
- Agency_Transfer__c,
- //add by rentx 2020-10-14 start
- ContractNo_text__c /*,ContractNo__c*/,
- // tcm start
- Consumable_order_minor__r.ContractNo__c,
- // tcm end
- //add by rentx 2020-10-14 end
- Report_Product_Expiration__c,
- Intra_Trade_List__c
- FROM Consumable_order_details2__c
- WHERE
- Dealer_Arrive__c = TRUE
- AND (Dealer_Shipment__c = TRUE
- //AND Consumable_Shipment_order__r.SummonsForDirction__c != '浜掔浉璋冭揣')
- OR Dealer_Saled__c = TRUE
- // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 start
- OR (Dealer_Shipment__c = FALSE
- AND Dealer_Saled__c = FALSE
- AND Lose_Flag__c = TRUE))
- // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 end
- AND Dealer_Info_text__c = :accountName
- AND Bar_Code__c IN :GrListIn
- AND Product_Type__c LIKE :userPro_Typestr
- AND Dealer_Returned__c = FALSE
- AND (Arrive_Owner_Work_Location__c = :userWorkLocation
- OR OwnerId = :System.Label.User_OlympusSystem)
- ORDER BY Box_Piece__c DESC, Name
- ];
- ShowGoodsofReturnList = new List<ConsumableorderdetailsInfo>();
-
- //杩斿搧鏃秈stinct澶勭悊
- if (ArrType == 'ReG') {
- BarcodeRetrunResult = getDistinctZSOrder(BarcodeRetrunResult);
- }
-
- for (Consumable_order_details2__c codc : BarcodeRetrunResult) {
- if (
- ErrorIdMap.containsKey(codc.Bar_Code__c) ||
- ExistIdMap.containsKey(codc.Bar_Code__c)
- ) {
- // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
- continue;
- } else {
- Matcher n = Pattern.compile('[0-9]').matcher(codc.TracingCode__c);
- if (n.find()) {
- // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 start
- if (codc.TracingCode__c.length() == 5) {
- String tr = codc.TracingCode__c;
- String Ctr = tr.substring(tr.length() - 3, tr.length());
- String Btr = tr.substring(tr.length() - 4, tr.length() - 3);
- String Atr = tr.substring(tr.length() - 5, tr.length() - 4);
- if (
- Pattern.compile('[0-9]').matcher(Atr).find() ||
- Pattern.compile('[0-9]').matcher(Ctr).find()
- ) {
- String str = '绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�';
- ConsumableorderdetailsRecordserror.add(
- new ConsumableorderdetailsInfo(codc, str)
- );
- ErrorIdMap.put(codc.Bar_Code__c, codc.Bar_Code__c);
- continue;
- }
- }
- // String str = '绠＄悊缂栫爜涓湁鏁板瓧锛岃涓庣鐞嗗憳纭鏄惁閿欒銆�';
- // ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(codc,str));
- // ErrorIdMap.put(codc.Bar_Code__c,codc.Bar_Code__c);
- // continue;
- // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 end
- }
- if (CheckBarcodeResult.containsKey(codc.Bar_Code__c)) {
- GrList.add(codc.Bar_Code__c);
- if (codc.Dealer_Shipment__c == true) {
- CheckBarcodeResult.put(codc.Bar_Code__c, '宸插嚭搴�');
- ShowGoodsofReturnList.add(new ConsumableorderdetailsInfo(codc));
- }
- // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 start
- // else{
- // CheckBarcodeResult.put( codc.Bar_Code__c, '宸查攢鍞�');
- // ShowGoodsofReturnList.add( new ConsumableorderdetailsInfo( codc ) );
- // }
- else if (codc.Dealer_Saled__c == true) {
- CheckBarcodeResult.put(codc.Bar_Code__c, '宸查攢鍞�');
- ShowGoodsofReturnList.add(new ConsumableorderdetailsInfo(codc));
- } else {
- CheckBarcodeResult.put(codc.Bar_Code__c, '宸蹭涪澶�');
- ShowGoodsofReturnList.add(new ConsumableorderdetailsInfo(codc));
- }
- // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 end
- } else {
- continue;
- }
- }
- }
-
- return BarcodeRetrunResult.size();
- }
-
- // 鍗曚綅涓轰釜鐨凚arcode瀵瑰簲鐨勫嚭搴撳崟
- public integer Getconsumableorderdetails2Nobox() {
- consumableorderdetails2Nobox = new List<Consumable_order_details2__c>();
- BarcodeCntMap.clear();
- consumableorderdetails2Nobox = [
- SELECT
- Id,
- Consumable_order_minor__c,
- Deliver_date__c,
- Asset_Model_No__c,
- Consumable_Product__c,
- Consumable_Product__r.Name,
- Consumable_Product__r.Name__c,
- Name,
- Bar_Code__c,
- Arrive_date__c,
- Dealer_Shipment__c,
- Dealer_Saled__c,
- Return_reason__c,
- Consumable_Shipment_order__c,
- Send_date__c,
- Consumable_Sale_order__c,
- Used_date__c,
- SerialLotNo__c,
- TracingCode__c,
- Sterilization_limit__c,
- Consumable_ZS_order__c,
- Consumable_ZS_order__r.Name,
- Product_OutDate__c,
- Invoice_Date__c,
- recordtypeid,
- Consumable_Arrived_order__c,
- Box_Piece__c,
- RemoveBox_No__c,
- RemoveBox_date__c,
- Rrturn_count__c,
- Dealer_Info_text__c,
- Arrive_Owner_Work_Location__c,
- Intra_Trade_List_RMB__c,
- //add by rentx 2020-10-13 start 杩斿搧鏃� 鏂版暟鎹褰昐AP鍚堝悓鍙�
- ContractNo_text__c /*,ContractNo__c*/,
- // tcm start
- Consumable_order_minor__r.ContractNo__c,
- // tcm end
- Report_Product_Expiration__c,
- //add by rentx 2020-10-13 end
- Intra_Trade_List__c
- //gzw 鎵嬪姩鍏ュ簱 榛樿浜у搧鍗曚环 20230307
- FROM Consumable_order_details2__c
- WHERE
- // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 start
- // (Dealer_Shipment__c = true or Dealer_Saled__c = true)
- (Dealer_Shipment__c = TRUE
- OR Dealer_Saled__c = TRUE
- OR (Dealer_Shipment__c = FALSE
- AND Dealer_Saled__c = FALSE
- AND Lose_Flag__c = TRUE))
- // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 end
- AND Dealer_Info_text__c = :accountName
- AND Bar_Code__c IN :noboxBarcodeList
- AND Arrive_Owner_Work_Location__c = :userWorkLocation
- AND Dealer_Returned__c = FALSE
- AND Box_Piece__c = '涓�'
- ORDER BY Consumable_ZS_order__c, RemoveBox_No__c
- ];
-
- AggregateResult[] results = [
- SELECT Consumable_ZS_order__c, Bar_Code__c, count(Id) recordCount
- FROM Consumable_order_details2__c
- WHERE
- Dealer_Arrive__c = TRUE
- // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 start
- // AND (Dealer_Shipment__c= true OR Dealer_Saled__c = true)
- AND (Dealer_Shipment__c = TRUE
- OR Dealer_Saled__c = TRUE
- OR (Dealer_Shipment__c = FALSE
- AND Dealer_Saled__c = FALSE
- AND Lose_Flag__c = TRUE))
- // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 end
- AND Dealer_Returned__c = FALSE
- AND Bar_Code__c IN :noboxBarcodeList
- AND Arrive_Owner_Work_Location__c = :userWorkLocation
- AND Box_Piece__c = '涓�'
- AND Dealer_Info_text__c = :accountName
- GROUP BY Consumable_ZS_order__c, Bar_Code__c
- ];
-
- for (AggregateResult ar : results) {
- String key =
- '' +
- ar.get('Consumable_ZS_order__c') +
- ar.get('Bar_Code__c');
- BarcodeCntMap.put(key, Integer.valueOf(ar.get('recordCount')));
- }
-
- return consumableorderdetails2Nobox.size();
- }
-
- //distinct
- public List<Consumable_order_details2__c> getDistinctZSOrder(
- List<Consumable_order_details2__c> duplicates
- ) {
- List<Consumable_order_details2__c> distinctOrder = new List<Consumable_order_details2__c>();
-
- for (Consumable_order_details2__c details2 : duplicates) {
- Boolean found = false;
- for (Consumable_order_details2__c result : distinctOrder) {
- if (
- details2.Consumable_ZS_order__c == result.Consumable_ZS_order__c &&
- details2.Bar_Code__c == result.Bar_Code__c
- ) {
- found = true;
- break;
- }
- }
-
- if (!found) {
- distinctOrder.add(details2);
-
- if (details2.Box_Piece__c == '涓�')
- noboxBarcodeList.add(details2.Bar_Code__c);
- }
- }
- return distinctOrder;
- }
-
- // Update杩斿搧鏄庣粏淇℃伅
- public Pagereference UpdateGoodsOfReturn() {
- if (ShowGoodsofReturnList == null) {
- GoodsReturnCheck();
- }
- Getconsumableorderdetails2Nobox();
-
- Savepoint sp = Database.setSavepoint();
- boolean hasReturnGoods = false;
- boolean hasLoseGoods = false;
- try {
- if (ShowGoodsofReturnList.size() > 0 || consumableInventory.size() > 0) {
- Consumable_order__c Return_Order_Sheet = new Consumable_order__c();
- Return_Order_Sheet.Name = '*';
- Return_Order_Sheet.Order_status__c = '鎵瑰噯';
- Return_Order_Sheet.ReturnGs_Uploader_ID__c = UserInfo.getUserId();
- Return_Order_Sheet.ReturnGs_Upload_Date__c = Date.today();
- Return_Order_Sheet.Order_type__c = '杩斿搧';
- Return_Order_Sheet.RecordTypeid = System.Label.Dealer_Returned_Label;
- Return_Order_Sheet.Order_ProType__c = userPro_Type;
- insert Return_Order_Sheet;
- return_Order_id = Return_Order_Sheet.id;
- List<Consumable_order__c> consumable_order_ret = [
- SELECT Name
- FROM Consumable_order__c
- WHERE id = :Return_Order_Sheet.id
- ];
-
- //2017-07-03 鍒拌揣璁㈠崟
- Consumable_order__c Arrived_Order_Sheet = new Consumable_order__c();
- Arrived_Order_Sheet.Name = '*';
- Arrived_Order_Sheet.Order_status__c = '鎵瑰噯';
- Arrived_Order_Sheet.Order_type__c = '鍒拌揣';
- Arrived_Order_Sheet.Dealer_Info__c = accountid;
- Arrived_Order_Sheet.RecordTypeid = System.Label.RT_ConOrder_Arrive;
- Arrived_Order_Sheet.Order_ProType__c = userPro_Type;
- insert Arrived_Order_Sheet;
- List<Consumable_order__c> consumable_order_arr = [
- SELECT Name
- FROM Consumable_order__c
- WHERE id = :Arrived_Order_Sheet.id
- ];
-
- // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 start
- // 铏氭嫙鐩樼偣鍗�
- Consumable_order__c Inventory_Order_Sheet = new Consumable_order__c();
- Inventory_Order_Sheet.Name = '*';
- Inventory_Order_Sheet.Order_status__c = '鎵瑰噯';
- Inventory_Order_Sheet.ReturnGs_Uploader_ID__c = UserInfo.getUserId();
- Inventory_Order_Sheet.Inventory_date__c = Date.today();
- Inventory_Order_Sheet.Dealer_Info__c = accountid;
- Inventory_Order_Sheet.ReturnGs_Upload_Date__c = Date.today();
- Inventory_Order_Sheet.Order_type__c = '鐩樼偣';
- Inventory_Order_Sheet.RecordTypeid = System.Label.RT_ConOrder_Inventory;
- Inventory_Order_Sheet.Order_ProType__c = userPro_Type;
- insert Inventory_Order_Sheet;
- inventory_Order_id = Inventory_Order_Sheet.id;
- List<Consumable_order__c> consumable_order_Inv = [
- SELECT Name
- FROM Consumable_order__c
- WHERE id = :Inventory_Order_Sheet.id
- ];
- // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 end
-
- List<Consumable_order_details2__c> codcList = new List<Consumable_order_details2__c>();
- //鏂拌杩斿搧瀵瑰簲鐨勪骇鍝佹槑缁�
- List<Consumable_order_details2__c> codcorderdetList = new List<Consumable_order_details2__c>();
- //杩斿搧鍘熷洜,杩斿搧鏁伴噺妫�鏌�
- for (ConsumableorderdetailsInfo codi : ShowGoodsofReturnList) {
- if (
- codi.esd.Box_Piece__c == '涓�' &&
- (codi.esd.Rrturn_count__c == null ||
- String.valueof(codi.esd.Rrturn_count__c) == '' ||
- codi.esd.Rrturn_count__c <= 0)
- ) {
- continue;
- }
-
- if (
- codi.esd.Return_reason__c == null ||
- codi.esd.Return_reason__c == ''
- ) {
- if (isLwc) {
- returnError = '璇疯ˉ鍏呰繑鍝佸師鍥�';
- } else {
- codi.esd.Return_reason__c.addError('璇疯ˉ鍏呰繑鍝佸師鍥�');
+ if(isLwc){
+ returnError = '涓嶅瓨鍦ㄥ埌璐ф槑缁�';
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'涓嶅瓨鍦ㄥ埌璐ф槑缁�'));
}
return null;
- }
-
- if (codi.esd.Box_Piece__c == '涓�' && codi.esd.Rrturn_count__c > 0) {
- String key =
- '' +
- codi.esd.Consumable_ZS_order__c +
- codi.esd.Bar_Code__c;
- Integer deliverycnt = BarcodeCntMap.get(key);
- if (codi.esd.Rrturn_count__c > deliverycnt) {
- if (isLwc) {
- returnError = '瓒呭嚭鍑哄簱鏁伴噺';
- } else {
- codi.esd.Rrturn_count__c.addError('瓒呭嚭鍑哄簱鏁伴噺');
- }
- return null;
- }
- }
}
-
- Integer tempNo = 0;
- // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 start
- List<Consumable_order_details2__c> conOrderDetail2InList = new List<Consumable_order_details2__c>();
- // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 start
- for (ConsumableorderdetailsInfo codi : ShowGoodsofReturnList) {
- Consumable_order_details2__c codcorderdet = new Consumable_order_details2__c();
-
- //鍗曚綅=涓�
- if (
- codi.esd.Box_Piece__c == '涓�' &&
- (codi.esd.Rrturn_count__c == null ||
- String.valueof(codi.esd.Rrturn_count__c) == '' ||
- codi.esd.Rrturn_count__c <= 0)
- ) {
- continue;
- }
-
- if (codi.esd.Box_Piece__c == '涓�' && codi.esd.Rrturn_count__c > 0) {
- hasReturnGoods = true;
-
- Integer cnt = 1;
- for (
- Consumable_order_details2__c codctmp : consumableorderdetails2Nobox
- ) {
- if (
- codctmp.Consumable_ZS_order__c ==
- codi.esd.Consumable_ZS_order__c &&
- codctmp.Bar_Code__c == codi.esd.Bar_Code__c
- ) {
- Consumable_order_details2__c esd = codctmp;
- // esd.Consumable_Return_order__c = Return_Order_Sheet.id;
- esd.Return_reason__c = codi.esd.Return_reason__c;
- esd.Return_date__c = Date.today();
- // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 start
- // esd.Return_reason__c = codi.esd.Return_reason__c;
- // esd.Return_date__c = Date.today();
- // esd.Consumable_Return_order__c = Return_Order_Sheet.id;
- if (
- codi.esd.Dealer_Saled__c == false &&
- codi.esd.Dealer_Shipment__c == false &&
- codi.esd.Lose_Flag__c == true
- ) {
- // esd.Lose_Flag__c = false;
- esd.Consumable_Inventory_order__c = Inventory_Order_Sheet.id;
- conOrderDetail2InList.add(esd);
- hasLoseGoods = true;
- } else {
- // esd.Return_date__c = Date.today();
- esd.Consumable_Return_order__c = Return_Order_Sheet.id;
+ if(EsetId != null && EsetId != ''){
+ resultcheck = ConfimResult();
+ if(resultcheck.length() > 0){
+ for(String widget : overOrderBARcodeCunMap.keySet()) {
+ if(overOrderBARcodeCunMap.get(widget).size() >0){
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ warningList.add('浜у搧' + widget + '鏈鍒拌揣鏁伴噺瓒呰繃' + overOrderBARcodeCunMap.get(widget).size() +'涓璐х殑鏁伴噺銆�');
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO, '浜у搧' + widget + '鏈鍒拌揣鏁伴噺瓒呰繃' + overOrderBARcodeCunMap.get(widget).size() +'涓璐х殑鏁伴噺銆�'));
+ }
+ for(String barcodeListTTT : (List<String>)overOrderBARcodeCunMap.get(widget)) {
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ warningList.add(barcodeListTTT);
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO, barcodeListTTT));
+ }
+ }
+ }
}
- // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 end
- esd.ReturnGs_Uploader_ID__c = UserInfo.getUserId();
+ }
+ }else{
+ confimResultWithoutOrder();
+ }
+ try{
+ Consumable_order__c orderMain = new Consumable_order__c();
+ List<Consumable_order_details2__c> orderdetails = New List<Consumable_order_details2__c>();
+ //鍒拌揣姝ｇ‘淇℃伅
+ orderMain.Name = '*';
+ orderMain.Order_status__c = '鎵瑰噯';
+ orderMain.Dealer_Info__c = accountid;
+ orderMain.Deliver_date__c = Date.today();
+ orderMain.Order_date__c = Date.today();
+ orderMain.Order_type__c = '鍒拌揣';
+ orderMain.Order_ProType__c = userPro_Type;
+ if(EsetId != null && EsetId != ''){
+ orderMain.Arrive_Order__c = coc.Id;
+ }
+ orderMain.RecordTypeid = System.Label.RT_ConOrder_Arrive;
+ insert orderMain;
- //淇敼杩斿搧鎵�鏈変汉
- esd.OwnerId = UserInfo.getUserId();
- esd.RecordTypeId = System.Label.RT_ConOrderDetail2_Return;
-
- //Consumable_order__c coc = [select name from Consumable_order__c where Id =:Arrived_Order_Sheet.id];
- codcorderdet = new Consumable_order_details2__c();
- codcorderdet.Name =
- consumable_order_arr[0].name +
- '-' +
- String.valueOf(++tempNo).leftPad(4, '0');
- codcorderdet.Consumable_order_minor__c = codi.esd.Consumable_order_minor__c;
- codcorderdet.Consumable_Arrived_order__c = Arrived_Order_Sheet.id;
- //淇敼鍒拌揣鎵�鏈変汉
- codcorderdet.OwnerId = UserInfo.getUserId();
- codcorderdet.Arrive_date__c = Date.today();
- codcorderdet.Consumable_Product__c = codi.esd.Consumable_Product__c;
- codcorderdet.Asset_Model_No__c = codi.esd.Asset_Model_No__c;
- codcorderdet.Bar_Code__c = codi.esd.Bar_Code__c;
- codcorderdet.Deliver_date__c = codi.esd.Deliver_date__c;
- codcorderdet.SerialLotNo__c = codi.esd.SerialLotNo__c;
- codcorderdet.TracingCode__c = codi.esd.TracingCode__c;
- codcorderdet.Sterilization_limit__c = codi.esd.Sterilization_limit__c;
+ List<Consumable_order__c> consumable_order = [SELECT Name FROM Consumable_order__c WHERE id =:orderMain.id];
+ arriveId = orderMain.id;
+ Decimal arriveAmount =0;
+ for (ConsumableorderdetailsInfo ass : consumableorderdetailsRecordsUse) {
+ //ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'------1------'));
+ Consumable_order_details2__c insDetails = new Consumable_order_details2__c();
+ insDetails.Id = ass.esd.Id;
+ insDetails.Consumable_Arrived_order__c = orderMain.id;
+ insDetails.Arrive_date__c = Date.today();
+ insDetails.Bar_Code__c = ass.esd.Bar_Code__c;
+ insDetails.OwnerId = UserInfo.getUserId();
+ // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 start
+ if (orderdetails2trMap.containsKey(ass.esd.Bar_Code__c)) {
+ insDetails.Transfer_Time__c = ass.esd.Transfer_Time__c == null ? 1 : ass.esd.Transfer_Time__c;
+ insDetails.Agency_Transfer__c = true;
+ insDetails.Frist_Transfer_Agency__c = ass.esd.Frist_Transfer_Agency__c == null ? ass.esd.Dealer_Info_text__c : ass.esd.Frist_Transfer_Agency__c;
+ }
+ // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 end
+
+ // 杩藉姞棣栨鍏ュ簱缁忛攢鍟� add by gzw 2020-04-27 start
+ insDetails.Agencyinfo_fromSAP__c = ass.esd.Agencyinfo_fromSAP__c;
+ insDetails.Frist_Storage_Agency__c = ass.esd.Frist_Storage_Agency__c == null ? ass.esd.Dealer_Info_text__c : ass.esd.Frist_Storage_Agency__c;
+ // 杩藉姞棣栨鍏ュ簱缁忛攢鍟� add by gzw 2020-04-27 end
+ arriveAmount += ass.esd.Intra_Trade_List_RMB__c;
+ orderdetails.add(insDetails);
+ }
+ Integer i = 1;
+ for(ConsumableorderdetailsInfo ass : consumableInventoryUse){
+ //ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'------2------'));
+ Consumable_order_details2__c insAfterDel = new Consumable_order_details2__c();
+ String str = ('000' + i).right(4);
+ // if(str.length() == 1){
+ // str = '0' + str;
+ // }
+ insAfterDel.Name = consumable_order[0].Name + '-'+ str;
+ insAfterDel.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
+ // gzw 鎵嬪姩鍏ュ簱 榛樿浜у搧鍗曚环 20230307
+ // if(EsetId != null && EsetId != ''){
+ // insAfterDel.Intra_Trade_List_RMB__c = ass.Prod.Intra_Trade_List_RMB__c;
+ // }else{
+ // insAfterDel.Intra_Trade_List_RMB__c = 0;
+ // }
+ insAfterDel.Intra_Trade_List_RMB__c = ass.Prod.Intra_Trade_List_RMB__c;
//gzw 鎵嬪姩鍏ュ簱 榛樿浜у搧鍗曚环 20230307
- codcorderdet.Intra_Trade_List_RMB__c = (codi.esd.Intra_Trade_List_RMB__c ==
- null ||
- codi.esd.Intra_Trade_List_RMB__c == 0)
- ? codi.esd.Intra_Trade_List__c
- : codi.esd.Intra_Trade_List_RMB__c;
- codcorderdet.RemoveBox_No__c = codctmp.RemoveBox_No__c;
- codcorderdet.RemoveBox_date__c = codctmp.RemoveBox_date__c;
- codcorderdet.Box_Piece__c = codctmp.Box_Piece__c;
+ insAfterDel.Asset_Model_No__c = ass.Prod.Asset_Model_No__c;
+ if(EsetId != null && EsetId != ''){
+ insAfterDel.Consumable_order_minor__c = ESetId;
+ }
+ insAfterDel.Deliver_date__c = Date.today();
+ insAfterDel.Direct_Arrive_Product__c = true;
+ //TODO寰呯‘璁�
+ insAfterDel.Sterilization_limit__c = ass.sterilizationlimitDate;
+ insAfterDel.Consumable_Product__c = ass.Prod.id;
+ insAfterDel.Bar_Code__c = ass.barCodeNo;
+ insAfterDel.Used_account__c = accountid;
+ //TODO寰呯‘璁�
+ insAfterDel.SerialLotNo__c = ass.serialNoorLotNo;
+ insAfterDel.TracingCode__c = ass.tracingCodeNo;
- //add by rentx 2020-10-13 start 杩斿搧鏃舵柊鏁版嵁璁板綍SAP鍚堝悓鍙�
- // codcorderdet.ContractNo_text__c= codctmp.ContractNo__c;
+ //insAfterDel.Dealer_Arrive__c = true;
+ insAfterDel.Consumable_Arrived_order__c = orderMain.id;
+ insAfterDel.Arrive_date__c = Date.today();
+ insAfterDel.OwnerId = UserInfo.getUserId();
+ // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 start
+ if (orderdetails2trMap.containsKey(ass.esd.Bar_Code__c)) {
+ insAfterDel.Transfer_Time__c = ass.esd.Transfer_Time__c == null ? 1 : ass.esd.Transfer_Time__c;
+ insAfterDel.Agency_Transfer__c = true;
+ insAfterDel.Frist_Transfer_Agency__c = ass.esd.Frist_Transfer_Agency__c == null ? accountName : ass.esd.Frist_Transfer_Agency__c;
+ }
+ // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 end
+
+ // 杩藉姞棣栨鍏ュ簱缁忛攢鍟� add by gzw 2020-04-27 start
+ insAfterDel.Agencyinfo_fromSAP__c = ass.esd.Agencyinfo_fromSAP__c;
+ insAfterDel.Frist_Storage_Agency__c = ass.esd.Frist_Storage_Agency__c == null ? accountName : ass.esd.Frist_Storage_Agency__c;
+ // 杩藉姞棣栨鍏ュ簱缁忛攢鍟� add by gzw 2020-04-27 end
+ arriveAmount += insAfterDel.Intra_Trade_List_RMB__c;
+ //add by rentx 2020-10-14 strat
+ //insAfterDel.ContractNo_text__c = /*ass.esd.ContractNo__c*/;
// tcm start
- if (
- String.isBlank(
- codctmp.Consumable_order_minor__r.ContractNo__c
- )
- ) {
- codcorderdet.ContractNo_text__c = codctmp.ContractNo_text__c;
- } else {
- codcorderdet.ContractNo_text__c = codctmp.Consumable_order_minor__r.ContractNo__c;
+ if (String.isBlank(ass.esd.Consumable_order_minor__r.ContractNo__c)) {
+ insAfterDel.ContractNo_text__c= ass.esd.ContractNo_text__c;
+ }else {
+ insAfterDel.ContractNo_text__c= ass.esd.Consumable_order_minor__r.ContractNo__c;
}
// tcm end
- //add by rentx 2020-10-13 end 杩斿搧鏃舵柊鏁版嵁璁板綍SAP鍚堝悓鍙�
+ //add by rentx 2020-10-14 end
+ i++;
- // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 start
- if (hasLoseGoods) {
- codcorderdet.loseInventory__c = true;
+ ins.add(insAfterDel);
+
+ }
+ orderMain.Arrive_total_amount__c = arriveAmount;
+ update orderMain;
+ List<Consumable_order_details2__c> updateconsumableorderdetails2 = new List<Consumable_order_details2__c>();
+ //鏇存柊鏄庣粏鍙栨秷鏃堕棿 => 鏈埌璐у彇娑堬紝鍒拌揣鑷姩鐢熸垚鍑哄簱娴佺▼
+ List<Consumable_order_details2__c> addSaleOrderList = new List<Consumable_order_details2__c> ();
+ for(Consumable_order_details2__c Cod : consumableorderdetails2Cancle){
+ //ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'------3------'));
+ if (Cod.Dealer_Arrive__c) {
+ if (Cod.Dealer_Shipment__c == FALSE && Cod.Dealer_Saled__c == FALSE) {
+ addSaleOrderList.add(Cod);
+ }
+ } else {
+ Cod.Cancellation_Date__c = Date.today();
+ Cod.Cancellation_Flag__c = true;
+ updateconsumableorderdetails2.add(Cod);
}
- // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 end
+ }
+ if (addSaleOrderList.size() > 0) {
+ addSaleOrderAuto(addSaleOrderList);
+ }
+
+ if(updateconsumableorderdetails2.size() > 0){
+ update updateconsumableorderdetails2;
+ }
+
+ List<Consumable_order_details2__c> insertconsumableorderdetails2 = new List<Consumable_order_details2__c>();
+ for(Consumable_order_details2__c Cod2 : consumableorderdetails2Insert){
+ //ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'------4------'));
+ String str = ('000' + i).right(4);
+ // if(str.length() == 1){
+ // str = '0' + str;
+ // }
+ Cod2.Name = consumable_order[0].Name + '-'+ str;
+ Cod2.Consumable_order_minor__c = null;
+ Cod2.Deliver_date__c = Date.today();
+ Cod2.Used_account__c = accountid;
+ Cod2.Consumable_Arrived_order__c = orderMain.id;
+ Cod2.Arrive_date__c = Date.today();
+ // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 start
+ if (orderdetails2trMap.containsKey(Cod2.Bar_Code__c)) {
+ //ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'------4++++++' + Cod2.Frist_Storage_Agency__c));
+ Cod2.Transfer_Time__c = Cod2.Transfer_Time__c == null ? 1 : Cod2.Transfer_Time__c;
+ Cod2.Agency_Transfer__c = true;
+ Cod2.Frist_Transfer_Agency__c = Cod2.Frist_Transfer_Agency__c == null ? accountName : Cod2.Frist_Transfer_Agency__c;
+ }
+ // 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 end
+
// 杩藉姞棣栨鍏ュ簱缁忛攢鍟� add by gzw 2020-04-27 start
- // 杩斿搧鏃讹紝鈶犺拷鍔犲�熻皟鍊熷嚭鏂逛俊鎭� 鈶′繚鐣欏�熻皟淇℃伅 鈶繚瀛楽AP鍜岀粡閿�鍟嗛娆″彂璐х粡閿�鍟�
- codcorderdet.Used_account__c = codi.esd.Used_account__c;
- codcorderdet.Transfer_Time__c = codi.esd.Transfer_Time__c;
- codcorderdet.Frist_Transfer_Agency__c = codi.esd.Frist_Transfer_Agency__c;
- codcorderdet.Agency_Transfer__c = codi.esd.Agency_Transfer__c;
-
- codcorderdet.Agencyinfo_fromSAP__c = codi.esd.Agencyinfo_fromSAP__c;
- //ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'------1------' + codi.esd.Frist_Storage_Agency__c));
- codcorderdet.Frist_Storage_Agency__c = codi.esd.Frist_Storage_Agency__c ==
- null
- ? codi.esd.Dealer_Info_text__c
- : codi.esd.Frist_Storage_Agency__c;
+ Cod2.Agencyinfo_fromSAP__c = Cod2.Agencyinfo_fromSAP__c;
+ //ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'------4------' + Cod2.Frist_Storage_Agency__c));
+ Cod2.Frist_Storage_Agency__c = Cod2.Frist_Storage_Agency__c == null ? accountName : Cod2.Frist_Storage_Agency__c;
// 杩藉姞棣栨鍏ュ簱缁忛攢鍟� add by gzw 2020-04-27 end
- codcorderdetList.add(codcorderdet);
- codcList.add(esd);
-
- cnt++;
- if (cnt > codi.esd.Rrturn_count__c)
- break;
- }
+ insertconsumableorderdetails2.add(Cod2);
+ i++;
}
- } else {
- hasReturnGoods = true;
- //鍗曚綅=鐩�
- //changeinvoiceInfo(codi.esd);
- //Consumable_order__c coc = [select name from Consumable_order__c where Id =:Arrived_Order_Sheet.id];
- // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 start
- codi.esd.Return_date__c = Date.today();
- // codi.esd.Consumable_Return_order__c = Return_Order_Sheet.id;
- if (
- codi.esd.Dealer_Saled__c == false &&
- codi.esd.Dealer_Shipment__c == false &&
- codi.esd.Lose_Flag__c == true
- ) {
- codi.esd.Lose_Flag__c = false;
- codi.esd.Return_reason__c = '';
- codi.esd.Consumable_Inventory_order__c = Inventory_Order_Sheet.id;
- conOrderDetail2InList.add(codi.esd);
- hasLoseGoods = true;
- } else {
- // codi.esd.Return_date__c = Date.today();
- codi.esd.Consumable_Return_order__c = Return_Order_Sheet.id;
+
+ //return null;
+
+ if(insertconsumableorderdetails2.size() >0){
+ insert insertconsumableorderdetails2;
}
- // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 end
- codi.esd.ReturnGs_Uploader_ID__c = UserInfo.getUserId();
- // codi.esd.Consumable_Return_order__c = Return_Order_Sheet.id;
- //淇敼杩斿搧鎵�鏈変汉
- codi.esd.OwnerId = UserInfo.getUserId();
- codi.esd.RecordTypeId = System.Label.RT_ConOrderDetail2_Return;
- codcorderdet.Name =
- consumable_order_arr[0].name +
- '-' +
- String.valueOf(++tempNo).leftPad(4, '0');
- codcorderdet.Consumable_order_minor__c = codi.esd.Consumable_order_minor__c;
- codcorderdet.Consumable_Arrived_order__c = Arrived_Order_Sheet.id;
- //淇敼鍒拌揣鎵�鏈変汉
- codcorderdet.OwnerId = UserInfo.getUserId();
- codcorderdet.Arrive_date__c = Date.today();
- codcorderdet.Consumable_Product__c = codi.esd.Consumable_Product__c;
- codcorderdet.Asset_Model_No__c = codi.esd.Asset_Model_No__c;
- codcorderdet.Bar_Code__c = codi.esd.Bar_Code__c;
- codcorderdet.Deliver_date__c = codi.esd.Deliver_date__c;
- codcorderdet.SerialLotNo__c = codi.esd.SerialLotNo__c;
- codcorderdet.TracingCode__c = codi.esd.TracingCode__c;
- codcorderdet.Sterilization_limit__c = codi.esd.Sterilization_limit__c;
- //gzw 鎵嬪姩鍏ュ簱 榛樿浜у搧鍗曚环 20230307
- codcorderdet.Intra_Trade_List_RMB__c = (codi.esd.Intra_Trade_List_RMB__c ==
- null ||
- codi.esd.Intra_Trade_List_RMB__c == 0)
- ? codi.esd.Intra_Trade_List__c
- : codi.esd.Intra_Trade_List_RMB__c;
- // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 start
- if (hasLoseGoods) {
- codcorderdet.loseInventory__c = true;
+
+ if(ins.size()>0){
+ insert ins;
}
- // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 end
- // 杩藉姞棣栨鍏ュ簱缁忛攢鍟� add by gzw 2020-04-27 start
- // 杩斿搧鏃讹紝鈶犺拷鍔犲�熻皟鍊熷嚭鏂逛俊鎭� 鈶′繚鐣欏�熻皟淇℃伅 鈶繚瀛楽AP鍜岀粡閿�鍟嗛娆″彂璐х粡閿�鍟�
- codcorderdet.Used_account__c = codi.esd.Used_account__c;
- codcorderdet.Transfer_Time__c = codi.esd.Transfer_Time__c;
- codcorderdet.Frist_Transfer_Agency__c = codi.esd.Frist_Transfer_Agency__c;
- codcorderdet.Agency_Transfer__c = codi.esd.Agency_Transfer__c;
-
- codcorderdet.Agencyinfo_fromSAP__c = codi.esd.Agencyinfo_fromSAP__c;
- //ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'------2------' + codi.esd.Frist_Storage_Agency__c));
- codcorderdet.Frist_Storage_Agency__c = codi.esd.Frist_Storage_Agency__c ==
- null
- ? codi.esd.Dealer_Info_text__c
- : codi.esd.Frist_Storage_Agency__c;
- // 杩藉姞棣栨鍏ュ簱缁忛攢鍟� add by gzw 2020-04-27 end
-
- //add by rentx 2020-10-13 start 杩斿搧鏃舵柊鏁版嵁璁板綍SAP鍚堝悓鍙�
- // codcorderdet.ContractNo_text__c = /*codi.esd.ContractNo__c*/;
- // tcm start
- if (
- String.isBlank(codi.esd.Consumable_order_minor__r.ContractNo__c)
- ) {
- codcorderdet.ContractNo_text__c = codi.esd.ContractNo_text__c;
- } else {
- codcorderdet.ContractNo_text__c = codi.esd.Consumable_order_minor__r.ContractNo__c;
+ if(orderdetails.size()>0){
+ ControllerUtil.updateOrderDetailsSatus(orderdetails);
}
- // tcm end
- //add by rentx 2020-10-13 end 杩斿搧鏃舵柊鏁版嵁璁板綍SAP鍚堝悓鍙�
-
- codcorderdetList.add(codcorderdet);
- codcList.add(codi.esd);
- }
- }
-
- //鏄庣粏2涓嶅瓨鍦ㄧ殑瀵瑰簲鐨勫埌璐ц鍗曟槑缁� 2017-07-05
- Integer i = 1;
- //for(ConsumableorderdetailsInfo ass : consumableInventoryUse){
- for (ConsumableorderdetailsInfo ass : consumableInventory) {
- hasReturnGoods = true;
- Consumable_order_details2__c codcorderdetail = new Consumable_order_details2__c();
- Consumable_order_details2__c retorddetail = new Consumable_order_details2__c();
- String str = ('000' + i).right(4);
- // if(str.length() == 1){
- // str = '0' + str;
- // }
-
- if (ass.ReturnReason == null || ass.ReturnReason == '') {
+ //瓒呭嚭鍒拌揣鏁伴噺浜у搧鍙栨秷鏃ユ湡鏇存柊
+ List<Consumable_order_details2__c> needcanceldet = new List<Consumable_order_details2__c>();
+ if(cancellationProList.size() > 0){
+ needcanceldet = [SELECT Id,
+ Cancellation_Date__c
+ FROM Consumable_order_details2__c
+ WHERE Asset_Model_No__c in :cancellationProList
+ AND Consumable_order_minor__c = :ESetId
+ AND Dealer_Arrive__c = FALSE
+ AND Cancellation_Date__c = null ];
+ if(needcanceldet.size() >0){
+ for(Integer a = 0; a < needcanceldet.size(); a++){
+ needcanceldet[a].Cancellation_Date__c = Date.today();
+ needcanceldet[a].Cancellation_Flag__c = true;
+ }
+ ControllerUtil.updateOrderDetailsSatus(needcanceldet);
+ }
+ }
+ List<Consumable_order__c> qs = New List<Consumable_order__c>();
+ qs = [SELECT Id,Name,Order_status__c,Dealer_Info__c,Deliver_date__c,ReturnGs_Upload_Date__c,
+ Order_Reason__c,Order_date__c,
+ Contract_application_decision__c,Order_type__c,Total_num__c,
+ OrderNumber_arrived__c,Delivery_detail_count__c,OrderNumber_notarrive__c
+ FROM Consumable_order__c
+ WHERE Id =:ESetId
+ AND Dealer_Info__c = :accountid];
+ if (qs.size()>0){
+ coc = qs[0];
+ }
+ saveFLGbln = true;
+ alertMessage = '鍒拌揣瀹屾垚銆�';
+ // Integer a = 1/0;
+ }catch(Exception e){
+ Database.rollback(sp);
//LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- returnError = '璇疯ˉ鍏呰繑鍝佸師鍥�';
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '璇疯ˉ鍏呰繑鍝佸師鍥�'
- )
- );
+ if(isLwc){
+ returnError = e.getLineNumber()+'---'+e.getMessage();
+ }else {
+ ApexPages.addMessages(e);
}
return null;
- }
-
- //鍒拌揣鏄庣粏
- codcorderdetail.Name = consumable_order_arr[0].Name + '-' + str;
- codcorderdetail.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
- codcorderdetail.Intra_Trade_List_RMB__c = ass.Prod.Intra_Trade_List_RMB__c;
- //gzw 鎵嬪姩鍏ュ簱 榛樿浜у搧鍗曚环 20230307
- codcorderdetail.Asset_Model_No__c = ass.Prod.Asset_Model_No__c;
- codcorderdetail.Direct_Arrive_Product__c = true;
- codcorderdetail.Sterilization_limit__c = ass.sterilizationlimitDate;
- codcorderdetail.Consumable_Product__c = ass.Prod.id;
- codcorderdetail.Bar_Code__c = ass.barCodeNo;
- codcorderdetail.SerialLotNo__c = ass.serialNoorLotNo;
- codcorderdetail.TracingCode__c = ass.tracingCodeNo;
- codcorderdetail.Consumable_Arrived_order__c = Arrived_Order_Sheet.id;
- codcorderdetail.Arrive_date__c = Date.today();
-
- //add by rentx 2020-10-14 start
- // codcorderdetail.ContractNo_text__c = /*ass.esd.ContractNo__c*/;
- // tcm start
- if (String.isBlank(ass.esd.Consumable_order_minor__r.ContractNo__c)) {
- codcorderdetail.ContractNo_text__c = ass.esd.ContractNo_text__c;
- } else {
- codcorderdetail.ContractNo_text__c = ass.esd.Consumable_order_minor__r.ContractNo__c;
- }
- // tcm end
- //add by rentx 2020-10-14 end
-
- codcorderdetList.add(codcorderdetail);
-
- //杩斿搧鏄庣粏
- retorddetail.Return_reason__c = ass.ReturnReason;
- retorddetail.Return_date__c = Date.today();
- retorddetail.ReturnGs_Uploader_ID__c = UserInfo.getUserId();
-
- // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 start
- // if(ass.esd.Dealer_Saled__c == false && ass.esd.Dealer_Shipment__c == false && ass.esd.Lose_Flag__c == true){
- // retorddetail.Consumable_Inventory_order__c = Inventory_Order_Sheet.id;
- // retorddetail.loseInventory__c = true;
- // }
- retorddetail.Consumable_Return_order__c = Return_Order_Sheet.id;
- // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 end
-
- retorddetail.Name = consumable_order_ret[0].Name + '-' + str;
- retorddetail.RecordTypeId = System.Label.RT_ConOrderDetail2_Return;
- retorddetail.Intra_Trade_List_RMB__c = ass.Prod.Intra_Trade_List_RMB__c;
- //gzw 鎵嬪姩鍏ュ簱 榛樿浜у搧鍗曚环 20230307
- retorddetail.Dealer_Info_IF__c = accountid;
- retorddetail.Asset_Model_No__c = ass.Prod.Asset_Model_No__c;
- retorddetail.Direct_Arrive_Product__c = true;
- retorddetail.Sterilization_limit__c = ass.sterilizationlimitDate;
- retorddetail.Consumable_Product__c = ass.Prod.id;
- retorddetail.Bar_Code__c = ass.barCodeNo;
- retorddetail.SerialLotNo__c = ass.serialNoorLotNo;
- retorddetail.TracingCode__c = ass.tracingCodeNo;
- retorddetail.Arrive_date__c = Date.today();
- retorddetail.Deliver_date__c = Date.today();
- // 杩藉姞棣栨鍏ュ簱缁忛攢鍟� add by gzw 2020-04-27 start
- retorddetail.Frist_Storage_Agency__c = accountName;
- // 杩藉姞棣栨鍏ュ簱缁忛攢鍟� add by gzw 2020-04-27 end
-
- //add by rentx 2020-10-14 start
- // retorddetail.ContractNo_text__c = /*ass.esd.ContractNo__c*/;
- // tcm start
- if (String.isBlank(ass.esd.Consumable_order_minor__r.ContractNo__c)) {
- retorddetail.ContractNo_text__c = ass.esd.ContractNo_text__c;
- } else {
- retorddetail.ContractNo_text__c = ass.esd.Consumable_order_minor__r.ContractNo__c;
- }
- // tcm end
- //add by rentx 2020-10-14 end
-
- codcorderdetList.add(retorddetail);
- i++;
}
-
- // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'------end------'));
- // return null;
-
- if (codcList.size() > 0) {
- ControllerUtil.updateOrderDetailsSatus(codcList);
- //insert codcorderdetList;
- }
- if (codcorderdetList.size() > 0) {
- System.debug('codcorderdetList +++++ ' + codcorderdetList);
- insert codcorderdetList;
- }
- // WYIN-BPE3T4 铏氭嫙鐩樼偣鍗� update by vivek 2020-05-11 start
- if (conOrderDetail2InList.size() > 0) {
- addInventoryDetails1(conOrderDetail2InList);
- }
- // WYIN-BPE3T4 铏氭嫙鐩樼偣鍗� update by vivek 2020-05-11 start
-
- if (hasReturnGoods) {
- // WYIN-BPE3T4 铏氭嫙鐩樼偣鍗� update by vivek 2020-05-11 start
- // return ToReturnGoodsPage();
- if (hasLoseGoods) {
- urlType = 'ToInventoryGoodsPage';
- return ToInventoryGoodsPage();
+ if(resultcheck.length() > 0){
+ return null;
+ }else if(resultcheckWithoutOrder.size() >0){
+ return null;
+ } else{
+ urlType = 'UnabletoEdit';
+ return UnabletoEdit();
// return null;
- } else {
- urlType = 'ToReturnGoodsPage';
- return ToReturnGoodsPage();
- // return null;
- }
- // WYIN-BPE3T4 铏氭嫙鐩樼偣鍗� update by vivek 2020-05-11 start
- } else {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- returnError = '娌℃湁闇�瑕佺櫥褰曠殑杩斿搧';
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '娌℃湁闇�瑕佺櫥褰曠殑杩斿搧'
- )
- );
- }
- return null;
}
- } else {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- returnError = '娌℃湁闇�瑕佺櫥褰曠殑杩斿搧';
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '娌℃湁闇�瑕佺櫥褰曠殑杩斿搧'
- )
- );
+ }
+
+ // 杩斿搧妫�鏌ワ紝鍚庡洖搴�
+ public integer GoodsReturnCheck(){
+ List<String> GrListIn = ParseBarCode( barcode );
+ GrList = new List<String>();
+ Map<String,String> CheckBarcodeResult = new Map<String,String>();
+ for( String Str : GrListIn ){
+ CheckBarcodeResult.put( str , 'UnFind');
}
- return null;
- }
- } catch (Exception e) {
- Database.rollback(sp);
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- returnError = e.getLineNumber() + '---' + e.getMessage();
- } else {
- ApexPages.addMessages(e);
- }
- return null;
- }
- }
-
- public void makeArrivedSummary() {
- detailsSummary = new List<ConsumableorderdetailsInfo>();
- //ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'consumableInventory ' + consumableInventory));
- try {
- ConsumableorderdetailsInfo arriveDdetailsSummary = null;
- Map<String, ConsumableorderdetailsInfo> detailsSummaryMap = new Map<String, ConsumableorderdetailsInfo>();
- for (ConsumableorderdetailsInfo ass : ConsumableorderdetailsRecords) {
- if (detailsSummaryMap.containsKey(ass.Prod.Id)) {
- detailsSummaryMap.get(ass.Prod.Id).arrivedCount++;
- detailsSummaryMap.get(ass.Prod.Id)
- .arriveAmount += ass.esd.Intra_Trade_List_RMB__c;
- } else {
- arriveDdetailsSummary = new ConsumableorderdetailsInfo(ass.Prod);
- arriveDdetailsSummary.arrivedCount = 1;
- arriveDdetailsSummary.arriveAmount = ass.esd.Intra_Trade_List_RMB__c;
- detailsSummaryMap.put(ass.Prod.Id, arriveDdetailsSummary);
+ List<Consumable_order_details2__c> BarcodeRetrunResult =
+ [ SELECT Id,Name,Intra_Trade_List_RMB__c,Asset_Model_No__c,
+ Consumable_Product__c,Consumable_Product__r.Name,
+ Consumable_Product__r.Name__c,Consumable_Product__r.Asset_Model_No__c,
+ Sterilization_limit__c,Deliver_date__c,Bar_Code__c,
+ Arrive_date__c,Send_Date__c,Consumable_order_minor__r.Name,
+ Consumable_order_minor__c,Dealer_Arrive__c,
+ Guarantee_period_for_products__c,CFDA_Status__c,
+ ProductPacking_list_manual__c,Report_Product_Approbation__c,
+ Report_Product_Expiration__c,Box_Piece__c, Rrturn_count__c,
+ Product_Type__c
+ //add by rentx 2020-10-14 start
+ ,ContractNo_text__c/*,ContractNo__c*/
+ // tcm start
+ ,Consumable_order_minor__r.ContractNo__c
+ // tcm end
+ //add by rentx 2020-10-14 end
+ FROM Consumable_order_details2__c
+ WHERE ((Dealer_Arrive__c = true
+ AND( Dealer_Shipment__c = true
+ //AND Consumable_Shipment_order__r.SummonsForDirction__c != '浜掔浉璋冭揣')
+ or Dealer_Saled__c = true
+ )
+ ))
+ AND Dealer_Info_text__c = :accountName
+ AND Bar_Code__c in :GrListIn
+ AND ( not Product_Type__c like :userPro_Typestr)
+ AND Dealer_Returned__c = false
+ AND Arrive_Owner_Work_Location__c =: userWorkLocation
+ ORDER BY Box_Piece__c desc,Name ];
+ if(BarcodeRetrunResult.size()>0){
+ for (Integer i = 0; i < BarcodeRetrunResult.size(); i++) {
+ if(ErrorIdMap.containsKey(BarcodeRetrunResult[i].Bar_Code__c) || ExistIdMap.containsKey(BarcodeRetrunResult[i].Bar_Code__c)){
+ // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
+ continue;
+ }else{
+ String str = '浜у搧绫诲瀷['+BarcodeRetrunResult[i].Product_Type__c+']涓庣敤鎴风殑绫诲瀷['+userPro_Type+']涓嶇';
+ ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(BarcodeRetrunResult[i],str));
+ ErrorIdMap.put(BarcodeRetrunResult[i].Bar_Code__c,BarcodeRetrunResult[i].Bar_Code__c);
+ }
+ }
}
- }
- for (ConsumableorderdetailsInfo ass : consumableInventory) {
- if (detailsSummaryMap.containsKey(ass.Prod.Id)) {
- detailsSummaryMap.get(ass.Prod.Id).arrivedCount++;
- if (EsetId != null && EsetId != '') {
- detailsSummaryMap.get(ass.Prod.Id)
- .arriveAmount += ass.Prod.Intra_Trade_List_RMB__c;
- } else {
- detailsSummaryMap.get(ass.Prod.Id).arriveAmount += 0;
- }
- } else {
- arriveDdetailsSummary = new ConsumableorderdetailsInfo(ass.Prod);
- arriveDdetailsSummary.arrivedCount = 1;
- if (EsetId != null && EsetId != '') {
- arriveDdetailsSummary.arriveAmount = ass.Prod.Intra_Trade_List_RMB__c;
- } else {
- arriveDdetailsSummary.arriveAmount = 0;
- }
- detailsSummaryMap.put(ass.Prod.Id, arriveDdetailsSummary);
+ AllMap.putAll(ErrorIdMap);
+ BarcodeRetrunResult =
+ [ SELECT Id,
+ Consumable_order_minor__c,
+ Deliver_date__c,
+ Asset_Model_No__c,
+ Consumable_Product__c,
+ Consumable_Product__r.Name,
+ Consumable_Product__r.Name__c,
+ Name,
+ Bar_Code__c,
+ Arrive_date__c,
+ Dealer_Shipment__c,
+ Lose_Flag__c,
+ Dealer_Saled__c,
+ Return_reason__c,
+ Consumable_Shipment_order__c,
+ Consumable_Shipment_order__r.Name,
+ Send_date__c,
+ Consumable_Sale_order__c,
+ Consumable_Sale_order__r.Name,
+ Used_date__c,
+ SerialLotNo__c,
+ TracingCode__c,
+ Sterilization_limit__c,
+ Consumable_ZS_order__c,
+ Consumable_ZS_order__r.Name,
+ Product_OutDate__c,
+ Invoice_Date__c,
+ recordtypeid,
+ Consumable_Arrived_order__c,
+ Box_Piece__c,
+ Rrturn_count__c,
+ Intra_Trade_List_RMB__c,
+ OwnerId,
+ SummonsForDirction_det__c,
+ Order_Dealer_Info__c,
+ HospItal_Name__c,
+ Agencyinfo_fromSAP__c,
+ Frist_Storage_Agency__c,
+ Dealer_Info_text__c,
+ Used_account__c,
+ Transfer_Time__c,
+ Frist_Transfer_Agency__c,
+ Arrive_Owner_Work_Location__c,
+ Agency_Transfer__c
+ //add by rentx 2020-10-14 start
+ ,ContractNo_text__c/*,ContractNo__c*/
+ // tcm start
+ ,Consumable_order_minor__r.ContractNo__c
+ // tcm end
+ //add by rentx 2020-10-14 end
+ ,Report_Product_Expiration__c
+ ,Intra_Trade_List__c
+ FROM Consumable_order_details2__c
+ WHERE ((Dealer_Arrive__c = true
+ AND( Dealer_Shipment__c = true
+ //AND Consumable_Shipment_order__r.SummonsForDirction__c != '浜掔浉璋冭揣')
+ or Dealer_Saled__c = true
+ // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 start
+ or (Dealer_Shipment__c = false and Dealer_Saled__c = false and Lose_Flag__c = true)
+ // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 end
+ )
+ ))
+ AND Dealer_Info_text__c = :accountName
+ AND Bar_Code__c in :GrListIn
+ AND Product_Type__c like :userPro_Typestr
+ AND Dealer_Returned__c = false
+ AND (Arrive_Owner_Work_Location__c =: userWorkLocation
+ OR OwnerId = :System.Label.User_OlympusSystem)
+ ORDER BY Box_Piece__c desc,Name ];
+ ShowGoodsofReturnList = new List<ConsumableorderdetailsInfo>();
+
+ //杩斿搧鏃秈stinct澶勭悊
+ if(ArrType=='ReG'){
+ BarcodeRetrunResult = getDistinctZSOrder(BarcodeRetrunResult);
}
- }
- for (String key : detailsSummaryMap.keySet()) {
- detailsSummary.add(detailsSummaryMap.get(key));
- }
- } catch (Exception e) {
- //Database.rollback(sp);
- throw new ControllerUtil.myException(
- 'e::' + e + ' linenumber::' + e.getLineNumber()
- );
- // ApexPages.addMessages(e);
- // ApexPages.addMessages(e.getLineNumber() + ' 11111111111111111');
- //return null;
- }
- }
+ for( Consumable_order_details2__c codc : BarcodeRetrunResult ){
+ if(ErrorIdMap.containsKey(codc.Bar_Code__c) || ExistIdMap.containsKey(codc.Bar_Code__c)){
+ // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
+ continue;
+ }else{
- //璺宠浆鍒拌繑鍝侀〉闈�
- public Pagereference ToReturnGoodsPage() {
- PageReference ref = new Pagereference('/' + return_Order_id);
- ref.setRedirect(true);
- return ref;
- }
+ Matcher n = Pattern.compile('[0-9]').matcher(codc.TracingCode__c);
+ if(n.find()){
+ // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 start
+ if (codc.TracingCode__c.length() == 5) {
+ String tr = codc.TracingCode__c;
+ String Ctr = tr.substring(tr.length() - 3,tr.length());
+ String Btr = tr.substring(tr.length() - 4,tr.length()-3);
+ String Atr = tr.substring(tr.length() - 5,tr.length()-4);
+ if (Pattern.compile('[0-9]').matcher(Atr).find() || Pattern.compile('[0-9]').matcher(Ctr).find()) {
+ String str = '绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�';
+ ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(codc,str));
+ ErrorIdMap.put(codc.Bar_Code__c,codc.Bar_Code__c);
+ continue;
+ }
+ }
+ // String str = '绠＄悊缂栫爜涓湁鏁板瓧锛岃涓庣鐞嗗憳纭鏄惁閿欒銆�';
+ // ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(codc,str));
+ // ErrorIdMap.put(codc.Bar_Code__c,codc.Bar_Code__c);
+ // continue;
+ // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 end
+ }
+ if( CheckBarcodeResult.containsKey( codc.Bar_Code__c )){
+ GrList.add(codc.Bar_Code__c);
+ if( codc.Dealer_Shipment__c == true){
+ CheckBarcodeResult.put( codc.Bar_Code__c, '宸插嚭搴�' );
+ ShowGoodsofReturnList.add( new ConsumableorderdetailsInfo( codc ) );
+ }
+ // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 start
+ // else{
+ // CheckBarcodeResult.put( codc.Bar_Code__c, '宸查攢鍞�');
+ // ShowGoodsofReturnList.add( new ConsumableorderdetailsInfo( codc ) );
+ // }
+ else if( codc.Dealer_Saled__c == true ){
+ CheckBarcodeResult.put( codc.Bar_Code__c, '宸查攢鍞�');
+ ShowGoodsofReturnList.add( new ConsumableorderdetailsInfo( codc ) );
+ }else{
+ CheckBarcodeResult.put( codc.Bar_Code__c, '宸蹭涪澶�');
+ ShowGoodsofReturnList.add( new ConsumableorderdetailsInfo( codc ) );
+ }
+ // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 end
+ }else{
+ continue;
+ }
+ }
+ }
- // WYIN-BPE3T4 铏氭嫙鐩樼偣鍗� update by vivek 2020-05-11 start
- public Pagereference ToInventoryGoodsPage() {
- PageReference ref = new Pagereference('/' + inventory_Order_id);
- ref.setRedirect(true);
- return ref;
- }
- // WYIN-BPE3T4 铏氭嫙鐩樼偣鍗� update by vivek 2020-05-11 end
-
- // 璺宠浆鍒板埌璐ц鍗曟槑缁�
- public PageReference UnabletoEdit() {
- PageReference ref = new Pagereference(
- '/ArriveGsDetails?EsetId=' + arriveId
- );
- ref.setRedirect(true);
- return ref;
- }
-
- public class ConsumableorderdetailsInfo implements Comparable {
- public Consumable_order_details2__c esd { get; set; }
- public Product2__c Prod { get; set; }
- public String ProductName { get; set; }
- //public Boolean canSELECT { get; set; }
- public String barCodeNo { get; set; }
- public Date sterilizationlimitDate { get; set; }
- public String serialNoorLotNo { get; set; }
- public String tracingCodeNo { get; set; }
- public String ReturnReason { get; set; }
- public String oldConsumableCount { get; set; }
- public String ErrorReason { get; set; }
- public boolean canEdit { get; set; }
- public Integer intMark { get; set; }
- public Decimal arriveAmount { get; set; }
- public Decimal arrivedCount { get; set; }
-
- public String ReportProductExpirationDate { get; set; }
-
- public ConsumableorderdetailsInfo() {
+ return BarcodeRetrunResult.size();
}
- public ConsumableorderdetailsInfo(
- Consumable_order_details2__c e,
- string str
- ) {
- esd = e;
- Prod = e.Consumable_Product__r;
- oldConsumableCount = e.name;
- ErrorReason = str;
- intMark = 1;
- if (e.Report_Product_Expiration__c != null) {
- ReportProductExpirationDate = e.Report_Product_Expiration__c.format();
- }
- }
- public ConsumableorderdetailsInfo(Consumable_order_details2__c e) {
- canEdit = false;
- if (e.Box_Piece__c == '鐩�') {
- e.Rrturn_count__c = 1;
- canEdit = true;
- }
+ // 鍗曚綅涓轰釜鐨凚arcode瀵瑰簲鐨勫嚭搴撳崟
+ public integer Getconsumableorderdetails2Nobox(){
+ consumableorderdetails2Nobox = new List<Consumable_order_details2__c>();
+ BarcodeCntMap.clear();
+ consumableorderdetails2Nobox =
+ [ SELECT Id,
+ Consumable_order_minor__c,
+ Deliver_date__c,
+ Asset_Model_No__c,
+ Consumable_Product__c,
+ Consumable_Product__r.Name,
+ Consumable_Product__r.Name__c,
+ Name,
+ Bar_Code__c,
+ Arrive_date__c,
+ Dealer_Shipment__c,
+ Dealer_Saled__c,
+ Return_reason__c,
+ Consumable_Shipment_order__c,
+ Send_date__c,
+ Consumable_Sale_order__c,
+ Used_date__c,
+ SerialLotNo__c,
+ TracingCode__c,
+ Sterilization_limit__c,
+ Consumable_ZS_order__c,
+ Consumable_ZS_order__r.Name,
+ Product_OutDate__c,
+ Invoice_Date__c,
+ recordtypeid,
+ Consumable_Arrived_order__c,
+ Box_Piece__c,
+ RemoveBox_No__c,
+ RemoveBox_date__c,
+ Rrturn_count__c,
+ Dealer_Info_text__c,
+ Arrive_Owner_Work_Location__c,
+ Intra_Trade_List_RMB__c
+ //add by rentx 2020-10-13 start 杩斿搧鏃� 鏂版暟鎹褰昐AP鍚堝悓鍙�
+ ,ContractNo_text__c/*,ContractNo__c*/
+ // tcm start
+ ,Consumable_order_minor__r.ContractNo__c
+ // tcm end
+ ,Report_Product_Expiration__c
+ //add by rentx 2020-10-13 end
+ ,Intra_Trade_List__c
+ //gzw 鎵嬪姩鍏ュ簱 榛樿浜у搧鍗曚环 20230307
+ FROM Consumable_order_details2__c
+ WHERE
+ // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 start
+ // (Dealer_Shipment__c = true or Dealer_Saled__c = true)
+ (Dealer_Shipment__c = true or Dealer_Saled__c = true or (Dealer_Shipment__c = false and Dealer_Saled__c = false and Lose_Flag__c = true))
+ // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 end
+ AND Dealer_Info_text__c = :accountName
+ AND Bar_Code__c in :noboxBarcodeList
+ AND Arrive_Owner_Work_Location__c =: userWorkLocation
+ AND Dealer_Returned__c = false
+ AND Box_Piece__c = '涓�'
+ ORDER BY Consumable_ZS_order__c,RemoveBox_No__c];
- esd = e;
- Prod = e.Consumable_Product__r;
- oldConsumableCount = e.name;
- if (e.Report_Product_Expiration__c != null) {
- ReportProductExpirationDate = e.Report_Product_Expiration__c.format();
- }
+ AggregateResult[] results = [SELECT Consumable_ZS_order__c,Bar_Code__c,count(Id) recordCount
+ FROM Consumable_order_details2__c
+ WHERE Dealer_Arrive__c = true
+ // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 start
+ // AND (Dealer_Shipment__c= true OR Dealer_Saled__c = true)
+ AND (Dealer_Shipment__c= true OR Dealer_Saled__c = true or(Dealer_Shipment__c = false and Dealer_Saled__c = false and Lose_Flag__c = true))
+ // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 end
+ AND Dealer_Returned__c = false
+ AND Bar_Code__c in :noboxBarcodeList
+ AND Arrive_Owner_Work_Location__c =: userWorkLocation
+ AND Box_Piece__c = '涓�'
+ AND Dealer_Info_text__c = :accountName
+ GROUP BY Consumable_ZS_order__c,Bar_Code__c];
+
+ for(AggregateResult ar: results){
+ String key = '' + ar.get('Consumable_ZS_order__c') + ar.get('Bar_Code__c');
+ BarcodeCntMap.put(key, Integer.valueOf(ar.get('recordCount')));
+ }
+
+ return consumableorderdetails2Nobox.size();
}
- public ConsumableorderdetailsInfo(Product2__c e, List<String> barinfoL) {
- esd = new Consumable_order_details2__c();
- ProductName = e.Name__c;
- Prod = e;
- barCodeNo = barinfoL[0];
- if (String.isNotBlank(barinfoL[1])) {
- sterilizationlimitDate = Date.valueOf(barinfoL[1]);
- }
- serialNoorLotNo = barinfoL[2];
- tracingCodeNo = barinfoL[3];
- ReturnReason = '';
+ //distinct
+ public List<Consumable_order_details2__c> getDistinctZSOrder(List<Consumable_order_details2__c> duplicates){
+ List<Consumable_order_details2__c> distinctOrder = new List<Consumable_order_details2__c>();
+
+ for(Consumable_order_details2__c details2 : duplicates){
+ Boolean found = false;
+ for(Consumable_order_details2__c result : distinctOrder){
+ if(details2.Consumable_ZS_order__c == result.Consumable_ZS_order__c
+ && details2.Bar_Code__c == result.Bar_Code__c){
+ found = true;
+ break;
+ }
+ }
+
+ if(!found){
+ distinctOrder.add(details2);
+
+ if(details2.Box_Piece__c == '涓�') noboxBarcodeList.add(details2.Bar_Code__c);
+ }
+ }
+ return distinctOrder;
}
- public ConsumableorderdetailsInfo(
- Consumable_order_details2__c e,
- List<String> barinfoL
- ) {
- esd = e;
- Prod = e.Consumable_Product__r;
- barCodeNo = barinfoL[0];
- if (String.isNotBlank(barinfoL[1])) {
- sterilizationlimitDate = Date.valueOf(barinfoL[1]);
- }
- serialNoorLotNo = barinfoL[2];
- tracingCodeNo = barinfoL[3];
- if (e.Report_Product_Expiration__c != null) {
- ReportProductExpirationDate = e.Report_Product_Expiration__c.format();
- }
+ // Update杩斿搧鏄庣粏淇℃伅
+ public Pagereference UpdateGoodsOfReturn(){
+ if( ShowGoodsofReturnList==null){
+ GoodsReturnCheck();
+ }
+ Getconsumableorderdetails2Nobox();
+
+ Savepoint sp = Database.setSavepoint();
+ boolean hasReturnGoods = false;
+ boolean hasLoseGoods = false;
+ try{
+ if( ShowGoodsofReturnList.size() >0 || consumableInventory.size()>0 ){
+
+ Consumable_order__c Return_Order_Sheet = new Consumable_order__c();
+ Return_Order_Sheet.Name ='*';
+ Return_Order_Sheet.Order_status__c = '鎵瑰噯';
+ Return_Order_Sheet.ReturnGs_Uploader_ID__c = UserInfo.getUserId();
+ Return_Order_Sheet.ReturnGs_Upload_Date__c = Date.today();
+ Return_Order_Sheet.Order_type__c = '杩斿搧';
+ Return_Order_Sheet.RecordTypeid =System.Label.Dealer_Returned_Label;
+ Return_Order_Sheet.Order_ProType__c = userPro_Type;
+ insert Return_Order_Sheet;
+ return_Order_id = Return_Order_Sheet.id;
+ List<Consumable_order__c> consumable_order_ret = [SELECT Name FROM Consumable_order__c WHERE id =:Return_Order_Sheet.id];
+
+ //2017-07-03 鍒拌揣璁㈠崟
+ Consumable_order__c Arrived_Order_Sheet = new Consumable_order__c();
+ Arrived_Order_Sheet.Name ='*';
+ Arrived_Order_Sheet.Order_status__c = '鎵瑰噯';
+ Arrived_Order_Sheet.Order_type__c = '鍒拌揣';
+ Arrived_Order_Sheet.Dealer_Info__c =accountid;
+ Arrived_Order_Sheet.RecordTypeid =System.Label.RT_ConOrder_Arrive;
+ Arrived_Order_Sheet.Order_ProType__c = userPro_Type;
+ insert Arrived_Order_Sheet;
+ List<Consumable_order__c> consumable_order_arr = [SELECT Name FROM Consumable_order__c WHERE id =:Arrived_Order_Sheet.id];
+
+ // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 start
+ // 铏氭嫙鐩樼偣鍗�
+ Consumable_order__c Inventory_Order_Sheet = new Consumable_order__c();
+ Inventory_Order_Sheet.Name ='*';
+ Inventory_Order_Sheet.Order_status__c = '鎵瑰噯';
+ Inventory_Order_Sheet.ReturnGs_Uploader_ID__c = UserInfo.getUserId();
+ Inventory_Order_Sheet.Inventory_date__c = Date.today();
+ Inventory_Order_Sheet.Dealer_Info__c =accountid;
+ Inventory_Order_Sheet.ReturnGs_Upload_Date__c = Date.today();
+ Inventory_Order_Sheet.Order_type__c = '鐩樼偣';
+ Inventory_Order_Sheet.RecordTypeid = System.Label.RT_ConOrder_Inventory;
+ Inventory_Order_Sheet.Order_ProType__c = userPro_Type;
+ insert Inventory_Order_Sheet;
+ inventory_Order_id = Inventory_Order_Sheet.id;
+ //List<Consumable_order__c> consumable_order_Inv = [SELECT Name FROM Consumable_order__c WHERE id =:Inventory_Order_Sheet.id]; //Commented By Li Jun 20230616
+ // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 end
+
+ List<Consumable_order_details2__c> codcList = new List<Consumable_order_details2__c>();
+ //鏂拌杩斿搧瀵瑰簲鐨勪骇鍝佹槑缁�
+ List<Consumable_order_details2__c> codcorderdetList = new List<Consumable_order_details2__c>();
+ //杩斿搧鍘熷洜,杩斿搧鏁伴噺妫�鏌�
+ for( ConsumableorderdetailsInfo codi : ShowGoodsofReturnList ){
+ if (codi.esd.Box_Piece__c =='涓�' && (
+ codi.esd.Rrturn_count__c == null ||
+ String.valueof(codi.esd.Rrturn_count__c) =='' ||
+ codi.esd.Rrturn_count__c <= 0)){
+ continue;
+ }
+
+ if(codi.esd.Return_reason__c==null||codi.esd.Return_reason__c==''){
+ if(isLwc){
+ returnError = '璇疯ˉ鍏呰繑鍝佸師鍥�';
+ }else {
+ codi.esd.Return_reason__c.addError('璇疯ˉ鍏呰繑鍝佸師鍥�');
+ }
+ return null;
+ }
+
+
+ if(codi.esd.Box_Piece__c=='涓�' && codi.esd.Rrturn_count__c > 0){
+ String key = '' + codi.esd.Consumable_ZS_order__c + codi.esd.Bar_Code__c;
+ Integer deliverycnt = BarcodeCntMap.get(key);
+ if(codi.esd.Rrturn_count__c > deliverycnt){
+ if(isLwc){
+ returnError = '瓒呭嚭鍑哄簱鏁伴噺';
+ }else {
+ codi.esd.Rrturn_count__c.addError('瓒呭嚭鍑哄簱鏁伴噺');
+ }
+ return null;
+ }
+ }
+ }
+
+ Integer tempNo=0;
+ // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 start
+ List<Consumable_order_details2__c> conOrderDetail2InList = new List<Consumable_order_details2__c>();
+ // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 start
+ for( ConsumableorderdetailsInfo codi : ShowGoodsofReturnList ){
+ Consumable_order_details2__c codcorderdet = new Consumable_order_details2__c();
+
+ //鍗曚綅=涓�
+ if (codi.esd.Box_Piece__c =='涓�' && (
+ codi.esd.Rrturn_count__c == null ||
+ String.valueof(codi.esd.Rrturn_count__c) =='' ||
+ codi.esd.Rrturn_count__c <= 0)){
+ continue;
+ }
+
+ if(codi.esd.Box_Piece__c=='涓�' && codi.esd.Rrturn_count__c > 0){
+ hasReturnGoods = true;
+
+ Integer cnt = 1;
+ for(Consumable_order_details2__c codctmp : consumableorderdetails2Nobox ){
+ if(codctmp.Consumable_ZS_order__c == codi.esd.Consumable_ZS_order__c && codctmp.Bar_Code__c == codi.esd.Bar_Code__c){
+ Consumable_order_details2__c esd = codctmp;
+ // esd.Consumable_Return_order__c = Return_Order_Sheet.id;
+ esd.Return_reason__c = codi.esd.Return_reason__c;
+ esd.Return_date__c = Date.today();
+ // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 start
+ // esd.Return_reason__c = codi.esd.Return_reason__c;
+ // esd.Return_date__c = Date.today();
+ // esd.Consumable_Return_order__c = Return_Order_Sheet.id;
+ if(codi.esd.Dealer_Saled__c == false && codi.esd.Dealer_Shipment__c == false && codi.esd.Lose_Flag__c == true){
+ // esd.Lose_Flag__c = false;
+ esd.Consumable_Inventory_order__c = Inventory_Order_Sheet.id;
+ conOrderDetail2InList.add(esd);
+ hasLoseGoods = true;
+ }
+ else{
+ // esd.Return_date__c = Date.today();
+ esd.Consumable_Return_order__c = Return_Order_Sheet.id;
+
+ }
+ // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 end
+ esd.ReturnGs_Uploader_ID__c = UserInfo.getUserId();
+
+ //淇敼杩斿搧鎵�鏈変汉
+ esd.OwnerId = UserInfo.getUserId();
+ esd.RecordTypeId = System.Label.RT_ConOrderDetail2_Return;
+
+ //Consumable_order__c coc = [select name from Consumable_order__c where Id =:Arrived_Order_Sheet.id];
+ codcorderdet = new Consumable_order_details2__c();
+ codcorderdet.Name = consumable_order_arr[0].name + '-' + String.valueOf(++tempNo).leftPad(4,'0');
+ codcorderdet.Consumable_order_minor__c = codi.esd.Consumable_order_minor__c;
+ codcorderdet.Consumable_Arrived_order__c = Arrived_Order_Sheet.id;
+ //淇敼鍒拌揣鎵�鏈変汉
+ codcorderdet.OwnerId = UserInfo.getUserId();
+ codcorderdet.Arrive_date__c = Date.today();
+ codcorderdet.Consumable_Product__c = codi.esd.Consumable_Product__c;
+ codcorderdet.Asset_Model_No__c = codi.esd.Asset_Model_No__c;
+ codcorderdet.Bar_Code__c = codi.esd.Bar_Code__c;
+ codcorderdet.Deliver_date__c = codi.esd.Deliver_date__c;
+ codcorderdet.SerialLotNo__c = codi.esd.SerialLotNo__c;
+ codcorderdet.TracingCode__c = codi.esd.TracingCode__c;
+ codcorderdet.Sterilization_limit__c = codi.esd.Sterilization_limit__c;
+ //gzw 鎵嬪姩鍏ュ簱 榛樿浜у搧鍗曚环 20230307
+ codcorderdet.Intra_Trade_List_RMB__c = (codi.esd.Intra_Trade_List_RMB__c == null || codi.esd.Intra_Trade_List_RMB__c == 0) ? codi.esd.Intra_Trade_List__c : codi.esd.Intra_Trade_List_RMB__c;
+ codcorderdet.RemoveBox_No__c = codctmp.RemoveBox_No__c;
+ codcorderdet.RemoveBox_date__c = codctmp.RemoveBox_date__c;
+ codcorderdet.Box_Piece__c = codctmp.Box_Piece__c;
+
+ //add by rentx 2020-10-13 start 杩斿搧鏃舵柊鏁版嵁璁板綍SAP鍚堝悓鍙�
+ // codcorderdet.ContractNo_text__c= codctmp.ContractNo__c;
+ // tcm start
+ if (String.isBlank(codctmp.Consumable_order_minor__r.ContractNo__c)) {
+ codcorderdet.ContractNo_text__c= codctmp.ContractNo_text__c;
+ }else {
+ codcorderdet.ContractNo_text__c= codctmp.Consumable_order_minor__r.ContractNo__c;
+ }
+ // tcm end
+ //add by rentx 2020-10-13 end 杩斿搧鏃舵柊鏁版嵁璁板綍SAP鍚堝悓鍙�
+
+
+ // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 start
+ if(hasLoseGoods){
+ codcorderdet.loseInventory__c = true;
+ }
+ // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 end
+
+ // 杩藉姞棣栨鍏ュ簱缁忛攢鍟� add by gzw 2020-04-27 start
+ // 杩斿搧鏃讹紝鈶犺拷鍔犲�熻皟鍊熷嚭鏂逛俊鎭� 鈶′繚鐣欏�熻皟淇℃伅 鈶繚瀛楽AP鍜岀粡閿�鍟嗛娆″彂璐х粡閿�鍟�
+ codcorderdet.Used_account__c = codi.esd.Used_account__c;
+ codcorderdet.Transfer_Time__c = codi.esd.Transfer_Time__c;
+ codcorderdet.Frist_Transfer_Agency__c = codi.esd.Frist_Transfer_Agency__c;
+ codcorderdet.Agency_Transfer__c = codi.esd.Agency_Transfer__c;
+
+ codcorderdet.Agencyinfo_fromSAP__c = codi.esd.Agencyinfo_fromSAP__c;
+ //ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'------1------' + codi.esd.Frist_Storage_Agency__c));
+ codcorderdet.Frist_Storage_Agency__c = codi.esd.Frist_Storage_Agency__c == null ? codi.esd.Dealer_Info_text__c : codi.esd.Frist_Storage_Agency__c;
+ // 杩藉姞棣栨鍏ュ簱缁忛攢鍟� add by gzw 2020-04-27 end
+ codcorderdetList.add(codcorderdet);
+ codcList.add( esd );
+
+ cnt++;
+ if(cnt > codi.esd.Rrturn_count__c) break;
+ }
+
+ }
+ }
+ else{
+ hasReturnGoods = true;
+ //鍗曚綅=鐩�
+ //changeinvoiceInfo(codi.esd);
+ //Consumable_order__c coc = [select name from Consumable_order__c where Id =:Arrived_Order_Sheet.id];
+ // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 start
+ codi.esd.Return_date__c = Date.today();
+ // codi.esd.Consumable_Return_order__c = Return_Order_Sheet.id;
+ if(codi.esd.Dealer_Saled__c == false && codi.esd.Dealer_Shipment__c == false && codi.esd.Lose_Flag__c == true){
+ codi.esd.Lose_Flag__c = false;
+ codi.esd.Return_reason__c = '';
+ codi.esd.Consumable_Inventory_order__c = Inventory_Order_Sheet.id;
+ conOrderDetail2InList.add(codi.esd);
+ hasLoseGoods = true;
+ }
+ else{
+ // codi.esd.Return_date__c = Date.today();
+ codi.esd.Consumable_Return_order__c = Return_Order_Sheet.id;
+
+ }
+ // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 end
+ codi.esd.ReturnGs_Uploader_ID__c = UserInfo.getUserId();
+ // codi.esd.Consumable_Return_order__c = Return_Order_Sheet.id;
+ //淇敼杩斿搧鎵�鏈変汉
+ codi.esd.OwnerId = UserInfo.getUserId();
+ codi.esd.RecordTypeId = System.Label.RT_ConOrderDetail2_Return;
+ codcorderdet.Name = consumable_order_arr[0].name + '-' + String.valueOf(++tempNo).leftPad(4,'0');
+ codcorderdet.Consumable_order_minor__c = codi.esd.Consumable_order_minor__c;
+ codcorderdet.Consumable_Arrived_order__c = Arrived_Order_Sheet.id;
+ //淇敼鍒拌揣鎵�鏈変汉
+ codcorderdet.OwnerId = UserInfo.getUserId();
+ codcorderdet.Arrive_date__c = Date.today();
+ codcorderdet.Consumable_Product__c = codi.esd.Consumable_Product__c;
+ codcorderdet.Asset_Model_No__c = codi.esd.Asset_Model_No__c;
+ codcorderdet.Bar_Code__c = codi.esd.Bar_Code__c;
+ codcorderdet.Deliver_date__c = codi.esd.Deliver_date__c;
+ codcorderdet.SerialLotNo__c = codi.esd.SerialLotNo__c;
+ codcorderdet.TracingCode__c = codi.esd.TracingCode__c;
+ codcorderdet.Sterilization_limit__c = codi.esd.Sterilization_limit__c;
+ //gzw 鎵嬪姩鍏ュ簱 榛樿浜у搧鍗曚环 20230307
+ codcorderdet.Intra_Trade_List_RMB__c = (codi.esd.Intra_Trade_List_RMB__c == null || codi.esd.Intra_Trade_List_RMB__c == 0) ? codi.esd.Intra_Trade_List__c : codi.esd.Intra_Trade_List_RMB__c;
+ // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 start
+ if(hasLoseGoods){
+ codcorderdet.loseInventory__c = true;
+ }
+ // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 end
+ // 杩藉姞棣栨鍏ュ簱缁忛攢鍟� add by gzw 2020-04-27 start
+ // 杩斿搧鏃讹紝鈶犺拷鍔犲�熻皟鍊熷嚭鏂逛俊鎭� 鈶′繚鐣欏�熻皟淇℃伅 鈶繚瀛楽AP鍜岀粡閿�鍟嗛娆″彂璐х粡閿�鍟�
+ codcorderdet.Used_account__c = codi.esd.Used_account__c;
+ codcorderdet.Transfer_Time__c = codi.esd.Transfer_Time__c;
+ codcorderdet.Frist_Transfer_Agency__c = codi.esd.Frist_Transfer_Agency__c;
+ codcorderdet.Agency_Transfer__c = codi.esd.Agency_Transfer__c;
+
+ codcorderdet.Agencyinfo_fromSAP__c = codi.esd.Agencyinfo_fromSAP__c;
+ //ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'------2------' + codi.esd.Frist_Storage_Agency__c));
+ codcorderdet.Frist_Storage_Agency__c = codi.esd.Frist_Storage_Agency__c == null ? codi.esd.Dealer_Info_text__c : codi.esd.Frist_Storage_Agency__c;
+ // 杩藉姞棣栨鍏ュ簱缁忛攢鍟� add by gzw 2020-04-27 end
+
+ //add by rentx 2020-10-13 start 杩斿搧鏃舵柊鏁版嵁璁板綍SAP鍚堝悓鍙�
+ // codcorderdet.ContractNo_text__c = /*codi.esd.ContractNo__c*/;
+ // tcm start
+ if (String.isBlank(codi.esd.Consumable_order_minor__r.ContractNo__c)) {
+ codcorderdet.ContractNo_text__c= codi.esd.ContractNo_text__c;
+ }else {
+ codcorderdet.ContractNo_text__c= codi.esd.Consumable_order_minor__r.ContractNo__c;
+ }
+ // tcm end
+ //add by rentx 2020-10-13 end 杩斿搧鏃舵柊鏁版嵁璁板綍SAP鍚堝悓鍙�
+
+ codcorderdetList.add(codcorderdet);
+ codcList.add( codi.esd );
+ }
+ }
+
+ //鏄庣粏2涓嶅瓨鍦ㄧ殑瀵瑰簲鐨勫埌璐ц鍗曟槑缁� 2017-07-05
+ Integer i = 1;
+ //for(ConsumableorderdetailsInfo ass : consumableInventoryUse){
+ for(ConsumableorderdetailsInfo ass : consumableInventory){
+ hasReturnGoods = true;
+ Consumable_order_details2__c codcorderdetail = new Consumable_order_details2__c();
+ Consumable_order_details2__c retorddetail = new Consumable_order_details2__c();
+ String str = ('000' + i).right(4);
+ // if(str.length() == 1){
+ // str = '0' + str;
+ // }
+
+ if(ass.ReturnReason==null || ass.ReturnReason==''){
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ returnError = '璇疯ˉ鍏呰繑鍝佸師鍥�';
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'璇疯ˉ鍏呰繑鍝佸師鍥�'));
+ }
+ return null;
+ }
+
+ //鍒拌揣鏄庣粏
+ codcorderdetail.Name = consumable_order_arr[0].Name + '-'+ str;
+ codcorderdetail.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
+ codcorderdetail.Intra_Trade_List_RMB__c = ass.Prod.Intra_Trade_List_RMB__c;
+ //gzw 鎵嬪姩鍏ュ簱 榛樿浜у搧鍗曚环 20230307
+ codcorderdetail.Asset_Model_No__c = ass.Prod.Asset_Model_No__c;
+ codcorderdetail.Direct_Arrive_Product__c = true;
+ codcorderdetail.Sterilization_limit__c = ass.sterilizationlimitDate;
+ codcorderdetail.Consumable_Product__c = ass.Prod.id;
+ codcorderdetail.Bar_Code__c = ass.barCodeNo;
+ codcorderdetail.SerialLotNo__c = ass.serialNoorLotNo;
+ codcorderdetail.TracingCode__c = ass.tracingCodeNo;
+ codcorderdetail.Consumable_Arrived_order__c = Arrived_Order_Sheet.id;
+ codcorderdetail.Arrive_date__c = Date.today();
+
+ //add by rentx 2020-10-14 start
+ // codcorderdetail.ContractNo_text__c = /*ass.esd.ContractNo__c*/;
+ // tcm start
+ if (String.isBlank(ass.esd.Consumable_order_minor__r.ContractNo__c)) {
+ codcorderdetail.ContractNo_text__c= ass.esd.ContractNo_text__c;
+ }else {
+ codcorderdetail.ContractNo_text__c= ass.esd.Consumable_order_minor__r.ContractNo__c;
+ }
+ // tcm end
+ //add by rentx 2020-10-14 end
+
+ codcorderdetList.add(codcorderdetail);
+
+ //杩斿搧鏄庣粏
+ retorddetail.Return_reason__c = ass.ReturnReason;
+ retorddetail.Return_date__c = Date.today();
+ retorddetail.ReturnGs_Uploader_ID__c = UserInfo.getUserId();
+
+ // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 start
+ // if(ass.esd.Dealer_Saled__c == false && ass.esd.Dealer_Shipment__c == false && ass.esd.Lose_Flag__c == true){
+ // retorddetail.Consumable_Inventory_order__c = Inventory_Order_Sheet.id;
+ // retorddetail.loseInventory__c = true;
+ // }
+ retorddetail.Consumable_Return_order__c = Return_Order_Sheet.id;
+ // WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 end
+
+
+ retorddetail.Name = consumable_order_ret[0].Name + '-'+ str;
+ retorddetail.RecordTypeId = System.Label.RT_ConOrderDetail2_Return;
+ retorddetail.Intra_Trade_List_RMB__c = ass.Prod.Intra_Trade_List_RMB__c;
+ //gzw 鎵嬪姩鍏ュ簱 榛樿浜у搧鍗曚环 20230307
+ retorddetail.Dealer_Info_IF__c = accountid;
+ retorddetail.Asset_Model_No__c = ass.Prod.Asset_Model_No__c;
+ retorddetail.Direct_Arrive_Product__c = true;
+ retorddetail.Sterilization_limit__c = ass.sterilizationlimitDate;
+ retorddetail.Consumable_Product__c = ass.Prod.id;
+ retorddetail.Bar_Code__c = ass.barCodeNo;
+ retorddetail.SerialLotNo__c = ass.serialNoorLotNo;
+ retorddetail.TracingCode__c = ass.tracingCodeNo;
+ retorddetail.Arrive_date__c = Date.today();
+ retorddetail.Deliver_date__c = Date.today();
+ // 杩藉姞棣栨鍏ュ簱缁忛攢鍟� add by gzw 2020-04-27 start
+ retorddetail.Frist_Storage_Agency__c = accountName;
+ // 杩藉姞棣栨鍏ュ簱缁忛攢鍟� add by gzw 2020-04-27 end
+
+ //add by rentx 2020-10-14 start
+ // retorddetail.ContractNo_text__c = /*ass.esd.ContractNo__c*/;
+ // tcm start
+ if (String.isBlank(ass.esd.Consumable_order_minor__r.ContractNo__c)) {
+ retorddetail.ContractNo_text__c= ass.esd.ContractNo_text__c;
+ }else {
+ retorddetail.ContractNo_text__c= ass.esd.Consumable_order_minor__r.ContractNo__c;
+ }
+ // tcm end
+ //add by rentx 2020-10-14 end
+
+ codcorderdetList.add(retorddetail);
+ i++;
+ }
+
+ // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'------end------'));
+ // return null;
+
+ if(codcList.size()>0){
+ ControllerUtil.updateOrderDetailsSatus( codcList );
+ //insert codcorderdetList;
+ }
+ if (codcorderdetList.size()>0){
+ System.debug('codcorderdetList +++++ '+ codcorderdetList);
+ insert codcorderdetList;
+ }
+ // WYIN-BPE3T4 铏氭嫙鐩樼偣鍗� update by vivek 2020-05-11 start
+ if(conOrderDetail2InList.size() > 0){
+ addInventoryDetails1(conOrderDetail2InList);
+ }
+ // WYIN-BPE3T4 铏氭嫙鐩樼偣鍗� update by vivek 2020-05-11 start
+
+ if(hasReturnGoods){
+ // WYIN-BPE3T4 铏氭嫙鐩樼偣鍗� update by vivek 2020-05-11 start
+ // return ToReturnGoodsPage();
+ if(hasLoseGoods){
+ urlType = 'ToInventoryGoodsPage';
+ return ToInventoryGoodsPage();
+ // return null;
+ }else{
+ urlType = 'ToReturnGoodsPage';
+ return ToReturnGoodsPage();
+ // return null;
+ }
+ // WYIN-BPE3T4 铏氭嫙鐩樼偣鍗� update by vivek 2020-05-11 start
+ }
+ else{
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ returnError = '娌℃湁闇�瑕佺櫥褰曠殑杩斿搧';
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'娌℃湁闇�瑕佺櫥褰曠殑杩斿搧'));
+ }
+ return null;
+ }
+
+ }else{
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ returnError = '娌℃湁闇�瑕佺櫥褰曠殑杩斿搧';
+ }else {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'娌℃湁闇�瑕佺櫥褰曠殑杩斿搧'));
+ }
+ return null;
+ }
+ }catch(Exception e){
+ Database.rollback(sp);
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if(isLwc){
+ returnError = e.getLineNumber()+'---'+e.getMessage();
+ }else {
+ ApexPages.addMessages(e);
+ }
+ return null;
+ }
}
- public ConsumableorderdetailsInfo(Product2__c e) {
- Prod = e;
+
+ public void makeArrivedSummary(){
+ detailsSummary = new List<ConsumableorderdetailsInfo>();
+ //ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'consumableInventory ' + consumableInventory));
+ try{
+ ConsumableorderdetailsInfo arriveDdetailsSummary = null;
+ Map<String,ConsumableorderdetailsInfo> detailsSummaryMap = new Map<String,ConsumableorderdetailsInfo>();
+ for(ConsumableorderdetailsInfo ass : ConsumableorderdetailsRecords){
+ if(detailsSummaryMap.containsKey(ass.Prod.Id)){
+ detailsSummaryMap.get(ass.Prod.Id).arrivedCount ++;
+ detailsSummaryMap.get(ass.Prod.Id).arriveAmount += ass.esd.Intra_Trade_List_RMB__c;
+ }else{
+ arriveDdetailsSummary = new ConsumableorderdetailsInfo(ass.Prod);
+ arriveDdetailsSummary.arrivedCount = 1;
+ arriveDdetailsSummary.arriveAmount = ass.esd.Intra_Trade_List_RMB__c;
+ detailsSummaryMap.put(ass.Prod.Id, arriveDdetailsSummary);
+ }
+ }
+ for(ConsumableorderdetailsInfo ass : consumableInventory){
+ if(detailsSummaryMap.containsKey(ass.Prod.Id)){
+ detailsSummaryMap.get(ass.Prod.Id).arrivedCount ++;
+ if(EsetId != null && EsetId != ''){
+ detailsSummaryMap.get(ass.Prod.Id).arriveAmount += ass.Prod.Intra_Trade_List_RMB__c;
+ }else{
+ detailsSummaryMap.get(ass.Prod.Id).arriveAmount += 0;
+ }
+ }else{
+ arriveDdetailsSummary = new ConsumableorderdetailsInfo(ass.Prod);
+ arriveDdetailsSummary.arrivedCount = 1;
+ if(EsetId != null && EsetId != ''){
+ arriveDdetailsSummary.arriveAmount = ass.Prod.Intra_Trade_List_RMB__c;
+ }else{
+ arriveDdetailsSummary.arriveAmount = 0;
+ }
+ detailsSummaryMap.put(ass.Prod.Id, arriveDdetailsSummary);
+ }
+ }
+ for(String key : detailsSummaryMap.keySet()){
+ detailsSummary.add(detailsSummaryMap.get(key));
+ }
+ }catch(Exception e){
+ //Database.rollback(sp);
+ throw new ControllerUtil.myException('e::'+e + ' linenumber::'+e.getLineNumber());
+ // ApexPages.addMessages(e);
+ // ApexPages.addMessages(e.getLineNumber() + ' 11111111111111111');
+
+ //return null;
+ }
}
- // 鎺掑簭
- public Integer compareTo(Object compareTo) {
- return null;
+
+ //璺宠浆鍒拌繑鍝侀〉闈�
+ public Pagereference ToReturnGoodsPage(){
+ PageReference ref = new Pagereference('/'+return_Order_id);
+ ref.setRedirect(true);
+ return ref;
}
- }
-}
+
+ // WYIN-BPE3T4 铏氭嫙鐩樼偣鍗� update by vivek 2020-05-11 start
+ public Pagereference ToInventoryGoodsPage(){
+ PageReference ref = new Pagereference('/'+inventory_Order_id);
+ ref.setRedirect(true);
+ return ref;
+ }
+ // WYIN-BPE3T4 铏氭嫙鐩樼偣鍗� update by vivek 2020-05-11 end
+
+ // 璺宠浆鍒板埌璐ц鍗曟槑缁�
+ public PageReference UnabletoEdit(){
+ PageReference ref = new Pagereference('/ArriveGsDetails?EsetId='+arriveId);
+ ref.setRedirect(true);
+ return ref;
+ }
+
+ public class ConsumableorderdetailsInfo implements Comparable {
+ public Consumable_order_details2__c esd { get; set; }
+ public Product2__c Prod { get; set; }
+ public String ProductName { get; set; }
+ //public Boolean canSELECT { get; set; }
+ public String barCodeNo { get; set; }
+ public Date sterilizationlimitDate { get; set; }
+ public String serialNoorLotNo { get; set; }
+ public String tracingCodeNo { get; set; }
+ public String ReturnReason { get; set; }
+ public String oldConsumableCount { get; set; }
+ public String ErrorReason { get; set; }
+ public boolean canEdit { get; set; }
+ public Integer intMark { get; set; }
+ public Decimal arriveAmount { get; set; }
+ public Decimal arrivedCount { get; set; }
+
+ public String ReportProductExpirationDate {get;set;}
+
+ public ConsumableorderdetailsInfo(){
+
+ }
+
+ public ConsumableorderdetailsInfo(Consumable_order_details2__c e,string str) {
+ esd = e;
+ Prod = e.Consumable_Product__r;
+ oldConsumableCount = e.name;
+ ErrorReason = str;
+ intMark = 1;
+ if (e.Report_Product_Expiration__c != null) {
+ ReportProductExpirationDate = e.Report_Product_Expiration__c.format();
+ }
+
+ }
+ public ConsumableorderdetailsInfo(Consumable_order_details2__c e) {
+ canEdit = false;
+ if(e.Box_Piece__c=='鐩�'){
+ e.Rrturn_count__c = 1;
+ canEdit = true;
+ }
+
+ esd = e;
+ Prod = e.Consumable_Product__r;
+ oldConsumableCount = e.name;
+ if (e.Report_Product_Expiration__c != null) {
+ ReportProductExpirationDate = e.Report_Product_Expiration__c.format();
+ }
+
+ }
+
+ public ConsumableorderdetailsInfo(Product2__c e,List<String> barinfoL) {
+ esd = new Consumable_order_details2__c();
+ ProductName = e.Name__c;
+ Prod = e;
+ barCodeNo = barinfoL[0];
+ if(String.isNotBlank(barinfoL[1])){
+ sterilizationlimitDate = Date.valueOf(barinfoL[1]);
+ }
+ serialNoorLotNo = barinfoL[2];
+ tracingCodeNo = barinfoL[3];
+ ReturnReason = '';
+ }
+
+ public ConsumableorderdetailsInfo(Consumable_order_details2__c e,List<String> barinfoL) {
+ esd = e;
+ Prod = e.Consumable_Product__r;
+ barCodeNo = barinfoL[0];
+ if(String.isNotBlank(barinfoL[1])){
+ sterilizationlimitDate = Date.valueOf(barinfoL[1]);
+ }
+ serialNoorLotNo = barinfoL[2];
+ tracingCodeNo = barinfoL[3];
+ if (e.Report_Product_Expiration__c != null) {
+ ReportProductExpirationDate = e.Report_Product_Expiration__c.format();
+ }
+
+ }
+ public ConsumableorderdetailsInfo(Product2__c e) {
+ Prod = e;
+ }
+ // 鎺掑簭
+ public Integer compareTo(Object compareTo) {
+ return null;
+ }
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/classes/Batch_FixAttachmentToFiles.cls b/force-app/main/default/classes/Batch_FixAttachmentToFiles.cls
new file mode 100644
index 0000000..749b18b
--- /dev/null
+++ b/force-app/main/default/classes/Batch_FixAttachmentToFiles.cls
@@ -0,0 +1,57 @@
+global without sharing class Batch_FixAttachmentToFiles implements Database.Batchable<sObject>{
+ // Id batchJobId = Database.executeBatch(new Batch_FixAttachmentToFiles(Datetime.newInstance(2023, 5, 20, 8, 0, 0),'Consumable_order__c'),2000);
+ private Datetime endDate = null;
+ private String objectApiName = null;
+ public Batch_FixAttachmentToFiles(Datetime setTime,String objectType) {
+ endDate = setTime;
+ objectApiName = objectType;
+ }
+
+ global Database.QueryLocator start(Database.BatchableContext BC) {
+ String queryObject = 'SELECT Id FROM ' + objectApiName + ' WHERE CreatedDate >=:endDate' + ' order by CreatedDate desc';
+ System.debug('queryObject:' + queryObject);
+ return Database.getQueryLocator(queryObject);//鍙栨寚瀹歄bject涓嬮潰鐨処d鎴栬�呭鐞嗗叏閮�
+ }
+
+ global void execute(Database.BatchableContext BC, List<sObject> scope) {
+ Set<Id> setId = new Set<Id>();
+ for(sObject sc: scope){
+ setId.add(sc.Id);
+ }
+ List<ContentVersion> insertContents = new List<ContentVersion>();
+ Map<string,id> nameParentMaps = new Map<string,id>();
+ for (Attachment att : [select Id,Name ,OwnerId,ParentId, Body, CreatedById from Attachment where ParentId in: setId Order by Name desc]) {
+ nameParentMaps.put(att.name, att.ParentId);
+ ContentVersion cVersion = new ContentVersion();
+ cVersion.ContentLocation = 'S'; //S-Document is in Salesforce. E-Document is outside of Salesforce. L-Document is on a Social Netork.
+ cVersion.PathOnClient = att.Name; //File name with extention
+ cVersion.Origin = 'C'; //C-Content Origin. H-Chatter Origin.
+ cVersion.Title = att.Name; //Name of the file
+ cVersion.VersionData = att.Body; //File content
+ insertContents.add(cVersion);
+ }
+ if(insertContents.isEmpty()){
+ return;
+ }
+ Insert insertContents;
+ set<Id> contentIds = new set<Id>();
+ for(ContentVersion cv : insertContents){
+ contentIds.add(cv.id);
+ }
+ List<ContentVersion> conDocuments = [SELECT ContentDocumentId, Title FROM ContentVersion WHERE Id in: contentIds];
+ List<ContentDocumentLink> insertDocLinks = new List<ContentDocumentLink>();
+ for(ContentVersion cv : conDocuments){
+ ContentDocumentLink cDocLink = new ContentDocumentLink();
+ cDocLink.ContentDocumentId = cv.ContentDocumentId; //Add ContentDocumentId
+ cDocLink.LinkedEntityId = nameParentMaps.get(cv.Title); //Add attachment parentId
+ cDocLink.ShareType = 'V'; //V - Viewer permission. C - Collaborator permission. I - Inferred permission.
+ cDocLink.Visibility = 'AllUsers';
+ insertDocLinks.add(cDocLink);
+ }
+ Insert insertDocLinks;
+ }
+
+ global void finish(Database.BatchableContext BC) {
+
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/classes/Batch_FixAttachmentToFiles.cls-meta.xml b/force-app/main/default/classes/Batch_FixAttachmentToFiles.cls-meta.xml
new file mode 100644
index 0000000..754ecb1
--- /dev/null
+++ b/force-app/main/default/classes/Batch_FixAttachmentToFiles.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>
diff --git a/force-app/main/default/classes/LexArriveGoodsController.cls b/force-app/main/default/classes/LexArriveGoodsController.cls
index ad92c51..b2c79cc 100644
--- a/force-app/main/default/classes/LexArriveGoodsController.cls
+++ b/force-app/main/default/classes/LexArriveGoodsController.cls
@@ -1,356 +1,256 @@
public without sharing class LexArriveGoodsController {
- //鍒濆鍖�
- @AuraEnabled
- public static Results init(String arrType, String eSetId) {
- Results results = new Results();
- results.isNoteStay = LexUtility.getIsNoteStay();
- try {
- ArriveGoodsController arrController = new ArriveGoodsController(
- eSetId,
- arrType
- );
- arrController.isLwc = true;
- arrController.init();
- results.arrGoodCon = JSON.serialize(arrController);
- results.coc = arrController.coc;
- results.saveFLGbln = arrController.saveFLGbln;
- results.returnFLGbln = arrController.ReturnFLGbln;
- results.result = 'Success';
- } catch (Exception e) {
- results.result = 'Fail';
- results.errorMsg = e.getLineNumber() + '---' + e.getMessage();
- }
- return results;
- }
-
- //鎼滅储浜у搧
- @AuraEnabled
- public static Results searchProduct(String barcode, String arrControllerStr) {
- Results results = new Results();
- try {
- System.debug('arrControllerStr:' + arrControllerStr);
- ArriveGoodsController arrController = (ArriveGoodsController) JSON.deserialize(
- arrControllerStr,
- ArriveGoodsController.class
- );
- arrController.barcode = barcode;
- arrController.returnError = null;
- arrController.warningList = new List<String>();
- arrController.errorList = new List<String>();
- arrController.SearchPro();
- results.arrGoodCon = JSON.serialize(arrController);
- if (
- arrController.returnError != null &&
- arrController.returnError != ''
- ) {
- results.result = 'Fail';
- results.errorMsgList = arrController.errorList;
- results.warningMsgList = arrController.warningList;
- results.errorMsg = arrController.returnError;
- } else {
- results.coc = arrController.coc;
- results.saveFLGbln = arrController.saveFLGbln;
- results.returnFLGbln = arrController.ReturnFLGbln;
- results.detailsSummary = changeType1(arrController.detailsSummary);
- results.consumableorderdetailsRecords = changeType1(
- arrController.ConsumableorderdetailsRecords
- );
- results.showGoodsofReturnList = changeType1(
- arrController.ShowGoodsofReturnList
- );
- results.consumableInventory = changeType1(
- arrController.consumableInventory
- );
- results.consumableorderdetailsRecordserror = changeType1(
- arrController.ConsumableorderdetailsRecordserror
- );
- results.errorMsgList = arrController.errorList;
- results.warningMsgList = arrController.warningList;
- results.result = 'Success';
- }
- } catch (Exception e) {
- results.result = 'Fail';
- results.errorMsg =
- e.getLineNumber() +
- '---' +
- e.getMessage() +
- '---' +
- e.getStackTraceString();
- }
- return results;
- }
-
- //鍒拌揣纭
- @AuraEnabled
- public static Results arriveGoodsConfim(String arrControllerStr) {
- Results results = new Results();
- try {
- ArriveGoodsController arrController = (ArriveGoodsController) JSON.deserialize(
- arrControllerStr,
- ArriveGoodsController.class
- );
- arrController.returnError = null;
- arrController.warningList = new List<String>();
- arrController.errorList = new List<String>();
- Pagereference page = arrController.ArriveGoodsConfim();
- results.arrGoodCon = JSON.serialize(arrController);
- if (
- arrController.returnError != null &&
- arrController.returnError != ''
- ) {
- results.result = 'Fail';
- results.errorMsgList = arrController.errorList;
- results.warningMsgList = arrController.warningList;
- results.errorMsg = arrController.returnError;
- } else {
- if (arrController.urlType == 'UnabletoEdit') {
- results.url = '/lexarrivegsdetails?EsetId=' + arrController.arriveId;
+
+ //鍒濆鍖�
+ @AuraEnabled
+ public static Results init(String arrType, String eSetId) {
+ Results results = new Results();
+ results.isNoteStay = LexUtility.getIsNoteStay();
+ try {
+ ArriveGoodsController arrController = new ArriveGoodsController(eSetId, arrType);
+ arrController.isLwc = true;
+ arrController.init();
+ results.arrGoodCon = JSON.serialize(arrController);
+ results.coc = arrController.coc;
+ results.saveFLGbln = arrController.saveFLGbln;
+ results.returnFLGbln = arrController.ReturnFLGbln;
+ results.result = 'Success';
+ } catch (Exception e) {
+ results.result = 'Fail';
+ results.errorMsg = e.getLineNumber() + '---' + e.getMessage();
}
- results.errorMsgList = arrController.errorList;
- results.warningMsgList = arrController.warningList;
- results.result = 'Success';
- }
- } catch (Exception e) {
- results.result = 'Fail';
- results.errorMsg = e.getLineNumber() + '---' + e.getMessage();
+ return results;
}
- return results;
- }
- //鐧诲綍杩斿搧
- @AuraEnabled
- public static Results updateGoodsOfReturn(
- String arrControllerStr,
- String showGoodsofReturnListStr
- ) {
- Results results = new Results();
- try {
- List<ConsumableorderdetailsInfo> showGoodsofReturnList = (List<ConsumableorderdetailsInfo>) JSON.deserialize(
- showGoodsofReturnListStr,
- List<ConsumableorderdetailsInfo>.class
- );
- ArriveGoodsController arrController = (ArriveGoodsController) JSON.deserialize(
- arrControllerStr,
- ArriveGoodsController.class
- );
- arrController.ShowGoodsofReturnList = changeType2(showGoodsofReturnList);
- arrController.returnError = null;
- arrController.warningList = new List<String>();
- arrController.errorList = new List<String>();
- Pagereference page = arrController.UpdateGoodsOfReturn();
- results.arrGoodCon = JSON.serialize(arrController);
- if (
- arrController.returnError != null &&
- arrController.returnError != ''
- ) {
- results.result = 'Fail';
- results.errorMsgList = arrController.errorList;
- results.warningMsgList = arrController.warningList;
- results.errorMsg = arrController.returnError;
- } else {
- if (arrController.urlType == 'ToReturnGoodsPage') {
- results.url = '/detail/' + arrController.return_Order_id;
+ //鎼滅储浜у搧
+ @AuraEnabled
+ public static Results searchProduct(String barcode, String arrControllerStr) {
+ Results results = new Results();
+ try {
+ System.debug('arrControllerStr:'+arrControllerStr);
+ ArriveGoodsController arrController = (ArriveGoodsController)JSON.deserialize(arrControllerStr, ArriveGoodsController.class);
+ arrController.barcode = barcode;
+ arrController.returnError = null;
+ arrController.warningList = new List<String>();
+ arrController.errorList = new List<String>();
+ arrController.SearchPro();
+ results.arrGoodCon = JSON.serialize(arrController);
+ if(arrController.returnError != null && arrController.returnError != ''){
+ results.result = 'Fail';
+ results.errorMsgList = arrController.errorList;
+ results.warningMsgList = arrController.warningList;
+ results.errorMsg = arrController.returnError;
+ }else {
+ results.coc = arrController.coc;
+ results.saveFLGbln = arrController.saveFLGbln;
+ results.returnFLGbln = arrController.ReturnFLGbln;
+ results.detailsSummary = changeType1(arrController.detailsSummary);
+ results.consumableorderdetailsRecords = changeType1(arrController.ConsumableorderdetailsRecords);
+ results.showGoodsofReturnList = changeType1(arrController.ShowGoodsofReturnList);
+ results.consumableInventory = changeType1(arrController.consumableInventory);
+ results.consumableorderdetailsRecordserror = changeType1(arrController.ConsumableorderdetailsRecordserror);
+ results.errorMsgList = arrController.errorList;
+ results.warningMsgList = arrController.warningList;
+ results.result = 'Success';
+ }
+ } catch (Exception e) {
+ results.result = 'Fail';
+ results.errorMsg = e.getLineNumber() + '---' + e.getMessage() + '---' + e.getStackTraceString();
}
- if (arrController.urlType == 'ToInventoryGoodsPage') {
- results.url = '/detail/' + arrController.inventory_Order_id;
+ return results;
+ }
+
+ //鍒拌揣纭
+ @AuraEnabled
+ public static Results arriveGoodsConfim(String arrControllerStr) {
+ Results results = new Results();
+ try {
+ ArriveGoodsController arrController = (ArriveGoodsController)JSON.deserialize(arrControllerStr, ArriveGoodsController.class);
+ arrController.returnError = null;
+ arrController.warningList = new List<String>();
+ arrController.errorList = new List<String>();
+ Pagereference page = arrController.ArriveGoodsConfim();
+ results.arrGoodCon = JSON.serialize(arrController);
+ if(arrController.returnError != null && arrController.returnError != ''){
+ results.result = 'Fail';
+ results.errorMsgList = arrController.errorList;
+ results.warningMsgList = arrController.warningList;
+ results.errorMsg = arrController.returnError;
+ }else {
+ if(arrController.urlType == 'UnabletoEdit'){
+ results.url = '/lexarrivegsdetails?EsetId='+arrController.arriveId;
+ }
+ results.errorMsgList = arrController.errorList;
+ results.warningMsgList = arrController.warningList;
+ results.result = 'Success';
+ }
+ } catch (Exception e) {
+ results.result = 'Fail';
+ results.errorMsg = e.getLineNumber() + '---' + e.getMessage();
}
- results.errorMsgList = arrController.errorList;
- results.warningMsgList = arrController.warningList;
- results.result = 'Success';
- }
- } catch (Exception e) {
- results.result = 'Fail';
- results.errorMsg = e.getLineNumber() + '---' + e.getMessage();
+ return results;
}
- return results;
- }
-
- public static List<ConsumableorderdetailsInfo> changeType1(
- List<ArriveGoodsController.ConsumableorderdetailsInfo> conList
- ) {
- List<ConsumableorderdetailsInfo> conList1 = new List<ConsumableorderdetailsInfo>();
- if (conList != null) {
- for (ArriveGoodsController.ConsumableorderdetailsInfo con : conList) {
- ConsumableorderdetailsInfo con1 = new ConsumableorderdetailsInfo();
- con1.esd = con.esd;
- con1.Prod = con.Prod;
- con1.ProductName = con.ProductName;
- con1.barCodeNo = con.barCodeNo;
- con1.sterilizationlimitDate = con.sterilizationlimitDate;
- con1.serialNoorLotNo = con.serialNoorLotNo;
- con1.tracingCodeNo = con.tracingCodeNo;
- con1.ReturnReason = con.ReturnReason;
- con1.oldConsumableCount = con.oldConsumableCount;
- con1.ErrorReason = con.ErrorReason;
- con1.canEdit = con.canEdit;
- con1.intMark = con.intMark;
- con1.arriveAmount = con.arriveAmount;
- con1.arrivedCount = con.arrivedCount;
- con1.ReportProductExpirationDate = con.ReportProductExpirationDate;
- conList1.add(con1);
- }
- }
- return conList1;
- }
-
- public static List<ArriveGoodsController.ConsumableorderdetailsInfo> changeType2(
- List<ConsumableorderdetailsInfo> conList
- ) {
- List<ArriveGoodsController.ConsumableorderdetailsInfo> conList1 = new List<ArriveGoodsController.ConsumableorderdetailsInfo>();
- if (conList != null) {
- for (ConsumableorderdetailsInfo con : conList) {
- ArriveGoodsController.ConsumableorderdetailsInfo con1 = new ArriveGoodsController.ConsumableorderdetailsInfo();
- con1.esd = con.esd;
- con1.Prod = con.Prod;
- con1.ProductName = con.ProductName;
- con1.barCodeNo = con.barCodeNo;
- con1.sterilizationlimitDate = con.sterilizationlimitDate;
- con1.serialNoorLotNo = con.serialNoorLotNo;
- con1.tracingCodeNo = con.tracingCodeNo;
- con1.ReturnReason = con.ReturnReason;
- con1.oldConsumableCount = con.oldConsumableCount;
- con1.ErrorReason = con.ErrorReason;
- con1.canEdit = con.canEdit;
- con1.intMark = con.intMark;
- con1.arriveAmount = con.arriveAmount;
- con1.arrivedCount = con.arrivedCount;
- con1.ReportProductExpirationDate = con.ReportProductExpirationDate;
- conList1.add(con1);
- }
- }
- return conList1;
- }
-
- public class Results {
+
+ //鐧诲綍杩斿搧
@AuraEnabled
- public String result;
- @AuraEnabled
- public String errorMsg;
- @AuraEnabled
- public String url;
- @AuraEnabled
- public String arrGoodCon;
- @AuraEnabled
- public Consumable_order__c coc;
- @AuraEnabled
- public Boolean returnFLGbln;
- @AuraEnabled
- public Boolean saveFLGbln;
- @AuraEnabled
- public List<ConsumableorderdetailsInfo> detailsSummary;
- @AuraEnabled
- public List<ConsumableorderdetailsInfo> consumableorderdetailsRecords;
- @AuraEnabled
- public List<ConsumableorderdetailsInfo> showGoodsofReturnList;
- @AuraEnabled
- public List<ConsumableorderdetailsInfo> consumableInventory;
- @AuraEnabled
- public List<ConsumableorderdetailsInfo> consumableorderdetailsRecordserror;
- @AuraEnabled
- public List<String> errorMsgList;
- @AuraEnabled
- public List<String> warningMsgList;
- @AuraEnabled
- public Boolean isNoteStay;
- }
-
- public class ConsumableorderdetailsInfo implements Comparable {
- @AuraEnabled
- public Consumable_order_details2__c esd { get; set; }
- @AuraEnabled
- public Product2__c Prod { get; set; }
- @AuraEnabled
- public String ProductName { get; set; }
- @AuraEnabled
- public String barCodeNo { get; set; }
- @AuraEnabled
- public Date sterilizationlimitDate { get; set; }
- @AuraEnabled
- public String serialNoorLotNo { get; set; }
- @AuraEnabled
- public String tracingCodeNo { get; set; }
- @AuraEnabled
- public String ReturnReason { get; set; }
- @AuraEnabled
- public String oldConsumableCount { get; set; }
- @AuraEnabled
- public String ErrorReason { get; set; }
- @AuraEnabled
- public boolean canEdit { get; set; }
- @AuraEnabled
- public Integer intMark { get; set; }
- @AuraEnabled
- public Decimal arriveAmount { get; set; }
- @AuraEnabled
- public Decimal arrivedCount { get; set; }
- @AuraEnabled
- public String ReportProductExpirationDate { get; set; }
-
- public ConsumableorderdetailsInfo() {
+ public static Results updateGoodsOfReturn(String arrControllerStr, String showGoodsofReturnListStr) {
+ Results results = new Results();
+ try {
+ List<ConsumableorderdetailsInfo> showGoodsofReturnList = (List<ConsumableorderdetailsInfo>)JSON.deserialize(showGoodsofReturnListStr, List<ConsumableorderdetailsInfo>.class);
+ ArriveGoodsController arrController = (ArriveGoodsController)JSON.deserialize(arrControllerStr, ArriveGoodsController.class);
+ arrController.ShowGoodsofReturnList = changeType2(showGoodsofReturnList);
+ arrController.returnError = null;
+ arrController.warningList = new List<String>();
+ arrController.errorList = new List<String>();
+ StaticParameter.ConsumableOrderTrigger = true; //Add by Li Jun for bypass ConsumableOrderTrigger 20230616
+ Pagereference page = arrController.UpdateGoodsOfReturn();
+ results.arrGoodCon = JSON.serialize(arrController);
+ if(arrController.returnError != null && arrController.returnError != ''){
+ results.result = 'Fail';
+ results.errorMsgList = arrController.errorList;
+ results.warningMsgList = arrController.warningList;
+ results.errorMsg = arrController.returnError;
+ }else {
+ if(arrController.urlType == 'ToReturnGoodsPage'){
+ results.url = '/detail/'+arrController.return_Order_id;
+ }
+ if(arrController.urlType == 'ToInventoryGoodsPage'){
+ results.url = '/detail/'+arrController.inventory_Order_id;
+ }
+ results.errorMsgList = arrController.errorList;
+ results.warningMsgList = arrController.warningList;
+ results.result = 'Success';
+ }
+ } catch (Exception e) {
+ results.result = 'Fail';
+ results.errorMsg = e.getLineNumber() + '---' + e.getMessage();
+ }
+ return results;
}
- public ConsumableorderdetailsInfo(
- Consumable_order_details2__c e,
- string str
- ) {
- esd = e;
- Prod = e.Consumable_Product__r;
- oldConsumableCount = e.name;
- ErrorReason = str;
- intMark = 1;
- if (e.Report_Product_Expiration__c != null) {
- ReportProductExpirationDate = e.Report_Product_Expiration__c.format();
- }
- }
- public ConsumableorderdetailsInfo(Consumable_order_details2__c e) {
- canEdit = false;
- if (e.Box_Piece__c == '鐩�') {
- e.Rrturn_count__c = 1;
- canEdit = true;
- }
- esd = e;
- Prod = e.Consumable_Product__r;
- oldConsumableCount = e.name;
- if (e.Report_Product_Expiration__c != null) {
- ReportProductExpirationDate = e.Report_Product_Expiration__c.format();
- }
+ public static List<ConsumableorderdetailsInfo> changeType1(List<ArriveGoodsController.ConsumableorderdetailsInfo> conList){
+ List<ConsumableorderdetailsInfo> conList1 = new List<ConsumableorderdetailsInfo>();
+ if(conList != null){
+ for(ArriveGoodsController.ConsumableorderdetailsInfo con : conList){
+ ConsumableorderdetailsInfo con1 = new ConsumableorderdetailsInfo();
+ con1.esd = con.esd;
+ con1.Prod = con.Prod;
+ con1.ProductName = con.ProductName;
+ con1.barCodeNo = con.barCodeNo;
+ con1.sterilizationlimitDate = con.sterilizationlimitDate;
+ con1.serialNoorLotNo = con.serialNoorLotNo;
+ con1.tracingCodeNo = con.tracingCodeNo;
+ con1.ReturnReason = con.ReturnReason;
+ con1.oldConsumableCount = con.oldConsumableCount;
+ con1.ErrorReason = con.ErrorReason;
+ con1.canEdit = con.canEdit;
+ con1.intMark = con.intMark;
+ con1.arriveAmount = con.arriveAmount;
+ con1.arrivedCount = con.arrivedCount;
+ con1.ReportProductExpirationDate = con.ReportProductExpirationDate;
+ conList1.add(con1);
+ }
+ }
+ return conList1;
}
- public ConsumableorderdetailsInfo(Product2__c e, List<String> barinfoL) {
- esd = new Consumable_order_details2__c();
- ProductName = e.Name__c;
- Prod = e;
- barCodeNo = barinfoL[0];
- if (String.isNotBlank(barinfoL[1])) {
- sterilizationlimitDate = Date.valueOf(barinfoL[1]);
- }
- serialNoorLotNo = barinfoL[2];
- tracingCodeNo = barinfoL[3];
- ReturnReason = '';
+ public static List<ArriveGoodsController.ConsumableorderdetailsInfo> changeType2(List<ConsumableorderdetailsInfo> conList){
+ List<ArriveGoodsController.ConsumableorderdetailsInfo> conList1 = new List<ArriveGoodsController.ConsumableorderdetailsInfo>();
+ if(conList != null){
+ for(ConsumableorderdetailsInfo con : conList){
+ ArriveGoodsController.ConsumableorderdetailsInfo con1 = new ArriveGoodsController.ConsumableorderdetailsInfo();
+ con1.esd = con.esd;
+ con1.Prod = con.Prod;
+ con1.ProductName = con.ProductName;
+ con1.barCodeNo = con.barCodeNo;
+ con1.sterilizationlimitDate = con.sterilizationlimitDate;
+ con1.serialNoorLotNo = con.serialNoorLotNo;
+ con1.tracingCodeNo = con.tracingCodeNo;
+ con1.ReturnReason = con.ReturnReason;
+ con1.oldConsumableCount = con.oldConsumableCount;
+ con1.ErrorReason = con.ErrorReason;
+ con1.canEdit = con.canEdit;
+ con1.intMark = con.intMark;
+ con1.arriveAmount = con.arriveAmount;
+ con1.arrivedCount = con.arrivedCount;
+ con1.ReportProductExpirationDate = con.ReportProductExpirationDate;
+ conList1.add(con1);
+ }
+ }
+ return conList1;
}
- public ConsumableorderdetailsInfo(
- Consumable_order_details2__c e,
- List<String> barinfoL
- ) {
- esd = e;
- Prod = e.Consumable_Product__r;
- barCodeNo = barinfoL[0];
- if (String.isNotBlank(barinfoL[1])) {
- sterilizationlimitDate = Date.valueOf(barinfoL[1]);
- }
- serialNoorLotNo = barinfoL[2];
- tracingCodeNo = barinfoL[3];
- if (e.Report_Product_Expiration__c != null) {
- ReportProductExpirationDate = e.Report_Product_Expiration__c.format();
- }
+ public class Results {
+ @AuraEnabled
+ public String result;
+ @AuraEnabled
+ public String errorMsg;
+ @AuraEnabled
+ public String url;
+ @AuraEnabled
+ public String arrGoodCon;
+ @AuraEnabled
+ public Consumable_order__c coc;
+ @AuraEnabled
+ public Boolean returnFLGbln;
+ @AuraEnabled
+ public Boolean saveFLGbln;
+ @AuraEnabled
+ public List<ConsumableorderdetailsInfo> detailsSummary;
+ @AuraEnabled
+ public List<ConsumableorderdetailsInfo> consumableorderdetailsRecords;
+ @AuraEnabled
+ public List<ConsumableorderdetailsInfo> showGoodsofReturnList;
+ @AuraEnabled
+ public List<ConsumableorderdetailsInfo> consumableInventory;
+ @AuraEnabled
+ public List<ConsumableorderdetailsInfo> consumableorderdetailsRecordserror;
+ @AuraEnabled
+ public List<String> errorMsgList;
+ @AuraEnabled
+ public List<String> warningMsgList;
+ @AuraEnabled
+ public Boolean isNoteStay;
}
- public ConsumableorderdetailsInfo(Product2__c e) {
- Prod = e;
+
+ public class ConsumableorderdetailsInfo implements Comparable {
+ @AuraEnabled
+ public Consumable_order_details2__c esd { get; set; }
+ @AuraEnabled
+ public Product2__c Prod { get; set; }
+ @AuraEnabled
+ public String ProductName { get; set; }
+ @AuraEnabled
+ public String barCodeNo { get; set; }
+ @AuraEnabled
+ public Date sterilizationlimitDate { get; set; }
+ @AuraEnabled
+ public String serialNoorLotNo { get; set; }
+ @AuraEnabled
+ public String tracingCodeNo { get; set; }
+ @AuraEnabled
+ public String ReturnReason { get; set; }
+ @AuraEnabled
+ public String oldConsumableCount { get; set; }
+ @AuraEnabled
+ public String ErrorReason { get; set; }
+ @AuraEnabled
+ public boolean canEdit { get; set; }
+ @AuraEnabled
+ public Integer intMark { get; set; }
+ @AuraEnabled
+ public Decimal arriveAmount { get; set; }
+ @AuraEnabled
+ public Decimal arrivedCount { get; set; }
+ @AuraEnabled
+ public String ReportProductExpirationDate { get; set; }
+
+ public ConsumableorderdetailsInfo(){
+
+ }
+
+ // 鎺掑簭
+ public Integer compareTo(Object compareTo) {
+ return null;
+ }
}
- // 鎺掑簭
- public Integer compareTo(Object compareTo) {
- return null;
- }
- }
-}
+}
\ No newline at end of file
diff --git a/force-app/main/default/classes/LexArriveGoodsController.cls-meta.xml b/force-app/main/default/classes/LexArriveGoodsController.cls-meta.xml
index 1248daa..fbbad0a 100644
--- a/force-app/main/default/classes/LexArriveGoodsController.cls-meta.xml
+++ b/force-app/main/default/classes/LexArriveGoodsController.cls-meta.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
<apiVersion>56.0</apiVersion>
<status>Active</status>
diff --git a/force-app/main/default/classes/LexArriveGoodsMainController.cls b/force-app/main/default/classes/LexArriveGoodsMainController.cls
index 489086c..57746d1 100644
--- a/force-app/main/default/classes/LexArriveGoodsMainController.cls
+++ b/force-app/main/default/classes/LexArriveGoodsMainController.cls
@@ -32,18 +32,6 @@
Results results = new Results();
results.isNoteStay = LexUtility.getIsNoteStay();
try {
- List<String> idList = new List<String>();
- idList.add('a2K10000002zHyDEAU');
- idList.add('a2K10000002zIJEEA2');
- idList.add('a2K10000002zK9rEAE');
- idList.add('a2K10000004AKGBEA4');
- idList.add('a2K10000004ALqeEAG');
- idList.add('a2K10000004AMmrEAG');
- idList.add('a2K10000004ANvDEAW');
- idList.add('a2K10000004AOVxEAO');
- idList.add('a2K10000004AOJZEA4');
- idList.add('a2K10000004AOLuEAO');
- idList.add('a2K10000004AOLfEAO');
// coc = new Consumable_order__c();
String userId = UserInfo.getUserId();
List<user> Useracc = New List<user>();
diff --git a/force-app/main/default/classes/LexArriveGsDetailsController.cls b/force-app/main/default/classes/LexArriveGsDetailsController.cls
index 05b90bc..69da85c 100644
--- a/force-app/main/default/classes/LexArriveGsDetailsController.cls
+++ b/force-app/main/default/classes/LexArriveGsDetailsController.cls
@@ -84,8 +84,9 @@
//鍑哄簱
@AuraEnabled
- public static Results proSale(String cocStr, Decimal orderallcountParm, Integer consumableorderdetailsCountParm) {
+ public static Results proSale(String cocStr, Decimal orderallcountParm, Integer consumableorderdetailsCountParm, String eSetIdStr) {
Results results = new Results();
+ eSetId = eSetIdStr;
try {
orderallcount = orderallcountParm;
consumableorderdetailsCount = consumableorderdetailsCountParm;
diff --git a/force-app/main/default/classes/LexConInvoicedetailsController.cls b/force-app/main/default/classes/LexConInvoicedetailsController.cls
index 5996cba..18a4fb5 100644
--- a/force-app/main/default/classes/LexConInvoicedetailsController.cls
+++ b/force-app/main/default/classes/LexConInvoicedetailsController.cls
@@ -1,512 +1,392 @@
public with sharing class LexConInvoicedetailsController {
- //鍑哄簱鍗曚娇鐢�
- public static Consumable_order__c coc { get; set; }
+ //鍑哄簱鍗曚娇鐢�
+ public static Consumable_order__c coc { get; set; }
- //鍙戠エ浣跨敤
- public static Consumable_order__c invoicecode { get; set; }
+ //鍙戠エ浣跨敤
+ public static Consumable_order__c invoicecode { get; set; }
- //浠锋牸璁＄畻缁撴灉
- public static Decimal sumPrice { get; set; }
+ //浠锋牸璁＄畻缁撴灉
+ public static Decimal sumPrice {get;set;}
- //鍑哄簱鍗旾D
- private static String orderId { get; set; }
- //鍙戠エ鍗旾D
- private static String invoiceId { get; set; }
- //鍑哄簱鍗曟槑缁�1锛岀敾闈㈡樉绀轰娇鐢�
- public static List<ConsumableorderdetailsInfo> consumableorderdetails1Records {
- get;
- set;
- }
- //鏄庣粏鏁伴噺
- public static Integer invoiceOrderRecoedsCount {
- get {
- return consumableorderdetails1Records == null
- ? 0
- : consumableorderdetails1Records.size();
- }
- }
-
- //椤甸潰鍒濆鍖�
- @AuraEnabled
- public static ResponseBodyLWC init(String orderIdLwc, String invoiceIdLwc) {
- ResponseBodyLWC res = new ResponseBodyLWC();
- Map<String, object> data = new Map<String, object>();
- res.entity = data;
-
- orderId = orderIdLwc;
- invoiceId = invoiceIdLwc;
- consumableorderdetails1Records = new List<ConsumableorderdetailsInfo>();
- sumPrice = 0;
- coc = new Consumable_order__c();
- //鍑哄簱鍗曚俊鎭�
- coc = [
- SELECT Id, Name, Outbound_Date__c, Order_ForDealerText__c, Dealer_Info__c
- FROM Consumable_order__c
- WHERE Id = :orderId
- ];
- //鍙戠エ淇℃伅
- invoicecode = [
- SELECT
- Id,
- Name,
- ShipmentAccount__c,
- Order_ForCustomerText__c,
- Order_ForDealerText__c,
- Dealer_Info__c
- FROM Consumable_order__c
- WHERE Id = :invoiceId
- ];
- //鍙戠エ鏄庣粏1
- Map<String, Consumable_Orderdetails__c> invoiceorderdet1CountMap = new Map<String, Consumable_Orderdetails__c>();
- List<Consumable_Orderdetails__c> invoiceorderdetails1 = [
- SELECT
- Id,
- Name,
- Consumable_order__c,
- Asset_Model_No__c,
- Consumable_Product__r.Asset_Model_No__c,
- Consumable_Count__c,
- Shipment_Count__c,
- RrturnPro_count__c,
- Delivery_List_RMB__c,
- InvoicedProCost_RMB__c,
- Invoiced_Procount__c,
- Invoiced_Count__c,
- Invoice_Unitprice__c,
- InvoiceProNot_count__c,
- Invoice_Cost_RMB__c,
- Invoice_No__c,
- Invoice_Unit__c,
- Invoicedet1_OD_link__c
- FROM Consumable_Orderdetails__c
- WHERE
- Consumable_order__c = :invoiceId
- AND Invoicedet1_OD_link__c = :orderId
- ];
- for (Integer i = 0; i < invoiceorderdetails1.size(); i++) {
- invoiceorderdet1CountMap.put(
- invoiceorderdetails1[i].Asset_Model_No__c,
- invoiceorderdetails1[i]
- );
- }
+ //鍑哄簱鍗旾D
+ private static String orderId {get;set;}
+ //鍙戠エ鍗旾D
+ private static String invoiceId {get;set;}
//鍑哄簱鍗曟槑缁�1锛岀敾闈㈡樉绀轰娇鐢�
- List<Consumable_Orderdetails__c> consumableorderdetails1 = [
- SELECT
- Id,
- Name,
- Consumable_order__c,
- Asset_Model_No__c,
- Consumable_Product__r.Asset_Model_No__c,
- Consumable_Count__c,
- Shipment_Count__c,
- RrturnPro_count__c,
- Delivery_List_RMB__c,
- InvoicedProCost_RMB__c,
- Invoiced_Procount__c,
- Invoiced_Count__c,
- Invoice_Unitprice__c,
- InvoiceProNot_count__c,
- Invoice_Cost_RMB__c,
- Invoice_No__c,
- Consumable_Product__c,
- Intra_Trade_List_RMB__c,
- Dealer_Custom_Price__c,
- Sum_of_money__c,
- Used_date__c,
- Send_date__c,
- Box_Piece__c,
- Invoice_Unit__c,
- Consumable_Product__r.Packing_list_manual__c,
- ProductPacking_list_manual__c
- FROM Consumable_Orderdetails__c
- WHERE Consumable_order__c = :orderId
- ];
- for (Integer i = 0; i < consumableorderdetails1.size(); i++) {
- consumableorderdetails1Records.add(
- new ConsumableorderdetailsInfo(consumableorderdetails1[i])
- );
+ public static List<ConsumableorderdetailsInfo> consumableorderdetails1Records { get; set; }
+ //鏄庣粏鏁伴噺
+ public static Integer invoiceOrderRecoedsCount {
+ get {
+ return consumableorderdetails1Records == null ? 0 : consumableorderdetails1Records.size();
+ }
}
- for (ConsumableorderdetailsInfo ass : consumableorderdetails1Records) {
- if (invoiceorderdet1CountMap.containsKey(ass.esd.Asset_Model_No__c)) {
- ass.check = true;
- if (
- invoiceorderdet1CountMap.get(ass.esd.Asset_Model_No__c)
- .Invoice_Unit__c == null ||
- invoiceorderdet1CountMap.get(ass.esd.Asset_Model_No__c)
- .Invoice_Unit__c == ''
- ) {
- ass.esd.Invoice_Unit__c = ass.esd.Box_Piece__c;
- } else {
- ass.esd.Invoice_Unit__c = invoiceorderdet1CountMap.get(
- ass.esd.Asset_Model_No__c
- )
- .Invoice_Unit__c;
+
+ //椤甸潰鍒濆鍖�
+ @AuraEnabled
+ public static ResponseBodyLWC init(String orderIdLwc,String invoiceIdLwc) {
+ ResponseBodyLWC res = new ResponseBodyLWC();
+ Map<String, object> data = new Map<String, object>();
+ res.entity = data;
+
+ orderId = orderIdLwc;
+ invoiceId = invoiceIdLwc;
+ consumableorderdetails1Records = new List<ConsumableorderdetailsInfo>();
+ sumPrice = 0;
+ coc = new Consumable_order__c();
+ //鍑哄簱鍗曚俊鎭�
+ coc = [SELECT Id, Name, Outbound_Date__c, Order_ForDealerText__c, Dealer_Info__c FROM Consumable_order__c WHERE Id = :orderId];
+ //鍙戠エ淇℃伅
+ invoicecode = [
+ SELECT Id, Name, ShipmentAccount__c, Order_ForCustomerText__c, Order_ForDealerText__c, Dealer_Info__c
+ FROM Consumable_order__c
+ WHERE Id = :invoiceId
+ ];
+ //鍙戠エ鏄庣粏1
+ Map<String, Consumable_Orderdetails__c> invoiceorderdet1CountMap = new Map<String, Consumable_Orderdetails__c>();
+ List<Consumable_Orderdetails__c> invoiceorderdetails1 = [
+ SELECT
+ Id,
+ Name,
+ Consumable_order__c,
+ Asset_Model_No__c,
+ Consumable_Product__r.Asset_Model_No__c,
+ Consumable_Count__c,
+ Shipment_Count__c,
+ RrturnPro_count__c,
+ Delivery_List_RMB__c,
+ InvoicedProCost_RMB__c,
+ Invoiced_Procount__c,
+ Invoiced_Count__c,
+ Invoice_Unitprice__c,
+ InvoiceProNot_count__c,
+ Invoice_Cost_RMB__c,
+ Invoice_No__c,
+ Invoice_Unit__c,
+ Invoicedet1_OD_link__c
+ FROM Consumable_Orderdetails__c
+ WHERE Consumable_order__c = :invoiceId AND Invoicedet1_OD_link__c = :orderId
+ ];
+ for (Integer i = 0; i < invoiceorderdetails1.size(); i++) {
+ invoiceorderdet1CountMap.put(invoiceorderdetails1[i].Asset_Model_No__c, invoiceorderdetails1[i]);
}
- if (
- invoiceorderdet1CountMap.get(ass.esd.Asset_Model_No__c)
- .Invoiced_Count__c == null ||
- invoiceorderdet1CountMap.get(ass.esd.Asset_Model_No__c)
- .Invoiced_Count__c == 0
- ) {
- ass.invoiceCount = ass.esd.Invoiced_Count__c;
- } else {
- ass.invoiceCount = invoiceorderdet1CountMap.get(
- ass.esd.Asset_Model_No__c
- )
- .Invoiced_Count__c;
+ //鍑哄簱鍗曟槑缁�1锛岀敾闈㈡樉绀轰娇鐢�
+ List<Consumable_Orderdetails__c> consumableorderdetails1 = [
+ SELECT
+ Id,
+ Name,
+ Consumable_order__c,
+ Asset_Model_No__c,
+ Consumable_Product__r.Asset_Model_No__c,
+ Consumable_Count__c,
+ Shipment_Count__c,
+ RrturnPro_count__c,
+ Delivery_List_RMB__c,
+ InvoicedProCost_RMB__c,
+ Invoiced_Procount__c,
+ Invoiced_Count__c,
+ Invoice_Unitprice__c,
+ InvoiceProNot_count__c,
+ Invoice_Cost_RMB__c,
+ Invoice_No__c,
+ Consumable_Product__c,
+ Intra_Trade_List_RMB__c,
+ Dealer_Custom_Price__c,
+ Sum_of_money__c,
+ Used_date__c,
+ Send_date__c,
+ Box_Piece__c,
+ Invoice_Unit__c,
+ Consumable_Product__r.Packing_list_manual__c,
+ ProductPacking_list_manual__c
+ FROM Consumable_Orderdetails__c
+ WHERE Consumable_order__c = :orderId
+ ];
+ for (Integer i = 0; i < consumableorderdetails1.size(); i++) {
+ consumableorderdetails1Records.add(new ConsumableorderdetailsInfo(consumableorderdetails1[i]));
}
+ for (ConsumableorderdetailsInfo ass : consumableorderdetails1Records) {
+ if (invoiceorderdet1CountMap.containsKey(ass.esd.Asset_Model_No__c)) {
+ ass.check = true;
+ if (
+ invoiceorderdet1CountMap.get(ass.esd.Asset_Model_No__c).Invoice_Unit__c == null ||
+ invoiceorderdet1CountMap.get(ass.esd.Asset_Model_No__c).Invoice_Unit__c == ''
+ ) {
+ ass.esd.Invoice_Unit__c = ass.esd.Box_Piece__c;
+ } else {
+ ass.esd.Invoice_Unit__c = invoiceorderdet1CountMap.get(ass.esd.Asset_Model_No__c).Invoice_Unit__c;
+ }
+ if (
+ invoiceorderdet1CountMap.get(ass.esd.Asset_Model_No__c).Invoiced_Count__c == null ||
+ invoiceorderdet1CountMap.get(ass.esd.Asset_Model_No__c).Invoiced_Count__c == 0
+ ) {
+ ass.invoiceCount = ass.esd.Invoiced_Count__c;
+ } else {
+ ass.invoiceCount = invoiceorderdet1CountMap.get(ass.esd.Asset_Model_No__c).Invoiced_Count__c;
+ }
- if (ass.esd.Box_Piece__c == '鐩�' && ass.esd.Invoice_Unit__c == '涓�') {
- ass.esd.Invoice_Unitprice__c =
- ass.esd.Delivery_List_RMB__c / ass.Packing_list_manual;
- } else {
- ass.esd.Invoice_Unitprice__c = ass.esd.Delivery_List_RMB__c;
- }
- Decimal invoiceAllprice = 0.00;
- invoiceAllprice = (ass.invoiceCount * ass.esd.Invoice_Unitprice__c)
- .setScale(2);
- ass.invoiceAllprice = invoiceAllprice;
- } else {
- ass.invoiceCount = ass.esd.InvoiceProNot_count__c;
- ass.esd.Invoice_Unit__c = ass.esd.Box_Piece__c;
- ass.esd.Invoice_Unitprice__c = ass.esd.Delivery_List_RMB__c;
- }
- }
- data.put('invoicecode', invoicecode);
- data.put('coc', coc);
- data.put('consumableorderdetails1Records', consumableorderdetails1Records);
- res.status = 'Success';
- res.code = 200;
- System.debug('res = ' + res);
- return res;
- }
-
- @AuraEnabled
- public static ResponseBodyLWC save(
- String consumableorderdetails1RecordsLwc,
- String invoiceIdLwc,
- String orderIdLwc
- ) {
- system.debug(
- 'consumableorderdetails1RecordsLwc:' + consumableorderdetails1RecordsLwc
- );
- ResponseBodyLWC res = new ResponseBodyLWC();
- Map<String, object> data = new Map<String, object>();
- res.entity = data;
-
- consumableorderdetails1Records = (List<ConsumableorderdetailsInfo>) JSON.deserialize(
- consumableorderdetails1RecordsLwc,
- List<ConsumableorderdetailsInfo>.class
- );
-
- invoiceId = invoiceIdLwc;
- orderId = orderIdLwc;
- System.debug(
- 'consumableorderdetails1Records = ' + consumableorderdetails1Records
- );
- System.debug('invoiceId = ' + invoiceId);
- System.debug('orderId = ' + orderId);
-
- Savepoint sp = Database.setSavepoint();
- //鏂拌鍙戠エ鏄庣粏1
- List<Consumable_Orderdetails__c> invoiceorderList1 = new List<Consumable_Orderdetails__c>();
- //鏇存柊鍙戠エ鏄庣粏1
- List<Consumable_Orderdetails__c> invoiceorderUpList1 = new List<Consumable_Orderdetails__c>();
- //鍒犻櫎鍙戠エ鏄庣粏1
- List<Consumable_Orderdetails__c> invoiceorderDeList1 = new List<Consumable_Orderdetails__c>();
-
- Map<String, Consumable_Orderdetails__c> invoiceordet1Map = new Map<String, Consumable_Orderdetails__c>();
-
- List<String> consumableorderList = new List<String>();
- List<String> consumableNameList = new List<String>();
- try {
- //鏇存柊鍑哄簱鍗曟槑缁�1
- for (ConsumableorderdetailsInfo ass : consumableorderdetails1Records) {
- consumableorderList.add(ass.esd.Asset_Model_No__c);
- }
-
- //鍙戠エ鏄庣粏1鑾峰彇
- List<Consumable_Orderdetails__c> invoiceorderdetails1 = [
- SELECT
- Id,
- Name,
- Consumable_order__c,
- Asset_Model_No__c,
- Consumable_Product__r.Asset_Model_No__c,
- Consumable_Count__c,
- Shipment_Count__c,
- RrturnPro_count__c,
- Delivery_List_RMB__c,
- InvoicedProCost_RMB__c,
- Invoiced_Procount__c,
- Invoiced_Count__c,
- Invoice_Unitprice__c,
- InvoiceProNot_count__c,
- Invoice_Cost_RMB__c,
- Invoice_No__c,
- Invoice_Unit__c,
- Box_Piece__c,
- Invoicedet1_OD_link__c
- FROM Consumable_Orderdetails__c
- WHERE
- Consumable_order__c = :invoiceId
- AND Invoicedet1_OD_link__c = :orderId
- AND Asset_Model_No__c IN :consumableorderList
- ];
- for (Integer i = 0; i < invoiceorderdetails1.size(); i++) {
- invoiceordet1Map.put(
- invoiceorderdetails1[i].Invoicedet1_OD_link__c +
- invoiceorderdetails1[i].Asset_Model_No__c,
- invoiceorderdetails1[i]
- );
- }
- List<Consumable_Orderdetails__c> invoicedetails1count = [
- SELECT
- Id,
- Name,
- Consumable_order__c,
- Invoicedet1_OD_link__c,
- Asset_Model_No__c,
- Consumable_Product__r.Asset_Model_No__c,
- Consumable_Count__c,
- Shipment_Count__c,
- RrturnPro_count__c,
- Delivery_List_RMB__c,
- InvoicedProCost_RMB__c,
- Invoiced_Procount__c,
- Invoiced_Count__c,
- Sum_of_money__c,
- Invoice_Unitprice__c,
- InvoiceProNot_count__c,
- Invoice_Cost_RMB__c,
- Invoice_Unit__c,
- Invoice_No__c
- FROM Consumable_Orderdetails__c
- WHERE Consumable_order__c = :invoiceId
- ];
- Integer invoiceRecordscon = invoicedetails1count.size() + 1;
-
- for (ConsumableorderdetailsInfo ass : consumableorderdetails1Records) {
- if (ass.check == true && ass.invoiceCount > 0) {
- if (String.isEmpty(String.valueOf(ass.invoiceCount))) {
- // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '璇疯緭鍏ュ彂绁ㄦ暟閲忥紒'));
- // return null;
- return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ュ彂绁ㄦ暟閲忥紒', '');
- }
- if (ass.esd.Box_Piece__c == '鐩�' && ass.esd.Invoice_Unit__c == '涓�') {
- if (
- ass.invoiceCount >
- (ass.esd.InvoiceProNot_count__c * ass.Packing_list_manual)
- .setScale(0)
- ) {
- // ass.esd.InvoiceProNot_count__c.addError('鍙戠エ鏁伴噺涓嶈兘瓒呰繃杩樻病鍙戠エ鏁伴噺锛�');
- // return null;
- return new ResponseBodyLWC(
- 'Error',
- 500,
- '鍙戠エ鏁伴噺涓嶈兘瓒呰繃杩樻病鍙戠エ鏁伴噺锛�',
- ''
- );
- }
- } else {
- if (ass.invoiceCount > ass.esd.InvoiceProNot_count__c) {
- // ass.esd.InvoiceProNot_count__c.addError('鍙戠エ鏁伴噺涓嶈兘瓒呰繃杩樻病鍙戠エ鏁伴噺锛�');
- // return null;
- return new ResponseBodyLWC(
- 'Error',
- 500,
- '鍙戠エ鏁伴噺涓嶈兘瓒呰繃杩樻病鍙戠エ鏁伴噺锛�',
- ''
- );
- }
- }
-
- //if(ass.esd.Invoice_Unit__c =='涓�'){
- String invoiceCount = String.valueOf(ass.invoiceCount);
- if (!Pattern.matches('^\\+{0,1}[1-9]\\d*', invoiceCount)) {
- // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, '鍙戠エ鏁伴噺蹇呴』鏄暣鏁�'));
- // return null;
- return new ResponseBodyLWC('Error', 500, '鍙戠エ鏁伴噺蹇呴』鏄暣鏁�', '');
- }
- //}
-
- if (
- invoiceordet1Map.containsKey(
- ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c
- )
- ) {
- invoiceordet1Map.get(
- ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c
- )
- .Shipment_Count__c = ass.invoiceCount;
- invoiceordet1Map.get(
- ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c
- )
- .Invoiced_Count__c = ass.invoiceCount;
- //invoiceordet1Map.get(ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c).InvoicedProCost_RMB__c = invoiceordet1Map.get(ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c).Delivery_List_RMB__c * ass.invoiceCount;
- invoiceordet1Map.get(
- ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c
- )
- .Invoice_Unit__c = ass.esd.Invoice_Unit__c;
- invoiceordet1Map.get(
- ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c
- )
- .Box_Piece__c = ass.esd.Box_Piece__c;
- if (
- ass.esd.Box_Piece__c == '鐩�' &&
- ass.esd.Invoice_Unit__c == '涓�'
- ) {
- invoiceordet1Map.get(
- ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c
- )
- .InvoicedProCost_RMB__c =
- (ass.esd.Delivery_List_RMB__c / ass.Packing_list_manual) *
- ass.invoiceCount;
- invoiceordet1Map.get(
- ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c
- )
- .Invoice_Unitprice__c =
- ass.esd.Delivery_List_RMB__c / ass.Packing_list_manual;
+ if (ass.esd.Box_Piece__c == '鐩�' && ass.esd.Invoice_Unit__c == '涓�') {
+ ass.esd.Invoice_Unitprice__c = ass.esd.Delivery_List_RMB__c / ass.Packing_list_manual;
+ } else {
+ ass.esd.Invoice_Unitprice__c = ass.esd.Delivery_List_RMB__c;
+ }
+ Decimal invoiceAllprice = 0.00;
+ invoiceAllprice = (ass.invoiceCount * ass.esd.Invoice_Unitprice__c).setScale(2);
+ ass.invoiceAllprice = invoiceAllprice;
} else {
- invoiceordet1Map.get(
- ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c
- )
- .InvoicedProCost_RMB__c =
- ass.esd.Delivery_List_RMB__c * ass.invoiceCount;
- invoiceordet1Map.get(
- ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c
- )
- .Invoice_Unitprice__c = ass.esd.Delivery_List_RMB__c;
+ ass.invoiceCount = ass.esd.InvoiceProNot_count__c;
+ ass.esd.Invoice_Unit__c = ass.esd.Box_Piece__c;
+ ass.esd.Invoice_Unitprice__c = ass.esd.Delivery_List_RMB__c;
}
-
- invoiceorderUpList1.add(
- invoiceordet1Map.get(
- ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c
- )
- );
- invoiceRecordscon++;
- } else {
- String str = string.valueOf(invoiceRecordscon);
- if (str.length() == 1) {
- str = '0' + str;
- }
- Consumable_Orderdetails__c invoiceInsert1 = new Consumable_Orderdetails__c();
- invoiceInsert1.Used_date__c = ass.esd.Used_date__c;
- invoiceInsert1.Send_date__c = ass.esd.Send_date__c;
- invoiceInsert1.Name =
- invoicecode.Name +
- '-' +
- ass.esd.Name.substring(
- ass.esd.Name.length() - 7,
- ass.esd.Name.length()
- );
- invoiceInsert1.Shipment_Count__c = ass.invoiceCount;
- invoiceInsert1.Consumable_Product__c = ass.esd.Consumable_Product__c;
- invoiceInsert1.Intra_Trade_List_RMB__c = ass.esd.Intra_Trade_List_RMB__c;
- invoiceInsert1.Delivery_List_RMB__c = ass.esd.Delivery_List_RMB__c;
- invoiceInsert1.Dealer_Custom_Price__c = ass.esd.Dealer_Custom_Price__c;
- invoiceInsert1.RecordTypeId = System.Label.RT_ConOrderDetail1_Invoice;
- if (
- ass.esd.Box_Piece__c == '鐩�' &&
- ass.esd.Invoice_Unit__c == '涓�'
- ) {
- invoiceInsert1.Invoice_Unitprice__c =
- ass.esd.Delivery_List_RMB__c / ass.Packing_list_manual;
- } else {
- invoiceInsert1.Invoice_Unitprice__c = ass.esd.Delivery_List_RMB__c;
- }
- //invoiceInsert1.Invoice_Unitprice__c = ass.esd.Invoice_Unitprice__c;
- invoiceInsert1.Invoice_Unit__c = ass.esd.Invoice_Unit__c;
- invoiceInsert1.Box_Piece__c = ass.esd.Box_Piece__c;
- if (ass.esd.Invoiced_Procount__c == null)
- ass.esd.Invoiced_Procount__c = 0;
- invoiceInsert1.Invoiced_Count__c = ass.invoiceCount;
- if (ass.esd.InvoicedProCost_RMB__c == null)
- ass.esd.InvoicedProCost_RMB__c = 0;
- invoiceInsert1.InvoicedProCost_RMB__c =
- ass.invoiceCount * invoiceInsert1.Invoice_Unitprice__c;
- invoiceInsert1.Consumable_order__c = invoiceId;
- invoiceInsert1.Invoicedet1_OD_link__c = orderId;
- invoiceRecordscon++;
- invoiceorderList1.add(invoiceInsert1);
- }
- } else {
- if (
- invoiceordet1Map.containsKey(
- ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c
- )
- ) {
- invoiceorderDeList1.add(
- invoiceordet1Map.get(
- ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c
- )
- );
- }
}
- }
-
- if (invoiceorderList1.size() > 0) {
- insert invoiceorderList1;
- }
- if (invoiceorderUpList1.size() > 0) {
- update invoiceorderUpList1;
- }
- if (invoiceorderDeList1.size() > 0) {
- delete invoiceorderDeList1;
- }
- } catch (Exception e) {
- ApexPages.addmessages(e);
- // Database.rollback(sp);
- // return null;
- return new ResponseBodyLWC(
- 'Error',
- 500,
- e.getMessage() + ' ' + e.getLineNumber(),
- ''
- );
+ data.put('invoicecode',invoicecode);
+ data.put('coc',coc);
+ data.put('consumableorderdetails1Records',consumableorderdetails1Records);
+ res.status = 'Success';
+ res.code = 200;
+ System.debug('res = ' + res);
+ return res;
}
- res.status = 'Success';
- res.code = 200;
- System.debug('res = ' + res);
- return res;
- }
- // Data Bean
- class ConsumableorderdetailsInfo {
@AuraEnabled
- public Boolean check { get; set; }
- @AuraEnabled
- public Boolean oldCheck { get; set; }
- @AuraEnabled
- public Consumable_Orderdetails__c esd { get; set; }
- @AuraEnabled
- public Product2__c Prod { get; set; }
- @AuraEnabled
- public Decimal invoiceCount { get; set; }
- @AuraEnabled
- public Decimal invoiceAllprice { get; set; }
- @AuraEnabled
- public Decimal Packing_list_manual { get; set; }
- public List<SelectOption> Invoice_UnitOpts { get; set; }
- @AuraEnabled
- public Map<String, String> Invoice_UnitOptsMap { get; set; }
- // 娑堣�楀搧浜у搧鏄庣粏
- public ConsumableorderdetailsInfo(Consumable_Orderdetails__c e) {
- check = false;
- oldCheck = false;
- esd = e;
- Prod = e.Consumable_Product__r;
- invoiceAllprice = 0;
+ public static ResponseBodyLWC save(String consumableorderdetails1RecordsLwc,String invoiceIdLwc,String orderIdLwc) {
+ ResponseBodyLWC res = new ResponseBodyLWC();
+ Map<String, object> data = new Map<String, object>();
+ res.entity = data;
- Packing_list_manual = e.Consumable_Product__r.Packing_list_manual__c;
+ consumableorderdetails1Records= (List<ConsumableorderdetailsInfo>)JSON.deserialize(consumableorderdetails1RecordsLwc, List<ConsumableorderdetailsInfo>.class);
+ invoiceId = invoiceIdLwc;
+ orderId = orderIdLwc;
+ System.debug('consumableorderdetails1Records = ' + consumableorderdetails1Records);
+ System.debug('invoiceId = ' + invoiceId);
+ System.debug('orderId = ' + orderId);
- Invoice_UnitOpts = new List<SelectOption>();
- Invoice_UnitOpts.add(new SelectOption('鐩�', '鐩�'));
- Invoice_UnitOpts.add(new SelectOption('涓�', '涓�'));
+ Savepoint sp = Database.setSavepoint();
+ //鏂拌鍙戠エ鏄庣粏1
+ List<Consumable_Orderdetails__c> invoiceorderList1 = new List<Consumable_Orderdetails__c>();
+ //鏇存柊鍙戠エ鏄庣粏1
+ List<Consumable_Orderdetails__c> invoiceorderUpList1 = new List<Consumable_Orderdetails__c>();
+ //鍒犻櫎鍙戠エ鏄庣粏1
+ List<Consumable_Orderdetails__c> invoiceorderDeList1 = new List<Consumable_Orderdetails__c>();
- Invoice_UnitOptsMap = new Map<String, String>();
- Invoice_UnitOptsMap.put('鐩�', '鐩�');
- Invoice_UnitOptsMap.put('涓�', '涓�');
+ Map<String, Consumable_Orderdetails__c> invoiceordet1Map = new Map<String, Consumable_Orderdetails__c>();
+
+ List<String> consumableorderList = new List<String>();
+ List<String> consumableNameList = new List<String>();
+ try {
+ //鏇存柊鍑哄簱鍗曟槑缁�1
+ for (ConsumableorderdetailsInfo ass : consumableorderdetails1Records) {
+ consumableorderList.add(ass.esd.Asset_Model_No__c);
+ }
+
+ //鍙戠エ鏄庣粏1鑾峰彇
+ List<Consumable_Orderdetails__c> invoiceorderdetails1 = [
+ SELECT
+ Id,
+ Name,
+ Consumable_order__c,
+ Asset_Model_No__c,
+ Consumable_Product__r.Asset_Model_No__c,
+ Consumable_Count__c,
+ Shipment_Count__c,
+ RrturnPro_count__c,
+ Delivery_List_RMB__c,
+ InvoicedProCost_RMB__c,
+ Invoiced_Procount__c,
+ Invoiced_Count__c,
+ Invoice_Unitprice__c,
+ InvoiceProNot_count__c,
+ Invoice_Cost_RMB__c,
+ Invoice_No__c,
+ Invoice_Unit__c,
+ Box_Piece__c,
+ Invoicedet1_OD_link__c
+ FROM Consumable_Orderdetails__c
+ WHERE Consumable_order__c = :invoiceId AND Invoicedet1_OD_link__c = :orderId AND Asset_Model_No__c IN :consumableorderList
+ ];
+ for (Integer i = 0; i < invoiceorderdetails1.size(); i++) {
+ invoiceordet1Map.put(
+ invoiceorderdetails1[i].Invoicedet1_OD_link__c + invoiceorderdetails1[i].Asset_Model_No__c,
+ invoiceorderdetails1[i]
+ );
+ }
+ List<Consumable_Orderdetails__c> invoicedetails1count = [
+ SELECT
+ Id,
+ Name,
+ Consumable_order__c,
+ Invoicedet1_OD_link__c,
+ Asset_Model_No__c,
+ Consumable_Product__r.Asset_Model_No__c,
+ Consumable_Count__c,
+ Shipment_Count__c,
+ RrturnPro_count__c,
+ Delivery_List_RMB__c,
+ InvoicedProCost_RMB__c,
+ Invoiced_Procount__c,
+ Invoiced_Count__c,
+ Sum_of_money__c,
+ Invoice_Unitprice__c,
+ InvoiceProNot_count__c,
+ Invoice_Cost_RMB__c,
+ Invoice_Unit__c,
+ Invoice_No__c
+ FROM Consumable_Orderdetails__c
+ WHERE Consumable_order__c = :invoiceId
+ ];
+ Integer invoiceRecordscon = invoicedetails1count.size() + 1;
+
+ for (ConsumableorderdetailsInfo ass : consumableorderdetails1Records) {
+ if (ass.check == true && ass.invoiceCount > 0) {
+ if (String.isEmpty(String.valueOf(ass.invoiceCount))) {
+ // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '璇疯緭鍏ュ彂绁ㄦ暟閲忥紒'));
+ // return null;
+ return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ュ彂绁ㄦ暟閲忥紒', '');
+ }
+ if (ass.esd.Box_Piece__c == '鐩�' && ass.esd.Invoice_Unit__c == '涓�') {
+ if (ass.invoiceCount > (ass.esd.InvoiceProNot_count__c * ass.Packing_list_manual).setScale(0)) {
+ // ass.esd.InvoiceProNot_count__c.addError('鍙戠エ鏁伴噺涓嶈兘瓒呰繃杩樻病鍙戠エ鏁伴噺锛�');
+ // return null;
+ return new ResponseBodyLWC('Error', 500, '鍙戠エ鏁伴噺涓嶈兘瓒呰繃杩樻病鍙戠エ鏁伴噺锛�', '');
+ }
+ } else {
+ if (ass.invoiceCount > ass.esd.InvoiceProNot_count__c) {
+ // ass.esd.InvoiceProNot_count__c.addError('鍙戠エ鏁伴噺涓嶈兘瓒呰繃杩樻病鍙戠エ鏁伴噺锛�');
+ // return null;
+ return new ResponseBodyLWC('Error', 500, '鍙戠エ鏁伴噺涓嶈兘瓒呰繃杩樻病鍙戠エ鏁伴噺锛�', '');
+ }
+ }
+
+ //if(ass.esd.Invoice_Unit__c =='涓�'){
+ String invoiceCount = String.valueOf(ass.invoiceCount);
+ if (!Pattern.matches('^\\+{0,1}[1-9]\\d*', invoiceCount)) {
+ // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, '鍙戠エ鏁伴噺蹇呴』鏄暣鏁�'));
+ // return null;
+ return new ResponseBodyLWC('Error', 500, '鍙戠エ鏁伴噺蹇呴』鏄暣鏁�', '');
+ }
+ //}
+
+ if (invoiceordet1Map.containsKey(ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c)) {
+ invoiceordet1Map.get(ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c).Shipment_Count__c = ass.invoiceCount;
+ invoiceordet1Map.get(ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c).Invoiced_Count__c = ass.invoiceCount;
+ //invoiceordet1Map.get(ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c).InvoicedProCost_RMB__c = invoiceordet1Map.get(ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c).Delivery_List_RMB__c * ass.invoiceCount;
+ invoiceordet1Map.get(ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c)
+ .Invoice_Unit__c = ass.esd.Invoice_Unit__c;
+ invoiceordet1Map.get(ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c).Box_Piece__c = ass.esd.Box_Piece__c;
+ if (ass.esd.Box_Piece__c == '鐩�' && ass.esd.Invoice_Unit__c == '涓�') {
+ invoiceordet1Map.get(ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c).InvoicedProCost_RMB__c =
+ (ass.esd.Delivery_List_RMB__c / ass.Packing_list_manual) * ass.invoiceCount;
+ invoiceordet1Map.get(ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c).Invoice_Unitprice__c =
+ ass.esd.Delivery_List_RMB__c / ass.Packing_list_manual;
+ } else {
+ invoiceordet1Map.get(ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c).InvoicedProCost_RMB__c =
+ ass.esd.Delivery_List_RMB__c * ass.invoiceCount;
+ invoiceordet1Map.get(ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c)
+ .Invoice_Unitprice__c = ass.esd.Delivery_List_RMB__c;
+ }
+
+ invoiceorderUpList1.add(invoiceordet1Map.get(ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c));
+ invoiceRecordscon++;
+ } else {
+ String str = string.valueOf(invoiceRecordscon);
+ if (str.length() == 1) {
+ str = '0' + str;
+ }
+ Consumable_Orderdetails__c invoiceInsert1 = new Consumable_Orderdetails__c();
+ invoiceInsert1.Used_date__c = ass.esd.Used_date__c;
+ invoiceInsert1.Send_date__c = ass.esd.Send_date__c;
+ invoiceInsert1.Name =
+ invoicecode.Name +
+ '-' +
+ ass.esd.Name.substring(ass.esd.Name.length() - 7, ass.esd.Name.length());
+ invoiceInsert1.Shipment_Count__c = ass.invoiceCount;
+ invoiceInsert1.Consumable_Product__c = ass.esd.Consumable_Product__c;
+ invoiceInsert1.Intra_Trade_List_RMB__c = ass.esd.Intra_Trade_List_RMB__c;
+ invoiceInsert1.Delivery_List_RMB__c = ass.esd.Delivery_List_RMB__c;
+ invoiceInsert1.Dealer_Custom_Price__c = ass.esd.Dealer_Custom_Price__c;
+ invoiceInsert1.RecordTypeId = System.Label.RT_ConOrderDetail1_Invoice;
+ if (ass.esd.Box_Piece__c == '鐩�' && ass.esd.Invoice_Unit__c == '涓�') {
+ invoiceInsert1.Invoice_Unitprice__c = ass.esd.Delivery_List_RMB__c / ass.Packing_list_manual;
+ } else {
+ invoiceInsert1.Invoice_Unitprice__c = ass.esd.Delivery_List_RMB__c;
+ }
+ //invoiceInsert1.Invoice_Unitprice__c = ass.esd.Invoice_Unitprice__c;
+ invoiceInsert1.Invoice_Unit__c = ass.esd.Invoice_Unit__c;
+ invoiceInsert1.Box_Piece__c = ass.esd.Box_Piece__c;
+ if (ass.esd.Invoiced_Procount__c == null)
+ ass.esd.Invoiced_Procount__c = 0;
+ invoiceInsert1.Invoiced_Count__c = ass.invoiceCount;
+ if (ass.esd.InvoicedProCost_RMB__c == null)
+ ass.esd.InvoicedProCost_RMB__c = 0;
+ invoiceInsert1.InvoicedProCost_RMB__c = ass.invoiceCount * invoiceInsert1.Invoice_Unitprice__c;
+ invoiceInsert1.Consumable_order__c = invoiceId;
+ invoiceInsert1.Invoicedet1_OD_link__c = orderId;
+ invoiceRecordscon++;
+ invoiceorderList1.add(invoiceInsert1);
+ }
+ } else {
+ if (invoiceordet1Map.containsKey(ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c)) {
+ invoiceorderDeList1.add(invoiceordet1Map.get(ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c));
+ }
+ }
+ }
+
+ if (invoiceorderList1.size() > 0) {
+ insert invoiceorderList1;
+ }
+ if (invoiceorderUpList1.size() > 0) {
+ update invoiceorderUpList1;
+ }
+ if (invoiceorderDeList1.size() > 0) {
+ delete invoiceorderDeList1;
+ }
+ } catch (Exception e) {
+ ApexPages.addmessages(e);
+ // Database.rollback(sp);
+ // return null;
+ return new ResponseBodyLWC('Error', 500, e.getMessage() + ' ' + e.getLineNumber(), '');
+ }
+ res.status = 'Success';
+ res.code = 200;
+ System.debug('res = ' + res);
+ return res;
}
- }
-}
+
+ // Data Bean
+ class ConsumableorderdetailsInfo {
+ @AuraEnabled
+ public Boolean check { get; set; }
+ @AuraEnabled
+ public Boolean oldCheck { get; set; }
+ @AuraEnabled
+ public Consumable_Orderdetails__c esd { get; set; }
+ @AuraEnabled
+ public Product2__c Prod { get; set; }
+ @AuraEnabled
+ public Decimal invoiceCount { get; set; }
+ @AuraEnabled
+ public Decimal invoiceAllprice { get; set; }
+ @AuraEnabled
+ public Decimal Packing_list_manual { get; set; }
+ public List<SelectOption> Invoice_UnitOpts { get; set; }
+ @AuraEnabled
+ public Map<String,String> Invoice_UnitOptsMap { get; set; }
+ // 娑堣�楀搧浜у搧鏄庣粏
+ public ConsumableorderdetailsInfo(Consumable_Orderdetails__c e) {
+ check = false;
+ oldCheck = false;
+ esd = e;
+ Prod = e.Consumable_Product__r;
+ invoiceAllprice = 0;
+
+ Packing_list_manual = e.Consumable_Product__r.Packing_list_manual__c;
+
+ Invoice_UnitOpts = new List<SelectOption>();
+ Invoice_UnitOpts.add(new SelectOption('鐩�', '鐩�'));
+ Invoice_UnitOpts.add(new SelectOption('涓�', '涓�'));
+
+ Invoice_UnitOptsMap = new Map<String,String>();
+ Invoice_UnitOptsMap.put('鐩�', '鐩�');
+ Invoice_UnitOptsMap.put('涓�', '涓�');
+ }
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/classes/LexConsumableAccountController.cls b/force-app/main/default/classes/LexConsumableAccountController.cls
index 9925a02..21d519d 100644
--- a/force-app/main/default/classes/LexConsumableAccountController.cls
+++ b/force-app/main/default/classes/LexConsumableAccountController.cls
@@ -244,20 +244,29 @@
AggregateResult[] arList = null;
System.debug('fiscalYear = ' + fiscalYear);
+ System.debug('thisYear = ' + thisYear);
+ System.debug('lastYear = ' + lastYear);
+
if (fiscalYear == 'thisYear') {
AggregateResult[] saleAmountList = LexConsumableAccountSOQL.getAccountTotalSales(thisDatetime, nextDatetime);
- topInfo.saleAmount = Decimal.valueOf(String.valueOf(saleAmountList[0].get('saleAmount')));
- System.debug('topInfo.saleAmount = ' + topInfo.saleAmount);
+ if(saleAmountList[0].get('saleAmount') != null){
+ topInfo.saleAmount = Decimal.valueOf(String.valueOf(saleAmountList[0].get('saleAmount')));
+ System.debug('topInfo.saleAmount = ' + topInfo.saleAmount);
+ }
arList = LexConsumableAccountSOQL.getAccountBySales(thisDatetime, nextDatetime);
} else if (fiscalYear == 'lastYear') {
AggregateResult[] saleAmountList = LexConsumableAccountSOQL.getAccountTotalSales(lastDatetime, thisDatetime2);
- topInfo.saleAmount = Decimal.valueOf(String.valueOf(saleAmountList[0].get('saleAmount')));
- System.debug('topInfo.saleAmount = ' + topInfo.saleAmount);
+ if(saleAmountList[0].get('saleAmount') != null){
+ topInfo.saleAmount = Decimal.valueOf(String.valueOf(saleAmountList[0].get('saleAmount')));
+ System.debug('topInfo.saleAmount = ' + topInfo.saleAmount);
+ }
arList = LexConsumableAccountSOQL.getAccountBySales(lastDatetime, thisDatetime2);
} else {
AggregateResult[] saleAmountList = LexConsumableAccountSOQL.getAccountTotalSales(lastDatetime, nextDatetime);
- topInfo.saleAmount = Decimal.valueOf(String.valueOf(saleAmountList[0].get('saleAmount')));
- System.debug('topInfo.saleAmount = ' + topInfo.saleAmount);
+ if(saleAmountList[0].get('saleAmount') != null){
+ topInfo.saleAmount = Decimal.valueOf(String.valueOf(saleAmountList[0].get('saleAmount')));
+ System.debug('topInfo.saleAmount = ' + topInfo.saleAmount);
+ }
arList = LexConsumableAccountSOQL.getAccountBySales(lastDatetime, nextDatetime);
}
//鏌ヨ瀹㈡埛淇℃伅锛堝悕绉帮紝鐪侊紝鍘匡級
diff --git a/force-app/main/default/classes/LexConsumableController.cls b/force-app/main/default/classes/LexConsumableController.cls
index ae8b99b..c6f9846 100644
--- a/force-app/main/default/classes/LexConsumableController.cls
+++ b/force-app/main/default/classes/LexConsumableController.cls
@@ -1651,6 +1651,7 @@
OSHFLG = OSHFLGStr;
coc = (Consumable_order__c)JSON.deserialize(cocStr, Consumable_order__c.class);
contactDealer = (List<String>)JSON.deserialize(contactDealerStr, List<String>.class);
+ System.debug('consumableorderdetailsRecordsviewStr:'+consumableorderdetailsRecordsviewStr);
consumableorderdetailsRecordsview = (List<ConsumableorderdetailsInfo>)JSON.deserialize(consumableorderdetailsRecordsviewStr, List<ConsumableorderdetailsInfo>.class);
if(coc.Offers_Price__c != null){
String offerStr = String.valueOf(coc.Offers_Price__c);
@@ -2018,13 +2019,19 @@
//鍒犻櫎闄勪欢
@AuraEnabled
- public static Results deleteAtt(String contentVersionId){
+ public static Results deleteAtt(String contentVersionId, String cocId){
Results results = new Results();
try {
+ List<ContentVersion> cvInfo = [SELECT Id FROM ContentVersion WHERE FirstPublishLocationId = :cocId];
ContentVersion conVersion = [SELECT ContentDocumentId FROM ContentVersion WHERE Id = :contentVersionId];
String contentDocumentId = conVersion.ContentDocumentId;
ContentDocument conDocument = [SELECT Id FROM ContentDocument where Id = :contentDocumentId];
delete conDocument;
+ if(cvInfo.size() <= 1){
+ Consumable_order__c c = [SELECT Id FROM Consumable_order__c WHERE Id =:cocId];
+ c.Consumable_pdf_insert_day__c =null;
+ update c;
+ }
results.result = 'Success';
} catch (Exception e) {
results.result = 'Fail';
@@ -2056,7 +2063,7 @@
}
}
- class ConsumableorderdetailsInfo implements Comparable {
+ public class ConsumableorderdetailsInfo implements Comparable {
@AuraEnabled
public Boolean check { get; set; }
@AuraEnabled
diff --git a/force-app/main/default/classes/LexConsumableGoodsInfo.cls b/force-app/main/default/classes/LexConsumableGoodsInfo.cls
index e60bfdd..78044ce 100644
--- a/force-app/main/default/classes/LexConsumableGoodsInfo.cls
+++ b/force-app/main/default/classes/LexConsumableGoodsInfo.cls
@@ -21,19 +21,10 @@
String rtTypeDelivery = System.Label.RT_ConOrder_Delivery;
List<Consumable_order__c> conorderlist = new List<Consumable_order__c>();
//20200916 ljh update start
- if(Test.isRunningTest()){
- if(type !=null && type.equals('all')){
- conorderlist = [select id,Owner.Name from Consumable_order__c where Order_type__c = '璁㈠崟' and recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and (OrderNumber_notarrive__c >= 0 or Delivery_detail_count__c >=0) and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation and showFalseNotshowTrue__c = false];
- }else{
- conorderlist = [select id,Owner.Name from Consumable_order__c where Order_type__c = '璁㈠崟' and recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and Delivery_detail_count__c >=0 and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation and showFalseNotshowTrue__c = false];
- }
-
+ if(type !=null && type.equals('all')){
+ conorderlist = [select id,Owner.Name from Consumable_order__c where Order_type__c = '璁㈠崟' and recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and (OrderNumber_notarrive__c > 0 or Delivery_detail_count__c >0) and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation and showFalseNotshowTrue__c = false];
}else{
- if(type !=null && type.equals('all')){
- conorderlist = [select id,Owner.Name from Consumable_order__c where Order_type__c = '璁㈠崟' and recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and (OrderNumber_notarrive__c > 0 or Delivery_detail_count__c >0) and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation and showFalseNotshowTrue__c = false];
- }else{
- conorderlist = [select id,Owner.Name from Consumable_order__c where Order_type__c = '璁㈠崟' and recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and Delivery_detail_count__c >0 and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation and showFalseNotshowTrue__c = false];
- }
+ conorderlist = [select id,Owner.Name from Consumable_order__c where Order_type__c = '璁㈠崟' and recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and Delivery_detail_count__c >0 and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation and showFalseNotshowTrue__c = false];
}
for(Consumable_order__c conorder : conorderlist){
String temp = (String)conorder.Id;
@@ -42,11 +33,8 @@
System.debug('ANY o'+orderId);
}
List<Consumable_Orderdetails__c> conOrderList1 = new List<Consumable_Orderdetails__c>();
- if(Test.isRunningTest()){
- conOrderList1 = [SELECT Asset_Model_No__c ,Consumable_count__c FROM Consumable_Orderdetails__c];
- }else{
- conOrderList1 = [SELECT Asset_Model_No__c ,Consumable_count__c FROM Consumable_Orderdetails__c WHERE Consumable_order__c =:orderId];
- }
+
+ conOrderList1 = [SELECT Asset_Model_No__c ,Consumable_count__c FROM Consumable_Orderdetails__c WHERE Consumable_order__c =:orderId];
Map<String,Decimal> allConOrderMap = new Map<String,Decimal>();
for(Consumable_Orderdetails__c con : conOrderList1){
@@ -123,21 +111,11 @@
String rtTypeDelivery = System.Label.RT_ConOrder_Delivery;
List<Consumable_order__c> conorderlist = new List<Consumable_order__c>();
//20200916 ljh update start
- if(Test.isRunningTest()){
- //conorderlist = [select id,name,Owner.Name from Consumable_order__c where Order_type__c = '璁㈠崟' and recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and Delivery_detail_count__c >=0 and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation];
- if(type !=null && type.equals('all')){
- conorderlist = [select id,Owner.Name from Consumable_order__c where Order_type__c = '璁㈠崟' and recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and (OrderNumber_notarrive__c >= 0 or Delivery_detail_count__c >=0) and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation and showFalseNotshowTrue__c = false];
- }else{
- conorderlist = [select id,Owner.Name from Consumable_order__c where Order_type__c = '璁㈠崟' and recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and Delivery_detail_count__c >=0 and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation and showFalseNotshowTrue__c = false];
- }
-
+ //conorderlist = [select id,name,Owner.Name from Consumable_order__c where Order_type__c = '璁㈠崟' and recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and Delivery_detail_count__c >0 and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation];
+ if(type !=null && type.equals('all')){
+ conorderlist = [select id,Owner.Name from Consumable_order__c where Order_type__c = '璁㈠崟' and recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and (OrderNumber_notarrive__c > 0 or Delivery_detail_count__c >0) and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation and showFalseNotshowTrue__c = false];
}else{
- //conorderlist = [select id,name,Owner.Name from Consumable_order__c where Order_type__c = '璁㈠崟' and recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and Delivery_detail_count__c >0 and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation];
- if(type !=null && type.equals('all')){
- conorderlist = [select id,Owner.Name from Consumable_order__c where Order_type__c = '璁㈠崟' and recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and (OrderNumber_notarrive__c > 0 or Delivery_detail_count__c >0) and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation and showFalseNotshowTrue__c = false];
- }else{
- conorderlist = [select id,Owner.Name from Consumable_order__c where Order_type__c = '璁㈠崟' and recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and Delivery_detail_count__c >0 and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation and showFalseNotshowTrue__c = false];
- }
+ conorderlist = [select id,Owner.Name from Consumable_order__c where Order_type__c = '璁㈠崟' and recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and Delivery_detail_count__c >0 and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation and showFalseNotshowTrue__c = false];
}
//20200916 ljh update end
// List<Consumable_order__c> conorderlist = [select id,Owner.Name from Consumable_order__c where Order_type__c = '璁㈠崟' and recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and Delivery_detail_count__c > 0 and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation];
@@ -151,18 +129,14 @@
}
System.debug('ANY o'+orderId);
List<Consumable_order_details2__c> conList = new List<Consumable_order_details2__c>();
- if(Test.isRunningTest()){
- conList = [SELECT id,Bar_Code__c FROM Consumable_order_details2__c ];
+ //20200916 ljh update start
+ //conList = [SELECT id,Bar_Code__c FROM Consumable_order_details2__c WHERE Dealer_Arrive__c = true AND Consumable_order_minor__c = :orderId AND Deliver_date__c < :orderdate AND recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery];
+ if(type !=null && type.equals('all')){
+ conList = [SELECT id,Bar_Code__c FROM Consumable_order_details2__c WHERE Dealer_Arrive__c = true AND Consumable_order_minor__c = :orderId AND recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery];
}else{
- //20200916 ljh update start
- //conList = [SELECT id,Bar_Code__c FROM Consumable_order_details2__c WHERE Dealer_Arrive__c = true AND Consumable_order_minor__c = :orderId AND Deliver_date__c < :orderdate AND recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery];
- if(type !=null && type.equals('all')){
- conList = [SELECT id,Bar_Code__c FROM Consumable_order_details2__c WHERE Dealer_Arrive__c = true AND Consumable_order_minor__c = :orderId AND recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery];
- }else{
- conList = [SELECT id,Bar_Code__c FROM Consumable_order_details2__c WHERE Dealer_Arrive__c = true AND Consumable_order_minor__c = :orderId AND Deliver_date__c < :orderdate AND recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery];
- }
- //20200916 ljh update end
+ conList = [SELECT id,Bar_Code__c FROM Consumable_order_details2__c WHERE Dealer_Arrive__c = true AND Consumable_order_minor__c = :orderId AND Deliver_date__c < :orderdate AND recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery];
}
+ //20200916 ljh update end
// List<Consumable_order_details2__c> conList = [SELECT id,Bar_Code__c FROM Consumable_order_details2__c WHERE Dealer_Arrive__c = false AND Consumable_order_minor__c = :orderId AND Deliver_date__c < :orderdate AND recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery];
Map<String,String> srtMap = new Map<String,String>();
for(Consumable_order_details2__c con : conList){
@@ -227,21 +201,11 @@
String rtTypeDelivery = System.Label.RT_ConOrder_Delivery;
List<Consumable_order__c> conorderlist = new List<Consumable_order__c>();
//20200916 ljh update start
- if(Test.isRunningTest()){
- //conorderlist = [select id,name,Owner.Name from Consumable_order__c where Order_type__c = '璁㈠崟' and recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and Delivery_detail_count__c >=0 and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation];
- if(type !=null && type.equals('all')){
- conorderlist = [select id,Owner.Name from Consumable_order__c where Order_type__c = '璁㈠崟' and recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and (OrderNumber_notarrive__c >= 0 or Delivery_detail_count__c >=0) and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation and showFalseNotshowTrue__c = false];
- }else{
- conorderlist = [select id,Owner.Name from Consumable_order__c where Order_type__c = '璁㈠崟' and recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and Delivery_detail_count__c >=0 and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation and showFalseNotshowTrue__c = false];
- }
-
+ //conorderlist = [select id,name,Owner.Name from Consumable_order__c where Order_type__c = '璁㈠崟' and recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and Delivery_detail_count__c >0 and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation];
+ if(type !=null && type.equals('all')){
+ conorderlist = [select id,Owner.Name from Consumable_order__c where Order_type__c = '璁㈠崟' and recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and (OrderNumber_notarrive__c > 0 or Delivery_detail_count__c >0) and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation and showFalseNotshowTrue__c = false];
}else{
- //conorderlist = [select id,name,Owner.Name from Consumable_order__c where Order_type__c = '璁㈠崟' and recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and Delivery_detail_count__c >0 and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation];
- if(type !=null && type.equals('all')){
- conorderlist = [select id,Owner.Name from Consumable_order__c where Order_type__c = '璁㈠崟' and recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and (OrderNumber_notarrive__c > 0 or Delivery_detail_count__c >0) and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation and showFalseNotshowTrue__c = false];
- }else{
- conorderlist = [select id,Owner.Name from Consumable_order__c where Order_type__c = '璁㈠崟' and recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and Delivery_detail_count__c >0 and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation and showFalseNotshowTrue__c = false];
- }
+ conorderlist = [select id,Owner.Name from Consumable_order__c where Order_type__c = '璁㈠崟' and recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and Delivery_detail_count__c >0 and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation and showFalseNotshowTrue__c = false];
}
//20200916 ljh update end
// List<Consumable_order__c> conorderlist = [select id,Owner.Name from Consumable_order__c where Order_type__c = '璁㈠崟' and recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and Delivery_detail_count__c > 0 and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation];
@@ -255,18 +219,14 @@
}
System.debug('ANY o'+orderId);
List<Consumable_order_details2__c> conList = new List<Consumable_order_details2__c>();
- if(Test.isRunningTest()){
- conList = [SELECT id,Bar_Code__c FROM Consumable_order_details2__c ];
+ //20200916 ljh update start
+ //conList = [SELECT id,Bar_Code__c FROM Consumable_order_details2__c WHERE Dealer_Arrive__c = false AND Consumable_order_minor__c = :orderId AND Deliver_date__c < :orderdate AND recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery];
+ if(type !=null && type.equals('all')){
+ conList = [SELECT id,Bar_Code__c FROM Consumable_order_details2__c WHERE Dealer_Arrive__c = false AND Consumable_order_minor__c = :orderId AND recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery];
}else{
- //20200916 ljh update start
- //conList = [SELECT id,Bar_Code__c FROM Consumable_order_details2__c WHERE Dealer_Arrive__c = false AND Consumable_order_minor__c = :orderId AND Deliver_date__c < :orderdate AND recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery];
- if(type !=null && type.equals('all')){
- conList = [SELECT id,Bar_Code__c FROM Consumable_order_details2__c WHERE Dealer_Arrive__c = false AND Consumable_order_minor__c = :orderId AND recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery];
- }else{
- conList = [SELECT id,Bar_Code__c FROM Consumable_order_details2__c WHERE Dealer_Arrive__c = false AND Consumable_order_minor__c = :orderId AND Deliver_date__c < :orderdate AND recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery];
- }
- //20200916 ljh update end
+ conList = [SELECT id,Bar_Code__c FROM Consumable_order_details2__c WHERE Dealer_Arrive__c = false AND Consumable_order_minor__c = :orderId AND Deliver_date__c < :orderdate AND recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery];
}
+ //20200916 ljh update end
// List<Consumable_order_details2__c> conList = [SELECT id,Bar_Code__c FROM Consumable_order_details2__c WHERE Dealer_Arrive__c = false AND Consumable_order_minor__c = :orderId AND Deliver_date__c < :orderdate AND recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery];
Map<String,String> srtMap = new Map<String,String>();
for(Consumable_order_details2__c con : conList){
@@ -396,21 +356,11 @@
String rtTypeDelivery = System.Label.RT_ConOrder_Delivery;
List<Consumable_order__c> conorderlist = new List<Consumable_order__c>();
//20200916 ljh update start
- if(Test.isRunningTest()){
- //conorderlist = [select id,name,Owner.Name from Consumable_order__c where Order_type__c = '璁㈠崟' and recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and Delivery_detail_count__c >=0 and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation];
- if(type !=null && type.equals('all')){
- conorderlist = [select id,Owner.Name from Consumable_order__c where Order_type__c = '璁㈠崟' and recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and (OrderNumber_notarrive__c >= 0 or Delivery_detail_count__c >=0) and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation and showFalseNotshowTrue__c = false];
- }else{
- conorderlist = [select id,Owner.Name from Consumable_order__c where Order_type__c = '璁㈠崟' and recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and Delivery_detail_count__c >=0 and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation and showFalseNotshowTrue__c = false];
- }
-
+ //conorderlist = [select id,name,Owner.Name from Consumable_order__c where Order_type__c = '璁㈠崟' and recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and Delivery_detail_count__c >0 and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation];
+ if(type !=null && type.equals('all')){
+ conorderlist = [select id,Owner.Name from Consumable_order__c where Order_type__c = '璁㈠崟' and recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and (OrderNumber_notarrive__c > 0 or Delivery_detail_count__c >0) and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation and showFalseNotshowTrue__c = false];
}else{
- //conorderlist = [select id,name,Owner.Name from Consumable_order__c where Order_type__c = '璁㈠崟' and recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and Delivery_detail_count__c >0 and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation];
- if(type !=null && type.equals('all')){
- conorderlist = [select id,Owner.Name from Consumable_order__c where Order_type__c = '璁㈠崟' and recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and (OrderNumber_notarrive__c > 0 or Delivery_detail_count__c >0) and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation and showFalseNotshowTrue__c = false];
- }else{
- conorderlist = [select id,Owner.Name from Consumable_order__c where Order_type__c = '璁㈠崟' and recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and Delivery_detail_count__c >0 and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation and showFalseNotshowTrue__c = false];
- }
+ conorderlist = [select id,Owner.Name from Consumable_order__c where Order_type__c = '璁㈠崟' and recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and Delivery_detail_count__c >0 and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation and showFalseNotshowTrue__c = false];
}
//20200916 ljh update end
// List<Consumable_order__c> conorderlist = [select id,Owner.Name from Consumable_order__c where Order_type__c = '璁㈠崟' and recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and Delivery_detail_count__c > 0 and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation];
@@ -424,18 +374,14 @@
}
System.debug('ANY o'+orderId);
List<Consumable_order_details2__c> conList = new List<Consumable_order_details2__c>();
- if(Test.isRunningTest()){
- conList = [SELECT id,Bar_Code__c FROM Consumable_order_details2__c ];
+ //20200916 ljh update start
+ //conList = [SELECT id,Bar_Code__c FROM Consumable_order_details2__c WHERE Consumable_order_minor__c = :orderId AND Deliver_date__c < :orderdate AND recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery];
+ if(type !=null && type.equals('all')){
+ conList = [SELECT id,Bar_Code__c FROM Consumable_order_details2__c WHERE Consumable_order_minor__c = :orderId AND recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery];
}else{
- //20200916 ljh update start
- //conList = [SELECT id,Bar_Code__c FROM Consumable_order_details2__c WHERE Consumable_order_minor__c = :orderId AND Deliver_date__c < :orderdate AND recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery];
- if(type !=null && type.equals('all')){
- conList = [SELECT id,Bar_Code__c FROM Consumable_order_details2__c WHERE Consumable_order_minor__c = :orderId AND recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery];
- }else{
- conList = [SELECT id,Bar_Code__c FROM Consumable_order_details2__c WHERE Consumable_order_minor__c = :orderId AND Deliver_date__c < :orderdate AND recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery];
- }
- //20200916 ljh update end
+ conList = [SELECT id,Bar_Code__c FROM Consumable_order_details2__c WHERE Consumable_order_minor__c = :orderId AND Deliver_date__c < :orderdate AND recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery];
}
+ //20200916 ljh update end
// List<Consumable_order_details2__c> conList = [SELECT id,Bar_Code__c FROM Consumable_order_details2__c WHERE Consumable_order_minor__c = :orderId AND Deliver_date__c < :orderdate AND recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery];
Map<String,String> srtMap = new Map<String,String>();
for(Consumable_order_details2__c con : conList){
@@ -534,21 +480,11 @@
String rtTypeDelivery = System.Label.RT_ConOrder_Delivery;
List<Consumable_order__c> conorderlist = new List<Consumable_order__c>();
//20200916 ljh update start
- if(Test.isRunningTest()){
- //conorderlist = [select id,name,Owner.Name from Consumable_order__c where Order_type__c = '璁㈠崟' and recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and Delivery_detail_count__c >=0 and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation];
- if(type !=null && type.equals('all')){
- conorderlist = [select id,Owner.Name from Consumable_order__c where Order_type__c = '璁㈠崟' and recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and (OrderNumber_notarrive__c >= 0 or Delivery_detail_count__c >=0) and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation and showFalseNotshowTrue__c = false];
- }else{
- conorderlist = [select id,Owner.Name from Consumable_order__c where Order_type__c = '璁㈠崟' and recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and Delivery_detail_count__c >=0 and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation and showFalseNotshowTrue__c = false];
- }
-
+ //conorderlist = [select id,name,Owner.Name from Consumable_order__c where Order_type__c = '璁㈠崟' and recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and Delivery_detail_count__c >0 and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation];
+ if(type !=null && type.equals('all')){
+ conorderlist = [select id,Owner.Name from Consumable_order__c where Order_type__c = '璁㈠崟' and recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and (OrderNumber_notarrive__c > 0 or Delivery_detail_count__c >0) and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation and showFalseNotshowTrue__c = false];
}else{
- //conorderlist = [select id,name,Owner.Name from Consumable_order__c where Order_type__c = '璁㈠崟' and recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and Delivery_detail_count__c >0 and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation];
- if(type !=null && type.equals('all')){
- conorderlist = [select id,Owner.Name from Consumable_order__c where Order_type__c = '璁㈠崟' and recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and (OrderNumber_notarrive__c > 0 or Delivery_detail_count__c >0) and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation and showFalseNotshowTrue__c = false];
- }else{
- conorderlist = [select id,Owner.Name from Consumable_order__c where Order_type__c = '璁㈠崟' and recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and Delivery_detail_count__c >0 and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation and showFalseNotshowTrue__c = false];
- }
+ conorderlist = [select id,Owner.Name from Consumable_order__c where Order_type__c = '璁㈠崟' and recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and Delivery_detail_count__c >0 and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation and showFalseNotshowTrue__c = false];
}
system.debug('==============>conorderlist'+conorderlist);
system.debug('==============>conorderlist'+conorderlist.size());
@@ -564,22 +500,18 @@
}
System.debug('ANY o'+orderId);
List<Consumable_order_details2__c> conList = new List<Consumable_order_details2__c>();
- if(Test.isRunningTest()){
- conList = [SELECT id,Bar_Code__c FROM Consumable_order_details2__c ];
+ //20200916 ljh update start
+ //conList = [SELECT id,Bar_Code__c FROM Consumable_order_details2__c WHERE Dealer_Arrive__c = false AND Consumable_order_minor__c = :orderId AND Deliver_date__c < :orderdate AND recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery];
+ if(type !=null && type.equals('all')){
+ system.debug('all============');
+ conList = [SELECT id,Bar_Code__c FROM Consumable_order_details2__c WHERE Dealer_Arrive__c = false AND Consumable_order_minor__c = :orderId AND recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery];
+ system.debug('allconList==========='+conList.size());
}else{
- //20200916 ljh update start
- //conList = [SELECT id,Bar_Code__c FROM Consumable_order_details2__c WHERE Dealer_Arrive__c = false AND Consumable_order_minor__c = :orderId AND Deliver_date__c < :orderdate AND recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery];
- if(type !=null && type.equals('all')){
- system.debug('all============');
- conList = [SELECT id,Bar_Code__c FROM Consumable_order_details2__c WHERE Dealer_Arrive__c = false AND Consumable_order_minor__c = :orderId AND recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery];
- system.debug('allconList==========='+conList.size());
- }else{
- system.debug('notall=============');
- conList = [SELECT id,Bar_Code__c FROM Consumable_order_details2__c WHERE Dealer_Arrive__c = false AND Consumable_order_minor__c = :orderId AND Deliver_date__c < :orderdate AND recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery];
- system.debug('notallconList==========='+conList.size());
- }
- //20200916 ljh update end
+ system.debug('notall=============');
+ conList = [SELECT id,Bar_Code__c FROM Consumable_order_details2__c WHERE Dealer_Arrive__c = false AND Consumable_order_minor__c = :orderId AND Deliver_date__c < :orderdate AND recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery];
+ system.debug('notallconList==========='+conList.size());
}
+ //20200916 ljh update end
// List<Consumable_order_details2__c> conList = [SELECT id,Bar_Code__c FROM Consumable_order_details2__c WHERE Dealer_Arrive__c = false AND Consumable_order_minor__c = :orderId AND Deliver_date__c < :orderdate AND recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery];
Map<String,String> srtMap = new Map<String,String>();
for(Consumable_order_details2__c con : conList){
diff --git a/force-app/main/default/classes/LexInventoryViewController.cls b/force-app/main/default/classes/LexInventoryViewController.cls
index cc2ec34..1a4c8fd 100644
--- a/force-app/main/default/classes/LexInventoryViewController.cls
+++ b/force-app/main/default/classes/LexInventoryViewController.cls
@@ -32,7 +32,7 @@
// };
public static String[] proLimitAndDate = new List<String>{};
- private static Map<String, Date> productkucun = new Map<String, Date>();
+ public static Map<String, Date> productkucun = new Map<String, Date>();
public static List<SelectOption> categoryOptionList { get; set; }
@AuraEnabled
public static Map<String, String> categoryOptionMap { get; set; }
@@ -49,7 +49,7 @@
public static String category1 { get; set; }
public static Boolean editAble { get; set; }
// 缁忛攢鍟嗗湪搴撲骇鍝両D
- public static List<String> orderDetZaikuList = new List<String>();
+ public static List<String> orderDetZaikuList{set;get;}
// 浜у搧 ID
public static String ESetId { get; set; }
public static String idCheck { get; set; }
@@ -69,6 +69,7 @@
// add by rentx 2021-3-10
public LexInventoryViewController() {
+ orderDetZaikuList = new List<String>();
consumableorderdetailsRecords = new List<ConsumableorderdetailsInfo>();
consumableorderdetailsRecordsview = new List<List<ConsumableorderdetailsInfo>>();
editAble = false;
@@ -407,9 +408,11 @@
data.put('consumableorderdetailsRecords', consumableorderdetailsRecords);
data.put('hasHos', hasHos);
data.put('productLimtAndDate',proLimitAndDate);
+ data.put('productkucun',productkucun);
res.status = 'Success';
res.code = 200;
System.debug('res = ' + res);
+ System.debug('productkucun = ' + productkucun);
return res;
}
@AuraEnabled
@@ -528,15 +531,19 @@
Integer pageSizeLWC,
Integer pageTokenLWC,
String sortFieldLWC,
- String sortOrderLWC
+ String sortOrderLWC,
+ Map<String, Date> productkucunLWC
) {
try {
System.debug('orderDetZaikuListLWC===>'+orderDetZaikuListLWC);
+ System.debug('productkucun===>'+productkucun);
pageSize = pageSizeLWC;
pageToken = pageTokenLWC;
sortField = sortFieldLWC;
sortOrder = sortOrderLWC;
+ productkucun = new Map<String, Date>();
orderDetZaikuList = new List<String>();
+ productkucun = productkucunLWC;
orderDetZaikuList = orderDetZaikuListLWC;
sqlagencyProType = '%' + agencyProType + '%';
@@ -1051,6 +1058,7 @@
}
// Data Bean
+ @TestVisible
class ConsumableorderdetailsInfo implements Comparable {
@AuraEnabled
public Consumable_order_details2__c esd { get; set; }
diff --git a/force-app/main/default/classes/LexOverdueStockController.cls b/force-app/main/default/classes/LexOverdueStockController.cls
index adbaaa7..c6d0fd1 100644
--- a/force-app/main/default/classes/LexOverdueStockController.cls
+++ b/force-app/main/default/classes/LexOverdueStockController.cls
@@ -146,12 +146,13 @@
}
}
// return;
- System.debug('overduePageRecords = ' + overduePageRecords);
+ System.debug('overduePageRecords = ' + overduePageRecords);
+ System.debug('overdueList = ' + overdueList);
data.put('overduePageRecords',JSON.serialize(overduePageRecords));
data.put('codPageRecords',JSON.serialize(codPageRecords));
data.put('iSinventory',iSinventory);
data.put('overdueList',overdueList);
- res.status = 'Success';
+ res.status = 'Success1';
res.code = 200;
// res.msg = '璇疯緭鍏arCode鍙�';
System.debug('res = ' + res);
@@ -233,7 +234,7 @@
StaticParameter.EscapeConsumableOrderDetail2Trigger = true;
if(!iSinventory){
// ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'璇峰厛鐐广�怋arCode褰曞叆銆�'));
- return new ResponseBodyLWC('Error',500, '璇峰厛褰曞叆BarCode', '');
+ return new ResponseBodyLWC('Error',500, '璇峰厛鐐瑰嚮鑾峰彇鏄庣粏', '');
// return null;
}
integer Lo = 0;
diff --git a/force-app/main/default/classes/LexSummonsCreatController.cls b/force-app/main/default/classes/LexSummonsCreatController.cls
index f83dc7a..df46d82 100644
--- a/force-app/main/default/classes/LexSummonsCreatController.cls
+++ b/force-app/main/default/classes/LexSummonsCreatController.cls
@@ -245,265 +245,504 @@
// 鐢婚潰鍒濆鍖�
@AuraEnabled
- public static ResponseBodyLWC init(String ESetidJs, String statusEdit, Integer pageSizeLWC, Integer pageTokenLWC) {
- // try {
- firstInit(ESetidJs);
- statusEdit = statusEdit;
- arriveorder = '';
- HospitalName = '';
- provinceOpts = new List<SelectOption>();
- provinceOptsMap = new Map<String, String>();
- ResponseBodyLWC res = new ResponseBodyLWC();
- Map<String, object> data = new Map<String, object>();
- res.entity = data;
- // public static Integer pagesize { get; set; }
- // public static Integer pageToken { get; set; }
- // public static String sortField { get; set; }
- // public static String sortOrder { get; set; }
- pagesize = pageSizeLWC;
- pageToken = pageTokenLWC > 2000 ? 2000 : pageTokenLWC;
+ public static ResponseBodyLWC init(String ESetidJs, String statusEdit, Integer pageSizeLWC, Integer pageTokenLWC,String arriveorderLWC) {
+ try {
+ firstInit(ESetidJs);
+ statusEdit = statusEdit;
+ arriveorder = arriveorderLWC;
+ HospitalName = '';
+ provinceOpts = new List<SelectOption>();
+ provinceOptsMap = new Map<String, String>();
+ ResponseBodyLWC res = new ResponseBodyLWC();
+ Map<String, object> data = new Map<String, object>();
+ res.entity = data;
+ // public static Integer pagesize { get; set; }
+ // public static Integer pageToken { get; set; }
+ // public static String sortField { get; set; }
+ // public static String sortOrder { get; set; }
+ pagesize = pageSizeLWC;
+ pageToken = pageTokenLWC > 2000 ? 2000 : pageTokenLWC;
- // sortKey = '1';
- // preSortKey = '1';
- // sortOrderAsc = false;
- // sortOrder = new List<String>(8);
- // sortOrder = new List<String>{ ' ', ' ', ' ', ' ', '鈫�', '', '', '' };
- //cate1ForSort = '';
- sumPrice = 0;
- IdCheck = EsetId;
- if (ESetId != null && ESetId != '' && (statusEdit == '' || statusEdit == null)) {
- editAble = false;
- } else if ((ESetId == null || ESetId == '') && (statusEdit == '' || statusEdit == null)) {
- editAble = true;
- } else if (ESetId != null && ESetId != '' && statusEdit != '' && statusEdit != null) {
- editAble = true;
- }
- userId = UserInfo.getUserId();
- localuser = [SELECT id, State_Hospital__c FROM User WHERE id = :UserInfo.getUserId()];
- //userId = '00510000005QO75';
- user Useracc = [SELECT accountid, Work_Location__c, UserPro_Type__c FROM user WHERE id = :userId];
- accountid = Useracc.accountid;
- userWorkLocation = Useracc.Work_Location__c;
- agencyProType = Useracc.UserPro_Type__c;
- if (String.isBlank(Useracc.UserPro_Type__c)) {
- agencyProType = 'ET';
- }
- Account accountInfo = [SELECT Name FROM account WHERE id = :accountid];
- accountName = accountInfo.Name;
- //coc.Order_date__c = Date.today();
- list<Dealer_elationship__c> Dealerelationship = new List<Dealer_elationship__c>();
- Dealerelationship = [
- SELECT Dealer_subordinate__c, Dealer_subordinate__r.Name
- FROM Dealer_elationship__c
- WHERE Dealer_principal__c = :accountid
- ];
-
- List<Agency_Hospital_Link__c> AgencyHospitalLink = new List<Agency_Hospital_Link__c>();
- AgencyHospitalLink = [SELECT Id, Hospital__c, Hospital__r.Name FROM Agency_Hospital_Link__c WHERE Agency__c = :accountid];
-
- //add by rentx 2021-3-1 start
- //鍒ゆ柇褰撳墠缁忛攢鍟嗕笅鏄惁鏈夌壒浠峰尰闄�
- List<hospitalprice__c> hlist = [SELECT id, product__c FROM hospitalprice__c WHERE account__c = :accountid];
- if (hlist == null || hlist.size() == 0) {
- hasHos = false;
- } else {
- for (hospitalprice__c hp : hlist) {
- HosProMap.put(hp.product__c, '');
+ // sortKey = '1';
+ // preSortKey = '1';
+ // sortOrderAsc = false;
+ // sortOrder = new List<String>(8);
+ // sortOrder = new List<String>{ ' ', ' ', ' ', ' ', '鈫�', '', '', '' };
+ //cate1ForSort = '';
+ sumPrice = 0;
+ IdCheck = EsetId;
+ if (ESetId != null && ESetId != '' && (statusEdit == '' || statusEdit == null)) {
+ editAble = false;
+ } else if ((ESetId == null || ESetId == '') && (statusEdit == '' || statusEdit == null)) {
+ editAble = true;
+ } else if (ESetId != null && ESetId != '' && statusEdit != '' && statusEdit != null) {
+ editAble = true;
}
- hasHos = true;
- }
- //add by rentx 2021-3-1 end
+ userId = UserInfo.getUserId();
+ localuser = [SELECT id, State_Hospital__c FROM User WHERE id = :UserInfo.getUserId()];
+ //userId = '00510000005QO75';
+ user Useracc = [SELECT accountid, Work_Location__c, UserPro_Type__c FROM user WHERE id = :userId];
+ accountid = Useracc.accountid;
+ userWorkLocation = Useracc.Work_Location__c;
+ agencyProType = Useracc.UserPro_Type__c;
+ if (String.isBlank(Useracc.UserPro_Type__c)) {
+ agencyProType = 'ET';
+ }
+ Account accountInfo = [SELECT Name FROM account WHERE id = :accountid];
+ accountName = accountInfo.Name;
+ //coc.Order_date__c = Date.today();
+ list<Dealer_elationship__c> Dealerelationship = new List<Dealer_elationship__c>();
+ Dealerelationship = [
+ SELECT Dealer_subordinate__c, Dealer_subordinate__r.Name
+ FROM Dealer_elationship__c
+ WHERE Dealer_principal__c = :accountid
+ ];
- saveBtnDisabled = false;
- SorderBtnDisabled = false;
- String sqlagencyProType = '%' + agencyProType + '%';
- coc = new Consumable_order__c();
- consumableorderdetailsSelectRecords = new List<ConsumableorderdetailsInfo>();
- Map<String, ConsumableorderdetailsInfo> MidMap = new Map<String, ConsumableorderdetailsInfo>();
- //add by rentx 2021-01-29
- Map<String, ConsumableorderdetailsInfo> MidMap2 = new Map<String, ConsumableorderdetailsInfo>();
- //add by rentx 2021-01-29
+ List<Agency_Hospital_Link__c> AgencyHospitalLink = new List<Agency_Hospital_Link__c>();
+ AgencyHospitalLink = [SELECT Id, Hospital__c, Hospital__r.Name FROM Agency_Hospital_Link__c WHERE Agency__c = :accountid];
- List<AggregateResult> orderdetailCount = [
- SELECT count(id), Consumable_Product__c cpc, Box_Piece__c
- FROM Consumable_order_details2__c
- WHERE
- Dealer_Arrive__c = TRUE
- AND Dealer_Shipment__c = FALSE
- AND Dealer_Saled__c = FALSE
- AND Lose_Flag__c = FALSE
- AND Cancellation_Flag__c = FALSE
- AND Bar_Code__c != NULL
- AND Isoverdue__c = 1
- AND Product_Type__c LIKE :sqlagencyProType
- AND Dealer_Info_text__c = :accountName
- AND Arrive_Owner_Work_Location__c = :userWorkLocation
- GROUP BY Consumable_Product__c, Box_Piece__c
- ];
- for (AggregateResult orderdetail : orderdetailCount) {
- zaikuId.add(String.valueOf(orderdetail.get('cpc')));
- }
- System.debug('sqlagencyProType = ' + sqlagencyProType);
- System.debug('userWorkLocation = ' + userWorkLocation);
- System.debug('accountName = ' + accountName);
- List<Consumable_order_details2__c> CountDel = [
- SELECT
- Id,
- Bar_Code__c,
- Name,
- Inventory_date__c,
- Consumable_Product__c,
- Consumable_Product__r.Asset_Model_No__c,
- Recordtypeid,
- Box_Piece__c,
- ProductPacking_list_manual__c,
- //add by rentx 2020-11-27 start
- hospitalSpecialOffer__c
- //add by rentx 2020-11-27 end
- FROM Consumable_order_details2__c
- WHERE
- Dealer_Arrive__c = TRUE
- AND Dealer_Shipment__c = FALSE
- AND Dealer_Saled__c = FALSE
- AND Dealer_Returned__c = FALSE
- AND Lose_Flag__c = FALSE
- AND Cancellation_Flag__c = FALSE
- AND Bar_Code__c != NULL
- AND Isoverdue__c = 1
- AND Product_Type__c LIKE :sqlagencyProType
- AND Arrive_Owner_Work_Location__c = :userWorkLocation
- AND Dealer_Info_text__c = :accountName
- ];
- // 鏂拌
- if (ESetId == null || ESetId == '') {
- SummonsFlag = 'hidden';
- String msoql = makeSoqlinventory();
- initStandardController(msoql);
- System.debug('msoql = ' + msoql);
- product2Selected = Database.query(msoql);
- if (String.isBlank(arriveorder)) {
- EditDelCommitBtnDisabled = true;
- for (Integer i = 0; i < product2Selected.size(); i++) {
- MidMap.put(product2Selected[i].Id, new ConsumableorderdetailsInfo(product2Selected[i]));
+ //add by rentx 2021-3-1 start
+ //鍒ゆ柇褰撳墠缁忛攢鍟嗕笅鏄惁鏈夌壒浠峰尰闄�
+ List<hospitalprice__c> hlist = [SELECT id, product__c FROM hospitalprice__c WHERE account__c = :accountid];
+ if (hlist == null || hlist.size() == 0) {
+ hasHos = false;
+ } else {
+ for (hospitalprice__c hp : hlist) {
+ HosProMap.put(hp.product__c, '');
}
- for (Integer i = 0; i < CountDel.size(); i++) {
- String str = '';
- if (CountDel[i].hospitalSpecialOffer__c) {
- str = 'isHos';
- } else {
- str = 'notHos';
+ hasHos = true;
+ }
+ //add by rentx 2021-3-1 end
+
+ saveBtnDisabled = false;
+ SorderBtnDisabled = false;
+ String sqlagencyProType = '%' + agencyProType + '%';
+ coc = new Consumable_order__c();
+ consumableorderdetailsSelectRecords = new List<ConsumableorderdetailsInfo>();
+ Map<String, ConsumableorderdetailsInfo> MidMap = new Map<String, ConsumableorderdetailsInfo>();
+ //add by rentx 2021-01-29
+ Map<String, ConsumableorderdetailsInfo> MidMap2 = new Map<String, ConsumableorderdetailsInfo>();
+ //add by rentx 2021-01-29
+
+ List<AggregateResult> orderdetailCount = [
+ SELECT count(id), Consumable_Product__c cpc, Box_Piece__c
+ FROM Consumable_order_details2__c
+ WHERE
+ Dealer_Arrive__c = TRUE
+ AND Dealer_Shipment__c = FALSE
+ AND Dealer_Saled__c = FALSE
+ AND Lose_Flag__c = FALSE
+ AND Cancellation_Flag__c = FALSE
+ AND Bar_Code__c != NULL
+ AND Isoverdue__c = 1
+ AND Product_Type__c LIKE :sqlagencyProType
+ AND Dealer_Info_text__c = :accountName
+ AND Arrive_Owner_Work_Location__c = :userWorkLocation
+ GROUP BY Consumable_Product__c, Box_Piece__c
+ ];
+ for (AggregateResult orderdetail : orderdetailCount) {
+ zaikuId.add(String.valueOf(orderdetail.get('cpc')));
+ }
+ System.debug('sqlagencyProType = ' + sqlagencyProType);
+ System.debug('userWorkLocation = ' + userWorkLocation);
+ System.debug('accountName = ' + accountName);
+ List<Consumable_order_details2__c> CountDel = [
+ SELECT
+ Id,
+ Bar_Code__c,
+ Name,
+ Inventory_date__c,
+ Consumable_Product__c,
+ Consumable_Product__r.Asset_Model_No__c,
+ Recordtypeid,
+ Box_Piece__c,
+ ProductPacking_list_manual__c,
+ //add by rentx 2020-11-27 start
+ hospitalSpecialOffer__c
+ //add by rentx 2020-11-27 end
+ FROM Consumable_order_details2__c
+ WHERE
+ Dealer_Arrive__c = TRUE
+ AND Dealer_Shipment__c = FALSE
+ AND Dealer_Saled__c = FALSE
+ AND Dealer_Returned__c = FALSE
+ AND Lose_Flag__c = FALSE
+ AND Cancellation_Flag__c = FALSE
+ AND Bar_Code__c != NULL
+ AND Isoverdue__c = 1
+ AND Product_Type__c LIKE :sqlagencyProType
+ AND Arrive_Owner_Work_Location__c = :userWorkLocation
+ AND Dealer_Info_text__c = :accountName
+ ];
+ // 鏂拌
+ if (ESetId == null || ESetId == '') {
+ SummonsFlag = 'hidden';
+ String msoql = makeSoqlinventory();
+ initStandardController(msoql);
+ System.debug('msoql = ' + msoql);
+ product2Selected = Database.query(msoql);
+ if (String.isBlank(arriveorder)) {
+ EditDelCommitBtnDisabled = true;
+ for (Integer i = 0; i < product2Selected.size(); i++) {
+ MidMap.put(product2Selected[i].Id, new ConsumableorderdetailsInfo(product2Selected[i]));
}
- //鏄庣粏2瀵瑰簲鐨勪骇鍝佸瓨鍦ㄤ簬MidMap涓�
- if (MidMap.containsKey(CountDel[i].Consumable_Product__c)) {
- //璁剧疆map涓璳ey鐨勫悗缂� 鐢ㄤ簬鍖哄垎鍖婚櫌鐗逛环鍜岄潪鍖婚櫌鐗逛环
- if (MidMap2.containsKey(CountDel[i].Consumable_Product__c + str)) {
- ConsumableorderdetailsInfo Jstage = MidMap2.get(CountDel[i].Consumable_Product__c + str);
- Jstage.allnumber = Jstage.allnumber + 1;
- if (CountDel[i].Box_Piece__c == '鐩�') {
- Jstage.Boxnumber = Jstage.Boxnumber + 1;
- } else if (CountDel[i].Box_Piece__c == '涓�') {
- Jstage.Piecenumber = Jstage.Piecenumber + 1;
- }
- if (CountDel[i].hospitalSpecialOffer__c) {
- Jstage.hospitalSpecialOffer = true;
- } else {
- Jstage.hospitalSpecialOffer = false;
- }
- if (HosProMap.containsKey(Jstage.Prod.Id)) {
- Jstage.hosPro = true;
- }
- MidMap2.put(CountDel[i].Consumable_Product__c + str, Jstage);
+ for (Integer i = 0; i < CountDel.size(); i++) {
+ String str = '';
+ if (CountDel[i].hospitalSpecialOffer__c) {
+ str = 'isHos';
} else {
- //midmap2涓病鏈夊搴旂殑浜у搧
- ConsumableorderdetailsInfo Jstage = MidMap.get(CountDel[i].Consumable_Product__c).clone();
- Jstage.allnumber = Jstage.allnumber + 1;
- if (CountDel[i].Box_Piece__c == '鐩�') {
- Jstage.Boxnumber = Jstage.Boxnumber + 1;
- } else if (CountDel[i].Box_Piece__c == '涓�') {
- Jstage.Piecenumber = Jstage.Piecenumber + 1;
- }
- if (CountDel[i].hospitalSpecialOffer__c) {
- Jstage.hospitalSpecialOffer = true;
+ str = 'notHos';
+ }
+ //鏄庣粏2瀵瑰簲鐨勪骇鍝佸瓨鍦ㄤ簬MidMap涓�
+ if (MidMap.containsKey(CountDel[i].Consumable_Product__c)) {
+ //璁剧疆map涓璳ey鐨勫悗缂� 鐢ㄤ簬鍖哄垎鍖婚櫌鐗逛环鍜岄潪鍖婚櫌鐗逛环
+ if (MidMap2.containsKey(CountDel[i].Consumable_Product__c + str)) {
+ ConsumableorderdetailsInfo Jstage = MidMap2.get(CountDel[i].Consumable_Product__c + str);
+ Jstage.allnumber = Jstage.allnumber + 1;
+ if (CountDel[i].Box_Piece__c == '鐩�') {
+ Jstage.Boxnumber = Jstage.Boxnumber + 1;
+ } else if (CountDel[i].Box_Piece__c == '涓�') {
+ Jstage.Piecenumber = Jstage.Piecenumber + 1;
+ }
+ if (CountDel[i].hospitalSpecialOffer__c) {
+ Jstage.hospitalSpecialOffer = true;
+ } else {
+ Jstage.hospitalSpecialOffer = false;
+ }
+ if (HosProMap.containsKey(Jstage.Prod.Id)) {
+ Jstage.hosPro = true;
+ }
+ MidMap2.put(CountDel[i].Consumable_Product__c + str, Jstage);
} else {
- Jstage.hospitalSpecialOffer = false;
+ //midmap2涓病鏈夊搴旂殑浜у搧
+ ConsumableorderdetailsInfo Jstage = MidMap.get(CountDel[i].Consumable_Product__c).clone();
+ Jstage.allnumber = Jstage.allnumber + 1;
+ if (CountDel[i].Box_Piece__c == '鐩�') {
+ Jstage.Boxnumber = Jstage.Boxnumber + 1;
+ } else if (CountDel[i].Box_Piece__c == '涓�') {
+ Jstage.Piecenumber = Jstage.Piecenumber + 1;
+ }
+ if (CountDel[i].hospitalSpecialOffer__c) {
+ Jstage.hospitalSpecialOffer = true;
+ } else {
+ Jstage.hospitalSpecialOffer = false;
+ }
+ if (HosProMap.containsKey(Jstage.Prod.Id)) {
+ Jstage.hosPro = true;
+ }
+ //Jstage.BoxPiece = CountDel[i].Box_Piece__c;
+ MidMap2.put(CountDel[i].Consumable_Product__c + str, Jstage);
}
- if (HosProMap.containsKey(Jstage.Prod.Id)) {
- Jstage.hosPro = true;
- }
- //Jstage.BoxPiece = CountDel[i].Box_Piece__c;
- MidMap2.put(CountDel[i].Consumable_Product__c + str, Jstage);
+ }
+ System.debug('MidMap2.size() = ' + MidMap2.size());
+ /*//鐒跺悗寰幆CountDel鍘讳慨鏀筸ap閲岀殑allnumber
+ if(MidMap.containsKey(CountDel[i].Consumable_Product__c)){
+ ConsumableorderdetailsInfo Jstage = MidMap.get(CountDel[i].Consumable_Product__c);
+ Jstage.allnumber = Jstage.allnumber+1 ;
+ if(CountDel[i].Box_Piece__c == '鐩�'){
+ Jstage.Boxnumber = Jstage.Boxnumber + 1;
+ }else if(CountDel[i].Box_Piece__c == '涓�'){
+ Jstage.Piecenumber = Jstage.Piecenumber + 1;
+ }
+ if (CountDel[i].hospitalSpecialOffer__c) {
+ Jstage.hospitalSpecialOffer = true;
+ }else{
+ Jstage.hospitalSpecialOffer = false;
+ }
+ //Jstage.BoxPiece = CountDel[i].Box_Piece__c;
+ MidMap.put(CountDel[i].Consumable_Product__c+str, Jstage);
+ }*/
+ }
+
+ //update by rentx 2021-01-29 end
+
+ //鍐嶆妸map閲岀殑鍊间粠鏂拌祴缁機onsumableorderdetailsRecords
+ //update by rentx 2021-01-29
+ // for(ConsumableorderdetailsInfo bss : MidMap.values()){
+ for (ConsumableorderdetailsInfo bss : MidMap2.values()) {
+ //update by rentx 2021-01-29
+ //if(bss.allnumber>0){
+ bss.packinglist = Integer.valueOf(bss.Prod.Product2__r.Packing_list_manual__c);
+ bss.approbation_No = bss.Prod.Product2__r.SFDA_Approbation_No__c;
+ bss.expiration_Date = bss.Prod.Product2__r.SFDA_Expiration_Date__c;
+ consumableorderdetailsSelectRecords.add(bss);
+ //}
+ }
+
+ Integer ishosnum = 0;
+ for (ConsumableorderdetailsInfo ass : consumableorderdetailsSelectRecords) {
+ //ass.sortBy = sortOrderAsc;
+ //add by rentx 2021-3-10
+ if (ass.hospitalSpecialOffer) {
+ ishosnum = ishosnum + 1;
}
}
- System.debug('MidMap2.size() = ' + MidMap2.size());
- /*//鐒跺悗寰幆CountDel鍘讳慨鏀筸ap閲岀殑allnumber
- if(MidMap.containsKey(CountDel[i].Consumable_Product__c)){
- ConsumableorderdetailsInfo Jstage = MidMap.get(CountDel[i].Consumable_Product__c);
- Jstage.allnumber = Jstage.allnumber+1 ;
- if(CountDel[i].Box_Piece__c == '鐩�'){
- Jstage.Boxnumber = Jstage.Boxnumber + 1;
- }else if(CountDel[i].Box_Piece__c == '涓�'){
- Jstage.Piecenumber = Jstage.Piecenumber + 1;
- }
- if (CountDel[i].hospitalSpecialOffer__c) {
- Jstage.hospitalSpecialOffer = true;
- }else{
- Jstage.hospitalSpecialOffer = false;
- }
- //Jstage.BoxPiece = CountDel[i].Box_Piece__c;
- MidMap.put(CountDel[i].Consumable_Product__c+str, Jstage);
- }*/
- }
-
- //update by rentx 2021-01-29 end
-
- //鍐嶆妸map閲岀殑鍊间粠鏂拌祴缁機onsumableorderdetailsRecords
- //update by rentx 2021-01-29
- // for(ConsumableorderdetailsInfo bss : MidMap.values()){
- for (ConsumableorderdetailsInfo bss : MidMap2.values()) {
+ if (ishosnum > 0) {
+ hasHosPro = true;
+ } else {
+ hasHosPro = false;
+ }
+ consumableorderdetailsSelectRecords.sort();
+ //add by rentx
+ noOfRecords = consumableorderdetailsSelectRecords.size();
+ //add by rentx
+ System.debug('makepagerecords1');
+ makepagerecords();
+ //listCut();
+ } else {
+ if (statusEdit == '' || statusEdit == null) {
+ editAble = false;
+ } else if (statusEdit != '' && statusEdit != null) {
+ editAble = true;
+ }
+ // upadte start by vivek 2019-7-15
+ // coc = [SELECT Id,Name,Summons_Order_type__c,SummonsStatus_c__c,Order_ForDealerText__c,
+ // Dealer_Info__c,Order_ForDealer__c,Order_ForDealer__r.Name,Order_ForDealerTextID__c,
+ // Order_ForHospital__c,SummonsForDirction__c,Order_date__c,Arrive_Order__c,
+ // Order_status__c,Shipment_total_amount__c,Offers_Price__c,
+ // Billed_Status__c,ShipmentAccount__c,Order_Dealer_Info__c,Order_ForCustomerText__c,ConInvoice_Code__c,Onchange_order__c
+ // FROM Consumable_order__c
+ // WHERE Id =:arriveorder AND Order_Owner_WorkLocal__c =: userWorkLocation
+ // AND recordtypeid = :System.Label.RT_ConOrder_Arrive];
+ coc = [
+ SELECT
+ Id,
+ Name,
+ Summons_Order_type__c,
+ NoConfirmedPrice__c,
+ SummonsStatus_c__c,
+ Order_ForDealerText__c,
+ Dealer_Info__c,
+ Order_ForDealer__c,
+ Order_ForDealer__r.Name,
+ Order_ForDealerTextID__c,
+ Order_ForHospital__c,
+ SummonsForDirction__c,
+ Order_date__c,
+ Arrive_Order__c,
+ Order_status__c,
+ Shipment_total_amount__c,
+ Offers_Price__c,
+ Billed_Status__c,
+ ShipmentAccount__c,
+ Order_Dealer_Info__c,
+ Order_ForCustomerText__c,
+ ConInvoice_Code__c,
+ Onchange_order__c,
+ OutPattern__c
+ FROM Consumable_order__c
+ WHERE
+ Id = :arriveorder
+ AND Order_Owner_WorkLocal__c = :userWorkLocation
+ AND recordtypeid = :System.Label.RT_ConOrder_Arrive
+ ];
+ // update end by vivek 2019-7-15
+ //鏄庣粏1鑾峰彇
+ consumableorderdetailsSelected = [
+ SELECT
+ Id,
+ Dealer_Custom_Price__c,
+ Delivery_List_RMB__c,
+ Consumable_Product__r.Name__c,
+ Name,
+ Consumable_order__c,
+ Consumable_Product__c,
+ Consumable_Product__r.Name,
+ Consumable_Product__r.Category3__c,
+ Consumable_Product__r.Category4__c,
+ Consumable_Product__r.Category5__c,
+ Shipment_Count__c,
+ Consumable_Product__r.Intra_Trade_List_RMB__c,
+ Consumable_Product__r.Asset_Model_No__c,
+ Sum_of_money__c,
+ Box_Piece__c,
+ ProductPacking_list_manual__c,
+ Consumable_Product__r.SFDA_Status__c,
+ Consumable_count__c,
+ Invoiced_Procount__c,
+ RrturnPro_count__c,
+ InvoiceProNot_count__c,
+ //Unitprice_To_agency__c,
+ Consumable_Product__r.Product2__r.SFDA_Approbation_No__c,
+ Consumable_Product__r.Product2__r.SFDA_Expiration_Date__c
+ FROM Consumable_Orderdetails__c
+ WHERE Consumable_order__c = :coc.Arrive_Order__c
+ ORDER BY Name
+ ];
+ for (Consumable_Orderdetails__c cdc1 : consumableorderdetailsSelected) {
+ orderzaikuId.add(cdc1.Consumable_Product__c);
+ }
+ msoql = makeSoqlorderdet();
+ product2Selected = Database.query(msoql);
+ size = product2Selected.size();
+ initStandardController(msoql);
+ for (Integer i = 0; i < product2Selected.size(); i++) {
+ MidMap.put(product2Selected[i].Id, new ConsumableorderdetailsInfo(product2Selected[i]));
+ }
//update by rentx 2021-01-29
- //if(bss.allnumber>0){
- bss.packinglist = Integer.valueOf(bss.Prod.Product2__r.Packing_list_manual__c);
- bss.approbation_No = bss.Prod.Product2__r.SFDA_Approbation_No__c;
- bss.expiration_Date = bss.Prod.Product2__r.SFDA_Expiration_Date__c;
- consumableorderdetailsSelectRecords.add(bss);
- //}
- }
+ /*for(Integer i = 0 ; i< CountDel.size();i++){
+ //鐒跺悗寰幆CountDel鍘讳慨鏀筸ap閲岀殑allnumber
+ if(MidMap.containsKey(CountDel[i].Consumable_Product__c)){
+ ConsumableorderdetailsInfo Jstage = MidMap.get(CountDel[i].Consumable_Product__c);
+ Jstage.allnumber = Jstage.allnumber+1 ;
+ if(CountDel[i].Box_Piece__c == '鐩�'){
+ Jstage.Boxnumber = Jstage.Boxnumber + 1;
+ }else if(CountDel[i].Box_Piece__c == '涓�'){
+ Jstage.Piecenumber = Jstage.Piecenumber + 1;
+ }
+ //Jstage.BoxPiece = CountDel[i].Box_Piece__c;
+ MidMap.put(CountDel[i].Consumable_Product__c, Jstage);
+ }
- Integer ishosnum = 0;
- for (ConsumableorderdetailsInfo ass : consumableorderdetailsSelectRecords) {
- //ass.sortBy = sortOrderAsc;
- //add by rentx 2021-3-10
- if (ass.hospitalSpecialOffer) {
- ishosnum = ishosnum + 1;
+ }*/
+ for (Integer i = 0; i < CountDel.size(); i++) {
+ String str = '';
+ if (CountDel[i].hospitalSpecialOffer__c) {
+ str = 'isHos';
+ } else {
+ str = 'notHos';
+ }
+ //鏄庣粏2瀵瑰簲鐨勪骇鍝佸瓨鍦ㄤ簬MidMap涓�
+ if (MidMap.containsKey(CountDel[i].Consumable_Product__c)) {
+ //璁剧疆map涓璳ey鐨勫悗缂� 鐢ㄤ簬鍖哄垎鍖婚櫌鐗逛环鍜岄潪鍖婚櫌鐗逛环
+ if (MidMap2.containsKey(CountDel[i].Consumable_Product__c + str)) {
+ ConsumableorderdetailsInfo Jstage = MidMap2.get(CountDel[i].Consumable_Product__c + str);
+ Jstage.allnumber = Jstage.allnumber + 1;
+ if (CountDel[i].Box_Piece__c == '鐩�') {
+ Jstage.Boxnumber = Jstage.Boxnumber + 1;
+ } else if (CountDel[i].Box_Piece__c == '涓�') {
+ Jstage.Piecenumber = Jstage.Piecenumber + 1;
+ }
+ if (CountDel[i].hospitalSpecialOffer__c) {
+ Jstage.hospitalSpecialOffer = true;
+ } else {
+ Jstage.hospitalSpecialOffer = false;
+ }
+
+ if (HosProMap.containsKey(Jstage.Prod.Id)) {
+ Jstage.hosPro = true;
+ }
+ MidMap2.put(CountDel[i].Consumable_Product__c + str, Jstage);
+ } else {
+ //midmap2涓病鏈夊搴旂殑浜у搧
+ ConsumableorderdetailsInfo Jstage = MidMap.get(CountDel[i].Consumable_Product__c).clone();
+ Jstage.allnumber = Jstage.allnumber + 1;
+ if (CountDel[i].Box_Piece__c == '鐩�') {
+ Jstage.Boxnumber = Jstage.Boxnumber + 1;
+ } else if (CountDel[i].Box_Piece__c == '涓�') {
+ Jstage.Piecenumber = Jstage.Piecenumber + 1;
+ }
+ if (CountDel[i].hospitalSpecialOffer__c) {
+ Jstage.hospitalSpecialOffer = true;
+ } else {
+ Jstage.hospitalSpecialOffer = false;
+ }
+
+ if (HosProMap.containsKey(Jstage.Prod.Id)) {
+ Jstage.hosPro = true;
+ }
+ //Jstage.BoxPiece = CountDel[i].Box_Piece__c;
+ MidMap2.put(CountDel[i].Consumable_Product__c + str, Jstage);
+ }
+ }
+ }
+
+ //鍐嶆妸map閲岀殑鍊间粠鏂拌祴缁機onsumableorderdetailsRecords
+ //update by rentx 2021-01-29
+ // for(ConsumableorderdetailsInfo bss : MidMap.values()){
+ for (ConsumableorderdetailsInfo bss : MidMap2.values()) {
+ //update by rentx 2021-01-29
+ bss.packinglist = Integer.valueOf(bss.Prod.Product2__r.Packing_list_manual__c);
+ bss.approbation_No = bss.Prod.Product2__r.SFDA_Approbation_No__c;
+ bss.expiration_Date = bss.Prod.Product2__r.SFDA_Expiration_Date__c;
+ consumableorderdetailsSelectRecords.add(bss);
+ }
+ //ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, 'test11111' + consumableorderdetailsSelected.size()));
+ //return;
+
+ Integer ishosnum = 0;
+ for (ConsumableorderdetailsInfo ass : consumableorderdetailsSelectRecords) {
+ //ass.sortBy = sortOrderAsc;
+ for (Consumable_Orderdetails__c cdc1 : consumableorderdetailsSelected) {
+ cdc1.Shipment_Count__c = cdc1.Consumable_count__c;
+ if (ass.prod.Id == cdc1.Consumable_Product__c) {
+ ass.check = true;
+ ass.orderdetails1 = cdc1;
+ }
+ }
+ if (ass.hospitalSpecialOffer == true) {
+ ishosnum = ishosnum + 1;
+ }
+ }
+ if (ishosnum > 0) {
+ hasHosPro = true;
+ } else {
+ hasHosPro = false;
+ }
+
+ consumableorderdetailsSelectRecords.sort();
+ //add by rentx
+ noOfRecords = consumableorderdetailsSelectRecords.size();
+ //add by rentx
+ System.debug('makepagerecords2');
+ makepagerecords();
+ consumablearriveproductdetailsSelected = [
+ SELECT
+ Id,
+ Name,
+ Intra_Trade_List_RMB__c,
+ Asset_Model_No__c,
+ Consumable_Product__c,
+ Consumable_Product__r.Name,
+ Consumable_Product__r.Name__c,
+ Consumable_Product__r.Category3__c,
+ Consumable_Product__r.Category4__c,
+ Consumable_Product__r.Category5__c,
+ Sterilization_limit__c,
+ Deliver_date__c,
+ Bar_Code__c,
+ Arrive_date__c,
+ Send_Date__c,
+ Consumable_order_minor__r.Name,
+ Consumable_order_minor__c,
+ Dealer_Arrive__c,
+ Delivery_List_RMB__c,
+ Box_Piece__c,
+ ProductPacking_list_manual__c,
+ //add by rentx start
+ hospitalSpecialOffer__c
+ //add by rentx end
+ FROM Consumable_order_details2__c
+ WHERE
+ Consumable_order_minor__c = :coc.Arrive_Order__c
+ AND recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery
+ AND Dealer_Arrive__c = TRUE
+ ORDER BY Name
+ ];
+ for (Integer i = 0; i < consumablearriveproductdetailsSelected.size(); i++) {
+ if (
+ consumablearriveproductdetailsSelected[i].hospitalSpecialOffer__c &&
+ HosProMap.containsKey(consumablearriveproductdetailsSelected[i].Consumable_product__c)
+ ) {
+ coc.OutPattern__c = true;
+ }
+ consumableproductdetailsRecords.add(new ConsumableorderdetailsInfo(consumablearriveproductdetailsSelected[i]));
}
}
- if (ishosnum > 0) {
- hasHosPro = true;
- } else {
- hasHosPro = false;
- }
- consumableorderdetailsSelectRecords.sort();
- //add by rentx
- noOfRecords = consumableorderdetailsSelectRecords.size();
- //add by rentx
- System.debug('makepagerecords1');
- makepagerecords();
- //listCut();
} else {
- if (statusEdit == '' || statusEdit == null) {
- editAble = false;
- } else if (statusEdit != '' && statusEdit != null) {
- editAble = true;
- }
- // upadte start by vivek 2019-7-15
- // coc = [SELECT Id,Name,Summons_Order_type__c,SummonsStatus_c__c,Order_ForDealerText__c,
- // Dealer_Info__c,Order_ForDealer__c,Order_ForDealer__r.Name,Order_ForDealerTextID__c,
- // Order_ForHospital__c,SummonsForDirction__c,Order_date__c,Arrive_Order__c,
- // Order_status__c,Shipment_total_amount__c,Offers_Price__c,
- // Billed_Status__c,ShipmentAccount__c,Order_Dealer_Info__c,Order_ForCustomerText__c,ConInvoice_Code__c,Onchange_order__c
- // FROM Consumable_order__c
- // WHERE Id =:arriveorder AND Order_Owner_WorkLocal__c =: userWorkLocation
- // AND recordtypeid = :System.Label.RT_ConOrder_Arrive];
+ // 鏇存柊銆�
+ SummonsFlag = 'visible';
+ // update start by vivek 2019-7-15 add 鈥淣oConfirmedPrice__c鈥� in select
+ consumableInvoiceRecords = [
+ SELECT Id, Name, Invoice_Date__c, NoConfirmedPrice__c, Invoice_total_amount__c, Invoice_status__c
+ FROM Consumable_order__c
+ WHERE
+ Id IN (SELECT Invoice_Code_link__c FROM Consumable_order_LinkTable__c WHERE Outboundorder_Code_link__c = :ESetId)
+ AND Invoice_status__c != '鑽夋涓�'
+ ];
+
+ System.debug('coc ESetId = ' + ESetId);
+ System.debug('coc userWorkLocation = ' + userWorkLocation);
coc = [
SELECT
Id,
@@ -531,871 +770,632 @@
Onchange_order__c,
OutPattern__c
FROM Consumable_order__c
- WHERE
- Id = :arriveorder
- AND Order_Owner_WorkLocal__c = :userWorkLocation
- AND recordtypeid = :System.Label.RT_ConOrder_Arrive
+ WHERE Id = :ESetId AND Order_Owner_WorkLocal__c = :userWorkLocation AND Order_type__c = '浼犵エ'
];
- // update end by vivek 2019-7-15
- //鏄庣粏1鑾峰彇
- consumableorderdetailsSelected = [
- SELECT
- Id,
- Dealer_Custom_Price__c,
- Delivery_List_RMB__c,
- Consumable_Product__r.Name__c,
- Name,
- Consumable_order__c,
- Consumable_Product__c,
- Consumable_Product__r.Name,
- Consumable_Product__r.Category3__c,
- Consumable_Product__r.Category4__c,
- Consumable_Product__r.Category5__c,
- Shipment_Count__c,
- Consumable_Product__r.Intra_Trade_List_RMB__c,
- Consumable_Product__r.Asset_Model_No__c,
- Sum_of_money__c,
- Box_Piece__c,
- ProductPacking_list_manual__c,
- Consumable_Product__r.SFDA_Status__c,
- Consumable_count__c,
- Invoiced_Procount__c,
- RrturnPro_count__c,
- InvoiceProNot_count__c,
- //Unitprice_To_agency__c,
- Consumable_Product__r.Product2__r.SFDA_Approbation_No__c,
- Consumable_Product__r.Product2__r.SFDA_Expiration_Date__c
- FROM Consumable_Orderdetails__c
- WHERE Consumable_order__c = :coc.Arrive_Order__c
- ORDER BY Name
- ];
- for (Consumable_Orderdetails__c cdc1 : consumableorderdetailsSelected) {
- orderzaikuId.add(cdc1.Consumable_Product__c);
+ // update start by vivek 2019-7-15
+ if (getExistarrive()) {
+ arriveorder = coc.Arrive_Order__c;
}
- msoql = makeSoqlorderdet();
- product2Selected = Database.query(msoql);
- size = product2Selected.size();
- initStandardController(msoql);
- for (Integer i = 0; i < product2Selected.size(); i++) {
- MidMap.put(product2Selected[i].Id, new ConsumableorderdetailsInfo(product2Selected[i]));
- }
- //update by rentx 2021-01-29
- /*for(Integer i = 0 ; i< CountDel.size();i++){
- //鐒跺悗寰幆CountDel鍘讳慨鏀筸ap閲岀殑allnumber
- if(MidMap.containsKey(CountDel[i].Consumable_Product__c)){
- ConsumableorderdetailsInfo Jstage = MidMap.get(CountDel[i].Consumable_Product__c);
- Jstage.allnumber = Jstage.allnumber+1 ;
- if(CountDel[i].Box_Piece__c == '鐩�'){
- Jstage.Boxnumber = Jstage.Boxnumber + 1;
- }else if(CountDel[i].Box_Piece__c == '涓�'){
- Jstage.Piecenumber = Jstage.Piecenumber + 1;
- }
- //Jstage.BoxPiece = CountDel[i].Box_Piece__c;
- MidMap.put(CountDel[i].Consumable_Product__c, Jstage);
- }
-
- }*/
- for (Integer i = 0; i < CountDel.size(); i++) {
- String str = '';
- if (CountDel[i].hospitalSpecialOffer__c) {
- str = 'isHos';
- } else {
- str = 'notHos';
+ // 鍒拌揣璁㈠崟鏉ョ殑鏃跺��
+ if (getExistarrive()) {
+ if (editAble) {
+ alertMessage = '鍒拌揣璁㈠崟鐩存帴鍑哄簱锛屽嚭搴撳崟鏄庣粏涓嶅彲缂栬緫';
}
- //鏄庣粏2瀵瑰簲鐨勪骇鍝佸瓨鍦ㄤ簬MidMap涓�
- if (MidMap.containsKey(CountDel[i].Consumable_Product__c)) {
- //璁剧疆map涓璳ey鐨勫悗缂� 鐢ㄤ簬鍖哄垎鍖婚櫌鐗逛环鍜岄潪鍖婚櫌鐗逛环
- if (MidMap2.containsKey(CountDel[i].Consumable_Product__c + str)) {
- ConsumableorderdetailsInfo Jstage = MidMap2.get(CountDel[i].Consumable_Product__c + str);
- Jstage.allnumber = Jstage.allnumber + 1;
- if (CountDel[i].Box_Piece__c == '鐩�') {
- Jstage.Boxnumber = Jstage.Boxnumber + 1;
- } else if (CountDel[i].Box_Piece__c == '涓�') {
- Jstage.Piecenumber = Jstage.Piecenumber + 1;
- }
- if (CountDel[i].hospitalSpecialOffer__c) {
- Jstage.hospitalSpecialOffer = true;
- } else {
- Jstage.hospitalSpecialOffer = false;
- }
-
- if (HosProMap.containsKey(Jstage.Prod.Id)) {
- Jstage.hosPro = true;
- }
- MidMap2.put(CountDel[i].Consumable_Product__c + str, Jstage);
- } else {
- //midmap2涓病鏈夊搴旂殑浜у搧
- ConsumableorderdetailsInfo Jstage = MidMap.get(CountDel[i].Consumable_Product__c).clone();
- Jstage.allnumber = Jstage.allnumber + 1;
- if (CountDel[i].Box_Piece__c == '鐩�') {
- Jstage.Boxnumber = Jstage.Boxnumber + 1;
- } else if (CountDel[i].Box_Piece__c == '涓�') {
- Jstage.Piecenumber = Jstage.Piecenumber + 1;
- }
- if (CountDel[i].hospitalSpecialOffer__c) {
- Jstage.hospitalSpecialOffer = true;
- } else {
- Jstage.hospitalSpecialOffer = false;
- }
-
- if (HosProMap.containsKey(Jstage.Prod.Id)) {
- Jstage.hosPro = true;
- }
- //Jstage.BoxPiece = CountDel[i].Box_Piece__c;
- MidMap2.put(CountDel[i].Consumable_Product__c + str, Jstage);
- }
+ if (coc.SummonsStatus_c__c == '宸叉彁浜�' || coc.SummonsStatus_c__c == '鎵瑰噯') {
+ system.debug('coc.SummonsStatus_c__c : ' + coc.SummonsStatus_c__c);
+ saveBtnDisabled = true;
+ SorderBtnDisabled = true;
+ EditDelCommitBtnDisabled = false;
}
- }
+ //鍖婚櫌浜岀骇缁忛攢鍟嗗垎绫�
+ Integer io = 0;
+ while (io < Dealerelationship.size()) {
+ if (coc.Order_ForDealer__c == Dealerelationship[io].Dealer_subordinate__c) {
+ SecondDealer = Dealerelationship[io].Dealer_subordinate__c;
+ coc.Order_ForDealer__c = null;
+ io = io + Dealerelationship.size();
+ }
+ io++;
+ }
- //鍐嶆妸map閲岀殑鍊间粠鏂拌祴缁機onsumableorderdetailsRecords
- //update by rentx 2021-01-29
- // for(ConsumableorderdetailsInfo bss : MidMap.values()){
- for (ConsumableorderdetailsInfo bss : MidMap2.values()) {
- //update by rentx 2021-01-29
- bss.packinglist = Integer.valueOf(bss.Prod.Product2__r.Packing_list_manual__c);
- bss.approbation_No = bss.Prod.Product2__r.SFDA_Approbation_No__c;
- bss.expiration_Date = bss.Prod.Product2__r.SFDA_Expiration_Date__c;
- consumableorderdetailsSelectRecords.add(bss);
- }
- //ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, 'test11111' + consumableorderdetailsSelected.size()));
- //return;
+ Integer ik = 0;
+ while (ik < AgencyHospitalLink.size()) {
+ if (coc.Order_ForHospital__c == AgencyHospitalLink[ik].Hospital__c) {
+ HospitalInfo = AgencyHospitalLink[ik].Hospital__c;
+ HospitalName = AgencyHospitalLink[ik].Hospital__r.Name;
+ coc.Order_ForHospital__c = null;
+ ik = ik + AgencyHospitalLink.size();
+ }
+ ik++;
+ }
+ //鍑哄簱鍗曟槑缁�1鍙栧緱
+ consumableorderdetailsSelected = [
+ SELECT
+ Id,
+ Dealer_Custom_Price__c,
+ Delivery_List_RMB__c,
+ Consumable_Product__r.Name__c,
+ Consumable_Product__r.SFDA_Status__c,
+ Name,
+ Consumable_order__c,
+ Consumable_Product__c,
+ Consumable_Product__r.Name,
+ Shipment_Count__c,
+ Consumable_Product__r.Intra_Trade_List_RMB__c,
+ Consumable_Product__r.Asset_Model_No__c,
+ Consumable_Product__r.Category3__c,
+ Consumable_Product__r.Category4__c,
+ Consumable_Product__r.Category5__c,
+ Shipment_amount__c,
+ //Unitprice_To_agency__c,
+ Box_Piece__c,
+ ProductPacking_list_manual__c,
+ Invoiced_Procount__c,
+ RrturnPro_count__c,
+ InvoiceProNot_count__c,
+ Consumable_Product__r.Product2__r.SFDA_Approbation_No__c,
+ Consumable_Product__r.Product2__r.SFDA_Expiration_Date__c,
+ isOutPattern__c
+ FROM Consumable_orderdetails__c
+ WHERE Consumable_order__c = :ESetId AND Consumable_order__r.Order_Owner_WorkLocal__c = :userWorkLocation
+ ORDER BY Name
+ ];
+ Map<String, Consumable_Orderdetails__c> cocMap = new Map<String, Consumable_Orderdetails__c>();
- Integer ishosnum = 0;
- for (ConsumableorderdetailsInfo ass : consumableorderdetailsSelectRecords) {
- //ass.sortBy = sortOrderAsc;
for (Consumable_Orderdetails__c cdc1 : consumableorderdetailsSelected) {
- cdc1.Shipment_Count__c = cdc1.Consumable_count__c;
- if (ass.prod.Id == cdc1.Consumable_Product__c) {
- ass.check = true;
- ass.orderdetails1 = cdc1;
+ sumPrice += cdc1.Shipment_amount__c;
+ orderzaikuId.add(cdc1.Consumable_Product__c);
+ //add by rentx 2021-2-26
+ String tempId = cdc1.Consumable_product__c;
+ if (cdc1.isOutPattern__c) {
+ cocMap.put(tempId + 'ishos', cdc1);
+ } else {
+ cocMap.put(tempId + 'nothos', cdc1);
+ }
+ //add by rentx 2021-2-26
+ }
+ String msoql = makeSoqlorderdet();
+ product2Selected = Database.query(msoql);
+ size = product2Selected.size();
+ initStandardController(msoql);
+
+ for (Integer i = 0; i < product2Selected.size(); i++) {
+ MidMap.put(product2Selected[i].Id, new ConsumableorderdetailsInfo(product2Selected[i]));
+ }
+ //update by rentx 2021-01-29
+ /*for(Integer i = 0 ; i< CountDel.size();i++){
+ //鐒跺悗寰幆CountDel鍘讳慨鏀筸ap閲岀殑allnumber
+ if(MidMap.containsKey(CountDel[i].Consumable_Product__c)){
+ ConsumableorderdetailsInfo Jstage = MidMap.get(CountDel[i].Consumable_Product__c);
+ Jstage.allnumber = Jstage.allnumber+1 ;
+ if(CountDel[i].Box_Piece__c == '鐩�'){
+ Jstage.Boxnumber = Jstage.Boxnumber + 1;
+ }else if(CountDel[i].Box_Piece__c == '涓�'){
+ Jstage.Piecenumber = Jstage.Piecenumber + 1;
+ }
+ //Jstage.BoxPiece = CountDel[i].Box_Piece__c;
+ MidMap.put(CountDel[i].Consumable_Product__c, Jstage);
+ }
+ }*/
+
+ for (Integer i = 0; i < CountDel.size(); i++) {
+ String str = '';
+ if (CountDel[i].hospitalSpecialOffer__c) {
+ str = 'isHos';
+ } else {
+ str = 'notHos';
+ }
+ //鏄庣粏2瀵瑰簲鐨勪骇鍝佸瓨鍦ㄤ簬MidMap涓�
+ if (MidMap.containsKey(CountDel[i].Consumable_Product__c)) {
+ //璁剧疆map涓璳ey鐨勫悗缂� 鐢ㄤ簬鍖哄垎鍖婚櫌鐗逛环鍜岄潪鍖婚櫌鐗逛环
+ if (MidMap2.containsKey(CountDel[i].Consumable_Product__c + str)) {
+ ConsumableorderdetailsInfo Jstage = MidMap2.get(CountDel[i].Consumable_Product__c + str);
+ Jstage.allnumber = Jstage.allnumber + 1;
+ if (CountDel[i].Box_Piece__c == '鐩�') {
+ Jstage.Boxnumber = Jstage.Boxnumber + 1;
+ } else if (CountDel[i].Box_Piece__c == '涓�') {
+ Jstage.Piecenumber = Jstage.Piecenumber + 1;
+ }
+ if (CountDel[i].hospitalSpecialOffer__c) {
+ Jstage.hospitalSpecialOffer = true;
+ } else {
+ Jstage.hospitalSpecialOffer = false;
+ }
+
+ if (HosProMap.containsKey(Jstage.Prod.Id)) {
+ Jstage.hosPro = true;
+ }
+ MidMap2.put(CountDel[i].Consumable_Product__c + str, Jstage);
+ } else {
+ //midmap2涓病鏈夊搴旂殑浜у搧
+ ConsumableorderdetailsInfo Jstage = MidMap.get(CountDel[i].Consumable_Product__c).clone();
+ Jstage.allnumber = Jstage.allnumber + 1;
+ if (CountDel[i].Box_Piece__c == '鐩�') {
+ Jstage.Boxnumber = Jstage.Boxnumber + 1;
+ } else if (CountDel[i].Box_Piece__c == '涓�') {
+ Jstage.Piecenumber = Jstage.Piecenumber + 1;
+ }
+ if (CountDel[i].hospitalSpecialOffer__c) {
+ Jstage.hospitalSpecialOffer = true;
+ } else {
+ Jstage.hospitalSpecialOffer = false;
+ }
+ if (HosProMap.containsKey(Jstage.Prod.Id)) {
+ Jstage.hosPro = true;
+ }
+ //Jstage.BoxPiece = CountDel[i].Box_Piece__c;
+ MidMap2.put(CountDel[i].Consumable_Product__c + str, Jstage);
+ }
}
}
- if (ass.hospitalSpecialOffer == true) {
- ishosnum = ishosnum + 1;
- }
- }
- if (ishosnum > 0) {
- hasHosPro = true;
- } else {
- hasHosPro = false;
- }
+ //update by rentx 2021-01-29
+ consumableorderdetailsSelectRecords = new List<ConsumableorderdetailsInfo>();
+ //鍐嶆妸map閲岀殑鍊间粠鏂拌祴缁機onsumableorderdetailsRecords
+ //update by rentx 2021-01-29
+ // for(ConsumableorderdetailsInfo bss : MidMap.values()){
+ for (ConsumableorderdetailsInfo bss : MidMap2.values()) {
+ //update by rentx 2021-01-29
- consumableorderdetailsSelectRecords.sort();
- //add by rentx
- noOfRecords = consumableorderdetailsSelectRecords.size();
- //add by rentx
- System.debug('makepagerecords2');
- makepagerecords();
- consumablearriveproductdetailsSelected = [
- SELECT
- Id,
- Name,
- Intra_Trade_List_RMB__c,
- Asset_Model_No__c,
- Consumable_Product__c,
- Consumable_Product__r.Name,
- Consumable_Product__r.Name__c,
- Consumable_Product__r.Category3__c,
- Consumable_Product__r.Category4__c,
- Consumable_Product__r.Category5__c,
- Sterilization_limit__c,
- Deliver_date__c,
- Bar_Code__c,
- Arrive_date__c,
- Send_Date__c,
- Consumable_order_minor__r.Name,
- Consumable_order_minor__c,
- Dealer_Arrive__c,
- Delivery_List_RMB__c,
- Box_Piece__c,
- ProductPacking_list_manual__c,
- //add by rentx start
- hospitalSpecialOffer__c
- //add by rentx end
- FROM Consumable_order_details2__c
- WHERE
- Consumable_order_minor__c = :coc.Arrive_Order__c
- AND recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery
- AND Dealer_Arrive__c = TRUE
- ORDER BY Name
- ];
- for (Integer i = 0; i < consumablearriveproductdetailsSelected.size(); i++) {
- if (
- consumablearriveproductdetailsSelected[i].hospitalSpecialOffer__c &&
- HosProMap.containsKey(consumablearriveproductdetailsSelected[i].Consumable_product__c)
- ) {
- coc.OutPattern__c = true;
+ //if(bss.allnumber > 0){
+ //bss.UnitpriceToagency = bss.orderdetails1.Unitprice_To_agency__c == null || bss.orderdetails1.Unitprice_To_agency__c == 0 ? '' :bss.orderdetails1.Unitprice_To_agency__c.format();
+ bss.packinglist = Integer.valueOf(bss.Prod.Product2__r.Packing_list_manual__c);
+ bss.approbation_No = bss.Prod.Product2__r.SFDA_Approbation_No__c;
+ bss.expiration_Date = bss.Prod.Product2__r.SFDA_Expiration_Date__c;
+
+ //update by rentx 2021-2-26 start
+ if (cocMap.containsKey(bss.Prod.Id + 'ishos') && bss.hospitalSpecialOffer == true) {
+ consumableorderdetailsSelectRecords.add(bss);
+ } else if (cocMap.containsKey(bss.Prod.Id + 'nothos') && bss.hospitalSpecialOffer == false) {
+ consumableorderdetailsSelectRecords.add(bss);
+ }
+ //update by rentx 2021-2-26 end
+ // consumableorderdetailsSelectRecords.add(bss);
+ //}
}
- consumableproductdetailsRecords.add(new ConsumableorderdetailsInfo(consumablearriveproductdetailsSelected[i]));
+ Integer ishosnum = 0;
+ for (ConsumableorderdetailsInfo ass : consumableorderdetailsSelectRecords) {
+ for (Consumable_Orderdetails__c cdc1 : consumableorderdetailsSelected) {
+ //update by rentx 2012-3-1 start
+ // if(ass.prod.Id == cdc1.Consumable_Product__c){
+ // ass.check = true;
+ // ass.orderdetails1 = cdc1;
+ // }
+ if (ass.Prod.Id == cdc1.Consumable_Product__c && ass.hospitalSpecialOffer == cdc1.isOutPattern__c) {
+ ass.check = true;
+ ass.orderdetails1 = cdc1;
+ }
+ //update by rentx 2012-3-1 end
+ }
+ if (ass.hospitalSpecialOffer == true) {
+ ishosnum = ishosnum + 1;
+ }
+ }
+ if (ishosnum > 0) {
+ hasHosPro = true;
+ } else {
+ hasHosPro = false;
+ }
+
+ //add by rentx
+ noOfRecords = consumableorderdetailsSelectRecords.size();
+ //add by rentx
+ System.debug('makepagerecords3');
+ makepagerecords();
+ //listCut();
+ // 娑堣�楀搧鏄庣粏2銈掑彇寰�
+ consumableorderdetails2RecordsList = [
+ SELECT
+ Id,
+ Name,
+ SerialLotNo__c,
+ Consumable_Product__r.Name__c,
+ TracingCode__c,
+ Sterilization_limit__c,
+ Consumable_Product__c,
+ Consumable_Product__r.Name,
+ Consumable_Product__r.Category3__c,
+ Consumable_Product__r.Category4__c,
+ Consumable_Product__r.Category5__c,
+ Return_date__c,
+ Invoice_Date__c,
+ Box_Piece__c,
+ ProductPacking_list_manual__c,
+ //add by rentx start
+ hospitalSpecialOffer__c
+ //add by rentx end
+ FROM Consumable_order_details2__c
+ WHERE Consumable_ZS_order__c = :ESetId
+ ORDER BY Name
+ ];
+ for (Integer i = 0; i < consumableorderdetails2RecordsList.size(); i++) {
+ consumableorderdetails2Records.add(new ConsumableorderdetailsInfo(consumableorderdetails2RecordsList[i]));
+ }
+ //浜у搧鏄庣粏鍙栧緱
+ consumablearriveproductdetailsSelected = [
+ SELECT
+ Id,
+ Delivery_List_RMB__c,
+ Consumable_Product__r.Name__c,
+ Name,
+ Consumable_Product__r.SFDA_Status__c,
+ Consumable_Product__r.Category3__c,
+ Consumable_Product__r.Category4__c,
+ Consumable_Product__r.Category5__c,
+ Consumable_Product__c,
+ Consumable_Product__r.Name,
+ Sterilization_limit__c,
+ Consumable_Product__r.Intra_Trade_List_RMB__c,
+ Consumable_Product__r.Asset_Model_No__c,
+ Box_Piece__c,
+ ProductPacking_list_manual__c,
+ //add by rentx start
+ hospitalSpecialOffer__c
+ //add by rentx end
+ FROM Consumable_order_details2__c
+ WHERE Consumable_ZS_order__c = :ESetId
+ ORDER BY Name
+ ];
+ for (Integer i = 0; i < consumablearriveproductdetailsSelected.size(); i++) {
+ consumableproductdetailsRecords.add(new ConsumableorderdetailsInfo(consumablearriveproductdetailsSelected[i]));
+ }
+ } else {
+ // 涓嶆槸鍒拌揣璁㈠崟鏉ョ殑鏃跺��
+ if (coc.SummonsStatus_c__c == '宸叉彁浜�' || coc.SummonsStatus_c__c == '鎵瑰噯') {
+ system.debug('coc.SummonsStatus_c__c : ' + coc.SummonsStatus_c__c);
+ saveBtnDisabled = true;
+ SorderBtnDisabled = true;
+ EditDelCommitBtnDisabled = false;
+ }
+ //鍖婚櫌浜岀骇缁忛攢鍟嗗垎绫�
+ Integer io = 0;
+ while (io < Dealerelationship.size()) {
+ if (coc.Order_ForDealer__c == Dealerelationship[io].Dealer_subordinate__c) {
+ SecondDealer = Dealerelationship[io].Dealer_subordinate__c;
+ coc.Order_ForDealer__c = null;
+ io = io + Dealerelationship.size();
+ }
+ io++;
+ }
+ Integer ik = 0;
+ while (ik < AgencyHospitalLink.size()) {
+ if (coc.Order_ForHospital__c == AgencyHospitalLink[ik].Hospital__c) {
+ HospitalInfo = AgencyHospitalLink[ik].Hospital__c;
+ HospitalName = AgencyHospitalLink[ik].Hospital__r.Name;
+ coc.Order_ForHospital__c = null;
+ ik = ik + AgencyHospitalLink.size();
+ }
+ ik++;
+ }
+ // 娑堣�楀搧鏄庣粏1銈掑彇寰�
+ consumableorderdetailsSelected = [
+ SELECT
+ Id,
+ Dealer_Custom_Price__c,
+ Delivery_List_RMB__c,
+ Consumable_Product__r.Name__c,
+ Consumable_Product__r.SFDA_Status__c,
+ Name,
+ Consumable_order__c,
+ Consumable_Product__c,
+ Consumable_Product__r.Name,
+ Shipment_Count__c,
+ Consumable_Product__r.Intra_Trade_List_RMB__c,
+ Consumable_Product__r.Asset_Model_No__c,
+ Shipment_amount__c,
+ Box_Piece__c,
+ ProductPacking_list_manual__c,
+ Invoiced_Procount__c,
+ RrturnPro_count__c,
+ //Unitprice_To_agency__c,
+ InvoiceProNot_count__c,
+ Consumable_Product__r.Category3__c,
+ Consumable_Product__r.Category4__c,
+ Consumable_Product__r.Category5__c,
+ Consumable_Product__r.Product2__r.SFDA_Approbation_No__c,
+ Consumable_Product__r.Product2__r.SFDA_Expiration_Date__c,
+ isOutPattern__c
+ FROM Consumable_orderdetails__c
+ WHERE Consumable_order__c = :ESetId AND Consumable_order__r.Order_Owner_WorkLocal__c = :userWorkLocation
+ ORDER BY Name
+ ];
+ //add by rentx 202-2-26
+ Map<String, Consumable_Orderdetails__c> cocMap = new Map<String, Consumable_Orderdetails__c>();
+
+ for (Consumable_Orderdetails__c cdc1 : consumableorderdetailsSelected) {
+ sumPrice += cdc1.Shipment_amount__c;
+ orderzaikuId.add(cdc1.Consumable_Product__c);
+ //add by rentx 2021-2-26
+ String tempId = cdc1.Consumable_product__c;
+ if (cdc1.isOutPattern__c) {
+ cocMap.put(tempId + 'ishos', cdc1);
+ } else {
+ cocMap.put(tempId + 'nothos', cdc1);
+ }
+ //add by rentx 2021-2-26
+ }
+
+ String msoql = makeSoqlorderdet();
+ product2Selected = Database.query(msoql);
+ size = product2Selected.size();
+ initStandardController(msoql);
+ for (Integer i = 0; i < product2Selected.size(); i++) {
+ MidMap.put(product2Selected[i].Id, new ConsumableorderdetailsInfo(product2Selected[i]));
+ }
+
+ for (Integer i = 0; i < CountDel.size(); i++) {
+ String str = '';
+ if (CountDel[i].hospitalSpecialOffer__c) {
+ str = 'isHos';
+ } else {
+ str = 'notHos';
+ }
+ //鏄庣粏2瀵瑰簲鐨勪骇鍝佸瓨鍦ㄤ簬MidMap涓�
+ if (MidMap.containsKey(CountDel[i].Consumable_Product__c)) {
+ //璁剧疆map涓璳ey鐨勫悗缂� 鐢ㄤ簬鍖哄垎鍖婚櫌鐗逛环鍜岄潪鍖婚櫌鐗逛环
+ if (MidMap2.containsKey(CountDel[i].Consumable_Product__c + str)) {
+ ConsumableorderdetailsInfo Jstage = MidMap2.get(CountDel[i].Consumable_Product__c + str);
+ Jstage.allnumber = Jstage.allnumber + 1;
+ if (CountDel[i].Box_Piece__c == '鐩�') {
+ Jstage.Boxnumber = Jstage.Boxnumber + 1;
+ } else if (CountDel[i].Box_Piece__c == '涓�') {
+ Jstage.Piecenumber = Jstage.Piecenumber + 1;
+ }
+ if (CountDel[i].hospitalSpecialOffer__c) {
+ Jstage.hospitalSpecialOffer = true;
+ } else {
+ Jstage.hospitalSpecialOffer = false;
+ }
+ if (HosProMap.containsKey(Jstage.Prod.Id)) {
+ Jstage.hosPro = true;
+ }
+ MidMap2.put(CountDel[i].Consumable_Product__c + str, Jstage);
+ } else {
+ //midmap2涓病鏈夊搴旂殑浜у搧
+ ConsumableorderdetailsInfo Jstage = MidMap.get(CountDel[i].Consumable_Product__c).clone();
+ Jstage.allnumber = Jstage.allnumber + 1;
+ if (CountDel[i].Box_Piece__c == '鐩�') {
+ Jstage.Boxnumber = Jstage.Boxnumber + 1;
+ } else if (CountDel[i].Box_Piece__c == '涓�') {
+ Jstage.Piecenumber = Jstage.Piecenumber + 1;
+ }
+
+ if (CountDel[i].hospitalSpecialOffer__c) {
+ Jstage.hospitalSpecialOffer = true;
+ } else {
+ Jstage.hospitalSpecialOffer = false;
+ }
+ if (HosProMap.containsKey(Jstage.Prod.Id)) {
+ Jstage.hosPro = true;
+ }
+ Jstage.BoxPiece = CountDel[i].Box_Piece__c;
+ MidMap2.put(CountDel[i].Consumable_Product__c + str, Jstage);
+ }
+ }
+ }
+
+ //鍐嶆妸map閲岀殑鍊间粠鏂拌祴缁機onsumableorderdetailsRecords
+ //update by rentx 2021-01-29
+ // for(ConsumableorderdetailsInfo bss : MidMap.values()){
+ for (ConsumableorderdetailsInfo bss : MidMap2.values()) {
+ //update by rentx 2021-01-29
+
+ //if(bss.allnumber>0){
+ bss.packinglist = Integer.valueOf(bss.Prod.Product2__r.Packing_list_manual__c);
+ bss.approbation_No = bss.Prod.Product2__r.SFDA_Approbation_No__c;
+ bss.expiration_Date = bss.Prod.Product2__r.SFDA_Expiration_Date__c;
+
+ //update by rentx 2021-2-26 start
+ if (cocMap.containsKey(bss.Prod.Id + 'ishos') && bss.hospitalSpecialOffer == true) {
+ consumableorderdetailsSelectRecords.add(bss);
+ } else if (cocMap.containsKey(bss.Prod.Id + 'nothos') && bss.hospitalSpecialOffer == false) {
+ consumableorderdetailsSelectRecords.add(bss);
+ }
+ // consumableorderdetailsSelectRecords.add(bss);
+ //}
+ }
+ // return null;
+ Integer ishosnum = 0;
+ for (ConsumableorderdetailsInfo ass : consumableorderdetailsSelectRecords) {
+ //ass.sortBy = sortOrderAsc;
+ for (Consumable_Orderdetails__c cdc1 : consumableorderdetailsSelected) {
+ //update by rentx 2012-3-1 start
+ // if(ass.prod.Id == cdc1.Consumable_Product__c){
+ // ass.check = true;
+ // ass.orderdetails1 = cdc1;
+ // }
+ if (ass.Prod.Id == cdc1.Consumable_Product__c && ass.hospitalSpecialOffer == cdc1.isOutPattern__c) {
+ ass.check = true;
+ ass.orderdetails1 = cdc1;
+ }
+ //update by rentx 2012-3-1 end
+ }
+
+ if (ass.hospitalSpecialOffer == true) {
+ ishosnum = ishosnum + 1;
+ }
+ }
+
+ if (ishosnum > 0) {
+ hasHosPro = true;
+ } else {
+ hasHosPro = false;
+ }
+
+ consumableorderdetailsSelectRecords.sort();
+ //add by rentx
+ noOfRecords = consumableorderdetailsSelectRecords.size();
+ //add by rentx
+ System.debug('makepagerecords4');
+ makepagerecords();
+
+ // 娑堣�楀搧鏄庣粏2銈掑彇寰�
+ consumableorderdetails2RecordsList = [
+ SELECT
+ Id,
+ Name,
+ SerialLotNo__c,
+ Consumable_Product__r.Name__c,
+ TracingCode__c,
+ Sterilization_limit__c,
+ Consumable_Product__c,
+ Consumable_Product__r.Name,
+ Consumable_Product__r.Category3__c,
+ Consumable_Product__r.Category4__c,
+ Consumable_Product__r.Category5__c,
+ Return_date__c,
+ Invoice_Date__c,
+ Box_Piece__c,
+ ProductPacking_list_manual__c,
+ //add by rentx start
+ hospitalSpecialOffer__c
+ //add by rentx end
+
+ FROM Consumable_order_details2__c
+ WHERE Consumable_ZS_order__c = :ESetId
+ ORDER BY Name
+ ];
+ for (Integer i = 0; i < consumableorderdetails2RecordsList.size(); i++) {
+ consumableorderdetails2Records.add(new ConsumableorderdetailsInfo(consumableorderdetails2RecordsList[i]));
+ }
}
}
- } else {
- // 鏇存柊銆�
- SummonsFlag = 'visible';
- // update start by vivek 2019-7-15 add 鈥淣oConfirmedPrice__c鈥� in select
- consumableInvoiceRecords = [
- SELECT Id, Name, Invoice_Date__c, NoConfirmedPrice__c, Invoice_total_amount__c, Invoice_status__c
- FROM Consumable_order__c
- WHERE
- Id IN (SELECT Invoice_Code_link__c FROM Consumable_order_LinkTable__c WHERE Outboundorder_Code_link__c = :ESetId)
- AND Invoice_status__c != '鑽夋涓�'
- ];
-
- System.debug('coc ESetId = ' + ESetId);
- System.debug('coc userWorkLocation = ' + userWorkLocation);
- coc = [
- SELECT
- Id,
- Name,
- Summons_Order_type__c,
- NoConfirmedPrice__c,
- SummonsStatus_c__c,
- Order_ForDealerText__c,
- Dealer_Info__c,
- Order_ForDealer__c,
- Order_ForDealer__r.Name,
- Order_ForDealerTextID__c,
- Order_ForHospital__c,
- SummonsForDirction__c,
- Order_date__c,
- Arrive_Order__c,
- Order_status__c,
- Shipment_total_amount__c,
- Offers_Price__c,
- Billed_Status__c,
- ShipmentAccount__c,
- Order_Dealer_Info__c,
- Order_ForCustomerText__c,
- ConInvoice_Code__c,
- Onchange_order__c,
- OutPattern__c
- FROM Consumable_order__c
- WHERE Id = :ESetId AND Order_Owner_WorkLocal__c = :userWorkLocation AND Order_type__c = '浼犵エ'
- ];
- // update start by vivek 2019-7-15
- if (getExistarrive()) {
- arriveorder = coc.Arrive_Order__c;
- }
- // 鍒拌揣璁㈠崟鏉ョ殑鏃跺��
- if (getExistarrive()) {
- if (editAble) {
- alertMessage = '鍒拌揣璁㈠崟鐩存帴鍑哄簱锛屽嚭搴撳崟鏄庣粏涓嶅彲缂栬緫';
- }
- if (coc.SummonsStatus_c__c == '宸叉彁浜�' || coc.SummonsStatus_c__c == '鎵瑰噯') {
- system.debug('coc.SummonsStatus_c__c : ' + coc.SummonsStatus_c__c);
- saveBtnDisabled = true;
- SorderBtnDisabled = true;
- EditDelCommitBtnDisabled = false;
- }
- //鍖婚櫌浜岀骇缁忛攢鍟嗗垎绫�
- Integer io = 0;
- while (io < Dealerelationship.size()) {
- if (coc.Order_ForDealer__c == Dealerelationship[io].Dealer_subordinate__c) {
- SecondDealer = Dealerelationship[io].Dealer_subordinate__c;
- coc.Order_ForDealer__c = null;
- io = io + Dealerelationship.size();
- }
- io++;
- }
-
- Integer ik = 0;
- while (ik < AgencyHospitalLink.size()) {
- if (coc.Order_ForHospital__c == AgencyHospitalLink[ik].Hospital__c) {
- HospitalInfo = AgencyHospitalLink[ik].Hospital__c;
- HospitalName = AgencyHospitalLink[ik].Hospital__r.Name;
- coc.Order_ForHospital__c = null;
- ik = ik + AgencyHospitalLink.size();
- }
- ik++;
- }
- //鍑哄簱鍗曟槑缁�1鍙栧緱
- consumableorderdetailsSelected = [
- SELECT
- Id,
- Dealer_Custom_Price__c,
- Delivery_List_RMB__c,
- Consumable_Product__r.Name__c,
- Consumable_Product__r.SFDA_Status__c,
- Name,
- Consumable_order__c,
- Consumable_Product__c,
- Consumable_Product__r.Name,
- Shipment_Count__c,
- Consumable_Product__r.Intra_Trade_List_RMB__c,
- Consumable_Product__r.Asset_Model_No__c,
- Consumable_Product__r.Category3__c,
- Consumable_Product__r.Category4__c,
- Consumable_Product__r.Category5__c,
- Shipment_amount__c,
- //Unitprice_To_agency__c,
- Box_Piece__c,
- ProductPacking_list_manual__c,
- Invoiced_Procount__c,
- RrturnPro_count__c,
- InvoiceProNot_count__c,
- Consumable_Product__r.Product2__r.SFDA_Approbation_No__c,
- Consumable_Product__r.Product2__r.SFDA_Expiration_Date__c,
- isOutPattern__c
- FROM Consumable_orderdetails__c
- WHERE Consumable_order__c = :ESetId AND Consumable_order__r.Order_Owner_WorkLocal__c = :userWorkLocation
- ORDER BY Name
- ];
- Map<String, Consumable_Orderdetails__c> cocMap = new Map<String, Consumable_Orderdetails__c>();
-
- for (Consumable_Orderdetails__c cdc1 : consumableorderdetailsSelected) {
- sumPrice += cdc1.Shipment_amount__c;
- orderzaikuId.add(cdc1.Consumable_Product__c);
- //add by rentx 2021-2-26
- String tempId = cdc1.Consumable_product__c;
- if (cdc1.isOutPattern__c) {
- cocMap.put(tempId + 'ishos', cdc1);
- } else {
- cocMap.put(tempId + 'nothos', cdc1);
- }
- //add by rentx 2021-2-26
- }
- String msoql = makeSoqlorderdet();
- product2Selected = Database.query(msoql);
- size = product2Selected.size();
- initStandardController(msoql);
-
- for (Integer i = 0; i < product2Selected.size(); i++) {
- MidMap.put(product2Selected[i].Id, new ConsumableorderdetailsInfo(product2Selected[i]));
- }
- //update by rentx 2021-01-29
- /*for(Integer i = 0 ; i< CountDel.size();i++){
- //鐒跺悗寰幆CountDel鍘讳慨鏀筸ap閲岀殑allnumber
- if(MidMap.containsKey(CountDel[i].Consumable_Product__c)){
- ConsumableorderdetailsInfo Jstage = MidMap.get(CountDel[i].Consumable_Product__c);
- Jstage.allnumber = Jstage.allnumber+1 ;
- if(CountDel[i].Box_Piece__c == '鐩�'){
- Jstage.Boxnumber = Jstage.Boxnumber + 1;
- }else if(CountDel[i].Box_Piece__c == '涓�'){
- Jstage.Piecenumber = Jstage.Piecenumber + 1;
- }
- //Jstage.BoxPiece = CountDel[i].Box_Piece__c;
- MidMap.put(CountDel[i].Consumable_Product__c, Jstage);
- }
- }*/
-
- for (Integer i = 0; i < CountDel.size(); i++) {
- String str = '';
- if (CountDel[i].hospitalSpecialOffer__c) {
- str = 'isHos';
- } else {
- str = 'notHos';
- }
- //鏄庣粏2瀵瑰簲鐨勪骇鍝佸瓨鍦ㄤ簬MidMap涓�
- if (MidMap.containsKey(CountDel[i].Consumable_Product__c)) {
- //璁剧疆map涓璳ey鐨勫悗缂� 鐢ㄤ簬鍖哄垎鍖婚櫌鐗逛环鍜岄潪鍖婚櫌鐗逛环
- if (MidMap2.containsKey(CountDel[i].Consumable_Product__c + str)) {
- ConsumableorderdetailsInfo Jstage = MidMap2.get(CountDel[i].Consumable_Product__c + str);
- Jstage.allnumber = Jstage.allnumber + 1;
- if (CountDel[i].Box_Piece__c == '鐩�') {
- Jstage.Boxnumber = Jstage.Boxnumber + 1;
- } else if (CountDel[i].Box_Piece__c == '涓�') {
- Jstage.Piecenumber = Jstage.Piecenumber + 1;
- }
- if (CountDel[i].hospitalSpecialOffer__c) {
- Jstage.hospitalSpecialOffer = true;
- } else {
- Jstage.hospitalSpecialOffer = false;
- }
-
- if (HosProMap.containsKey(Jstage.Prod.Id)) {
- Jstage.hosPro = true;
- }
- MidMap2.put(CountDel[i].Consumable_Product__c + str, Jstage);
- } else {
- //midmap2涓病鏈夊搴旂殑浜у搧
- ConsumableorderdetailsInfo Jstage = MidMap.get(CountDel[i].Consumable_Product__c).clone();
- Jstage.allnumber = Jstage.allnumber + 1;
- if (CountDel[i].Box_Piece__c == '鐩�') {
- Jstage.Boxnumber = Jstage.Boxnumber + 1;
- } else if (CountDel[i].Box_Piece__c == '涓�') {
- Jstage.Piecenumber = Jstage.Piecenumber + 1;
- }
- if (CountDel[i].hospitalSpecialOffer__c) {
- Jstage.hospitalSpecialOffer = true;
- } else {
- Jstage.hospitalSpecialOffer = false;
- }
- if (HosProMap.containsKey(Jstage.Prod.Id)) {
- Jstage.hosPro = true;
- }
- //Jstage.BoxPiece = CountDel[i].Box_Piece__c;
- MidMap2.put(CountDel[i].Consumable_Product__c + str, Jstage);
- }
- }
- }
- //update by rentx 2021-01-29
- consumableorderdetailsSelectRecords = new List<ConsumableorderdetailsInfo>();
- //鍐嶆妸map閲岀殑鍊间粠鏂拌祴缁機onsumableorderdetailsRecords
- //update by rentx 2021-01-29
- // for(ConsumableorderdetailsInfo bss : MidMap.values()){
- for (ConsumableorderdetailsInfo bss : MidMap2.values()) {
- //update by rentx 2021-01-29
-
- //if(bss.allnumber > 0){
- //bss.UnitpriceToagency = bss.orderdetails1.Unitprice_To_agency__c == null || bss.orderdetails1.Unitprice_To_agency__c == 0 ? '' :bss.orderdetails1.Unitprice_To_agency__c.format();
- bss.packinglist = Integer.valueOf(bss.Prod.Product2__r.Packing_list_manual__c);
- bss.approbation_No = bss.Prod.Product2__r.SFDA_Approbation_No__c;
- bss.expiration_Date = bss.Prod.Product2__r.SFDA_Expiration_Date__c;
-
- //update by rentx 2021-2-26 start
- if (cocMap.containsKey(bss.Prod.Id + 'ishos') && bss.hospitalSpecialOffer == true) {
- consumableorderdetailsSelectRecords.add(bss);
- } else if (cocMap.containsKey(bss.Prod.Id + 'nothos') && bss.hospitalSpecialOffer == false) {
- consumableorderdetailsSelectRecords.add(bss);
- }
- //update by rentx 2021-2-26 end
- // consumableorderdetailsSelectRecords.add(bss);
- //}
- }
- Integer ishosnum = 0;
- for (ConsumableorderdetailsInfo ass : consumableorderdetailsSelectRecords) {
- for (Consumable_Orderdetails__c cdc1 : consumableorderdetailsSelected) {
- //update by rentx 2012-3-1 start
- // if(ass.prod.Id == cdc1.Consumable_Product__c){
- // ass.check = true;
- // ass.orderdetails1 = cdc1;
- // }
- if (ass.Prod.Id == cdc1.Consumable_Product__c && ass.hospitalSpecialOffer == cdc1.isOutPattern__c) {
- ass.check = true;
- ass.orderdetails1 = cdc1;
- }
- //update by rentx 2012-3-1 end
- }
- if (ass.hospitalSpecialOffer == true) {
- ishosnum = ishosnum + 1;
- }
- }
- if (ishosnum > 0) {
- hasHosPro = true;
- } else {
- hasHosPro = false;
- }
-
- //add by rentx
- noOfRecords = consumableorderdetailsSelectRecords.size();
- //add by rentx
- System.debug('makepagerecords3');
- makepagerecords();
- //listCut();
- // 娑堣�楀搧鏄庣粏2銈掑彇寰�
- consumableorderdetails2RecordsList = [
- SELECT
- Id,
- Name,
- SerialLotNo__c,
- Consumable_Product__r.Name__c,
- TracingCode__c,
- Sterilization_limit__c,
- Consumable_Product__c,
- Consumable_Product__r.Name,
- Consumable_Product__r.Category3__c,
- Consumable_Product__r.Category4__c,
- Consumable_Product__r.Category5__c,
- Return_date__c,
- Invoice_Date__c,
- Box_Piece__c,
- ProductPacking_list_manual__c,
- //add by rentx start
- hospitalSpecialOffer__c
- //add by rentx end
- FROM Consumable_order_details2__c
- WHERE Consumable_ZS_order__c = :ESetId
- ORDER BY Name
- ];
- for (Integer i = 0; i < consumableorderdetails2RecordsList.size(); i++) {
- consumableorderdetails2Records.add(new ConsumableorderdetailsInfo(consumableorderdetails2RecordsList[i]));
- }
- //浜у搧鏄庣粏鍙栧緱
- consumablearriveproductdetailsSelected = [
- SELECT
- Id,
- Delivery_List_RMB__c,
- Consumable_Product__r.Name__c,
- Name,
- Consumable_Product__r.SFDA_Status__c,
- Consumable_Product__r.Category3__c,
- Consumable_Product__r.Category4__c,
- Consumable_Product__r.Category5__c,
- Consumable_Product__c,
- Consumable_Product__r.Name,
- Sterilization_limit__c,
- Consumable_Product__r.Intra_Trade_List_RMB__c,
- Consumable_Product__r.Asset_Model_No__c,
- Box_Piece__c,
- ProductPacking_list_manual__c,
- //add by rentx start
- hospitalSpecialOffer__c
- //add by rentx end
- FROM Consumable_order_details2__c
- WHERE Consumable_ZS_order__c = :ESetId
- ORDER BY Name
- ];
- for (Integer i = 0; i < consumablearriveproductdetailsSelected.size(); i++) {
- consumableproductdetailsRecords.add(new ConsumableorderdetailsInfo(consumablearriveproductdetailsSelected[i]));
+ //ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, 'test++++++' + SecondDealer));
+ if (SecondDealer == null || SecondDealer == '') {
+ provinceOpts.add(new SelectOption('', '-鏃�-'));
+ provinceOptsMap.put('', '-鏃�-');
+ for (Integer i = 0; i < Dealerelationship.size(); i++) {
+ provinceOpts.add(
+ new SelectOption(Dealerelationship[i].Dealer_subordinate__c, Dealerelationship[i].Dealer_subordinate__r.Name)
+ );
+ provinceOptsMap.put(Dealerelationship[i].Dealer_subordinate__c, Dealerelationship[i].Dealer_subordinate__r.Name);
}
} else {
- // 涓嶆槸鍒拌揣璁㈠崟鏉ョ殑鏃跺��
- if (coc.SummonsStatus_c__c == '宸叉彁浜�' || coc.SummonsStatus_c__c == '鎵瑰噯') {
- system.debug('coc.SummonsStatus_c__c : ' + coc.SummonsStatus_c__c);
- saveBtnDisabled = true;
- SorderBtnDisabled = true;
- EditDelCommitBtnDisabled = false;
- }
- //鍖婚櫌浜岀骇缁忛攢鍟嗗垎绫�
- Integer io = 0;
- while (io < Dealerelationship.size()) {
- if (coc.Order_ForDealer__c == Dealerelationship[io].Dealer_subordinate__c) {
- SecondDealer = Dealerelationship[io].Dealer_subordinate__c;
- coc.Order_ForDealer__c = null;
- io = io + Dealerelationship.size();
- }
- io++;
- }
- Integer ik = 0;
- while (ik < AgencyHospitalLink.size()) {
- if (coc.Order_ForHospital__c == AgencyHospitalLink[ik].Hospital__c) {
- HospitalInfo = AgencyHospitalLink[ik].Hospital__c;
- HospitalName = AgencyHospitalLink[ik].Hospital__r.Name;
- coc.Order_ForHospital__c = null;
- ik = ik + AgencyHospitalLink.size();
- }
- ik++;
- }
- // 娑堣�楀搧鏄庣粏1銈掑彇寰�
- consumableorderdetailsSelected = [
- SELECT
- Id,
- Dealer_Custom_Price__c,
- Delivery_List_RMB__c,
- Consumable_Product__r.Name__c,
- Consumable_Product__r.SFDA_Status__c,
- Name,
- Consumable_order__c,
- Consumable_Product__c,
- Consumable_Product__r.Name,
- Shipment_Count__c,
- Consumable_Product__r.Intra_Trade_List_RMB__c,
- Consumable_Product__r.Asset_Model_No__c,
- Shipment_amount__c,
- Box_Piece__c,
- ProductPacking_list_manual__c,
- Invoiced_Procount__c,
- RrturnPro_count__c,
- //Unitprice_To_agency__c,
- InvoiceProNot_count__c,
- Consumable_Product__r.Category3__c,
- Consumable_Product__r.Category4__c,
- Consumable_Product__r.Category5__c,
- Consumable_Product__r.Product2__r.SFDA_Approbation_No__c,
- Consumable_Product__r.Product2__r.SFDA_Expiration_Date__c,
- isOutPattern__c
- FROM Consumable_orderdetails__c
- WHERE Consumable_order__c = :ESetId AND Consumable_order__r.Order_Owner_WorkLocal__c = :userWorkLocation
- ORDER BY Name
- ];
- //add by rentx 202-2-26
- Map<String, Consumable_Orderdetails__c> cocMap = new Map<String, Consumable_Orderdetails__c>();
-
- for (Consumable_Orderdetails__c cdc1 : consumableorderdetailsSelected) {
- sumPrice += cdc1.Shipment_amount__c;
- orderzaikuId.add(cdc1.Consumable_Product__c);
- //add by rentx 2021-2-26
- String tempId = cdc1.Consumable_product__c;
- if (cdc1.isOutPattern__c) {
- cocMap.put(tempId + 'ishos', cdc1);
- } else {
- cocMap.put(tempId + 'nothos', cdc1);
- }
- //add by rentx 2021-2-26
- }
-
- String msoql = makeSoqlorderdet();
- product2Selected = Database.query(msoql);
- size = product2Selected.size();
- initStandardController(msoql);
- for (Integer i = 0; i < product2Selected.size(); i++) {
- MidMap.put(product2Selected[i].Id, new ConsumableorderdetailsInfo(product2Selected[i]));
- }
-
- for (Integer i = 0; i < CountDel.size(); i++) {
- String str = '';
- if (CountDel[i].hospitalSpecialOffer__c) {
- str = 'isHos';
- } else {
- str = 'notHos';
- }
- //鏄庣粏2瀵瑰簲鐨勪骇鍝佸瓨鍦ㄤ簬MidMap涓�
- if (MidMap.containsKey(CountDel[i].Consumable_Product__c)) {
- //璁剧疆map涓璳ey鐨勫悗缂� 鐢ㄤ簬鍖哄垎鍖婚櫌鐗逛环鍜岄潪鍖婚櫌鐗逛环
- if (MidMap2.containsKey(CountDel[i].Consumable_Product__c + str)) {
- ConsumableorderdetailsInfo Jstage = MidMap2.get(CountDel[i].Consumable_Product__c + str);
- Jstage.allnumber = Jstage.allnumber + 1;
- if (CountDel[i].Box_Piece__c == '鐩�') {
- Jstage.Boxnumber = Jstage.Boxnumber + 1;
- } else if (CountDel[i].Box_Piece__c == '涓�') {
- Jstage.Piecenumber = Jstage.Piecenumber + 1;
- }
- if (CountDel[i].hospitalSpecialOffer__c) {
- Jstage.hospitalSpecialOffer = true;
- } else {
- Jstage.hospitalSpecialOffer = false;
- }
- if (HosProMap.containsKey(Jstage.Prod.Id)) {
- Jstage.hosPro = true;
- }
- MidMap2.put(CountDel[i].Consumable_Product__c + str, Jstage);
- } else {
- //midmap2涓病鏈夊搴旂殑浜у搧
- ConsumableorderdetailsInfo Jstage = MidMap.get(CountDel[i].Consumable_Product__c).clone();
- Jstage.allnumber = Jstage.allnumber + 1;
- if (CountDel[i].Box_Piece__c == '鐩�') {
- Jstage.Boxnumber = Jstage.Boxnumber + 1;
- } else if (CountDel[i].Box_Piece__c == '涓�') {
- Jstage.Piecenumber = Jstage.Piecenumber + 1;
- }
-
- if (CountDel[i].hospitalSpecialOffer__c) {
- Jstage.hospitalSpecialOffer = true;
- } else {
- Jstage.hospitalSpecialOffer = false;
- }
- if (HosProMap.containsKey(Jstage.Prod.Id)) {
- Jstage.hosPro = true;
- }
- Jstage.BoxPiece = CountDel[i].Box_Piece__c;
- MidMap2.put(CountDel[i].Consumable_Product__c + str, Jstage);
- }
+ provinceOpts.add(new SelectOption('', '-鏃�-'));
+ provinceOptsMap.put('', '-鏃�-');
+ for (Integer i = 0; i < Dealerelationship.size(); i++) {
+ if (Dealerelationship[i].Dealer_subordinate__c == SecondDealer) {
+ provinceOpts.add(
+ new SelectOption(Dealerelationship[i].Dealer_subordinate__c, Dealerelationship[i].Dealer_subordinate__r.Name)
+ );
+ provinceOptsMap.put(Dealerelationship[i].Dealer_subordinate__c, Dealerelationship[i].Dealer_subordinate__r.Name);
}
}
-
- //鍐嶆妸map閲岀殑鍊间粠鏂拌祴缁機onsumableorderdetailsRecords
- //update by rentx 2021-01-29
- // for(ConsumableorderdetailsInfo bss : MidMap.values()){
- for (ConsumableorderdetailsInfo bss : MidMap2.values()) {
- //update by rentx 2021-01-29
-
- //if(bss.allnumber>0){
- bss.packinglist = Integer.valueOf(bss.Prod.Product2__r.Packing_list_manual__c);
- bss.approbation_No = bss.Prod.Product2__r.SFDA_Approbation_No__c;
- bss.expiration_Date = bss.Prod.Product2__r.SFDA_Expiration_Date__c;
-
- //update by rentx 2021-2-26 start
- if (cocMap.containsKey(bss.Prod.Id + 'ishos') && bss.hospitalSpecialOffer == true) {
- consumableorderdetailsSelectRecords.add(bss);
- } else if (cocMap.containsKey(bss.Prod.Id + 'nothos') && bss.hospitalSpecialOffer == false) {
- consumableorderdetailsSelectRecords.add(bss);
+ for (Integer i = 0; i < Dealerelationship.size(); i++) {
+ if (Dealerelationship[i].Dealer_subordinate__c != SecondDealer) {
+ provinceOpts.add(
+ new SelectOption(Dealerelationship[i].Dealer_subordinate__c, Dealerelationship[i].Dealer_subordinate__r.Name)
+ );
+ provinceOptsMap.put(Dealerelationship[i].Dealer_subordinate__c, Dealerelationship[i].Dealer_subordinate__r.Name);
}
- // consumableorderdetailsSelectRecords.add(bss);
- //}
- }
- // return null;
- Integer ishosnum = 0;
- for (ConsumableorderdetailsInfo ass : consumableorderdetailsSelectRecords) {
- //ass.sortBy = sortOrderAsc;
- for (Consumable_Orderdetails__c cdc1 : consumableorderdetailsSelected) {
- //update by rentx 2012-3-1 start
- // if(ass.prod.Id == cdc1.Consumable_Product__c){
- // ass.check = true;
- // ass.orderdetails1 = cdc1;
- // }
- if (ass.Prod.Id == cdc1.Consumable_Product__c && ass.hospitalSpecialOffer == cdc1.isOutPattern__c) {
- ass.check = true;
- ass.orderdetails1 = cdc1;
- }
- //update by rentx 2012-3-1 end
- }
-
- if (ass.hospitalSpecialOffer == true) {
- ishosnum = ishosnum + 1;
- }
- }
-
- if (ishosnum > 0) {
- hasHosPro = true;
- } else {
- hasHosPro = false;
- }
-
- consumableorderdetailsSelectRecords.sort();
- //add by rentx
- noOfRecords = consumableorderdetailsSelectRecords.size();
- //add by rentx
- System.debug('makepagerecords4');
- makepagerecords();
-
- // 娑堣�楀搧鏄庣粏2銈掑彇寰�
- consumableorderdetails2RecordsList = [
- SELECT
- Id,
- Name,
- SerialLotNo__c,
- Consumable_Product__r.Name__c,
- TracingCode__c,
- Sterilization_limit__c,
- Consumable_Product__c,
- Consumable_Product__r.Name,
- Consumable_Product__r.Category3__c,
- Consumable_Product__r.Category4__c,
- Consumable_Product__r.Category5__c,
- Return_date__c,
- Invoice_Date__c,
- Box_Piece__c,
- ProductPacking_list_manual__c,
- //add by rentx start
- hospitalSpecialOffer__c
- //add by rentx end
-
- FROM Consumable_order_details2__c
- WHERE Consumable_ZS_order__c = :ESetId
- ORDER BY Name
- ];
- for (Integer i = 0; i < consumableorderdetails2RecordsList.size(); i++) {
- consumableorderdetails2Records.add(new ConsumableorderdetailsInfo(consumableorderdetails2RecordsList[i]));
}
}
- }
- //ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, 'test++++++' + SecondDealer));
- if (SecondDealer == null || SecondDealer == '') {
- provinceOpts.add(new SelectOption('', '-鏃�-'));
- provinceOptsMap.put('', '-鏃�-');
- for (Integer i = 0; i < Dealerelationship.size(); i++) {
- provinceOpts.add(
- new SelectOption(Dealerelationship[i].Dealer_subordinate__c, Dealerelationship[i].Dealer_subordinate__r.Name)
- );
- provinceOptsMap.put(Dealerelationship[i].Dealer_subordinate__c, Dealerelationship[i].Dealer_subordinate__r.Name);
- }
- } else {
- provinceOpts.add(new SelectOption('', '-鏃�-'));
- provinceOptsMap.put('', '-鏃�-');
- for (Integer i = 0; i < Dealerelationship.size(); i++) {
- if (Dealerelationship[i].Dealer_subordinate__c == SecondDealer) {
- provinceOpts.add(
- new SelectOption(Dealerelationship[i].Dealer_subordinate__c, Dealerelationship[i].Dealer_subordinate__r.Name)
- );
- provinceOptsMap.put(Dealerelationship[i].Dealer_subordinate__c, Dealerelationship[i].Dealer_subordinate__r.Name);
+
+ Schema.DescribeFieldResult dfr = Product2__c.Intra_Trade_List_RMB__c.getDescribe();
+ cansee = dfr.isAccessible();
+ Schema.DescribeFieldResult dealerPrice = Consumable_orderdetails__c.Dealer_Custom_Price__c.getDescribe();
+ dealerPricesee = dealerPrice.isAccessible();
+ // 鏄剧ず鏁版嵁鏉℃暟淇℃伅
+ // makeMessage();
+ //闄勪欢
+ attachmentinfo = [SELECT Id, Name, OwnerId FROM Attachment WHERE parentid = :ESetId];
+ if (attachmentinfo.size() > 0) {
+ for (Integer i = 0; i < attachmentinfo.size(); i++) {
+ attachmentRecoeds.add(new ConsumableorderdetailsInfo(attachmentinfo[i]));
}
}
- for (Integer i = 0; i < Dealerelationship.size(); i++) {
- if (Dealerelationship[i].Dealer_subordinate__c != SecondDealer) {
- provinceOpts.add(
- new SelectOption(Dealerelationship[i].Dealer_subordinate__c, Dealerelationship[i].Dealer_subordinate__r.Name)
- );
- provinceOptsMap.put(Dealerelationship[i].Dealer_subordinate__c, Dealerelationship[i].Dealer_subordinate__r.Name);
- }
+ AggregateResult[] categoryList = [
+ SELECT Count(id), Category3_text__c c3c
+ FROM Product2__c
+ WHERE Category3_text__c != NULL
+ GROUP BY Category3_text__c
+ ];
+
+ categoryOptionList = new List<SelectOption>();
+ categoryOptionList.add(new SelectOption('', '-鏃�-'));
+ categoryOptionMap = new Map<String, String>();
+ categoryOptionMap.put('', '-鏃�-');
+ for (AggregateResult category3Search : categoryList) {
+ String deliverycnt = String.valueOf(category3Search.get('c3c'));
+ categoryOptionList.add(new SelectOption(deliverycnt, deliverycnt));
+ categoryOptionMap.put(deliverycnt, deliverycnt);
}
- }
- Schema.DescribeFieldResult dfr = Product2__c.Intra_Trade_List_RMB__c.getDescribe();
- cansee = dfr.isAccessible();
- Schema.DescribeFieldResult dealerPrice = Consumable_orderdetails__c.Dealer_Custom_Price__c.getDescribe();
- dealerPricesee = dealerPrice.isAccessible();
- // 鏄剧ず鏁版嵁鏉℃暟淇℃伅
- // makeMessage();
- //闄勪欢
- attachmentinfo = [SELECT Id, Name, OwnerId FROM Attachment WHERE parentid = :ESetId];
- if (attachmentinfo.size() > 0) {
- for (Integer i = 0; i < attachmentinfo.size(); i++) {
- attachmentRecoeds.add(new ConsumableorderdetailsInfo(attachmentinfo[i]));
+ category4OptionList = new List<SelectOption>();
+ category4OptionList.add(new SelectOption('', '-鏃�-'));
+ category4OptionMap = new Map<String, String>();
+ category4OptionMap.put('', '-鏃�-');
+ /*for(AggregateResult category4Search : category4List) {
+ String deliverycnt4 = String.valueOf(category4Search.get('c4c'));
+ category4OptionList.add(new SelectOption(deliverycnt4,deliverycnt4));
+ }*/
+
+ category5OptionList = new List<SelectOption>();
+ category5OptionList.add(new SelectOption('', '-鏃�-'));
+ category5OptionMap = new Map<String, String>();
+ category5OptionMap.put('', '-鏃�-');
+
+ //鍒嗛〉
+ PaginatedAccounts paginatedAccounts = new PaginatedAccounts();
+ totalCount = pageRecords.size();
+ System.debug('pageToken = ' + pageToken);
+ System.debug('pageSize = ' + pageSize);
+ System.debug('totalCount = ' + totalCount);
+ paginatedAccounts.nextPageToken = (pageToken + pageSize < totalCount) ? pageToken + pageSize : null;
+ System.debug('paginatedAccounts.nextPageToken = ' + paginatedAccounts.nextPageToken);
+ paginatedAccounts.recordStart = pageToken + 1;
+ paginatedAccounts.pageNumber = pageToken / pageSize + 1;
+ Integer recordEnd = pageSize * paginatedAccounts.pageNumber;
+ paginatedAccounts.recordEnd = totalCount >= recordEnd ? recordEnd : totalCount;
+ paginatedAccounts.totalRecords = totalCount;
+
+ Integer startIdx;
+ Integer endIdx;
+ startIdx = pageToken;
+ endIdx = pageToken + pageSize;
+ List<ConsumableorderdetailsInfo> pageRecordsTemp = new List<ConsumableorderdetailsInfo>();
+ if (endIdx > pageRecords.size()) {
+ endIdx = pageRecords.size();
}
+ for (Integer i = startIdx; i < endIdx; i++) {
+ pageRecordsTemp.add(pageRecords.get(i));
+ }
+
+ Boolean Existarrive = (coc.Arrive_Order__c != null);
+ String ConsumableOut_report = System.Label.ConsumableOut_report;
+ System.debug('consumableproductdetailsRecords = ' + consumableproductdetailsRecords);
+
+ data.put('paginatedAccounts', paginatedAccounts);
+ data.put('ConsumableOut_report', ConsumableOut_report);
+ data.put('accountid', accountid);
+ data.put('consumableproductdetailsRecords', consumableproductdetailsRecords);
+ data.put('agencyProType', agencyProType);
+ data.put('accountName', accountName);
+ data.put('userWorkLocation', userWorkLocation);
+ data.put('categoryOptionMap', categoryOptionMap);
+ data.put('category4OptionMap', category4OptionMap);
+ data.put('category5OptionMap', category5OptionMap);
+ data.put('outOutPatternOptionMap', outOutPatternOptionMap);
+ data.put('hasHosPro', hasHosPro);
+ data.put('Existarrive', Existarrive);
+ data.put('sumPrice', sumPrice);
+ data.put('HospitalName', HospitalName);
+ data.put('provinceOptsMap', provinceOptsMap);
+ data.put('SummonsFlag', SummonsFlag);
+ data.put('EditDelCommitBtnDisabled', EditDelCommitBtnDisabled);
+ data.put('EditAble', EditAble);
+ data.put('coc', coc);
+ data.put('pageRecords', pageRecordsTemp);
+ data.put('arriveorder', arriveorder);
+ data.put('consumableorderdetails2Count', consumableorderdetails2Count);
+ data.put('consumableorderdetails2Records', consumableorderdetails2Records);
+ data.put('HospitalInfo', HospitalInfo);
+ res.status = 'Success';
+ res.code = 200;
+ System.debug('res = ' + res);
+ return res;
+ } catch (Exception e) {
+ return new ResponseBodyLWC('Error',500, e.getMessage() + e.getLineNumber(), '');
}
- AggregateResult[] categoryList = [
- SELECT Count(id), Category3_text__c c3c
- FROM Product2__c
- WHERE Category3_text__c != NULL
- GROUP BY Category3_text__c
- ];
-
- categoryOptionList = new List<SelectOption>();
- categoryOptionList.add(new SelectOption('', '-鏃�-'));
- categoryOptionMap = new Map<String, String>();
- categoryOptionMap.put('', '-鏃�-');
- for (AggregateResult category3Search : categoryList) {
- String deliverycnt = String.valueOf(category3Search.get('c3c'));
- categoryOptionList.add(new SelectOption(deliverycnt, deliverycnt));
- categoryOptionMap.put(deliverycnt, deliverycnt);
- }
-
- category4OptionList = new List<SelectOption>();
- category4OptionList.add(new SelectOption('', '-鏃�-'));
- category4OptionMap = new Map<String, String>();
- category4OptionMap.put('', '-鏃�-');
- /*for(AggregateResult category4Search : category4List) {
- String deliverycnt4 = String.valueOf(category4Search.get('c4c'));
- category4OptionList.add(new SelectOption(deliverycnt4,deliverycnt4));
- }*/
-
- category5OptionList = new List<SelectOption>();
- category5OptionList.add(new SelectOption('', '-鏃�-'));
- category5OptionMap = new Map<String, String>();
- category5OptionMap.put('', '-鏃�-');
-
- //鍒嗛〉
- PaginatedAccounts paginatedAccounts = new PaginatedAccounts();
- totalCount = pageRecords.size();
- System.debug('pageToken = ' + pageToken);
- System.debug('pageSize = ' + pageSize);
- System.debug('totalCount = ' + totalCount);
- paginatedAccounts.nextPageToken = (pageToken + pageSize < totalCount) ? pageToken + pageSize : null;
- System.debug('paginatedAccounts.nextPageToken = ' + paginatedAccounts.nextPageToken);
- paginatedAccounts.recordStart = pageToken + 1;
- paginatedAccounts.pageNumber = pageToken / pageSize + 1;
- Integer recordEnd = pageSize * paginatedAccounts.pageNumber;
- paginatedAccounts.recordEnd = totalCount >= recordEnd ? recordEnd : totalCount;
- paginatedAccounts.totalRecords = totalCount;
-
- Integer startIdx;
- Integer endIdx;
- startIdx = pageToken;
- endIdx = pageToken + pageSize;
- List<ConsumableorderdetailsInfo> pageRecordsTemp = new List<ConsumableorderdetailsInfo>();
- if (endIdx > pageRecords.size()) {
- endIdx = pageRecords.size();
- }
- for (Integer i = startIdx; i < endIdx; i++) {
- pageRecordsTemp.add(pageRecords.get(i));
- }
-
- Boolean Existarrive = (coc.Arrive_Order__c != null);
- String ConsumableOut_report = System.Label.ConsumableOut_report;
- System.debug('consumableproductdetailsRecords = ' + consumableproductdetailsRecords);
-
- data.put('paginatedAccounts', paginatedAccounts);
- data.put('ConsumableOut_report', ConsumableOut_report);
- data.put('accountid', accountid);
- data.put('consumableproductdetailsRecords', consumableproductdetailsRecords);
- data.put('agencyProType', agencyProType);
- data.put('accountName', accountName);
- data.put('userWorkLocation', userWorkLocation);
- data.put('categoryOptionMap', categoryOptionMap);
- data.put('category4OptionMap', category4OptionMap);
- data.put('category5OptionMap', category5OptionMap);
- data.put('outOutPatternOptionMap', outOutPatternOptionMap);
- data.put('hasHosPro', hasHosPro);
- data.put('Existarrive', Existarrive);
- data.put('sumPrice', sumPrice);
- data.put('HospitalName', HospitalName);
- data.put('provinceOptsMap', provinceOptsMap);
- data.put('SummonsFlag', SummonsFlag);
- data.put('EditDelCommitBtnDisabled', EditDelCommitBtnDisabled);
- data.put('EditAble', EditAble);
- data.put('coc', coc);
- data.put('pageRecords', pageRecordsTemp);
- data.put('arriveorder', arriveorder);
- data.put('consumableorderdetails2Count', consumableorderdetails2Count);
- data.put('consumableorderdetails2Records', consumableorderdetails2Records);
- data.put('HospitalInfo', HospitalInfo);
- res.status = 'Success';
- res.code = 200;
- System.debug('res = ' + res);
- return res;
- // } catch (Exception e) {
- // return new ResponseBodyLWC('Error',500, e.getMessage(), '');
- // }
}
@AuraEnabled
@@ -1698,6 +1698,7 @@
data.put('paginatedAccounts', paginatedAccounts);
data.put('pageRecords', pageRecordsTemp);
data.put('SearchDone', SearchDone);
+ data.put('hasHosPro', hasHosPro);
res.status = 'Success';
res.code = 200;
System.debug('res = ' + res);
@@ -2177,22 +2178,19 @@
for (ConsumableorderdetailsInfoLwc ass : pageRecordsLwc) {
if (ass.check == true) {
if (ass.orderdetails1.Delivery_List_RMB__c < 0) {
- // ass.orderdetails1.Delivery_List_RMB__c.addError('璇疯緭鍏ユ纭殑鍑鸿揣鍗曚环 (鍏�)');
- // return null;
return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ユ纭殑鍑鸿揣鍗曚环 (鍏�)', '');
}
if (ass.orderdetails1.Delivery_List_RMB__c == null && coc.SummonsForDirction__c != '鍖婚櫌璇曠敤') {
- // ass.orderdetails1.Delivery_List_RMB__c.addError('璇疯緭鍏ュ嚭璐у崟浠� (鍏�)');
- // return null;
return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ユ纭殑鍑鸿揣鍗曚环 (鍏�)', '');
+ }
+ if ((ass.orderdetails1.Delivery_List_RMB__c == null || ass.orderdetails1.Delivery_List_RMB__c == 0) && coc.SummonsForDirction__c != '鍖婚櫌璇曠敤') {
+ return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ュ嚭璐у崟浠� (鍏�)', '');
}
if (
ass.orderdetails1.Delivery_List_RMB__c == 0 &&
(coc.SummonsForDirction__c == '閿�鍞粰浜岀骇缁忛攢鍟�' ||
coc.SummonsForDirction__c == '鐩存帴閿�鍞粰鍖婚櫌')
) {
- // ass.orderdetails1.Delivery_List_RMB__c.addError('璇疯緭鍏ュ嚭璐у崟浠� (鍏�)');
- // return null;
return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ュ嚭璐у崟浠� (鍏�)', '');
}
if (ass.orderdetails1.Shipment_Count__c == null || ass.orderdetails1.Shipment_Count__c == 0) {
@@ -2340,14 +2338,10 @@
for (ConsumableorderdetailsInfoLwc ass : pageRecordsLwc) {
if (ass.check == true) {
if (ass.orderdetails1.Delivery_List_RMB__c < 0) {
- // ass.orderdetails1.Delivery_List_RMB__c.addError('璇疯緭鍏ユ纭殑鍑鸿揣鍗曚环 (鍏�)');
- // return null;
return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ユ纭殑鍑鸿揣鍗曚环 (鍏�)', '');
}
Consumable_orderdetails__c InsAfterDel = new Consumable_orderdetails__c();
- if (ass.orderdetails1.Delivery_List_RMB__c == null && coc.SummonsForDirction__c != '鍖婚櫌璇曠敤') {
- // ass.orderdetails1.Delivery_List_RMB__c.addError('璇疯緭鍏ュ嚭璐у崟浠� (鍏�)');
- // return null;
+ if ((ass.orderdetails1.Delivery_List_RMB__c == null || ass.orderdetails1.Delivery_List_RMB__c == 0) && coc.SummonsForDirction__c != '鍖婚櫌璇曠敤') {
return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ュ嚭璐у崟浠� (鍏�)', '');
}
if (
@@ -2355,8 +2349,6 @@
(coc.SummonsForDirction__c == '閿�鍞粰浜岀骇缁忛攢鍟�' ||
coc.SummonsForDirction__c == '鐩存帴閿�鍞粰鍖婚櫌')
) {
- // ass.orderdetails1.Delivery_List_RMB__c.addError('璇疯緭鍏ュ嚭璐у崟浠� (鍏�)');
- // return null;
return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ュ嚭璐у崟浠� (鍏�)', '');
}
if (ass.orderdetails1.Box_Piece__c == null || ass.orderdetails1.Box_Piece__c == '') {
@@ -2695,6 +2687,20 @@
return res;
}
+ //鍒犻櫎闄勪欢
+ @AuraEnabled
+ public static ResponseBodyLWC deleteAtt(String contentVersionId){
+ try {
+ ContentVersion conVersion = [SELECT ContentDocumentId FROM ContentVersion WHERE Id = :contentVersionId];
+ String contentDocumentId = conVersion.ContentDocumentId;
+ ContentDocument conDocument = [SELECT Id FROM ContentDocument where Id = :contentDocumentId];
+ delete conDocument;
+ return new ResponseBodyLWC('Success',200,'','');
+ } catch (Exception e) {
+ return new ResponseBodyLWC('Error',500, e.getMessage() + e.getLineNumber(), '');
+ }
+ }
+
//璺宠浆鍑鸿揣/閿�鍞�
@AuraEnabled
public static ResponseBodyLWC GoodsDelivery(
diff --git a/force-app/main/default/classes/LexUpAccountProLimit.cls b/force-app/main/default/classes/LexUpAccountProLimit.cls
index c7288c6..7f195d7 100644
--- a/force-app/main/default/classes/LexUpAccountProLimit.cls
+++ b/force-app/main/default/classes/LexUpAccountProLimit.cls
@@ -24,6 +24,7 @@
system.debug('userPro_Type' + userPro_Type);
String checkResoultstr = checkResoult(productLimit);
system.debug('checkResoultstr====>'+checkResoultstr);
+ system.debug('accountId'+accountId);
if(String.isNotBlank(checkResoultstr)){
return new ResponseBodyLWC('Error',500,''+checkResoultstr+'', '');
// return checkResoultstr;
@@ -44,14 +45,15 @@
];
if(null == acc || acc.size() == 0) {
// return '娌℃湁缁忛攢鍟嗭細' + accountId + '鐨勬暟鎹��';
- return new ResponseBodyLWC('Error',500,'娌℃湁缁忛攢鍟嗭細' + accountId + '鐨勬暟鎹�', '');
+ return new ResponseBodyLWC('Error',500,'娌℃湁缁忛攢鍟嗭細' + accountId + '鐨勬暟鎹��', '');
}
//proidList = acc[0].view_product__c.split(',');
//--------UpdateStart-----XHL--------------20180929-------------
String sql = '';
- List<Product2__c> roduct2List = [SELECT Asset_Model_No__c
- FROM Product2__c
- WHERE Product_Type__c like :userPro_Typestr limit 10000];//Add Limit by Li Jun 20230601, need to remove limit later
+
+ List<Product2__c> roduct2List = [SELECT Asset_Model_No__c,Estimation_Entry_Possibility__c
+ FROM Product2__c
+ WHERE Product_Type__c like :userPro_Typestr and Estimation_Entry_Possibility__c = '鈼�'];//Add by WangXueqin 20230605
//ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'roduct2List:'+ roduct2List));
//sql = 'SELECT Asset_Model_No__c '
// + ' FROM Product2__c '
@@ -81,7 +83,7 @@
for(Integer i = 0; i < pro_List.size(); i++){
if(!productMap.containsKey(pro_List[i])){
// return '缁忛攢鍟嗘病鏈� ' + pro_List[i] + ' 鐨勪骇鍝佷笂闄愯瀹氭潈闄愶紝鎴栦骇鍝佷笉瀛樺湪锛�';
- return new ResponseBodyLWC('Error',500,'缁忛攢鍟嗘病鏈� ' + pro_List[i] + ' 鐨勪骇鍝佷笂闄愯瀹氭潈闄愶紝鎴栦骇鍝佷笉瀛樺湪', '');
+ return new ResponseBodyLWC('Error',500,'缁忛攢鍟嗘病鏈� ' + pro_List[i] + ' 鐨勪骇鍝佷笂闄愯瀹氭潈闄愶紝鎴栦骇鍝佷笉瀛樺湪锛�', '');
}
}
String productLimitDa = '';
@@ -134,7 +136,7 @@
}
}
if(asstModelNoCount.size() > 0){
- return '浜у搧锛�' + asstModelNoCount + '鐨勬暟鎹噸澶�';
+ return '浜у搧锛�' + asstModelNoCount + '鐨勬暟鎹噸澶嶃��';
// return new ResponseBodyLWC('Error',500,'浜у搧锛�' + asstModelNoCount + '鐨勬暟鎹噸澶嶃��', '');
}else{
return '';
diff --git a/force-app/main/default/experiences/Consumable1.site-meta.xml b/force-app/main/default/experiences/Consumable1.site-meta.xml
index 57e7f18..efa4cdd 100644
--- a/force-app/main/default/experiences/Consumable1.site-meta.xml
+++ b/force-app/main/default/experiences/Consumable1.site-meta.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
<ExperienceBundle xmlns="http://soap.sforce.com/2006/04/metadata">
<label>Consumable绯荤粺</label>
<type>ChatterNetworkPicasso</type>
diff --git a/force-app/main/default/experiences/Consumable1/brandingSets/partnerCentral.json b/force-app/main/default/experiences/Consumable1/brandingSets/partnerCentral.json
index 6305bbf..b4d36fb 100644
--- a/force-app/main/default/experiences/Consumable1/brandingSets/partnerCentral.json
+++ b/force-app/main/default/experiences/Consumable1/brandingSets/partnerCentral.json
@@ -1,60 +1,56 @@
{
- "definitionName": "prm:branding-prm-merged",
- "id": "57ae3440-8896-4020-a05b-a780ddaf46f0",
- "label": "Partner Central",
- "type": "brandingSet",
- "values": {
- "ActionColor": "rgb(10, 129, 223)",
- "BorderColor": "rgb(212, 212, 212)",
- "CardBackgroundColor": "rgba(244, 244, 244, 0)",
- "CompanyLogo": "/file-asset/servlet1?v=1&height=300&width=300",
- "DetailTextColor": "rgb(51, 51, 51)",
- "ErrorFontColor": "rgb(224, 75, 32)",
- "HeaderBackgroundColor": "rgb(255, 255, 255)",
- "HeaderFonts": "sans-serif",
- "LinkColor": "rgb(37, 116, 169)",
- "LoginBackgroundColor": "rgb(216, 233, 229)",
- "LoginBackgroundImage": "/file-asset/LEXCommunityLogin?v=1",
- "LoginButtonBorderColor": "#5d392e",
- "LoginButtonColor": "#202834",
- "LoginButtonHoverBorderColor": "#4f748b",
- "LoginButtonHoverColor": "#89644c",
- "NavigationMenuColor": "rgb(8, 16, 132)",
- "NavigationMenuTextColor": "rgb(255, 255, 255)",
- "OverlayTextColor": "rgb(255, 255, 255)",
- "PageBackgroundColor": "rgb(255, 255, 255)",
- "PrimaryFont": "sans-serif",
- "TextColor": "rgb(51, 51, 51)",
- "TextTransformStyle": "none",
- "_ActionColorDarker": "#0865ae",
- "_ActionColorTrans": "rgba(10, 129, 223, 0.9)",
- "_BackgroundColor1": "rgb(235, 235, 235)",
- "_BackgroundColor2": "rgb(194, 194, 194)",
- "_BackgroundColor3": "rgb(133, 133, 133)",
- "_DxpPageBackgroundColor": "rgb(255, 255, 255)",
- "_HeaderInputBackgroundColor": "rgba(255,255,255,.4)",
- "_HeaderPlaceholderTextColor": "rgba(85,85,85,.8)",
- "_HeaderTextColor": "rgba(34,34,34,.8)",
- "_HoverColor": "rgba(10, 129, 223, 0.05)",
- "_LinkColorDarker": "#1e5d88",
- "_NavigationMenuHoverColor": "rgba(255,255,255,.2)",
- "_NeutralColor": "#ecebea",
- "_NeutralColor1": "rgb(217, 215, 213)",
- "_NeutralColor2": "rgb(178, 174, 170)",
- "_NeutralColor3": "rgb(118, 113, 107)",
- "_NeutralForegroundColor": "#000",
- "_NeutralForegroundColor1": "#000",
- "_NeutralForegroundColor2": "#000",
- "_NeutralForegroundColor3": "#fff",
- "_OverlayTextColorShadow": "#000",
- "_PrimaryAccentColor1": "rgb(8, 106, 184)",
- "_PrimaryAccentColor2": "rgb(5, 61, 106)",
- "_PrimaryAccentColor3": "rgb(0, 0, 0)",
- "_PrimaryAccentForegroundColor1": "rgb(255, 255, 255)",
- "_PrimaryAccentForegroundColor2": "rgb(255, 255, 255)",
- "_PrimaryAccentForegroundColor3": "rgb(255, 255, 255)",
- "_TextColor1": "rgb(31, 31, 31)",
- "_TextColor2": "rgb(0, 0, 0)",
- "_TextColor3": "rgb(0, 0, 0)"
+ "definitionName" : "prm:branding-prm-merged",
+ "id" : "da39013d-fbc0-4c27-a7a2-5f9d07bdb4bd",
+ "label" : "Partner Central",
+ "type" : "brandingSet",
+ "values" : {
+ "ActionColor" : "rgb(10, 129, 223)",
+ "BorderColor" : "#D4D4D4",
+ "CardBackgroundColor" : "rgba(255, 255, 255, 0)",
+ "CompanyLogo" : "/file-asset/OlympusCommunityLogo?v=1&height=300&width=300",
+ "DetailTextColor" : "rgb(51, 51, 51)",
+ "ErrorFontColor" : "#ff9e9e",
+ "HeaderBackgroundColor" : "#FFFFFF",
+ "HeaderFonts" : "Salesforce Sans",
+ "LinkColor" : "rgb(37, 116, 169)",
+ "LoginBackgroundColor" : "#F4F4F4",
+ "LoginBackgroundImage" : "/file-asset/OlympusCommunityLoginBG?v=1",
+ "NavigationMenuColor" : "rgb(8, 16, 132)",
+ "NavigationMenuTextColor" : "#FFFFFF",
+ "OverlayTextColor" : "#FFFFFF",
+ "PageBackgroundColor" : "#FFFFFF",
+ "PrimaryFont" : "sans-serif",
+ "TextColor" : "#222222",
+ "TextTransformStyle" : "none",
+ "_ActionColorDarker" : "#0865ae",
+ "_ActionColorTrans" : "rgba(10, 129, 223, 0.9)",
+ "_BackgroundColor1" : "rgb(235, 235, 235)",
+ "_BackgroundColor2" : "rgb(194, 194, 194)",
+ "_BackgroundColor3" : "rgb(133, 133, 133)",
+ "_DxpPageBackgroundColor" : "#FFFFFF",
+ "_HeaderInputBackgroundColor" : "rgba(255,255,255,.4)",
+ "_HeaderPlaceholderTextColor" : "rgba(85,85,85,.8)",
+ "_HeaderTextColor" : "rgba(34,34,34,.8)",
+ "_HoverColor" : "rgba(10, 129, 223, 0.05)",
+ "_LinkColorDarker" : "#1e5d88",
+ "_NavigationMenuHoverColor" : "rgba(255,255,255,.2)",
+ "_NeutralColor" : "#ecebea",
+ "_NeutralColor1" : "rgb(217, 215, 213)",
+ "_NeutralColor2" : "rgb(178, 174, 170)",
+ "_NeutralColor3" : "rgb(118, 113, 107)",
+ "_NeutralForegroundColor" : "#000",
+ "_NeutralForegroundColor1" : "#000",
+ "_NeutralForegroundColor2" : "#000",
+ "_NeutralForegroundColor3" : "#fff",
+ "_OverlayTextColorShadow" : "#000000",
+ "_PrimaryAccentColor1" : "rgb(8, 106, 184)",
+ "_PrimaryAccentColor2" : "rgb(5, 61, 106)",
+ "_PrimaryAccentColor3" : "rgb(0, 0, 0)",
+ "_PrimaryAccentForegroundColor1" : "rgb(255, 255, 255)",
+ "_PrimaryAccentForegroundColor2" : "rgb(255, 255, 255)",
+ "_PrimaryAccentForegroundColor3" : "rgb(255, 255, 255)",
+ "_TextColor1" : "rgb(14, 14, 14)",
+ "_TextColor2" : "rgb(0, 0, 0)",
+ "_TextColor3" : "rgb(0, 0, 0)"
}
-}
+}
\ No newline at end of file
diff --git "a/force-app/main/default/experiences/Consumable1/config/consumable\347\263\273\347\273\237.json" "b/force-app/main/default/experiences/Consumable1/config/consumable\347\263\273\347\273\237.json"
index a461d36..a831dac 100644
--- "a/force-app/main/default/experiences/Consumable1/config/consumable\347\263\273\347\273\237.json"
+++ "b/force-app/main/default/experiences/Consumable1/config/consumable\347\263\273\347\273\237.json"
@@ -1,11 +1,11 @@
{
- "forgotPasswordRouteId": "696dc6cc-2e29-4d91-8947-826d95506b8b",
- "isAvailableToGuests": false,
- "isFilteredComponentsView": false,
- "isProgressiveRenderingEnabled": false,
- "loginAppPageId": "bfbf7350-cdcd-4e2c-97a5-ab51f2aa3b9d",
- "mainAppPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "preferredDomain": "none",
- "selfRegistrationRouteId": "e8838dbc-c64c-4cd5-b34a-9dea25b08d42",
- "type": "site"
-}
+ "forgotPasswordRouteId" : "543c3ca6-a340-46d3-a25b-82ce3864cf02",
+ "isAvailableToGuests" : false,
+ "isFilteredComponentsView" : false,
+ "isProgressiveRenderingEnabled" : false,
+ "loginAppPageId" : "7756c67f-7774-4fe1-b1c2-eecb19f9c6a5",
+ "mainAppPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "preferredDomain" : "none",
+ "selfRegistrationRouteId" : "2d8061dd-a482-4608-8514-113389805fc4",
+ "type" : "site"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/config/languages.json b/force-app/main/default/experiences/Consumable1/config/languages.json
index e37a81f..126afb1 100644
--- a/force-app/main/default/experiences/Consumable1/config/languages.json
+++ b/force-app/main/default/experiences/Consumable1/config/languages.json
@@ -1,6 +1,6 @@
{
- "defaultCode": "zh_CN",
- "defaultLabel": "涓枃锛堢畝浣擄級 (CN)",
- "id": "50b82dc6-9079-40b8-aa74-c83564656d96",
- "type": "languageContainer"
-}
+ "defaultCode" : "zh_CN",
+ "defaultLabel" : "涓枃锛堢畝浣擄級 (CN)",
+ "id" : "574943f7-c68f-4a1b-9b77-b2154af650ab",
+ "type" : "languageContainer"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/config/loginAppPage.json b/force-app/main/default/experiences/Consumable1/config/loginAppPage.json
index 8ac0de4..04f6dcf 100644
--- a/force-app/main/default/experiences/Consumable1/config/loginAppPage.json
+++ b/force-app/main/default/experiences/Consumable1/config/loginAppPage.json
@@ -1,7 +1,7 @@
{
- "cmsSettings": {},
- "id": "bfbf7350-cdcd-4e2c-97a5-ab51f2aa3b9d",
- "label": "login",
- "templateName": "Login Template",
- "type": "appPage"
-}
+ "cmsSettings" : { },
+ "id" : "7756c67f-7774-4fe1-b1c2-eecb19f9c6a5",
+ "label" : "login",
+ "templateName" : "Login Template",
+ "type" : "appPage"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/config/mainAppPage.json b/force-app/main/default/experiences/Consumable1/config/mainAppPage.json
index 3bed24b..360f3e1 100644
--- a/force-app/main/default/experiences/Consumable1/config/mainAppPage.json
+++ b/force-app/main/default/experiences/Consumable1/config/mainAppPage.json
@@ -1,10 +1,10 @@
{
- "cmsSettings": {},
- "currentThemeId": "0c81955a-9ad5-4639-a11d-03665e570a65",
- "headMarkup": "<script>\n var homeWindowLocation = '/consumable/s/';\n window.onload = function() {\n console.log('URL' +window.location.pathname);\n if(homeWindowLocation ==window.location.pathname ){\n console.log('refresh dashboard');\n setTimeout(\n function() {\n let refreshButtonElement = document.getElementsByTagName('iframe')[0].contentWindow.document.getElementsByTagName('button')[0];\n console.log('Refresh:'+refreshButtonElement);\n refreshButtonElement.click();\n }, 10000);\n }\n\t};\n\t\n</script>",
- "id": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "isRelaxedCSPLevel": true,
- "label": "main",
- "templateName": "PRM Community Template",
- "type": "appPage"
-}
+ "cmsSettings" : { },
+ "currentThemeId" : "dc3ec245-c32a-48fc-920e-8ff30c6cff7a",
+ "headMarkup" : "<script>\n var homeWindowLocation = '/consumable/s/';\n window.onload = function() {\n console.log('URL' +window.location.pathname);\n if(homeWindowLocation ==window.location.pathname ){\n console.log('refresh dashboard');\n setTimeout(\n function() {\n let refreshButtonElement = document.getElementsByTagName('iframe')[0].contentWindow.document.getElementsByTagName('button')[0];\n console.log('Refresh:'+refreshButtonElement);\n refreshButtonElement.click();\n }, 10000);\n }\n \n\t};\n\t\n</script>",
+ "id" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "isRelaxedCSPLevel" : true,
+ "label" : "main",
+ "templateName" : "PRM Community Template",
+ "type" : "appPage"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/accountManagement.json b/force-app/main/default/experiences/Consumable1/routes/accountManagement.json
index fbb82ef..99c8dd7 100644
--- a/force-app/main/default/experiences/Consumable1/routes/accountManagement.json
+++ b/force-app/main/default/experiences/Consumable1/routes/accountManagement.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "fd91a176-37cc-4c72-887d-8a32f8472825",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "4160137e-e9a7-47f3-8f55-2a7a6f94dacb",
- "label": "Account Management",
- "routeType": "account-management",
- "type": "route",
- "urlPrefix": "account-management"
-}
+ "activeViewId" : "198e4bed-7a3a-4a56-a15a-d354e55d5624",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "a5aefe6e-da20-437c-8ff9-ef31a22b8d4a",
+ "label" : "Account Management",
+ "routeType" : "account-management",
+ "type" : "route",
+ "urlPrefix" : "account-management"
+}
\ No newline at end of file
diff --git "a/force-app/main/default/experiences/Consumable1/routes/cIC\343\203\252\343\202\271\343\203\210.json" "b/force-app/main/default/experiences/Consumable1/routes/cIC\343\203\252\343\202\271\343\203\210.json"
index 9a31935..ab10f71 100644
--- "a/force-app/main/default/experiences/Consumable1/routes/cIC\343\203\252\343\202\271\343\203\210.json"
+++ "b/force-app/main/default/experiences/Consumable1/routes/cIC\343\203\252\343\202\271\343\203\210.json"
@@ -1,9 +1,9 @@
{
- "activeViewId": "708367ab-41a2-4633-a93a-1a54141f1f48",
- "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
- "id": "2af4afc3-d788-47c6-8467-a08f67296437",
- "label": "CIC 銉偣銉�",
- "routeType": "list-500",
- "type": "route",
- "urlPrefix": "case"
-}
+ "activeViewId" : "708367ab-41a2-4633-a93a-1a54141f1f48",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "2af4afc3-d788-47c6-8467-a08f67296437",
+ "label" : "CIC 銉偣銉�",
+ "routeType" : "list-500",
+ "type" : "route",
+ "urlPrefix" : "case"
+}
\ No newline at end of file
diff --git "a/force-app/main/default/experiences/Consumable1/routes/cIC\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json" "b/force-app/main/default/experiences/Consumable1/routes/cIC\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
index e666e76..f97616d 100644
--- "a/force-app/main/default/experiences/Consumable1/routes/cIC\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
+++ "b/force-app/main/default/experiences/Consumable1/routes/cIC\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
@@ -1,9 +1,9 @@
{
- "activeViewId": "23a3c897-7fcb-41da-8cff-7a8e8c2450a7",
- "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
- "id": "fb63da32-f68a-4674-89bb-f31fade86338",
- "label": "CIC 闁㈤�ｃ儶銈广儓",
- "routeType": "relatedlist-500",
- "type": "route",
- "urlPrefix": "case"
-}
+ "activeViewId" : "23a3c897-7fcb-41da-8cff-7a8e8c2450a7",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "fb63da32-f68a-4674-89bb-f31fade86338",
+ "label" : "CIC 闁㈤�ｃ儶銈广儓",
+ "routeType" : "relatedlist-500",
+ "type" : "route",
+ "urlPrefix" : "case"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/campaignList.json b/force-app/main/default/experiences/Consumable1/routes/campaignList.json
index e5bb431..8e2dd85 100644
--- a/force-app/main/default/experiences/Consumable1/routes/campaignList.json
+++ b/force-app/main/default/experiences/Consumable1/routes/campaignList.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "4908488d-d41c-4c3d-9f3e-c885a408863c",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "6b80aa5c-e10f-4760-82e4-c07fd6939d02",
- "label": "Campaign List",
- "routeType": "list-701",
- "type": "route",
- "urlPrefix": "campaign"
-}
+ "activeViewId" : "f83414cc-cd96-4d24-94d6-1d6fdad65b83",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "cccb42f4-95dd-426f-a700-cbe4c839764c",
+ "label" : "Campaign List",
+ "routeType" : "list-701",
+ "type" : "route",
+ "urlPrefix" : "campaign"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/caseDetail.json b/force-app/main/default/experiences/Consumable1/routes/caseDetail.json
index 1d15fa8..0cb514b 100644
--- a/force-app/main/default/experiences/Consumable1/routes/caseDetail.json
+++ b/force-app/main/default/experiences/Consumable1/routes/caseDetail.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "b17204f0-44a2-4866-abaf-23f750a97ddd",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "f4887cf8-32fc-4d06-ab40-bbe055a26662",
- "label": "Case Detail",
- "routeType": "detail-500",
- "type": "route",
- "urlPrefix": "case"
-}
+ "activeViewId" : "3b1b2646-af41-43d3-a519-528aa49f45f4",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "4601c961-03a6-4646-9c14-5db8084e379a",
+ "label" : "Case Detail",
+ "routeType" : "detail-500",
+ "type" : "route",
+ "urlPrefix" : "case"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/checkPassword.json b/force-app/main/default/experiences/Consumable1/routes/checkPassword.json
index 6ae9e96..abc8788 100644
--- a/force-app/main/default/experiences/Consumable1/routes/checkPassword.json
+++ b/force-app/main/default/experiences/Consumable1/routes/checkPassword.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "14d5ae00-1629-429d-ac4f-b5abd28a21a3",
- "appPageId": "bfbf7350-cdcd-4e2c-97a5-ab51f2aa3b9d",
- "id": "9c99cfbb-0aad-460f-9399-ef4943f6e535",
- "label": "Check Password",
- "routeType": "check-password",
- "type": "route",
- "urlPrefix": "CheckPasswordResetEmail"
-}
+ "activeViewId" : "82d3f50a-42f2-4aa2-b028-7b07d878cd63",
+ "appPageId" : "7756c67f-7774-4fe1-b1c2-eecb19f9c6a5",
+ "id" : "86273d15-52e6-4761-b84b-fd899e3def47",
+ "label" : "Check Password",
+ "routeType" : "check-password",
+ "type" : "route",
+ "urlPrefix" : "CheckPasswordResetEmail"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/contactSupport.json b/force-app/main/default/experiences/Consumable1/routes/contactSupport.json
index 6afe2b7..9029a59 100644
--- a/force-app/main/default/experiences/Consumable1/routes/contactSupport.json
+++ b/force-app/main/default/experiences/Consumable1/routes/contactSupport.json
@@ -1,10 +1,10 @@
{
- "activeViewId": "112e477b-4a73-4f9d-9e34-ebb2efff5acd",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "8620c8eb-dd82-44a2-9c87-5fe5a029d55c",
- "label": "Contact Support",
- "pageAccess": "UseParent",
- "routeType": "contactsupport",
- "type": "route",
- "urlPrefix": "contactsupport"
-}
+ "activeViewId" : "e8279a27-ff8f-42fc-9bd1-53b3f59350ab",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "1237083a-e1c5-44da-a3c1-cb1d6c3f762b",
+ "label" : "Contact Support",
+ "pageAccess" : "UseParent",
+ "routeType" : "contactsupport",
+ "type" : "route",
+ "urlPrefix" : "contactsupport"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/createRecord.json b/force-app/main/default/experiences/Consumable1/routes/createRecord.json
index 1d461c6..ec098c0 100644
--- a/force-app/main/default/experiences/Consumable1/routes/createRecord.json
+++ b/force-app/main/default/experiences/Consumable1/routes/createRecord.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "d64df38f-9de1-4248-9c13-ef41d110ffd8",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "a2259a30-2003-47b7-83a9-466f3e4d0aaf",
- "label": "Create Record",
- "routeType": "createrecord",
- "type": "route",
- "urlPrefix": "createrecord"
-}
+ "activeViewId" : "0f63dfba-f74b-4011-a0d5-75fe665d7bfb",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "ea1db874-7a52-4702-afc8-f7d4b8dbae5c",
+ "label" : "Create Record",
+ "routeType" : "createrecord",
+ "type" : "route",
+ "urlPrefix" : "createrecord"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/dashboardDetail.json b/force-app/main/default/experiences/Consumable1/routes/dashboardDetail.json
index 6281ce7..4362327 100644
--- a/force-app/main/default/experiences/Consumable1/routes/dashboardDetail.json
+++ b/force-app/main/default/experiences/Consumable1/routes/dashboardDetail.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "47937364-e71b-469a-b996-317032189c45",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "c5c8d6ff-ac51-41b6-8508-a408ce244a7d",
- "label": "Dashboard Detail",
- "routeType": "detail-01Z",
- "type": "route",
- "urlPrefix": "dashboard"
-}
+ "activeViewId" : "4544a0e2-5ddb-49d0-b154-3903b3e7fb68",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "7f941e81-8998-459a-a76b-93f5807e3db7",
+ "label" : "Dashboard Detail",
+ "routeType" : "detail-01Z",
+ "type" : "route",
+ "urlPrefix" : "dashboard"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/dashboardList.json b/force-app/main/default/experiences/Consumable1/routes/dashboardList.json
index c240a2a..d00ef40 100644
--- a/force-app/main/default/experiences/Consumable1/routes/dashboardList.json
+++ b/force-app/main/default/experiences/Consumable1/routes/dashboardList.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "b59c266b-a1ad-47f9-bf26-a8295147505c",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "677a2606-2502-4451-8e5e-9a903153d902",
- "label": "Dashboard List",
- "routeType": "list-01Z",
- "type": "route",
- "urlPrefix": "dashboard"
-}
+ "activeViewId" : "f10a3529-b77e-4ebc-9b99-281160c97c7f",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "57493307-536a-4ebe-84db-00112d5e0e8d",
+ "label" : "Dashboard List",
+ "routeType" : "list-01Z",
+ "type" : "route",
+ "urlPrefix" : "dashboard"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/error.json b/force-app/main/default/experiences/Consumable1/routes/error.json
index 8af93a8..82d3dd7 100644
--- a/force-app/main/default/experiences/Consumable1/routes/error.json
+++ b/force-app/main/default/experiences/Consumable1/routes/error.json
@@ -1,10 +1,10 @@
{
- "activeViewId": "48f1f5ec-b27a-4874-83fa-15e857b27699",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "83bad28f-5c2c-4e3e-999c-5173c3d188dc",
- "label": "Error",
- "pageAccess": "UseParent",
- "routeType": "error",
- "type": "route",
- "urlPrefix": "error"
-}
+ "activeViewId" : "f02c5a75-f64e-4716-b209-f9f1ef46d49a",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "2d27ac00-e60f-444a-8627-23c58e43d9ad",
+ "label" : "Error",
+ "pageAccess" : "UseParent",
+ "routeType" : "error",
+ "type" : "route",
+ "urlPrefix" : "error"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/feedDetail.json b/force-app/main/default/experiences/Consumable1/routes/feedDetail.json
index e102085..96d9f81 100644
--- a/force-app/main/default/experiences/Consumable1/routes/feedDetail.json
+++ b/force-app/main/default/experiences/Consumable1/routes/feedDetail.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "fefd7f80-945b-489b-8a4e-615884934641",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "e7141d9b-41ac-4475-918a-40364d069e55",
- "label": "Feed Detail",
- "routeType": "feeditem-generic",
- "type": "route",
- "urlPrefix": "feed"
-}
+ "activeViewId" : "eb28719b-06b5-4397-bf8d-667ec408ca46",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "cfc32bfb-64dc-442c-9c4a-ed8a75b0b9cc",
+ "label" : "Feed Detail",
+ "routeType" : "feeditem-generic",
+ "type" : "route",
+ "urlPrefix" : "feed"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/fileDetail.json b/force-app/main/default/experiences/Consumable1/routes/fileDetail.json
index 96e9585..4f445c7 100644
--- a/force-app/main/default/experiences/Consumable1/routes/fileDetail.json
+++ b/force-app/main/default/experiences/Consumable1/routes/fileDetail.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "cbccf1c1-b50f-4c66-9dbd-9be4accededd",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "4b6624be-47a1-4c1c-932e-ba1661e492d2",
- "label": "File Detail",
- "routeType": "detail-069",
- "type": "route",
- "urlPrefix": "contentdocument"
-}
+ "activeViewId" : "2322115a-ac65-4862-9104-912d42fca69a",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "b99c3313-97ee-4e8e-88e7-3156a4d86e82",
+ "label" : "File Detail",
+ "routeType" : "detail-069",
+ "type" : "route",
+ "urlPrefix" : "contentdocument"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/fileList.json b/force-app/main/default/experiences/Consumable1/routes/fileList.json
index 47fabf7..1230c88 100644
--- a/force-app/main/default/experiences/Consumable1/routes/fileList.json
+++ b/force-app/main/default/experiences/Consumable1/routes/fileList.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "eace253f-203f-4414-a7a4-a2d9c47deb3d",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "582cdc1b-b836-41bf-bc54-91e86a17b0aa",
- "label": "File List",
- "routeType": "list-069",
- "type": "route",
- "urlPrefix": "contentdocument"
-}
+ "activeViewId" : "193807a6-e99f-4075-9811-62dda5b13d43",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "b891df7c-7ecf-4a9c-92d4-8bb6107eb215",
+ "label" : "File List",
+ "routeType" : "list-069",
+ "type" : "route",
+ "urlPrefix" : "contentdocument"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/flow.json b/force-app/main/default/experiences/Consumable1/routes/flow.json
index 54ba316..4ae6621 100644
--- a/force-app/main/default/experiences/Consumable1/routes/flow.json
+++ b/force-app/main/default/experiences/Consumable1/routes/flow.json
@@ -1,10 +1,10 @@
{
- "activeViewId": "17c9c45c-4c81-49d0-985e-d6281d899320",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "366aef61-f77b-463e-9e3b-b64525248f29",
- "label": "Flow",
- "pageAccess": "UseParent",
- "routeType": "flow",
- "type": "route",
- "urlPrefix": "flow"
-}
+ "activeViewId" : "4aa9507c-1470-43b3-8000-390325f6bd7d",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "c8358de2-e646-44de-b2da-2424e96bea67",
+ "label" : "Flow",
+ "pageAccess" : "UseParent",
+ "routeType" : "flow",
+ "type" : "route",
+ "urlPrefix" : "flow"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/forgotPassword.json b/force-app/main/default/experiences/Consumable1/routes/forgotPassword.json
index 2401e3a..d4edea0 100644
--- a/force-app/main/default/experiences/Consumable1/routes/forgotPassword.json
+++ b/force-app/main/default/experiences/Consumable1/routes/forgotPassword.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "367df6e8-480c-4b75-9718-1ebcfc8d57c1",
- "appPageId": "bfbf7350-cdcd-4e2c-97a5-ab51f2aa3b9d",
- "id": "696dc6cc-2e29-4d91-8947-826d95506b8b",
- "label": "Forgot Password",
- "routeType": "forgot-password",
- "type": "route",
- "urlPrefix": "ForgotPassword"
-}
+ "activeViewId" : "eac49d21-4e4d-4e8e-997e-42dfce021ff4",
+ "appPageId" : "7756c67f-7774-4fe1-b1c2-eecb19f9c6a5",
+ "id" : "543c3ca6-a340-46d3-a25b-82ce3864cf02",
+ "label" : "Forgot Password",
+ "routeType" : "forgot-password",
+ "type" : "route",
+ "urlPrefix" : "ForgotPassword"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/groupDetail.json b/force-app/main/default/experiences/Consumable1/routes/groupDetail.json
index 77105d6..eefe29e 100644
--- a/force-app/main/default/experiences/Consumable1/routes/groupDetail.json
+++ b/force-app/main/default/experiences/Consumable1/routes/groupDetail.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "1f22553d-fa1f-41e2-afa6-bf930865e2fa",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "d65c3c39-9762-4205-b78a-8111168012f2",
- "label": "Group Detail",
- "routeType": "detail-0F9",
- "type": "route",
- "urlPrefix": "group"
-}
+ "activeViewId" : "7b772cb6-1146-4bb7-8567-853ebfe7bb2c",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "ddfb3b5d-5ba5-4152-8103-754658eba70b",
+ "label" : "Group Detail",
+ "routeType" : "detail-0F9",
+ "type" : "route",
+ "urlPrefix" : "group"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/groupList.json b/force-app/main/default/experiences/Consumable1/routes/groupList.json
index 565ea8a..d76ffbc 100644
--- a/force-app/main/default/experiences/Consumable1/routes/groupList.json
+++ b/force-app/main/default/experiences/Consumable1/routes/groupList.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "87a9b140-31e2-4c28-9fa4-82135022e59d",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "68d9196c-9eac-4f7c-b1ae-ad2eb703855c",
- "label": "Group List",
- "routeType": "list-0F9",
- "type": "route",
- "urlPrefix": "group"
-}
+ "activeViewId" : "949c0ee3-6484-4ed7-a44f-aa417cec1835",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "34a31fa2-0d70-4d03-a4bd-d962306cb8e4",
+ "label" : "Group List",
+ "routeType" : "list-0F9",
+ "type" : "route",
+ "urlPrefix" : "group"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/home.json b/force-app/main/default/experiences/Consumable1/routes/home.json
index 281d363..dfd4715 100644
--- a/force-app/main/default/experiences/Consumable1/routes/home.json
+++ b/force-app/main/default/experiences/Consumable1/routes/home.json
@@ -1,10 +1,10 @@
{
- "activeViewId": "d22f1a01-e0a0-44df-b5e2-808abb2391f5",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "939c3a99-21d2-46b8-82dd-6713bce11e9c",
- "label": "Home",
- "pageAccess": "UseParent",
- "routeType": "home",
- "type": "route",
- "urlPrefix": ""
-}
+ "activeViewId" : "0b3166bc-2eec-43fa-8adf-532f629e9392",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "8e6532c1-df5e-4843-af7f-e01178398907",
+ "label" : "Home",
+ "pageAccess" : "UseParent",
+ "routeType" : "home",
+ "type" : "route",
+ "urlPrefix" : ""
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/lexAgencyInfo.json b/force-app/main/default/experiences/Consumable1/routes/lexAgencyInfo.json
index 88492cb..9fdf59b 100644
--- a/force-app/main/default/experiences/Consumable1/routes/lexAgencyInfo.json
+++ b/force-app/main/default/experiences/Consumable1/routes/lexAgencyInfo.json
@@ -1,10 +1,10 @@
{
- "activeViewId": "ace4cc2b-a063-40be-94c6-c5bdabeb00e0",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "72138bd6-1956-4337-8eb3-3135b8091773",
- "label": "lexAgencyInfo",
- "pageAccess": "UseParent",
- "routeType": "custom-lexagencyinfo",
- "type": "route",
- "urlPrefix": "lexagencyinfo"
-}
+ "activeViewId" : "376ad65a-00b6-4198-aa04-19a6360969bc",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "5e5ad0fe-6812-4fd0-9c56-bfce5822bf96",
+ "label" : "LexAgencyInfo",
+ "pageAccess" : "UseParent",
+ "routeType" : "custom-lexagencyinfo",
+ "type" : "route",
+ "urlPrefix" : "lexagencyinfo"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/lexArriveGoods.json b/force-app/main/default/experiences/Consumable1/routes/lexArriveGoods.json
index 3a4c33d..72651ee 100644
--- a/force-app/main/default/experiences/Consumable1/routes/lexArriveGoods.json
+++ b/force-app/main/default/experiences/Consumable1/routes/lexArriveGoods.json
@@ -1,10 +1,10 @@
{
- "activeViewId": "23ddff87-c778-4457-b0f7-07029a8a9ffd",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "faabccd4-5e3b-4646-b626-6a85b751c910",
- "label": "LexArriveGoods",
- "pageAccess": "UseParent",
- "routeType": "custom-lexarrivegoods",
- "type": "route",
- "urlPrefix": "lexarrivegoods"
-}
+ "activeViewId" : "ec872079-c8a8-4c21-a0f2-84a95d4a93e5",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "cbb28431-553a-49de-8f9d-0d297c0dd897",
+ "label" : "LexArriveGoods",
+ "pageAccess" : "UseParent",
+ "routeType" : "custom-lexarrivegoods",
+ "type" : "route",
+ "urlPrefix" : "lexarrivegoods"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/lexArriveGoodsMain.json b/force-app/main/default/experiences/Consumable1/routes/lexArriveGoodsMain.json
index d144063..0717a5d 100644
--- a/force-app/main/default/experiences/Consumable1/routes/lexArriveGoodsMain.json
+++ b/force-app/main/default/experiences/Consumable1/routes/lexArriveGoodsMain.json
@@ -1,10 +1,10 @@
{
- "activeViewId": "e8d527e1-b86c-4449-bf5c-1ed05301648b",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "8e439ddc-a758-4cba-a5f8-c3295fc7349a",
- "label": "LexArriveGoodsMain",
- "pageAccess": "UseParent",
- "routeType": "custom-lexarrivegoodsmain",
- "type": "route",
- "urlPrefix": "lexarrivegoodsmain"
-}
+ "activeViewId" : "f46aba62-01c3-4a20-93c6-f9b2362717e6",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "372e3324-9c48-41ca-8e6d-4b349f076f65",
+ "label" : "LexArriveGoodsMain",
+ "pageAccess" : "UseParent",
+ "routeType" : "custom-lexarrivegoodsmain",
+ "type" : "route",
+ "urlPrefix" : "lexarrivegoodsmain"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/lexArriveGsDetails.json b/force-app/main/default/experiences/Consumable1/routes/lexArriveGsDetails.json
index e471837..f05df22 100644
--- a/force-app/main/default/experiences/Consumable1/routes/lexArriveGsDetails.json
+++ b/force-app/main/default/experiences/Consumable1/routes/lexArriveGsDetails.json
@@ -1,10 +1,10 @@
{
- "activeViewId": "ccdc4c02-3ec5-4c8c-bb43-af7c391c0876",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "e067f74a-448c-4b0e-aeb3-e0fc8d4bd724",
- "label": "LexArriveGsDetails",
- "pageAccess": "UseParent",
- "routeType": "custom-lexarrivegsdetails",
- "type": "route",
- "urlPrefix": "lexarrivegsdetails"
-}
+ "activeViewId" : "91695311-fdcc-4e42-87ca-c97cfd56a2b0",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "c7a297cc-a883-4507-b04c-965b15d7d470",
+ "label" : "LexArriveGsDetails",
+ "pageAccess" : "UseParent",
+ "routeType" : "custom-lexarrivegsdetails",
+ "type" : "route",
+ "urlPrefix" : "lexarrivegsdetails"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/lexCancelRemoveBox.json b/force-app/main/default/experiences/Consumable1/routes/lexCancelRemoveBox.json
index 8ed687f..b113ec1 100644
--- a/force-app/main/default/experiences/Consumable1/routes/lexCancelRemoveBox.json
+++ b/force-app/main/default/experiences/Consumable1/routes/lexCancelRemoveBox.json
@@ -1,10 +1,10 @@
{
- "activeViewId": "b7569df4-3d59-4e39-9916-b444d62da530",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "9022f6fd-bd92-40a7-a7a8-11276aa04bda",
- "label": "lexCancelRemoveBox",
- "pageAccess": "UseParent",
- "routeType": "custom-lexcancelremovebox",
- "type": "route",
- "urlPrefix": "lexcancelremovebox"
-}
+ "activeViewId" : "5fd84b73-2065-46d3-b121-2f8a77b76a3a",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "3289956a-758b-4222-898c-604d006a99fe",
+ "label" : "LexCancelRemoveBox",
+ "pageAccess" : "UseParent",
+ "routeType" : "custom-lexcancelremovebox",
+ "type" : "route",
+ "urlPrefix" : "lexcancelremovebox"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/lexConInvoiceView.json b/force-app/main/default/experiences/Consumable1/routes/lexConInvoiceView.json
index c2cafac..04ab667 100644
--- a/force-app/main/default/experiences/Consumable1/routes/lexConInvoiceView.json
+++ b/force-app/main/default/experiences/Consumable1/routes/lexConInvoiceView.json
@@ -1,10 +1,10 @@
{
- "activeViewId": "def29cb0-a769-4ec4-8e98-f1d9e4433e76",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "a7d054c5-781a-4e86-8137-3d65615fd049",
- "label": "LexConInvoiceView",
- "pageAccess": "UseParent",
- "routeType": "custom-lexconinvoiceview",
- "type": "route",
- "urlPrefix": "lexconinvoiceview"
-}
+ "activeViewId" : "4bbfb3d2-f8f2-4b23-b5cf-711d448a2b51",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "40788493-ac31-4a30-b873-956597a23a37",
+ "label" : "LexConInvoiceView",
+ "pageAccess" : "UseParent",
+ "routeType" : "custom-lexconinvoiceview",
+ "type" : "route",
+ "urlPrefix" : "lexconinvoiceview"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/lexConsumable.json b/force-app/main/default/experiences/Consumable1/routes/lexConsumable.json
index 68c7f11..8b79a03 100644
--- a/force-app/main/default/experiences/Consumable1/routes/lexConsumable.json
+++ b/force-app/main/default/experiences/Consumable1/routes/lexConsumable.json
@@ -1,10 +1,10 @@
{
- "activeViewId": "a3a6bd48-fa28-4210-b2f1-396f0169df2f",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "92ab763f-0891-4b15-b0c9-6c769b8a00a1",
- "label": "LexConsumable",
- "pageAccess": "UseParent",
- "routeType": "custom-lexconsumable",
- "type": "route",
- "urlPrefix": "lexconsumable"
-}
+ "activeViewId" : "756785e1-4fb5-4ab3-b38a-58ea679a4361",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "0460cf80-25a2-4785-acb9-587a66def46e",
+ "label" : "LexConsumable",
+ "pageAccess" : "UseParent",
+ "routeType" : "custom-lexconsumable",
+ "type" : "route",
+ "urlPrefix" : "lexconsumable"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/lexConsumableAccount.json b/force-app/main/default/experiences/Consumable1/routes/lexConsumableAccount.json
index 6f277a8..3871cad 100644
--- a/force-app/main/default/experiences/Consumable1/routes/lexConsumableAccount.json
+++ b/force-app/main/default/experiences/Consumable1/routes/lexConsumableAccount.json
@@ -1,10 +1,10 @@
{
- "activeViewId": "f724180a-789f-4a5f-909f-a3b6926cff21",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "790c190b-8bf4-4211-a8fb-172af3538e9f",
- "label": "LexConsumableAccount",
- "pageAccess": "UseParent",
- "routeType": "custom-lexconsumableaccount",
- "type": "route",
- "urlPrefix": "lexconsumableaccount"
-}
+ "activeViewId" : "65a5c9a4-0cc9-4b00-872b-b90bc1e47411",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "7db2303f-7e83-4c85-a7ad-12fa6672974b",
+ "label" : "LexConsumableAccount",
+ "pageAccess" : "UseParent",
+ "routeType" : "custom-lexconsumableaccount",
+ "type" : "route",
+ "urlPrefix" : "lexconsumableaccount"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/lexConsumableAccountInfoPrint.json b/force-app/main/default/experiences/Consumable1/routes/lexConsumableAccountInfoPrint.json
index dc404f5..9656121 100644
--- a/force-app/main/default/experiences/Consumable1/routes/lexConsumableAccountInfoPrint.json
+++ b/force-app/main/default/experiences/Consumable1/routes/lexConsumableAccountInfoPrint.json
@@ -1,10 +1,10 @@
{
- "activeViewId": "469dc013-dd9c-46d5-a4e8-57e7b4718b74",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "0b5b4633-9d43-4758-a5a1-7f3048846a66",
- "label": "LexConsumableAccountInfoPrint",
- "pageAccess": "UseParent",
- "routeType": "custom-lexconsumableaccountinfoprint",
- "type": "route",
- "urlPrefix": "lexconsumableaccountinfoprint"
-}
+ "activeViewId" : "5d615179-dd62-4481-a874-de16a69d7374",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "82091f6c-517f-4ee0-8ad2-8958cf953804",
+ "label" : "LexConsumableAccountInfoPrint",
+ "pageAccess" : "UseParent",
+ "routeType" : "custom-lexconsumableaccountinfoprint",
+ "type" : "route",
+ "urlPrefix" : "lexconsumableaccountinfoprint"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/lexConsumableOrderManage.json b/force-app/main/default/experiences/Consumable1/routes/lexConsumableOrderManage.json
index e18442e..907c13a 100644
--- a/force-app/main/default/experiences/Consumable1/routes/lexConsumableOrderManage.json
+++ b/force-app/main/default/experiences/Consumable1/routes/lexConsumableOrderManage.json
@@ -1,10 +1,10 @@
{
- "activeViewId": "adc3f3b5-03a9-4f8d-9284-7ff06dc338af",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "6335d5ad-ddd3-4fc4-b256-dd3fc662034f",
- "label": "LexConsumableOrderManage",
- "pageAccess": "UseParent",
- "routeType": "custom-lexconsumableordermanage",
- "type": "route",
- "urlPrefix": "lexconsumableordermanage"
-}
+ "activeViewId" : "0c6f8778-bba4-4726-97f6-b639cce7c99e",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "17e0e204-7337-4cc3-8ae8-386f15253878",
+ "label" : "LexConsumableOrderManage",
+ "pageAccess" : "UseParent",
+ "routeType" : "custom-lexconsumableordermanage",
+ "type" : "route",
+ "urlPrefix" : "lexconsumableordermanage"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/lexInventory.json b/force-app/main/default/experiences/Consumable1/routes/lexInventory.json
index 52910c0..f835008 100644
--- a/force-app/main/default/experiences/Consumable1/routes/lexInventory.json
+++ b/force-app/main/default/experiences/Consumable1/routes/lexInventory.json
@@ -1,10 +1,10 @@
{
- "activeViewId": "86cd7e17-9d77-47e1-906e-f87e8a36b5e0",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "347e4abc-85c2-477d-ae7a-0ac5bfc0728f",
- "label": "lexInventory",
- "pageAccess": "UseParent",
- "routeType": "custom-lex-inventory",
- "type": "route",
- "urlPrefix": "lexinventory"
-}
+ "activeViewId" : "5a24538d-0a99-40a3-a6a1-4496d0333a05",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "465ce810-60bc-45a4-92f4-8148664ee531",
+ "label" : "LexInventory",
+ "pageAccess" : "UseParent",
+ "routeType" : "custom-lexinventory",
+ "type" : "route",
+ "urlPrefix" : "lexinventory"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/lexInventoryView.json b/force-app/main/default/experiences/Consumable1/routes/lexInventoryView.json
index 0172bb1..3451cf5 100644
--- a/force-app/main/default/experiences/Consumable1/routes/lexInventoryView.json
+++ b/force-app/main/default/experiences/Consumable1/routes/lexInventoryView.json
@@ -1,10 +1,10 @@
{
- "activeViewId": "afb34dd9-404b-4bea-949d-07c42681d821",
- "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
- "id": "15de9dbd-a894-4fbc-8672-f2917c4addc5",
- "label": "LexInventoryView",
- "pageAccess": "UseParent",
- "routeType": "custom-lexinventoryview",
- "type": "route",
- "urlPrefix": "lexinventoryview"
-}
+ "activeViewId" : "afb34dd9-404b-4bea-949d-07c42681d821",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "15de9dbd-a894-4fbc-8672-f2917c4addc5",
+ "label" : "LexInventoryView",
+ "pageAccess" : "UseParent",
+ "routeType" : "custom-lexinventoryview",
+ "type" : "route",
+ "urlPrefix" : "lexinventoryview"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/lexOutboundorderImport.json b/force-app/main/default/experiences/Consumable1/routes/lexOutboundorderImport.json
index 73e0e3b..ae15cb4 100644
--- a/force-app/main/default/experiences/Consumable1/routes/lexOutboundorderImport.json
+++ b/force-app/main/default/experiences/Consumable1/routes/lexOutboundorderImport.json
@@ -1,10 +1,10 @@
{
- "activeViewId": "f8b18a5a-4f37-46d3-946e-3c5307c081e6",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "2b760536-1491-4c8d-b0e3-f9972354708d",
- "label": "LexOutboundorderImport",
- "pageAccess": "UseParent",
- "routeType": "custom-lexoutboundorderimport",
- "type": "route",
- "urlPrefix": "lexoutboundorderimport"
-}
+ "activeViewId" : "e8224149-f1b9-4c44-8839-4d9737739c72",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "839786f7-032b-4c35-b6b3-7e5ad0de3ac3",
+ "label" : "LexOutboundorderImport",
+ "pageAccess" : "UseParent",
+ "routeType" : "custom-lexoutboundorderimport",
+ "type" : "route",
+ "urlPrefix" : "lexoutboundorderimport"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/lexOverdueStock.json b/force-app/main/default/experiences/Consumable1/routes/lexOverdueStock.json
index f7f09e9..65cee31 100644
--- a/force-app/main/default/experiences/Consumable1/routes/lexOverdueStock.json
+++ b/force-app/main/default/experiences/Consumable1/routes/lexOverdueStock.json
@@ -1,10 +1,10 @@
{
- "activeViewId": "38d1e97a-0728-46a2-bee1-0c72ff1d6570",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "73006608-6ed7-459c-b9bc-14c6c16476f4",
- "label": "LexOverdueStock",
- "pageAccess": "UseParent",
- "routeType": "custom-lexoverduestock",
- "type": "route",
- "urlPrefix": "lexoverduestock"
-}
+ "activeViewId" : "b0f2e8e7-62fd-42f3-bf3a-4bdf40b02bf4",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "2c0812bd-c08f-4e4a-980f-360b54f841c4",
+ "label" : "LexOverdueStock",
+ "pageAccess" : "UseParent",
+ "routeType" : "custom-lexoverduestock",
+ "type" : "route",
+ "urlPrefix" : "lexoverduestock"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/lexProductLimitEdit.json b/force-app/main/default/experiences/Consumable1/routes/lexProductLimitEdit.json
index a6b998b..080f5a2 100644
--- a/force-app/main/default/experiences/Consumable1/routes/lexProductLimitEdit.json
+++ b/force-app/main/default/experiences/Consumable1/routes/lexProductLimitEdit.json
@@ -1,10 +1,10 @@
{
- "activeViewId": "57a80c74-e471-4b90-b214-580f7d3b66cd",
- "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
- "id": "073ef0e9-4de6-4848-9f87-c9ddffb1e842",
- "label": "LexProductLimitEdit",
- "pageAccess": "UseParent",
- "routeType": "custom-lexproductlimitedit",
- "type": "route",
- "urlPrefix": "lexproductlimitedit"
-}
+ "activeViewId" : "57a80c74-e471-4b90-b214-580f7d3b66cd",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "073ef0e9-4de6-4848-9f87-c9ddffb1e842",
+ "label" : "LexProductLimitEdit",
+ "pageAccess" : "UseParent",
+ "routeType" : "custom-lexproductlimitedit",
+ "type" : "route",
+ "urlPrefix" : "lexproductlimitedit"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/lexRemoveBox.json b/force-app/main/default/experiences/Consumable1/routes/lexRemoveBox.json
index ffa9997..17485f6 100644
--- a/force-app/main/default/experiences/Consumable1/routes/lexRemoveBox.json
+++ b/force-app/main/default/experiences/Consumable1/routes/lexRemoveBox.json
@@ -1,10 +1,10 @@
{
- "activeViewId": "8feef62c-b227-4815-b93f-fe0fe07a34bd",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "06d0bb54-97e9-4556-a6ee-5e9c7e34633a",
- "label": "LexRemoveBox",
- "pageAccess": "UseParent",
- "routeType": "custom-lexremovebox",
- "type": "route",
- "urlPrefix": "lexremovebox"
-}
+ "activeViewId" : "b4a2ba1b-3827-4ec7-8f8e-5461c3893ce0",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "f7bab43e-2170-4980-9b2c-126154272cb0",
+ "label" : "LexRemoveBox",
+ "pageAccess" : "UseParent",
+ "routeType" : "custom-lexremovebox",
+ "type" : "route",
+ "urlPrefix" : "lexremovebox"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/lexSaleAndDelivery.json b/force-app/main/default/experiences/Consumable1/routes/lexSaleAndDelivery.json
index 3d6ec3c..5930b92 100644
--- a/force-app/main/default/experiences/Consumable1/routes/lexSaleAndDelivery.json
+++ b/force-app/main/default/experiences/Consumable1/routes/lexSaleAndDelivery.json
@@ -1,10 +1,10 @@
{
- "activeViewId": "f5a6e76f-41cd-4eb3-8652-695bcce0e678",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "62628d80-2d75-4a25-aeaf-a0ce85407a6b",
- "label": "LexSaleAndDelivery",
- "pageAccess": "UseParent",
- "routeType": "custom-lexsaleanddelivery",
- "type": "route",
- "urlPrefix": "lexsaleanddelivery"
-}
+ "activeViewId" : "e5d81e8f-b0a5-4bf3-b11b-08dd8fef1a3c",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "28c40941-a2fa-4f30-a790-936542b1cf84",
+ "label" : "LexSaleAndDelivery",
+ "pageAccess" : "UseParent",
+ "routeType" : "custom-lexsaleanddelivery",
+ "type" : "route",
+ "urlPrefix" : "lexsaleanddelivery"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/lexSummonsCreat.json b/force-app/main/default/experiences/Consumable1/routes/lexSummonsCreat.json
index c923ac7..291e8b5 100644
--- a/force-app/main/default/experiences/Consumable1/routes/lexSummonsCreat.json
+++ b/force-app/main/default/experiences/Consumable1/routes/lexSummonsCreat.json
@@ -1,10 +1,10 @@
{
- "activeViewId": "b7e402c5-b5ed-4d2c-8cd1-a7c189bfbcda",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "4021ee9a-4769-4dac-af20-5099288bae35",
- "label": "LexSummonsCreat",
- "pageAccess": "UseParent",
- "routeType": "custom-lexsummonscreat",
- "type": "route",
- "urlPrefix": "lexsummonscreat"
-}
+ "activeViewId" : "c2e9c913-ab1c-4b38-899b-136fb95066fb",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "94af1a52-11ac-4e16-8f30-f6fe250ccd1e",
+ "label" : "LexSummonsCreat",
+ "pageAccess" : "UseParent",
+ "routeType" : "custom-lexsummonscreat",
+ "type" : "route",
+ "urlPrefix" : "lexsummonscreat"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/lexTopPage.json b/force-app/main/default/experiences/Consumable1/routes/lexTopPage.json
index 4f76731..1c3b87d 100644
--- a/force-app/main/default/experiences/Consumable1/routes/lexTopPage.json
+++ b/force-app/main/default/experiences/Consumable1/routes/lexTopPage.json
@@ -1,10 +1,10 @@
{
- "activeViewId": "bda75bd7-499d-4d41-ad47-2d49173854dd",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "146bed7f-b8f1-4016-8a31-035874516b5d",
- "label": "lexTopPage",
- "pageAccess": "UseParent",
- "routeType": "custom-lextoppage",
- "type": "route",
- "urlPrefix": "lextoppage"
-}
+ "activeViewId" : "09c93676-a531-4ba7-8708-cc47f8458c90",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "855eeb08-6e57-404b-a5f6-072349535002",
+ "label" : "LexTopPage",
+ "pageAccess" : "UseParent",
+ "routeType" : "custom-lextoppage",
+ "type" : "route",
+ "urlPrefix" : "lextoppage"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/login.json b/force-app/main/default/experiences/Consumable1/routes/login.json
index 94a379c..7928006 100644
--- a/force-app/main/default/experiences/Consumable1/routes/login.json
+++ b/force-app/main/default/experiences/Consumable1/routes/login.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "4c2e26c5-f1ea-42e0-85f6-371bc184fe49",
- "appPageId": "bfbf7350-cdcd-4e2c-97a5-ab51f2aa3b9d",
- "id": "bc26e928-8b62-4f80-9355-ef5553737e13",
- "label": "Login",
- "routeType": "login-home",
- "type": "route",
- "urlPrefix": ""
-}
+ "activeViewId" : "7c2dd152-d6d3-4652-bbfe-cb8e11d83c43",
+ "appPageId" : "7756c67f-7774-4fe1-b1c2-eecb19f9c6a5",
+ "id" : "c7457673-c277-4525-81e4-00da62b21ee0",
+ "label" : "Login",
+ "routeType" : "login-home",
+ "type" : "route",
+ "urlPrefix" : ""
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/loginError.json b/force-app/main/default/experiences/Consumable1/routes/loginError.json
index d170cd5..4073fc5 100644
--- a/force-app/main/default/experiences/Consumable1/routes/loginError.json
+++ b/force-app/main/default/experiences/Consumable1/routes/loginError.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "a8ddd7f3-7895-497a-bb20-7f0ce5c387aa",
- "appPageId": "bfbf7350-cdcd-4e2c-97a5-ab51f2aa3b9d",
- "id": "6b34ae60-30a7-46c8-8e80-657fa96816b1",
- "label": "Login Error",
- "routeType": "login-error",
- "type": "route",
- "urlPrefix": "error"
-}
+ "activeViewId" : "ba40442c-80fc-411f-8c02-9cfce2ab1372",
+ "appPageId" : "7756c67f-7774-4fe1-b1c2-eecb19f9c6a5",
+ "id" : "b0404c8e-8a84-4ed9-800b-93e742025cef",
+ "label" : "Login Error",
+ "routeType" : "login-error",
+ "type" : "route",
+ "urlPrefix" : "error"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/mDFAndCoop.json b/force-app/main/default/experiences/Consumable1/routes/mDFAndCoop.json
index c39322d..164a724 100644
--- a/force-app/main/default/experiences/Consumable1/routes/mDFAndCoop.json
+++ b/force-app/main/default/experiences/Consumable1/routes/mDFAndCoop.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "51554054-4eaf-44f6-96bd-b90145e6e078",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "f9897b41-4fb8-433e-8895-82e47d6aa298",
- "label": "MDF and Coop",
- "routeType": "mdf",
- "type": "route",
- "urlPrefix": "mdf"
-}
+ "activeViewId" : "b253bc1d-fe4a-4156-91f4-88f4725a3616",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "3e75febe-ff75-4d4f-841d-28dc994a1da1",
+ "label" : "MDF and Coop",
+ "routeType" : "mdf",
+ "type" : "route",
+ "urlPrefix" : "mdf"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/messages.json b/force-app/main/default/experiences/Consumable1/routes/messages.json
index 7066a0c..7f7068d 100644
--- a/force-app/main/default/experiences/Consumable1/routes/messages.json
+++ b/force-app/main/default/experiences/Consumable1/routes/messages.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "a4397b8d-c4ab-44d4-b2dc-cce577b9d2c8",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "3929da47-f3e6-42a7-ad00-269ea899171d",
- "label": "Messages",
- "routeType": "messages",
- "type": "route",
- "urlPrefix": "messages"
-}
+ "activeViewId" : "55f1ae5d-c9ac-44ad-bb27-4c22dddc2a2e",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "93d1b5dd-fc4b-464f-b034-2321557eb837",
+ "label" : "Messages",
+ "routeType" : "messages",
+ "type" : "route",
+ "urlPrefix" : "messages"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/myAccount.json b/force-app/main/default/experiences/Consumable1/routes/myAccount.json
index ede4fa6..756f7b6 100644
--- a/force-app/main/default/experiences/Consumable1/routes/myAccount.json
+++ b/force-app/main/default/experiences/Consumable1/routes/myAccount.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "25eab78c-263e-4a55-8bff-ad852efc15c9",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "ddfd00c8-3c1c-463c-a5d6-78a97c47b79f",
- "label": "My Account",
- "routeType": "my-account",
- "type": "route",
- "urlPrefix": "comm-my-account"
-}
+ "activeViewId" : "2cd7a2df-9e65-4663-9e35-9b4134b4beb1",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "42a42c86-6517-4e0e-a630-be5ab221baf1",
+ "label" : "My Account",
+ "routeType" : "my-account",
+ "type" : "route",
+ "urlPrefix" : "comm-my-account"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/questionDetail.json b/force-app/main/default/experiences/Consumable1/routes/questionDetail.json
index 0e60ff7..362255f 100644
--- a/force-app/main/default/experiences/Consumable1/routes/questionDetail.json
+++ b/force-app/main/default/experiences/Consumable1/routes/questionDetail.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "d4ed7ed0-3745-461e-acd3-32108749ab93",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "a91ac3c9-aca5-4723-ae43-bc9c7f231015",
- "label": "Question Detail",
- "routeType": "feeditem",
- "type": "route",
- "urlPrefix": "question"
-}
+ "activeViewId" : "c29033d4-ea89-4311-9a8f-9b1cee010f96",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "d4e8748f-c126-4d7f-a4e8-43e4314bf361",
+ "label" : "Question Detail",
+ "routeType" : "feeditem",
+ "type" : "route",
+ "urlPrefix" : "question"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/quipDocsRelatedList.json b/force-app/main/default/experiences/Consumable1/routes/quipDocsRelatedList.json
index 80464a5..7782b98 100644
--- a/force-app/main/default/experiences/Consumable1/routes/quipDocsRelatedList.json
+++ b/force-app/main/default/experiences/Consumable1/routes/quipDocsRelatedList.json
@@ -1,10 +1,10 @@
{
- "activeViewId": "b076cb5b-405f-4199-b9be-7429234ce226",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "56d102f8-5197-4dca-a1d3-fec183274f67",
- "label": "Quip Docs Related List",
- "pageAccess": "UseParent",
- "routeType": "extrelated-quip",
- "type": "route",
- "urlPrefix": "quip"
-}
+ "activeViewId" : "be244254-9e8f-46bd-83e0-a6cdb3780540",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "12cc102d-f664-49b7-8b25-c78d7939a8ed",
+ "label" : "Quip Docs Related List",
+ "pageAccess" : "UseParent",
+ "routeType" : "extrelated-quip",
+ "type" : "route",
+ "urlPrefix" : "quip"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/recordDetail.json b/force-app/main/default/experiences/Consumable1/routes/recordDetail.json
index 1cde82f..487ba18 100644
--- a/force-app/main/default/experiences/Consumable1/routes/recordDetail.json
+++ b/force-app/main/default/experiences/Consumable1/routes/recordDetail.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "c8075095-c3fd-4d07-8079-0eb063287ad7",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "de9cd95e-59e4-4622-8f8d-8fdb3768da70",
- "label": "Record Detail",
- "routeType": "detail",
- "type": "route",
- "urlPrefix": "detail"
-}
+ "activeViewId" : "d30889c1-09fc-407a-8d9d-155b305cce6f",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "63bae7d4-3412-48c3-9503-126a63811892",
+ "label" : "Record Detail",
+ "routeType" : "detail",
+ "type" : "route",
+ "urlPrefix" : "detail"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/recordList.json b/force-app/main/default/experiences/Consumable1/routes/recordList.json
index e9084b7..d7a4441 100644
--- a/force-app/main/default/experiences/Consumable1/routes/recordList.json
+++ b/force-app/main/default/experiences/Consumable1/routes/recordList.json
@@ -1,10 +1,10 @@
{
- "activeViewId": "568148b6-8356-45bb-a31e-e8c320ff9726",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "4bb09a90-41cc-4630-a450-d8545941e231",
- "label": "Record List",
- "pageAccess": "UseParent",
- "routeType": "list",
- "type": "route",
- "urlPrefix": "recordlist"
-}
+ "activeViewId" : "f14a9999-9077-4660-a62f-b9df05228f6c",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "b63deca7-c984-4812-9b2a-f757908981a0",
+ "label" : "Record List",
+ "pageAccess" : "UseParent",
+ "routeType" : "list",
+ "type" : "route",
+ "urlPrefix" : "recordlist"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/register.json b/force-app/main/default/experiences/Consumable1/routes/register.json
index f0f976a..e58b5e3 100644
--- a/force-app/main/default/experiences/Consumable1/routes/register.json
+++ b/force-app/main/default/experiences/Consumable1/routes/register.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "3af8afbb-87fe-417d-818c-7e8a8f00faf6",
- "appPageId": "bfbf7350-cdcd-4e2c-97a5-ab51f2aa3b9d",
- "id": "e8838dbc-c64c-4cd5-b34a-9dea25b08d42",
- "label": "Register",
- "routeType": "self-register",
- "type": "route",
- "urlPrefix": "SelfRegister"
-}
+ "activeViewId" : "7cadb098-b80c-40d4-a33c-714c36f8a2f3",
+ "appPageId" : "7756c67f-7774-4fe1-b1c2-eecb19f9c6a5",
+ "id" : "2d8061dd-a482-4608-8514-113389805fc4",
+ "label" : "Register",
+ "routeType" : "self-register",
+ "type" : "route",
+ "urlPrefix" : "SelfRegister"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/relatedRecordList.json b/force-app/main/default/experiences/Consumable1/routes/relatedRecordList.json
index 6e2a5d4..1ba38ad 100644
--- a/force-app/main/default/experiences/Consumable1/routes/relatedRecordList.json
+++ b/force-app/main/default/experiences/Consumable1/routes/relatedRecordList.json
@@ -1,10 +1,10 @@
{
- "activeViewId": "172db5bf-c37b-4cee-853b-212bf73517d7",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "0bcea7b6-93f9-47b9-a354-7c6ecc13b22f",
- "label": "Related Record List",
- "pageAccess": "UseParent",
- "routeType": "relatedlist",
- "type": "route",
- "urlPrefix": "relatedlist"
-}
+ "activeViewId" : "2a182209-2527-4335-b672-176196ee6a0d",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "821d09c9-7732-4bb0-a002-f8fc3e825a20",
+ "label" : "Related Record List",
+ "pageAccess" : "UseParent",
+ "routeType" : "relatedlist",
+ "type" : "route",
+ "urlPrefix" : "relatedlist"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/reportBuilder.json b/force-app/main/default/experiences/Consumable1/routes/reportBuilder.json
index cfcfe00..28e6645 100644
--- a/force-app/main/default/experiences/Consumable1/routes/reportBuilder.json
+++ b/force-app/main/default/experiences/Consumable1/routes/reportBuilder.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "8e5cdbce-69e6-41cf-9d28-bf22b82ab29f",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "4cbb98c3-d712-4d7f-9516-d497244b5d7b",
- "label": "Report Builder",
- "routeType": "createreport",
- "type": "route",
- "urlPrefix": "createreport"
-}
+ "activeViewId" : "059d5f4a-e616-4540-be96-a34b294fb2a4",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "20b2eb69-8eea-41f6-bef2-3a3e66f4ac0f",
+ "label" : "Report Builder",
+ "routeType" : "createreport",
+ "type" : "route",
+ "urlPrefix" : "createreport"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/reportDetail.json b/force-app/main/default/experiences/Consumable1/routes/reportDetail.json
index fd9efe2..3eeb602 100644
--- a/force-app/main/default/experiences/Consumable1/routes/reportDetail.json
+++ b/force-app/main/default/experiences/Consumable1/routes/reportDetail.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "ac90421b-0cd9-4c2e-a836-ee4567ce8d1f",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "a3d550e0-17da-410b-9046-20710587176d",
- "label": "Report Detail",
- "routeType": "detail-00O",
- "type": "route",
- "urlPrefix": "report"
-}
+ "activeViewId" : "66e48eb0-9203-4842-9fde-8b4e7e63b8ac",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "fbba1bbe-83b3-4711-ab64-131ca5bf8e4e",
+ "label" : "Report Detail",
+ "routeType" : "detail-00O",
+ "type" : "route",
+ "urlPrefix" : "report"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/reportList.json b/force-app/main/default/experiences/Consumable1/routes/reportList.json
index a95746f..8b7df17 100644
--- a/force-app/main/default/experiences/Consumable1/routes/reportList.json
+++ b/force-app/main/default/experiences/Consumable1/routes/reportList.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "f71c1609-6433-4cf0-8846-695e50897517",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "0334744b-2e69-4b21-bca0-46da443d17a2",
- "label": "Report List",
- "routeType": "list-00O",
- "type": "route",
- "urlPrefix": "report"
-}
+ "activeViewId" : "cbac51d9-cfc4-4fa7-bf92-603361ff1747",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "2f63d133-547c-46d3-ba43-4badc59db592",
+ "label" : "Report List",
+ "routeType" : "list-00O",
+ "type" : "route",
+ "urlPrefix" : "report"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/resources.json b/force-app/main/default/experiences/Consumable1/routes/resources.json
index 064d4e0..00b2916 100644
--- a/force-app/main/default/experiences/Consumable1/routes/resources.json
+++ b/force-app/main/default/experiences/Consumable1/routes/resources.json
@@ -1,10 +1,10 @@
{
- "activeViewId": "2feda9aa-a785-4e98-9448-352e28d95b34",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "d3935a4f-b947-4b06-aaa7-a435e32b0d8f",
- "label": "Resources",
- "pageAccess": "UseParent",
- "routeType": "files",
- "type": "route",
- "urlPrefix": "files"
-}
+ "activeViewId" : "dc215254-3731-423c-ba11-3d87746598e8",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "84243d63-bbfd-4642-8fc2-923d714ca322",
+ "label" : "Resources",
+ "pageAccess" : "UseParent",
+ "routeType" : "files",
+ "type" : "route",
+ "urlPrefix" : "files"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/search.json b/force-app/main/default/experiences/Consumable1/routes/search.json
index 763f3ab..e4139b2 100644
--- a/force-app/main/default/experiences/Consumable1/routes/search.json
+++ b/force-app/main/default/experiences/Consumable1/routes/search.json
@@ -1,10 +1,10 @@
{
- "activeViewId": "99b69c91-c8d8-42fe-91af-6f71e4612910",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "0bc852e1-bd84-4ab4-a37a-a680a15378e6",
- "label": "Search",
- "pageAccess": "UseParent",
- "routeType": "global-search",
- "type": "route",
- "urlPrefix": "global-search"
-}
+ "activeViewId" : "74aeae6d-8d40-433e-8168-45175ee356a6",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "a891eb3e-9e90-410a-9016-65f1ad0dc887",
+ "label" : "Search",
+ "pageAccess" : "UseParent",
+ "routeType" : "global-search",
+ "type" : "route",
+ "urlPrefix" : "global-search"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/streamDetail.json b/force-app/main/default/experiences/Consumable1/routes/streamDetail.json
index a79c5d4..146807a 100644
--- a/force-app/main/default/experiences/Consumable1/routes/streamDetail.json
+++ b/force-app/main/default/experiences/Consumable1/routes/streamDetail.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "0c2c3b1a-34ee-493b-af35-596aa83568d6",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "6d5ad4ec-9290-4748-81ac-d75e71699bbb",
- "label": "Stream Detail",
- "routeType": "detail-0Fq",
- "type": "route",
- "urlPrefix": "streams"
-}
+ "activeViewId" : "e3ef5ec3-0aba-44b3-b608-6f939cf49c88",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "363f8c18-dff6-46a3-91c7-f574cc32b412",
+ "label" : "Stream Detail",
+ "routeType" : "detail-0Fq",
+ "type" : "route",
+ "urlPrefix" : "streams"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/streamList.json b/force-app/main/default/experiences/Consumable1/routes/streamList.json
index 8a3eb9e..405a064 100644
--- a/force-app/main/default/experiences/Consumable1/routes/streamList.json
+++ b/force-app/main/default/experiences/Consumable1/routes/streamList.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "6ef6f17a-0dda-4824-8310-e283e961890f",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "328d83cb-799e-47d6-af05-0f3b2cd704e4",
- "label": "Stream List",
- "routeType": "list-0Fq",
- "type": "route",
- "urlPrefix": "streams"
-}
+ "activeViewId" : "e1275716-f06a-4a27-a667-19c49eefb083",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "fa6fe95d-1642-4d25-8690-9b9a1504e9a0",
+ "label" : "Stream List",
+ "routeType" : "list-0Fq",
+ "type" : "route",
+ "urlPrefix" : "streams"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/topicCatalog.json b/force-app/main/default/experiences/Consumable1/routes/topicCatalog.json
index 88fd16d..58fb2e3 100644
--- a/force-app/main/default/experiences/Consumable1/routes/topicCatalog.json
+++ b/force-app/main/default/experiences/Consumable1/routes/topicCatalog.json
@@ -1,10 +1,10 @@
{
- "activeViewId": "bc041b32-bf8f-47ac-8c7d-35d8b4167ee7",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "710677ce-88c2-4a7c-83bd-2e1a6ccce33f",
- "label": "Topic Catalog",
- "pageAccess": "UseParent",
- "routeType": "topic-catalog",
- "type": "route",
- "urlPrefix": "topiccatalog"
-}
+ "activeViewId" : "3912430c-3c10-4bf3-bf37-5a619a596491",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "ecc9aeb9-aacd-4c2a-ab2e-e2e1befce726",
+ "label" : "Topic Catalog",
+ "pageAccess" : "UseParent",
+ "routeType" : "topic-catalog",
+ "type" : "route",
+ "urlPrefix" : "topiccatalog"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/topicDetail.json b/force-app/main/default/experiences/Consumable1/routes/topicDetail.json
index c8d9482..e83118e 100644
--- a/force-app/main/default/experiences/Consumable1/routes/topicDetail.json
+++ b/force-app/main/default/experiences/Consumable1/routes/topicDetail.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "8f8238dc-8f81-4994-9933-b4dcb285776e",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "77f8e584-3870-49e2-86c8-08389b371d5f",
- "label": "Topic Detail",
- "routeType": "topic",
- "type": "route",
- "urlPrefix": "topic"
-}
+ "activeViewId" : "060ff5da-04b3-49de-8fb8-03decd8c188c",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "8a6adaa6-3a66-4924-aae5-ea1120239b86",
+ "label" : "Topic Detail",
+ "routeType" : "topic",
+ "type" : "route",
+ "urlPrefix" : "topic"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/userProfile.json b/force-app/main/default/experiences/Consumable1/routes/userProfile.json
index 61baba4..fcf8f3c 100644
--- a/force-app/main/default/experiences/Consumable1/routes/userProfile.json
+++ b/force-app/main/default/experiences/Consumable1/routes/userProfile.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "2245cd19-8057-487b-8284-d7f20c56e1f7",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "a6b8fa86-82fc-41af-ad13-7bd0f38d383e",
- "label": "User Profile",
- "routeType": "detail-005",
- "type": "route",
- "urlPrefix": "profile"
-}
+ "activeViewId" : "b3764d11-d26d-4554-8747-e7f30fb722bd",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "a611aa58-e18f-4242-882d-e91bc8977624",
+ "label" : "User Profile",
+ "routeType" : "detail-005",
+ "type" : "route",
+ "urlPrefix" : "profile"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/routes/userSettings.json b/force-app/main/default/experiences/Consumable1/routes/userSettings.json
index 8495442..7ae6ed3 100644
--- a/force-app/main/default/experiences/Consumable1/routes/userSettings.json
+++ b/force-app/main/default/experiences/Consumable1/routes/userSettings.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "55bd4245-fde3-4919-8a43-b7e2ffc3aed7",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "7b23fd34-333f-4950-8543-98bea72908f6",
- "label": "User Settings",
- "routeType": "usersettings",
- "type": "route",
- "urlPrefix": "settings"
-}
+ "activeViewId" : "8225f2be-2536-4868-afe9-ed11e1c1eb15",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "cf47d325-829c-4ce7-a2b3-2440777f63c4",
+ "label" : "User Settings",
+ "routeType" : "usersettings",
+ "type" : "route",
+ "urlPrefix" : "settings"
+}
\ No newline at end of file
diff --git "a/force-app/main/default/experiences/Consumable1/routes/\344\273\252\350\241\250\346\235\277\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json" "b/force-app/main/default/experiences/Consumable1/routes/\344\273\252\350\241\250\346\235\277\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
index 6c98e23..2a17a20 100644
--- "a/force-app/main/default/experiences/Consumable1/routes/\344\273\252\350\241\250\346\235\277\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
+++ "b/force-app/main/default/experiences/Consumable1/routes/\344\273\252\350\241\250\346\235\277\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
@@ -1,9 +1,9 @@
{
- "activeViewId": "97ed2657-7949-4aed-9e5d-cae9c935f730",
- "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
- "id": "81c4ebfb-629e-4689-9783-133bf5187a7e",
- "label": "浠〃鏉� 闁㈤�ｃ儶銈广儓",
- "routeType": "relatedlist-01Z",
- "type": "route",
- "urlPrefix": "dashboard"
-}
+ "activeViewId" : "97ed2657-7949-4aed-9e5d-cae9c935f730",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "81c4ebfb-629e-4689-9783-133bf5187a7e",
+ "label" : "浠〃鏉� 闁㈤�ｃ儶銈广儓",
+ "routeType" : "relatedlist-01Z",
+ "type" : "route",
+ "urlPrefix" : "dashboard"
+}
\ No newline at end of file
diff --git "a/force-app/main/default/experiences/Consumable1/routes/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255\350\251\263\347\264\260.json" "b/force-app/main/default/experiences/Consumable1/routes/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255\350\251\263\347\264\260.json"
index e5db28e..498c83a 100644
--- "a/force-app/main/default/experiences/Consumable1/routes/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255\350\251\263\347\264\260.json"
+++ "b/force-app/main/default/experiences/Consumable1/routes/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255\350\251\263\347\264\260.json"
@@ -1,9 +1,9 @@
{
- "activeViewId": "0ad6b8ab-53a5-4a50-a8e4-2cb763631aab",
- "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
- "id": "dee92b99-6db0-49ba-81bc-f626f65eb503",
- "label": "瀛︿細銉诲煿璁� 瑭崇窗",
- "routeType": "detail-701",
- "type": "route",
- "urlPrefix": "campaign"
-}
+ "activeViewId" : "0ad6b8ab-53a5-4a50-a8e4-2cb763631aab",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "dee92b99-6db0-49ba-81bc-f626f65eb503",
+ "label" : "瀛︿細銉诲煿璁� 瑭崇窗",
+ "routeType" : "detail-701",
+ "type" : "route",
+ "urlPrefix" : "campaign"
+}
\ No newline at end of file
diff --git "a/force-app/main/default/experiences/Consumable1/routes/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json" "b/force-app/main/default/experiences/Consumable1/routes/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
index 5ab9aab..60fd0f8 100644
--- "a/force-app/main/default/experiences/Consumable1/routes/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
+++ "b/force-app/main/default/experiences/Consumable1/routes/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
@@ -1,9 +1,9 @@
{
- "activeViewId": "4cf18bf4-7c54-4746-b895-ec877e8fcd43",
- "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
- "id": "663d23a2-f828-41e4-b9eb-d9c9dfaceb4d",
- "label": "瀛︿細銉诲煿璁� 闁㈤�ｃ儶銈广儓",
- "routeType": "relatedlist-701",
- "type": "route",
- "urlPrefix": "campaign"
-}
+ "activeViewId" : "4cf18bf4-7c54-4746-b895-ec877e8fcd43",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "663d23a2-f828-41e4-b9eb-d9c9dfaceb4d",
+ "label" : "瀛︿細銉诲煿璁� 闁㈤�ｃ儶銈广儓",
+ "routeType" : "relatedlist-701",
+ "type" : "route",
+ "urlPrefix" : "campaign"
+}
\ No newline at end of file
diff --git "a/force-app/main/default/experiences/Consumable1/routes/\345\260\217\347\273\204\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json" "b/force-app/main/default/experiences/Consumable1/routes/\345\260\217\347\273\204\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
index ccc9df9..940130b 100644
--- "a/force-app/main/default/experiences/Consumable1/routes/\345\260\217\347\273\204\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
+++ "b/force-app/main/default/experiences/Consumable1/routes/\345\260\217\347\273\204\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
@@ -1,9 +1,9 @@
{
- "activeViewId": "6c787120-bb1e-4d47-b4b2-7fa80ac6d3fb",
- "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
- "id": "62e1b94d-3ec3-4306-856c-75c669288587",
- "label": "灏忕粍 闁㈤�ｃ儶銈广儓",
- "routeType": "relatedlist-0F9",
- "type": "route",
- "urlPrefix": "group"
-}
+ "activeViewId" : "6c787120-bb1e-4d47-b4b2-7fa80ac6d3fb",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "62e1b94d-3ec3-4306-856c-75c669288587",
+ "label" : "灏忕粍 闁㈤�ｃ儶銈广儓",
+ "routeType" : "relatedlist-0F9",
+ "type" : "route",
+ "urlPrefix" : "group"
+}
\ No newline at end of file
diff --git "a/force-app/main/default/experiences/Consumable1/routes/\346\212\245\350\241\250\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json" "b/force-app/main/default/experiences/Consumable1/routes/\346\212\245\350\241\250\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
index 5a543d2..f2b9d79 100644
--- "a/force-app/main/default/experiences/Consumable1/routes/\346\212\245\350\241\250\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
+++ "b/force-app/main/default/experiences/Consumable1/routes/\346\212\245\350\241\250\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
@@ -1,9 +1,9 @@
{
- "activeViewId": "4dff72f1-db87-40bc-a8d6-36073e365a18",
- "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
- "id": "30959f3b-57e5-4a9f-b58c-7c1a9aaf9836",
- "label": "鎶ヨ〃 闁㈤�ｃ儶銈广儓",
- "routeType": "relatedlist-00O",
- "type": "route",
- "urlPrefix": "report"
-}
+ "activeViewId" : "4dff72f1-db87-40bc-a8d6-36073e365a18",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "30959f3b-57e5-4a9f-b58c-7c1a9aaf9836",
+ "label" : "鎶ヨ〃 闁㈤�ｃ儶銈广儓",
+ "routeType" : "relatedlist-00O",
+ "type" : "route",
+ "urlPrefix" : "report"
+}
\ No newline at end of file
diff --git "a/force-app/main/default/experiences/Consumable1/routes/\346\226\207\344\273\266\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json" "b/force-app/main/default/experiences/Consumable1/routes/\346\226\207\344\273\266\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
index 614e7d5..f385588 100644
--- "a/force-app/main/default/experiences/Consumable1/routes/\346\226\207\344\273\266\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
+++ "b/force-app/main/default/experiences/Consumable1/routes/\346\226\207\344\273\266\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
@@ -1,9 +1,9 @@
{
- "activeViewId": "3d5f9dc6-9374-4d60-8e41-d9ae76e732e3",
- "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
- "id": "629ebafc-04f3-4bfa-bc42-e7c310c2a59f",
- "label": "鏂囦欢 闁㈤�ｃ儶銈广儓",
- "routeType": "relatedlist-069",
- "type": "route",
- "urlPrefix": "contentdocument"
-}
+ "activeViewId" : "3d5f9dc6-9374-4d60-8e41-d9ae76e732e3",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "629ebafc-04f3-4bfa-bc42-e7c310c2a59f",
+ "label" : "鏂囦欢 闁㈤�ｃ儶銈广儓",
+ "routeType" : "relatedlist-069",
+ "type" : "route",
+ "urlPrefix" : "contentdocument"
+}
\ No newline at end of file
diff --git "a/force-app/main/default/experiences/Consumable1/routes/\346\265\201\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json" "b/force-app/main/default/experiences/Consumable1/routes/\346\265\201\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
index 11b3253..9add77d 100644
--- "a/force-app/main/default/experiences/Consumable1/routes/\346\265\201\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
+++ "b/force-app/main/default/experiences/Consumable1/routes/\346\265\201\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
@@ -1,9 +1,9 @@
{
- "activeViewId": "cd0d3153-1cca-4111-ae2a-08454a8fe698",
- "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
- "id": "e46a24a8-7707-472e-8bb4-daae7c059165",
- "label": "娴� 闁㈤�ｃ儶銈广儓",
- "routeType": "relatedlist-0Fq",
- "type": "route",
- "urlPrefix": "streams"
-}
+ "activeViewId" : "cd0d3153-1cca-4111-ae2a-08454a8fe698",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "e46a24a8-7707-472e-8bb4-daae7c059165",
+ "label" : "娴� 闁㈤�ｃ儶銈广儓",
+ "routeType" : "relatedlist-0Fq",
+ "type" : "route",
+ "urlPrefix" : "streams"
+}
\ No newline at end of file
diff --git "a/force-app/main/default/experiences/Consumable1/routes/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\345\210\227\350\241\250.json" "b/force-app/main/default/experiences/Consumable1/routes/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\345\210\227\350\241\250.json"
index 0550293..e5b91a5 100644
--- "a/force-app/main/default/experiences/Consumable1/routes/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\345\210\227\350\241\250.json"
+++ "b/force-app/main/default/experiences/Consumable1/routes/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\345\210\227\350\241\250.json"
@@ -1,10 +1,10 @@
{
- "activeViewId": "c331401c-5c71-4d88-9350-c5e8a79202c5",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "0bc8b231-a663-4b31-8bc2-7b3e5e625d81",
- "label": "娑堣�楀搧璁㈠崟 鍒楄〃",
- "objectApiName": "Consumable_order__c",
- "routeType": "list-a2K",
- "type": "route",
- "urlPrefix": "consumable-order"
-}
+ "activeViewId" : "293921b6-1a37-49a3-a225-be2f3471a41c",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "9d3bd2d5-0b87-4b44-adad-6044a25d08aa",
+ "label" : "娑堣�楀搧璁㈠崟 鍒楄〃",
+ "objectApiName" : "Consumable_order__c",
+ "routeType" : "list-a2K",
+ "type" : "route",
+ "urlPrefix" : "consumable-order"
+}
\ No newline at end of file
diff --git "a/force-app/main/default/experiences/Consumable1/routes/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\347\233\270\345\205\263\345\210\227\350\241\250.json" "b/force-app/main/default/experiences/Consumable1/routes/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\347\233\270\345\205\263\345\210\227\350\241\250.json"
index 258d66f..48c9c35 100644
--- "a/force-app/main/default/experiences/Consumable1/routes/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\347\233\270\345\205\263\345\210\227\350\241\250.json"
+++ "b/force-app/main/default/experiences/Consumable1/routes/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\347\233\270\345\205\263\345\210\227\350\241\250.json"
@@ -1,10 +1,10 @@
{
- "activeViewId": "3dd9b830-a644-429b-8b1c-e2770454179a",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "1c5bbf6d-ddab-45f3-a882-a7bac3128a9f",
- "label": "娑堣�楀搧璁㈠崟 鐩稿叧鍒楄〃",
- "objectApiName": "Consumable_order__c",
- "routeType": "relatedlist-a2K",
- "type": "route",
- "urlPrefix": "consumable-order"
-}
+ "activeViewId" : "54811d17-d3d4-47f5-b3a5-a9efd7a62afa",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "34031253-cc77-4f4e-8baf-c77ca2b9cc2a",
+ "label" : "娑堣�楀搧璁㈠崟 鐩稿叧鍒楄〃",
+ "objectApiName" : "Consumable_order__c",
+ "routeType" : "relatedlist-a2K",
+ "type" : "route",
+ "urlPrefix" : "consumable-order"
+}
\ No newline at end of file
diff --git "a/force-app/main/default/experiences/Consumable1/routes/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\350\257\246\347\273\206\344\277\241\346\201\257.json" "b/force-app/main/default/experiences/Consumable1/routes/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\350\257\246\347\273\206\344\277\241\346\201\257.json"
index 9b0a5e6..954f2cd 100644
--- "a/force-app/main/default/experiences/Consumable1/routes/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\350\257\246\347\273\206\344\277\241\346\201\257.json"
+++ "b/force-app/main/default/experiences/Consumable1/routes/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\350\257\246\347\273\206\344\277\241\346\201\257.json"
@@ -1,10 +1,10 @@
{
- "activeViewId": "ae18f3f9-5d00-46e8-96d1-86c0ec9719cc",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "7283136d-99d5-4982-bb41-02e2ebc00e5a",
- "label": "娑堣�楀搧璁㈠崟 璇︾粏淇℃伅",
- "objectApiName": "Consumable_order__c",
- "routeType": "detail-a2K",
- "type": "route",
- "urlPrefix": "consumable-order"
-}
+ "activeViewId" : "edf32642-ece4-4435-94c9-82eb6b8f67a9",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "e7af9c90-036b-4cee-921f-06d6ef72f826",
+ "label" : "娑堣�楀搧璁㈠崟 璇︾粏淇℃伅",
+ "objectApiName" : "Consumable_order__c",
+ "routeType" : "detail-a2K",
+ "type" : "route",
+ "urlPrefix" : "consumable-order"
+}
\ No newline at end of file
diff --git "a/force-app/main/default/experiences/Consumable1/routes/\347\224\250\346\210\267\343\203\252\343\202\271\343\203\210.json" "b/force-app/main/default/experiences/Consumable1/routes/\347\224\250\346\210\267\343\203\252\343\202\271\343\203\210.json"
index 0dfc94a..dac1f99 100644
--- "a/force-app/main/default/experiences/Consumable1/routes/\347\224\250\346\210\267\343\203\252\343\202\271\343\203\210.json"
+++ "b/force-app/main/default/experiences/Consumable1/routes/\347\224\250\346\210\267\343\203\252\343\202\271\343\203\210.json"
@@ -1,9 +1,9 @@
{
- "activeViewId": "09574ae1-7a1d-465b-852b-6604abee87c2",
- "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
- "id": "f61977d4-a8e8-4f2f-b5d3-52b1e7398240",
- "label": "鐢ㄦ埛 銉偣銉�",
- "routeType": "list-005",
- "type": "route",
- "urlPrefix": "profile"
-}
+ "activeViewId" : "09574ae1-7a1d-465b-852b-6604abee87c2",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "f61977d4-a8e8-4f2f-b5d3-52b1e7398240",
+ "label" : "鐢ㄦ埛 銉偣銉�",
+ "routeType" : "list-005",
+ "type" : "route",
+ "urlPrefix" : "profile"
+}
\ No newline at end of file
diff --git "a/force-app/main/default/experiences/Consumable1/routes/\347\224\250\346\210\267\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json" "b/force-app/main/default/experiences/Consumable1/routes/\347\224\250\346\210\267\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
index 37aebbf..7bef36f 100644
--- "a/force-app/main/default/experiences/Consumable1/routes/\347\224\250\346\210\267\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
+++ "b/force-app/main/default/experiences/Consumable1/routes/\347\224\250\346\210\267\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
@@ -1,9 +1,9 @@
{
- "activeViewId": "a7a75c83-a63d-4031-8a1a-524e45f77737",
- "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
- "id": "d938b950-7d64-43cc-b551-63aa85bd3198",
- "label": "鐢ㄦ埛 闁㈤�ｃ儶銈广儓",
- "routeType": "relatedlist-005",
- "type": "route",
- "urlPrefix": "profile"
-}
+ "activeViewId" : "a7a75c83-a63d-4031-8a1a-524e45f77737",
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id" : "d938b950-7d64-43cc-b551-63aa85bd3198",
+ "label" : "鐢ㄦ埛 闁㈤�ｃ儶銈广儓",
+ "routeType" : "relatedlist-005",
+ "type" : "route",
+ "urlPrefix" : "profile"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/themes/partnerCentral.json b/force-app/main/default/experiences/Consumable1/themes/partnerCentral.json
index 1657bd7..c1a3662 100644
--- a/force-app/main/default/experiences/Consumable1/themes/partnerCentral.json
+++ b/force-app/main/default/experiences/Consumable1/themes/partnerCentral.json
@@ -1,172 +1,148 @@
{
- "activeBrandingSetId": "57ae3440-8896-4020-a05b-a780ddaf46f0",
- "customCSS": ".siteforcePrmBody .cHeader .cBrandingLogo{\n width: 140px !important;\n height: 40px !important;\n}\n\n.siteforcePrmBody .comm-navigation{\n min-height:48px !important;\n}\n\n.siteforcePrmBody .comm-navigation .comm-navigation__item a, .siteforcePrmBody .comm-navigation .comm-navigation__item button{\n font-size:20px;\n}\n\ncAltToggleNav slds-icon_x-small{\n display:none;\n}\n\n.salesforceIdentityLoginBody2 .cCenterPanel{\n left:200px;\n top:-30px;\n min-width:320px !important;\n}\n.salesforceIdentityLoginForm2 .inputBox{\n min-width:180px !important;\n}\n\n.siteforcePrmBody .cHeader .forceSearchInputDesktop input, .siteforcePrmBody .cHeader .forceSearchInputDesktop input::placeholder{\n font-size:14px !important;\n}",
- "developerName": "prm",
- "id": "0c81955a-9ad5-4639-a11d-03665e570a65",
- "label": "Partner Central",
- "layouts": {
- "Inner": "39faaefb-3ef8-4fa6-a453-e348651dc20c",
- "Login": "84cd1ad9-7292-4b3d-9595-4e9b33dbb1ab",
- "ServiceNotAvailable": "16e1a319-5f46-4925-8a1d-7e4ee97b9b97"
+ "activeBrandingSetId" : "da39013d-fbc0-4c27-a7a2-5f9d07bdb4bd",
+ "customCSS" : ".siteforcePrmBody .cHeader .cBrandingLogo{\n width: 140px !important;\n height: 40px !important;\n pointer-events:none;\n}\n\n.siteforcePrmBody .comm-navigation{\n min-height:48px !important;\n}\n\n.siteforcePrmBody .comm-navigation .comm-navigation__item a, .siteforcePrmBody .comm-navigation .comm-navigation__item button{\n font-size:20px;\n}\n\ncAltToggleNav slds-icon_x-small{\n display:none;\n}\n\n.salesforceIdentityLoginBody2 .cCenterPanel{\n left:200px;\n top:-30px;\n min-width:320px !important;\n}\n.salesforceIdentityLoginForm2 .inputBox{\n min-width:180px !important;\n}\n\n.siteforcePrmBody .cHeader .forceSearchInputDesktop input, .siteforcePrmBody .cHeader .forceSearchInputDesktop input::placeholder{\n font-size:14px !important;\n}\n.slds-button_icon-more{\n display:none;\n}\na.slds-button{\n display:none;\n}\n\n.forcePageBlockItemView .slds-form-element .slds-button_icon {\n display: none;\n}\n.siteforcePrmBody .forceCommunityRecordDetail .forceRecordLayout .forcePageBlockSectionView .full.forcePageBlockItemView{\n pointer-events:none\n}\n\n.slds-nav-vertical__title{\n display:none;\n}\n.slds-nav-vertical__title:first-of-type {\n display: block;\n}\n.slds-nav-vertical .slds-nav-vertical__section.navItems.entityItems:nth-child(3){\n display: none!important;\n}",
+ "developerName" : "prm",
+ "id" : "dc3ec245-c32a-48fc-920e-8ff30c6cff7a",
+ "label" : "Partner Central",
+ "layouts" : {
+ "Inner" : "27b0f619-7930-4846-b53d-3eb904a52e9e",
+ "Login" : "d5b47306-6295-4d2d-a5d9-cb373be9c125",
+ "ServiceNotAvailable" : "1ed3aeb9-9205-4229-bfb0-71096321a26b"
},
- "type": "theme",
- "views": [
- {
- "componentAttributes": {},
- "componentName": "salesforceIdentity:loginBody2",
- "id": "84cd1ad9-7292-4b3d-9595-4e9b33dbb1ab",
- "label": "Login",
- "regions": [
- {
- "id": "a91c3512-ae18-4751-bcf0-80e8cd355d9b",
- "regionName": "header",
- "type": "region"
- },
- {
- "id": "b788957d-6263-4d64-8491-97ea0a5187a4",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "ba3b541d-6631-437f-a979-432ff99fdd30",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "type": "view"
+ "type" : "theme",
+ "views" : [ {
+ "componentAttributes" : { },
+ "componentName" : "salesforceIdentity:loginBody2",
+ "id" : "d5b47306-6295-4d2d-a5d9-cb373be9c125",
+ "label" : "Login",
+ "regions" : [ {
+ "id" : "74f03049-e17f-419d-b642-3406729e5ffe",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "id" : "0744fcb0-7421-49a4-8a25-eef41dc46740",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "74aa9402-e6be-4155-9d62-225d117a1754",
+ "regionName" : "footer",
+ "type" : "region"
+ } ],
+ "type" : "view"
+ }, {
+ "componentAttributes" : {
+ "IsDefaultHeaderHidden" : false,
+ "IsDefaultHeaderPositionFixed" : true,
+ "IsDefaultNotificationsHidden" : true,
+ "IsSearchBarHidden" : false,
+ "fixedPageWidth" : 1920,
+ "isPageWidthFixed" : true
},
- {
- "componentAttributes": {
- "IsDefaultHeaderHidden": false,
- "IsDefaultHeaderPositionFixed": true,
- "IsDefaultNotificationsHidden": true,
- "IsSearchBarHidden": false,
- "fixedPageWidth": 1920,
- "isPageWidthFixed": true
- },
- "componentName": "siteforce:prmBody",
- "id": "39faaefb-3ef8-4fa6-a453-e348651dc20c",
- "label": "Default",
- "regions": [
- {
- "id": "c5802569-2598-48b8-9441-b4c8f976a16c",
- "regionName": "customHeader",
- "type": "region"
+ "componentName" : "siteforce:prmBody",
+ "id" : "27b0f619-7930-4846-b53d-3eb904a52e9e",
+ "label" : "Default",
+ "regions" : [ {
+ "id" : "16bdf3ff-1315-4546-88a6-de32558d62ab",
+ "regionName" : "customHeader",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "maxAutoCompleteResults" : 5,
+ "searchLabel" : "鎼滅储...",
+ "searchObjects" : [ {
+ "isPublic" : true,
+ "name" : "Consumable_order__c"
+ }, {
+ "isPublic" : true,
+ "name" : "Consumable_order_details2__c"
+ }, {
+ "isPublic" : true,
+ "name" : "ContentDocument"
+ } ]
},
- {
- "components": [
- {
- "componentAttributes": {
- "maxAutoCompleteResults": 5,
- "searchLabel": "鎼滅储",
- "searchObjects": [
- {
- "isPublic": true,
- "name": "Agency_Report_Header__c"
- },
- {
- "isPublic": true,
- "name": "Consumable_order__c"
- }
- ]
- },
- "componentName": "forceCommunity:globalSearchInput",
- "id": "3c8dc360-c5d6-41fd-b1b0-8caec0d2377b",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "f6021099-2f13-462d-a2a5-3c8cd07eb5ad",
- "regionName": "search",
- "type": "region"
+ "componentName" : "forceCommunity:globalSearchInput",
+ "id" : "8675f0f3-1f0a-4d4b-a1e5-f49da3a754d6",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "7af0cf8c-92cf-45b1-a808-2c4edea02007",
+ "regionName" : "search",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "accountManagementLabel" : "Account Management",
+ "communityBuilderLabel" : "Experience Builder",
+ "communitySetupLabel" : "璁剧疆",
+ "contactSupportLabel" : "Contact Support",
+ "filterName" : "MyCases",
+ "homeLabel" : "涓婚〉",
+ "includeContactSupport" : false,
+ "includeMessages" : false,
+ "loginLabel" : "鐧诲綍",
+ "logoutLabel" : "閫�鍑�",
+ "myAccountLabel" : "鎴戠殑瀹㈡埛",
+ "showAccountManagement" : false,
+ "showUserSettings" : false,
+ "userSettingsLabel" : "My Settings",
+ "viewProfileLabel" : "涓汉淇℃伅"
},
- {
- "components": [
- {
- "componentAttributes": {
- "accountManagementLabel": "Account Management",
- "communityBuilderLabel": "Experience Builder",
- "communitySetupLabel": "Salesforce Setup",
- "contactSupportLabel": "Contact Support",
- "filterName": "MyCases",
- "homeLabel": "Home",
- "includeContactSupport": false,
- "includeMessages": false,
- "loginLabel": "Login",
- "logoutLabel": "Logout",
- "myAccountLabel": "My Account",
- "showAccountManagement": true,
- "showUserSettings": false,
- "userSettingsLabel": "My Settings",
- "viewProfileLabel": "My Profile"
- },
- "componentName": "selfService:userProfileMenu",
- "id": "c241566b-9bf8-43a6-a068-c176ff75109e",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "6a60ad26-0295-4a78-ab90-28fcd2c0531e",
- "regionName": "profileMenu",
- "type": "region"
+ "componentName" : "selfService:userProfileMenu",
+ "id" : "e9f75e24-e895-4c54-83c3-936329504b74",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "1f8acbb0-d430-44e9-a27f-695c6176b837",
+ "regionName" : "profileMenu",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "NavigationMenuEditorRefresh" : "Default_Navigation3",
+ "hideAppLauncher" : true,
+ "hideHomeText" : false
},
- {
- "components": [
- {
- "componentAttributes": {
- "NavigationMenuEditorRefresh": "Default_Navigation3",
- "hideAppLauncher": true,
- "hideHomeText": false
- },
- "componentName": "forceCommunity:globalNavigation",
- "id": "932fd9d7-f187-457d-83af-d59077849505",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "7475eca5-ac9b-46dd-bda0-15fee73ff99a",
- "regionName": "navBar",
- "type": "region"
- },
- {
- "id": "f932ec44-4720-4579-b9bb-014a3c718815",
- "regionName": "customRegion",
- "type": "region"
- },
- {
- "id": "0e9bcb14-01ed-4e78-b6a0-f04805ae5206",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "type": "view"
+ "componentName" : "forceCommunity:globalNavigation",
+ "id" : "ef1a7404-2c49-4de2-82fd-cfcd351cc65a",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "ce986e45-573a-4449-821c-c1d048044cd6",
+ "regionName" : "navBar",
+ "type" : "region"
+ }, {
+ "id" : "d389ebfc-0fde-47e7-93c5-1181c3a80075",
+ "regionName" : "customRegion",
+ "type" : "region"
+ }, {
+ "id" : "773b1fa0-0bcd-4b2e-81f7-a88ac559a6bf",
+ "regionName" : "footer",
+ "type" : "region"
+ } ],
+ "type" : "view"
+ }, {
+ "componentAttributes" : {
+ "fixedPageWidth" : 1170,
+ "headerBgColor" : "rgba(0, 0, 0, 0)",
+ "isHeaderPinned" : false,
+ "isHeroUnderHeader" : false,
+ "isPageWidthFixed" : true,
+ "showHeader" : true,
+ "showHero" : true
},
- {
- "componentAttributes": {
- "fixedPageWidth": 1170,
- "headerBgColor": "rgba(0, 0, 0, 0)",
- "isHeaderPinned": false,
- "isHeroUnderHeader": false,
- "isPageWidthFixed": true,
- "showHeader": true,
- "showHero": true
- },
- "componentName": "siteforce:themeLayoutStarter",
- "id": "16e1a319-5f46-4925-8a1d-7e4ee97b9b97",
- "label": "ServiceNotAvailable",
- "regions": [
- {
- "id": "a4d1a1d0-2316-47b2-8a3a-2e1a6fa7c860",
- "regionName": "themeHeader",
- "type": "region"
- },
- {
- "id": "649ab6db-a997-4384-970f-554fd7658ea8",
- "regionName": "themeFooter",
- "type": "region"
- }
- ],
- "type": "view"
- }
- ]
-}
+ "componentName" : "siteforce:themeLayoutStarter",
+ "id" : "1ed3aeb9-9205-4229-bfb0-71096321a26b",
+ "label" : "ServiceNotAvailable",
+ "regions" : [ {
+ "id" : "a29c8ac1-de42-4098-910c-b4c76b635e54",
+ "regionName" : "themeHeader",
+ "type" : "region"
+ }, {
+ "id" : "a2b35d26-5d76-47c4-9dd0-cfff946cd7c7",
+ "regionName" : "themeFooter",
+ "type" : "region"
+ } ],
+ "type" : "view"
+ } ]
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/variations/defaultCustomComponentPropertiesComponentProperties.json b/force-app/main/default/experiences/Consumable1/variations/defaultCustomComponentPropertiesComponentProperties.json
index 94bf10b..3fbfdc5 100644
--- a/force-app/main/default/experiences/Consumable1/variations/defaultCustomComponentPropertiesComponentProperties.json
+++ b/force-app/main/default/experiences/Consumable1/variations/defaultCustomComponentPropertiesComponentProperties.json
@@ -1,17 +1,15 @@
{
- "componentVariants": [
- {
- "id": "5a61b685-6f3e-4b96-979f-4aa7aa2ecc1f",
- "propertyOverrides": {
- "componentAttributes": {
- "NavigationMenuEditorRefresh": "ENGUser"
- }
- },
- "targetId": "ef1a7404-2c49-4de2-82fd-cfcd351cc65a",
- "type": "componentVariant"
- }
- ],
- "developerName": "Default_CustomComponent_Properties_Component_Properties",
- "id": "5cd60da6-8927-4324-9ed5-e03ab9ab5da6",
- "type": "experienceVariation"
-}
+ "componentVariants" : [ {
+ "id" : "5a61b685-6f3e-4b96-979f-4aa7aa2ecc1f",
+ "propertyOverrides" : {
+ "componentAttributes" : {
+ "NavigationMenuEditorRefresh" : "ENGUser"
+ }
+ },
+ "targetId" : "ef1a7404-2c49-4de2-82fd-cfcd351cc65a",
+ "type" : "componentVariant"
+ } ],
+ "developerName" : "Default_CustomComponent_Properties_Component_Properties",
+ "id" : "5cd60da6-8927-4324-9ed5-e03ab9ab5da6",
+ "type" : "experienceVariation"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/accountManagement.json b/force-app/main/default/experiences/Consumable1/views/accountManagement.json
index cbe9247..f2ab795 100644
--- a/force-app/main/default/experiences/Consumable1/views/accountManagement.json
+++ b/force-app/main/default/experiences/Consumable1/views/accountManagement.json
@@ -1,153 +1,129 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "fd91a176-37cc-4c72-887d-8a32f8472825",
- "label": "Account Management",
- "regions": [
- {
- "id": "262d4441-fd9c-4127-9986-4c9ad8587eba",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "richTextValue": " <h1 style=\"text-align: center;\"> <b style=\"font-size: 20px; color: #1e2443;\">Account Management</b> </h1> "
- },
- "componentName": "forceCommunity:richTextInline",
- "id": "3d0c495a-f911-45a0-9567-812a0743c581",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- },
- {
- "componentAttributes": {
- "tabsetConfig": {
- "UUID": "70bcdbb9-d991-42bc-b481-e7402ac6098d",
- "activeTab": "tab1",
- "tabs": [
- {
- "UUID": "a29aefd0-0fcc-4da9-9870-d36a8d0de93e",
- "allowGuestUser": false,
- "locked": false,
- "seedComponents": [
- {
- "attributes": {
- "customTitle": "Members",
- "parentRecordId": "{!CurrentUser.accountId}",
- "relatedListName": "Users",
- "showBreadCrumbs": "false",
- "showCustomTitle": "true",
- "showManualRefreshButton": "false",
- "showRowNumbers": "false"
- },
- "fqn": "forceCommunity:relatedList"
- }
- ],
- "tabKey": "tab1",
- "tabName": "Members"
- },
- {
- "UUID": "03536177-264d-43e3-8c3f-1214755f8b7b",
- "allowGuestUser": false,
- "locked": false,
- "seedComponents": [
- {
- "attributes": {
- "recordId": "{!CurrentUser.accountId}"
- },
- "fqn": "forceCommunity:accountBrandRecord"
- }
- ],
- "tabKey": "tab2",
- "tabName": "Branding"
- }
- ],
- "useOverflowMenu": false
- }
- },
- "componentName": "forceCommunity:tabset",
- "id": "70bcdbb9-d991-42bc-b481-e7402ac6098d",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {
- "customTitle": "Members",
- "parentRecordId": "{!CurrentUser.accountId}",
- "relatedListName": "Users",
- "showBreadCrumbs": false,
- "showCustomTitle": true,
- "showManualRefreshButton": false,
- "showRowNumbers": false
- },
- "componentName": "forceCommunity:relatedList",
- "id": "a9efd81a-d6fa-448b-93cf-280e7c6ef46c",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "a29aefd0-0fcc-4da9-9870-d36a8d0de93e",
- "regionLabel": "Members",
- "regionName": "tab1",
- "renditionMap": {},
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "recordId": "{!CurrentUser.accountId}"
- },
- "componentName": "forceCommunity:accountBrandRecord",
- "id": "18ef9967-2369-484a-83db-f4c32494e9cc",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "03536177-264d-43e3-8c3f-1214755f8b7b",
- "regionLabel": "Branding",
- "regionName": "tab2",
- "renditionMap": {},
- "type": "region"
- }
- ],
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "198e4bed-7a3a-4a56-a15a-d354e55d5624",
+ "label" : "Account Management",
+ "regions" : [ {
+ "id" : "202c6d5b-0e3e-4ee4-9327-bb9e056f5ccd",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "richTextValue" : " <h1 style=\"text-align: center;\"> <b style=\"font-size: 20px; color: #1e2443;\">Account Management</b> </h1> "
+ },
+ "componentName" : "forceCommunity:richTextInline",
+ "id" : "23086da8-7c2e-4db2-9d92-e2cb300415db",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ }, {
+ "componentAttributes" : {
+ "tabsetConfig" : {
+ "UUID" : "65ec293d-c556-4ebb-a718-1d2091eebe82",
+ "activeTab" : "tab1",
+ "tabs" : [ {
+ "UUID" : "507fb429-2282-49b5-8878-f05f01f9861a",
+ "allowGuestUser" : false,
+ "locked" : false,
+ "seedComponents" : [ {
+ "attributes" : {
+ "customTitle" : "Members",
+ "parentRecordId" : "{!CurrentUser.accountId}",
+ "relatedListName" : "Users",
+ "showBreadCrumbs" : "false",
+ "showCustomTitle" : "true",
+ "showManualRefreshButton" : "false",
+ "showRowNumbers" : "false"
+ },
+ "fqn" : "forceCommunity:relatedList"
+ } ],
+ "tabKey" : "tab1",
+ "tabName" : "Members"
+ }, {
+ "UUID" : "c61e3f16-c77e-49f2-b596-d89451128362",
+ "allowGuestUser" : false,
+ "locked" : false,
+ "seedComponents" : [ {
+ "attributes" : {
+ "recordId" : "{!CurrentUser.accountId}"
+ },
+ "fqn" : "forceCommunity:accountBrandRecord"
+ } ],
+ "tabKey" : "tab2",
+ "tabName" : "Branding"
+ } ],
+ "useOverflowMenu" : false
}
- ],
- "id": "994d71b3-70bd-4c11-a9a5-343ca297dc90",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "dd298082-15f8-418d-9f95-7384993b0791",
- "regionName": "footer",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "Account Management"
+ },
+ "componentName" : "forceCommunity:tabset",
+ "id" : "65ec293d-c556-4ebb-a718-1d2091eebe82",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : {
+ "customTitle" : "Members",
+ "parentRecordId" : "{!CurrentUser.accountId}",
+ "relatedListName" : "Users",
+ "showBreadCrumbs" : false,
+ "showCustomTitle" : true,
+ "showManualRefreshButton" : false,
+ "showRowNumbers" : false
},
- "componentName": "forceCommunity:seoAssistant",
- "id": "675eddaf-9bb9-4932-86dd-ee69780ecb3d",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "0736aa4d-5574-41f3-8504-6e9ab73263f2",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "account-management"
-}
+ "componentName" : "forceCommunity:relatedList",
+ "id" : "1054405a-fda1-450b-a9ec-67e9be3839fb",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "507fb429-2282-49b5-8878-f05f01f9861a",
+ "regionLabel" : "Members",
+ "regionName" : "tab1",
+ "renditionMap" : { },
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "recordId" : "{!CurrentUser.accountId}"
+ },
+ "componentName" : "forceCommunity:accountBrandRecord",
+ "id" : "7b84436c-612b-4042-b9c4-411d9fbe0957",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "c61e3f16-c77e-49f2-b596-d89451128362",
+ "regionLabel" : "Branding",
+ "regionName" : "tab2",
+ "renditionMap" : { },
+ "type" : "region"
+ } ],
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "9d9976f8-dd44-4d6f-91c8-06440b957386",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "3583c796-50b6-4943-86ba-e0f908a892d2",
+ "regionName" : "footer",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "Account Management"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "e6b1c498-01fb-4b0d-b21f-55bfa86e605b",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "786a718c-93c1-484e-8839-716d2b615d06",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "account-management"
+}
\ No newline at end of file
diff --git "a/force-app/main/default/experiences/Consumable1/views/cIC\343\203\252\343\202\271\343\203\210.json" "b/force-app/main/default/experiences/Consumable1/views/cIC\343\203\252\343\202\271\343\203\210.json"
index 9f0a890..45e3a08 100644
--- "a/force-app/main/default/experiences/Consumable1/views/cIC\343\203\252\343\202\271\343\203\210.json"
+++ "b/force-app/main/default/experiences/Consumable1/views/cIC\343\203\252\343\202\271\343\203\210.json"
@@ -1,52 +1,46 @@
{
- "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "708367ab-41a2-4633-a93a-1a54141f1f48",
- "label": "CIC 銉偣銉�",
- "regions": [
- {
- "id": "2c3dbc4b-bfd9-4394-af4f-e60cb9fdcb79",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "enableInlineEdit": true,
- "filterName": "{!filterId}",
- "layout": "FULL",
- "pageSize": 25,
- "scope": "{!objectName}",
- "showActionBar": true,
- "showChartsPanel": true,
- "showDisplay": "showall",
- "showFilterPanel": true,
- "showImageIcon": true,
- "showManualRefreshButton": true,
- "showObjectName": true,
- "showPinnedList": true,
- "showSearchBar": true
- },
- "componentName": "forceCommunity:objectHome",
- "id": "5f77c48f-42c0-4c08-85cc-69eedde9ea24",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "2e605af4-63d3-4eae-beb4-fd599953e389",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "04eec419-32b1-46b5-9099-b2d8ee3f3b9f",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "list-500"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "708367ab-41a2-4633-a93a-1a54141f1f48",
+ "label" : "CIC 銉偣銉�",
+ "regions" : [ {
+ "id" : "2c3dbc4b-bfd9-4394-af4f-e60cb9fdcb79",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "enableInlineEdit" : true,
+ "filterName" : "{!filterId}",
+ "layout" : "FULL",
+ "pageSize" : 25,
+ "scope" : "{!objectName}",
+ "showActionBar" : true,
+ "showChartsPanel" : true,
+ "showDisplay" : "showall",
+ "showFilterPanel" : true,
+ "showImageIcon" : true,
+ "showManualRefreshButton" : true,
+ "showObjectName" : true,
+ "showPinnedList" : true,
+ "showSearchBar" : true
+ },
+ "componentName" : "forceCommunity:objectHome",
+ "id" : "5f77c48f-42c0-4c08-85cc-69eedde9ea24",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "2e605af4-63d3-4eae-beb4-fd599953e389",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "04eec419-32b1-46b5-9099-b2d8ee3f3b9f",
+ "regionName" : "footer",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "list-500"
+}
\ No newline at end of file
diff --git "a/force-app/main/default/experiences/Consumable1/views/cIC\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json" "b/force-app/main/default/experiences/Consumable1/views/cIC\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
index b2dc126..f70a1a3 100644
--- "a/force-app/main/default/experiences/Consumable1/views/cIC\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
+++ "b/force-app/main/default/experiences/Consumable1/views/cIC\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
@@ -1,45 +1,39 @@
{
- "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "23a3c897-7fcb-41da-8cff-7a8e8c2450a7",
- "label": "CIC 闁㈤�ｃ儶銈广儓",
- "regions": [
- {
- "id": "7800ff3e-33e5-4b19-bab9-8644728f37bf",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customTitle": "",
- "parentRecordId": "{!recordId}",
- "relatedListName": "{!relationshipApiName}",
- "showBreadCrumbs": true,
- "showCustomTitle": false,
- "showManualRefreshButton": true,
- "showRowNumbers": true
- },
- "componentName": "forceCommunity:relatedList",
- "id": "9812e67b-fdc1-44ce-a0fe-a77f759b1350",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "a0fd5eb9-914a-4c35-b584-0ff858f8c09f",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "22efa46a-6f6e-4300-8b97-ab5a253c1410",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "relatedlist-500"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "23a3c897-7fcb-41da-8cff-7a8e8c2450a7",
+ "label" : "CIC 闁㈤�ｃ儶銈广儓",
+ "regions" : [ {
+ "id" : "7800ff3e-33e5-4b19-bab9-8644728f37bf",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customTitle" : "",
+ "parentRecordId" : "{!recordId}",
+ "relatedListName" : "{!relationshipApiName}",
+ "showBreadCrumbs" : true,
+ "showCustomTitle" : false,
+ "showManualRefreshButton" : true,
+ "showRowNumbers" : true
+ },
+ "componentName" : "forceCommunity:relatedList",
+ "id" : "9812e67b-fdc1-44ce-a0fe-a77f759b1350",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "a0fd5eb9-914a-4c35-b584-0ff858f8c09f",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "22efa46a-6f6e-4300-8b97-ab5a253c1410",
+ "regionName" : "footer",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "relatedlist-500"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/campaignList.json b/force-app/main/default/experiences/Consumable1/views/campaignList.json
index d559691..1427787 100644
--- a/force-app/main/default/experiences/Consumable1/views/campaignList.json
+++ b/force-app/main/default/experiences/Consumable1/views/campaignList.json
@@ -1,150 +1,128 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "4908488d-d41c-4c3d-9f3e-c885a408863c",
- "label": "Campaign List",
- "regions": [
- {
- "id": "60c2bc90-4421-459e-b1ba-a2107f339447",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "tabsetConfig": {
- "UUID": "d016bcc8-d583-403f-98e1-b4cc52482162",
- "activeTab": "tab1",
- "tabs": [
- {
- "UUID": "05cfd9b7-fe86-42d7-ae45-913d15406f64",
- "allowGuestUser": true,
- "locked": false,
- "seedComponents": [
- {
- "attributes": {
- "richTextValue": " <p><br/></p> <p style="text-align:left;"> Use these campaigns to generate leads and grow your business </p> "
- },
- "fqn": "forceCommunity:richTextInline"
- },
- {
- "attributes": {},
- "fqn": "forceCommunity:campaignTileList"
- }
- ],
- "tabKey": "tab1",
- "tabName": "Campaign Marketplace"
- },
- {
- "UUID": "6b84f5c2-b5dd-4aae-b061-dbb84244686b",
- "allowGuestUser": true,
- "locked": false,
- "seedComponents": [
- {
- "attributes": {
- "filterName": "Recent",
- "scope": "Campaign"
- },
- "fqn": "forceCommunity:objectHome"
- }
- ],
- "tabKey": "tab2",
- "tabName": "All Campaigns"
- }
- ],
- "useOverflowMenu": false
- }
- },
- "componentName": "forceCommunity:tabset",
- "id": "d016bcc8-d583-403f-98e1-b4cc52482162",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {
- "richTextValue": " <p><br/></p> <p style="text-align:left;"> Use these campaigns to generate leads and grow your business </p> "
- },
- "componentName": "forceCommunity:richTextInline",
- "id": "5d79ac34-0177-4289-b5a8-ca6411a73449",
- "renditionMap": {},
- "type": "component"
- },
- {
- "componentAttributes": {
- "bodyField": "Description",
- "categoryField": "__",
- "dataFieldsConfig": "",
- "highlight": "__",
- "highlightColor": "#007DB8",
- "listLabel": "",
- "listViewName": "GIRctiveCampaignsR",
- "showImage": true,
- "sortBy": "Num__c",
- "sortOrder": "Ascending",
- "titleField": "Name"
- },
- "componentName": "forceCommunity:campaignTileList",
- "id": "6759af65-a1cb-4ed7-857d-7d1e8f5345aa",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "05cfd9b7-fe86-42d7-ae45-913d15406f64",
- "regionLabel": "Campaign Marketplace",
- "regionName": "tab1",
- "renditionMap": {},
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "enableInlineEdit": true,
- "filterName": "Recent",
- "layout": "FULL",
- "pageSize": 25,
- "scope": "Campaign",
- "showActionBar": true,
- "showChartsPanel": true,
- "showDisplay": "showall",
- "showFilterPanel": true,
- "showImageIcon": true,
- "showManualRefreshButton": true,
- "showObjectName": true,
- "showPinnedList": true,
- "showSearchBar": true
- },
- "componentName": "forceCommunity:objectHome",
- "id": "b172d17f-5066-4094-8678-182496badab9",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "6b84f5c2-b5dd-4aae-b061-dbb84244686b",
- "regionLabel": "All Campaigns",
- "regionName": "tab2",
- "renditionMap": {},
- "type": "region"
- }
- ],
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "f83414cc-cd96-4d24-94d6-1d6fdad65b83",
+ "label" : "Campaign List",
+ "regions" : [ {
+ "id" : "8cd141df-47bb-44e7-88e8-d6cf2dcb60e0",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "tabsetConfig" : {
+ "UUID" : "8eb696d0-116a-43bd-aacf-3dcb9d42f82a",
+ "activeTab" : "tab1",
+ "tabs" : [ {
+ "UUID" : "295af927-269e-4ae3-89c6-1065c44b9479",
+ "allowGuestUser" : true,
+ "locked" : false,
+ "seedComponents" : [ {
+ "attributes" : {
+ "richTextValue" : " <p><br/></p> <p style="text-align:left;"> Use these campaigns to generate leads and grow your business </p> "
+ },
+ "fqn" : "forceCommunity:richTextInline"
+ }, {
+ "attributes" : { },
+ "fqn" : "forceCommunity:campaignTileList"
+ } ],
+ "tabKey" : "tab1",
+ "tabName" : "Campaign Marketplace"
+ }, {
+ "UUID" : "41da809c-e1f0-44f4-b742-c33cfecac7ff",
+ "allowGuestUser" : true,
+ "locked" : false,
+ "seedComponents" : [ {
+ "attributes" : {
+ "filterName" : "Recent",
+ "scope" : "Campaign"
+ },
+ "fqn" : "forceCommunity:objectHome"
+ } ],
+ "tabKey" : "tab2",
+ "tabName" : "All Campaigns"
+ } ],
+ "useOverflowMenu" : false
}
- ],
- "id": "535cdff9-cb2b-4795-a86f-7ab08bee59c0",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "3c3ec81e-d8af-40ff-9335-930d66638643",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "list-701"
-}
+ },
+ "componentName" : "forceCommunity:tabset",
+ "id" : "8eb696d0-116a-43bd-aacf-3dcb9d42f82a",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : {
+ "richTextValue" : " <p><br/></p> <p style="text-align:left;"> Use these campaigns to generate leads and grow your business </p> "
+ },
+ "componentName" : "forceCommunity:richTextInline",
+ "id" : "ffe2df03-ba7f-4a7f-a8a2-c3e393c9cfaa",
+ "renditionMap" : { },
+ "type" : "component"
+ }, {
+ "componentAttributes" : {
+ "bodyField" : "Description",
+ "categoryField" : "__",
+ "dataFieldsConfig" : "",
+ "highlight" : "__",
+ "highlightColor" : "#007DB8",
+ "listLabel" : "",
+ "listViewName" : "GIRctiveCampaignsR",
+ "showImage" : true,
+ "sortBy" : "Num__c",
+ "sortOrder" : "Ascending",
+ "titleField" : "Name"
+ },
+ "componentName" : "forceCommunity:campaignTileList",
+ "id" : "b697c485-7d58-4403-a0ca-3ad0490ca174",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "295af927-269e-4ae3-89c6-1065c44b9479",
+ "regionLabel" : "Campaign Marketplace",
+ "regionName" : "tab1",
+ "renditionMap" : { },
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "enableInlineEdit" : true,
+ "filterName" : "Recent",
+ "layout" : "FULL",
+ "pageSize" : 25,
+ "scope" : "Campaign",
+ "showActionBar" : true,
+ "showChartsPanel" : true,
+ "showDisplay" : "showall",
+ "showFilterPanel" : true,
+ "showImageIcon" : true,
+ "showManualRefreshButton" : true,
+ "showObjectName" : true,
+ "showPinnedList" : true,
+ "showSearchBar" : true
+ },
+ "componentName" : "forceCommunity:objectHome",
+ "id" : "468384df-73f0-459b-8b3b-99cb260ace82",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "41da809c-e1f0-44f4-b742-c33cfecac7ff",
+ "regionLabel" : "All Campaigns",
+ "regionName" : "tab2",
+ "renditionMap" : { },
+ "type" : "region"
+ } ],
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "f05e4448-347d-4264-ba99-7d8afeb75c23",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "7627cbac-8224-4c40-ac93-186f3a47f991",
+ "regionName" : "footer",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "list-701"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/caseDetail.json b/force-app/main/default/experiences/Consumable1/views/caseDetail.json
index 9278367..8580e4c 100644
--- a/force-app/main/default/experiences/Consumable1/views/caseDetail.json
+++ b/force-app/main/default/experiences/Consumable1/views/caseDetail.json
@@ -1,76 +1,66 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "b17204f0-44a2-4866-abaf-23f750a97ddd",
- "label": "Case Detail",
- "regions": [
- {
- "id": "9c67d8f8-f7eb-4b96-a1a7-16b8062b3d57",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "recordId": "{!recordId}"
- },
- "componentName": "forceCommunity:recordHeadline",
- "id": "2c68dcfb-9f4e-4cac-b812-0ae412ff8733",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- },
- {
- "componentAttributes": {
- "detailsTabLabel": "Details",
- "discussionsTabLabel": "Feed",
- "recordId": "{!recordId}",
- "relatedTabLabel": "Related",
- "showLegacyActivityComposer": false,
- "tab1Type": "details",
- "tab2Type": "related",
- "tab3Type": "chatter",
- "tab4Type": "none",
- "timelineTabLabel": "Activity"
- },
- "componentName": "forceCommunity:recordHomeTabs",
- "id": "fd039f89-ba1f-4f3d-a270-52cbb83bb6e5",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "744079bf-ab73-462e-a23f-4f17a7b40b13",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "c3923904-a96f-479d-94da-8529e773dada",
- "regionName": "footer",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "{!Record._Object}: {!Record._Title}"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "d7c9dd3f-bed9-4be6-877e-a0aa3309ab58",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "6926117b-34c0-4fd7-b2c0-040443303e3e",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "detail-500"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "3b1b2646-af41-43d3-a519-528aa49f45f4",
+ "label" : "Case Detail",
+ "regions" : [ {
+ "id" : "1eb1822e-40d4-40a9-8504-a3bc8ae79809",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "recordId" : "{!recordId}"
+ },
+ "componentName" : "forceCommunity:recordHeadline",
+ "id" : "1602b68a-ea96-47ea-8132-0bba6301069a",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ }, {
+ "componentAttributes" : {
+ "detailsTabLabel" : "Details",
+ "discussionsTabLabel" : "Feed",
+ "recordId" : "{!recordId}",
+ "relatedTabLabel" : "Related",
+ "showLegacyActivityComposer" : false,
+ "tab1Type" : "details",
+ "tab2Type" : "related",
+ "tab3Type" : "chatter",
+ "tab4Type" : "none",
+ "timelineTabLabel" : "Activity"
+ },
+ "componentName" : "forceCommunity:recordHomeTabs",
+ "id" : "eb5335d5-d3df-4512-91ae-50c5403ea737",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "40f59663-263d-41c7-94ea-345dca5b494e",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "c47a29f6-4120-46fd-9cfb-e9724d01b1e8",
+ "regionName" : "footer",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "{!Record._Object}: {!Record._Title}"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "f8cd34d0-3569-404e-ad02-b6abae393992",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "28f1ae6f-7ab6-49c0-a8b1-4819fbedcae3",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "detail-500"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/checkPassword.json b/force-app/main/default/experiences/Consumable1/views/checkPassword.json
index d0fdc3c..9d1fd68 100644
--- a/force-app/main/default/experiences/Consumable1/views/checkPassword.json
+++ b/force-app/main/default/experiences/Consumable1/views/checkPassword.json
@@ -1,57 +1,58 @@
{
- "appPageId": "bfbf7350-cdcd-4e2c-97a5-ab51f2aa3b9d",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "14d5ae00-1629-429d-ac4f-b5abd28a21a3",
- "label": "Check Password",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {
- "richTextValue": "<p style=\"text-align: center;\"><span style=\"color: rgb(255, 255, 255); font-size: 22px;\">璇锋鏌ユ偍鐨勯偖绠�</span></p>"
- },
- "componentName": "forceCommunity:richTextInline",
- "id": "e9066c74-c45a-4512-a11b-755b5f5629bc",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- },
- {
- "componentAttributes": {
- "richTextValue": "<p style=\"text-align: center;\"><span style=\"color: rgb(255, 255, 255);\">妫�鏌ヤ笌鎮ㄧ殑鐢ㄦ埛鍚嶅叧鑱旂殑鐢靛瓙閭欢甯愭埛锛屼互鑾峰彇鏈夊叧閲嶇疆瀵嗙爜鐨勮鏄庛�傝璁颁綇鏌ョ湅鎮ㄧ殑鍨冨溇閭欢鏂囦欢澶癸紝鑷姩閭欢鏈夋椂浼氬湪鍏朵腑杩囨护銆傚鏋滄偍浠嶇劧鏃犳硶鐧诲綍锛岃鑱旂郴鎮ㄧ殑绠＄悊鍛樸��</span></p><p style=\"text-align: center;\"><br></p><p style=\"text-align: center;\"><a href=\"./\" rel=\"noopener noreferrer\" target=\"_self\" style=\"font-size: 16px; color: rgb(255, 255, 255);\"><strong>杩斿洖鐧诲綍</strong></a></p>"
- },
- "componentName": "forceCommunity:richTextInline",
- "id": "87485c52-d378-475d-895e-caeb1bdd08ac",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "ee29b16c-6260-473d-b315-a8b3e70d218f",
- "regionName": "content",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "Check Password"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "cee2921c-7188-455b-b121-8633b148aac3",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "e3ffa5e5-e5e0-49ac-b32f-953d1c6c7084",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Login",
- "type": "view",
- "viewType": "check-password"
-}
+ "appPageId" : "7756c67f-7774-4fe1-b1c2-eecb19f9c6a5",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "82d3f50a-42f2-4aa2-b028-7b07d878cd63",
+ "label" : "Check Password",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : {
+ "richTextValue" : "<p style=\"text-align: center;\"><span style=\"font-size: 22px; color: rgb(255, 255, 255);\">璇疯緭鍏ユ偍鐨勯偖绠�</span></p>"
+ },
+ "componentName" : "forceCommunity:richTextInline",
+ "id" : "19245457-d13d-434e-9b0f-b0242a8ab8f4",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ }, {
+ "componentAttributes" : {
+ "richTextValue" : "<p style=\"text-align: center;\"><span style=\"color: rgb(255, 255, 255);\">妫�鏌ヤ笌鎮ㄧ殑鐢ㄦ埛鍚嶅叧鑱旂殑鐢靛瓙閭欢甯愭埛锛屼互鑾峰彇鏈夊叧閲嶇疆瀵嗙爜鐨勮鏄庛�傝璁颁綇鏌ョ湅鎮ㄧ殑鍨冨溇閭欢鏂囦欢澶癸紝鑷姩閭欢鏈夋椂浼氬湪鍏朵腑杩囨护銆傚鏋滄偍浠嶇劧鏃犳硶鐧诲綍锛岃鑱旂郴鎮ㄧ殑绠＄悊鍛�</span></p>"
+ },
+ "componentName" : "forceCommunity:richTextInline",
+ "id" : "402e03d5-588a-468f-9acf-adddef37b551",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ }, {
+ "componentAttributes" : {
+ "richTextValue" : "<p style=\"text-align: center;\"><a href=\"./\" rel=\"noopener noreferrer\" target=\"_blank\" style=\"color: rgb(255, 255, 255);\"><strong>杩斿洖鐧诲綍</strong></a></p>"
+ },
+ "componentName" : "forceCommunity:richTextInline",
+ "id" : "4ad83c2b-e483-49d6-9721-2245ea3567bf",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "9985d44e-a0e1-4ea8-8392-69ecd11b717a",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "Check Password"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "d9766929-20bd-4383-bb47-d081a8982254",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "cfc14d85-84ee-4928-9a0e-a5b204930def",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Login",
+ "type" : "view",
+ "viewType" : "check-password"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/consumableDetailFix.json b/force-app/main/default/experiences/Consumable1/views/consumableDetailFix.json
index af293b8..f54fb21 100644
--- a/force-app/main/default/experiences/Consumable1/views/consumableDetailFix.json
+++ b/force-app/main/default/experiences/Consumable1/views/consumableDetailFix.json
@@ -1,156 +1,132 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:dynamicLayout",
- "dataProviders": [],
- "id": "ae18f3f9-5d00-46e8-96d1-86c0ec9719cc",
- "label": "ConsumableDetail_fix",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {
- "background": "background: rgba(0,0,0,0)",
- "backgroundOverlay": "rgba(0,0,0,0.5)",
- "contentAreaWidth": 100,
- "sectionConfig": {
- "UUID": "c5216591-0210-4c09-a832-9b7a8c57c03f",
- "columns": [
- {
- "UUID": "192f0791-c2cd-4d37-953e-3b145ecdf320",
- "columnKey": "1",
- "columnName": "Column 1",
- "columnWidth": "12",
- "seedComponents": []
- }
- ]
- },
- "sectionHeight": 115
- },
- "componentName": "forceCommunity:section",
- "id": "c5216591-0210-4c09-a832-9b7a8c57c03f",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {
- "recordId": "{!recordId}"
- },
- "componentName": "forceCommunity:recordHeadline",
- "id": "6b924e95-ca67-4fab-87f2-d4d2286e13a7",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "192f0791-c2cd-4d37-953e-3b145ecdf320",
- "regionLabel": "Column 1",
- "regionName": "1",
- "renditionMap": {},
- "type": "region"
- }
- ],
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:dynamicLayout",
+ "dataProviders" : [ ],
+ "id" : "edf32642-ece4-4435-94c9-82eb6b8f67a9",
+ "label" : "ConsumableDetail_fix",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : {
+ "background" : "background: rgba(0,0,0,0)",
+ "backgroundOverlay" : "rgba(0,0,0,0.5)",
+ "contentAreaWidth" : 100,
+ "sectionConfig" : {
+ "UUID" : "2669d21c-e835-4689-a403-f77a18c9d715",
+ "columns" : [ {
+ "UUID" : "e9dbbc4b-efc6-4508-9533-9280eec53143",
+ "columnKey" : "1",
+ "columnName" : "Column 1",
+ "columnWidth" : "12",
+ "seedComponents" : [ ]
+ } ]
},
- {
- "componentAttributes": {
- "background": "background: rgba(0,0,0,0)",
- "backgroundOverlay": "rgba(0,0,0,0.5)",
- "contentAreaWidth": 100,
- "sectionConfig": {
- "UUID": "6ff941f3-4e49-4606-b575-e6c1111b189a",
- "columns": [
- {
- "UUID": "b39f19c2-e5bf-4dd1-8c92-f0e8ca28f43f",
- "columnKey": "1",
- "columnName": "Column 1",
- "columnWidth": "8",
- "seedComponents": []
- },
- {
- "UUID": "488034df-aeaa-4f35-a60f-f87855a1b359",
- "columnKey": "9f7d9",
- "columnName": "Column 2",
- "columnWidth": "4",
- "seedComponents": []
- }
- ]
- },
- "sectionHeight": 300
+ "sectionHeight" : 115
+ },
+ "componentName" : "forceCommunity:section",
+ "id" : "2669d21c-e835-4689-a403-f77a18c9d715",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : {
+ "recordId" : "{!recordId}"
},
- "componentName": "forceCommunity:section",
- "id": "6ff941f3-4e49-4606-b575-e6c1111b189a",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {
- "recordId": "{!recordId}"
- },
- "componentName": "forceCommunity:recordDetail",
- "id": "e13b2d88-d293-4f5f-92c3-114708265abb",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "b39f19c2-e5bf-4dd1-8c92-f0e8ca28f43f",
- "regionLabel": "Column 1",
- "regionName": "1",
- "renditionMap": {},
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "recordId": "{!recordId}",
- "width": "MEDIUM"
- },
- "componentName": "forceCommunity:relatedRecords",
- "id": "b85bf391-627a-4855-b35c-06ad17df77e7",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "488034df-aeaa-4f35-a60f-f87855a1b359",
- "regionLabel": "Column 2",
- "regionName": "9f7d9",
- "renditionMap": {},
- "type": "region"
- }
- ],
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "0dbd3738-5308-4691-90ef-2ca7435f6c0d",
- "regionName": "content",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "{!Record._Object}: {!Record._Title}"
+ "componentName" : "forceCommunity:recordHeadline",
+ "id" : "73412524-f13e-4a0f-b81b-94cc87c0440c",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "e9dbbc4b-efc6-4508-9533-9280eec53143",
+ "regionLabel" : "Column 1",
+ "regionName" : "1",
+ "renditionMap" : { },
+ "type" : "region"
+ } ],
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ }, {
+ "componentAttributes" : {
+ "background" : "background: rgba(0,0,0,0)",
+ "backgroundOverlay" : "rgba(0,0,0,0.5)",
+ "contentAreaWidth" : 100,
+ "sectionConfig" : {
+ "UUID" : "ca5f02db-0367-4e6f-8d40-9a4c8ea72d7b",
+ "columns" : [ {
+ "UUID" : "4bd8dfe7-7509-4b99-ad0a-0b6c9eb193bf",
+ "columnKey" : "1",
+ "columnName" : "Column 1",
+ "columnWidth" : "8",
+ "seedComponents" : [ ]
+ }, {
+ "UUID" : "3aa51a7e-96bb-475b-96b3-7cd6fe4a14af",
+ "columnKey" : "a2a96",
+ "columnName" : "Column 2",
+ "columnWidth" : "4",
+ "seedComponents" : [ ]
+ } ]
+ },
+ "sectionHeight" : 300
+ },
+ "componentName" : "forceCommunity:section",
+ "id" : "ca5f02db-0367-4e6f-8d40-9a4c8ea72d7b",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : {
+ "recordId" : "{!recordId}"
},
- "componentName": "forceCommunity:seoAssistant",
- "id": "d53c3fbf-b313-4cc9-ac51-c415bdb3a8c7",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "7edf4894-febc-4588-b8ec-a1600a9a04d3",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "detail-a2K"
-}
+ "componentName" : "forceCommunity:recordDetail",
+ "id" : "8804e9ec-b2a3-41f4-b8be-6a0443bea1e7",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "4bd8dfe7-7509-4b99-ad0a-0b6c9eb193bf",
+ "regionLabel" : "Column 1",
+ "regionName" : "1",
+ "renditionMap" : { },
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "recordId" : "{!recordId}",
+ "width" : "MEDIUM"
+ },
+ "componentName" : "forceCommunity:relatedRecords",
+ "id" : "eda1b3f7-603a-4290-a4b4-0bdd5bfea4ec",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "3aa51a7e-96bb-475b-96b3-7cd6fe4a14af",
+ "regionLabel" : "Column 2",
+ "regionName" : "a2a96",
+ "renditionMap" : { },
+ "type" : "region"
+ } ],
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "e0d975de-d0c9-499e-9c79-15b3de367011",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "{!Record._Object}: {!Record._Title}"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "d1ccd1e3-344a-42e4-b66e-81c4ac575f87",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "926e94d2-26ee-49b8-9085-abb739f639ee",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "detail-a2K"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/contactSupport.json b/force-app/main/default/experiences/Consumable1/views/contactSupport.json
index 04bc286..e094644 100644
--- a/force-app/main/default/experiences/Consumable1/views/contactSupport.json
+++ b/force-app/main/default/experiences/Consumable1/views/contactSupport.json
@@ -1,106 +1,94 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:sldsTwoCol66Layout",
- "dataProviders": [],
- "id": "112e477b-4a73-4f9d-9e34-ebb2efff5acd",
- "label": "Contact Support",
- "regions": [
- {
- "id": "3fac5382-70c4-4d82-9a05-196fbcfce6ce",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "allowAttachments": true,
- "attachmentLabel": "Upload File",
- "buttonAlignment": "center",
- "buttonBgColor": "",
- "buttonBgHoverColor": "",
- "buttonBorderColor": "",
- "buttonMaxWidth": "",
- "buttonRadius": 0,
- "buttonTextColor": "",
- "buttonTextHoverColor": "",
- "callToAction": false,
- "callToActionButtonText": "",
- "callToActionText": "",
- "callToActionUrl": "",
- "confirmationSubtext": "We鈥檒l get back to you soon.",
- "confirmationText": "Your case was created.",
- "guestQuickActionName": "閫夋嫨鎴栭厤缃叏灞�鎿嶄綔",
- "headerSubtitle": "Tell us how we can help.",
- "headerTitle": "Contact Customer Support",
- "isMicrobatch": false,
- "quickActionName": "",
- "requestSummaryText": "Case summary"
- },
- "componentName": "forceCommunity:contactSupportForm",
- "id": "6ccb7e63-0255-4dd9-995a-4d52b12e4311",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "ef1eb48b-62cf-4b6b-bb30-a9783f410efb",
- "regionName": "content",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "askConfirmationQuestion": true,
- "confirmationMessageLabel": "Got it!",
- "deflectionSubtitle": "Find what you need here.",
- "deflectionTitle": "Need Answers Fast?",
- "firstQuestion": "Did this content solve your issue?",
- "maxResults": 6,
- "measureDeflection": true,
- "redirectUrl": "",
- "secondQuestion": "Stop creating your case?",
- "showArticles": true,
- "showDiscussions": false,
- "topicId": ""
- },
- "componentName": "forceCommunity:caseDeflection",
- "id": "f2a0a519-1464-4325-a800-2ec01165be89",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "6dc7c8e1-bb5d-48b0-ba00-fa97b9cfeced",
- "regionName": "sidebar",
- "type": "region"
- },
- {
- "id": "c2e93eba-7820-4af2-bd14-a67cca438b33",
- "regionName": "footer",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "Contact Support"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "dc9640dc-b460-4a6b-a845-7e753a94d360",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "d377d055-e453-4ad9-a2ab-572a3e788983",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "contactsupport"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:sldsTwoCol66Layout",
+ "dataProviders" : [ ],
+ "id" : "e8279a27-ff8f-42fc-9bd1-53b3f59350ab",
+ "label" : "Contact Support",
+ "regions" : [ {
+ "id" : "4ad609eb-6693-4846-a08e-e4fa961e9991",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "allowAttachments" : true,
+ "attachmentLabel" : "Upload File",
+ "buttonAlignment" : "center",
+ "buttonBgColor" : "",
+ "buttonBgHoverColor" : "",
+ "buttonBorderColor" : "",
+ "buttonMaxWidth" : "",
+ "buttonRadius" : 0,
+ "buttonTextColor" : "",
+ "buttonTextHoverColor" : "",
+ "callToAction" : false,
+ "callToActionButtonText" : "",
+ "callToActionText" : "",
+ "callToActionUrl" : "",
+ "confirmationSubtext" : "We鈥檒l get back to you soon.",
+ "confirmationText" : "Your case was created.",
+ "guestQuickActionName" : "閫夋嫨鎴栭厤缃叏灞�鎿嶄綔",
+ "headerSubtitle" : "Tell us how we can help.",
+ "headerTitle" : "Contact Customer Support",
+ "isMicrobatch" : false,
+ "quickActionName" : "",
+ "requestSummaryText" : "Case summary"
+ },
+ "componentName" : "forceCommunity:contactSupportForm",
+ "id" : "31e9512a-f8de-4d46-8f19-5c2afaf7b18b",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "d2619a80-c4a9-449f-8dd4-4305e7c1e81c",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "askConfirmationQuestion" : true,
+ "confirmationMessageLabel" : "Got it!",
+ "deflectionSubtitle" : "Find what you need here.",
+ "deflectionTitle" : "Need Answers Fast?",
+ "firstQuestion" : "Did this content solve your issue?",
+ "maxResults" : 6,
+ "measureDeflection" : true,
+ "redirectUrl" : "",
+ "secondQuestion" : "Stop creating your case?",
+ "showArticles" : true,
+ "showDiscussions" : false,
+ "topicId" : ""
+ },
+ "componentName" : "forceCommunity:caseDeflection",
+ "id" : "647280c4-1a9d-4551-a0fd-1323f11625af",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "3c86f83b-c2fa-41ed-bef6-f6d97c96253c",
+ "regionName" : "sidebar",
+ "type" : "region"
+ }, {
+ "id" : "bacb957e-44f3-481a-aa70-7b45c0c9ba1e",
+ "regionName" : "footer",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "Contact Support"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "d0de04cd-88a3-4905-a36c-bbf4e97b7707",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "0b6a520d-0f34-4411-a3c9-c360b06d30fa",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "contactsupport"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/createRecord.json b/force-app/main/default/experiences/Consumable1/views/createRecord.json
index 5f6746c..ec2e970 100644
--- a/force-app/main/default/experiences/Consumable1/views/createRecord.json
+++ b/force-app/main/default/experiences/Consumable1/views/createRecord.json
@@ -1,27 +1,34 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "d64df38f-9de1-4248-9c13-ef41d110ffd8",
- "label": "Create Record",
- "regions": [
- {
- "id": "0ef64b23-8a56-4d87-9984-219633feaf24",
- "regionName": "header",
- "type": "region"
- },
- {
- "id": "33abd4a1-c8d6-4b2b-8df7-3ef0b829a56c",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "63eee37e-e8ea-4cae-b2a7-81328a5fefab",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "createrecord"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "0f63dfba-f74b-4011-a0d5-75fe665d7bfb",
+ "label" : "Create Record",
+ "regions" : [ {
+ "id" : "951aa7a1-efc5-4041-8929-3d980fe6f9b7",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "actionApiName" : "{!actionApiName}",
+ "isMicrobatch" : false
+ },
+ "componentName" : "forceCommunity:createRecordForm",
+ "id" : "21c870a6-c4cb-476f-8dde-6906530b418e",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "7f501f3e-1f42-4cf8-925e-d0e654c13ff3",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "23111281-f438-4296-b47a-773feea9a17e",
+ "regionName" : "footer",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "createrecord"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/dashboardDetail.json b/force-app/main/default/experiences/Consumable1/views/dashboardDetail.json
index 65f4914..45e6f1e 100644
--- a/force-app/main/default/experiences/Consumable1/views/dashboardDetail.json
+++ b/force-app/main/default/experiences/Consumable1/views/dashboardDetail.json
@@ -1,58 +1,49 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "47937364-e71b-469a-b996-317032189c45",
- "label": "Dashboard Detail",
- "regions": [
- {
- "id": "646d2c85-c6e9-4db7-8a6f-3c118c0c5ee8",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "height": "1065",
- "recordId": "{!recordId}"
- },
- "componentName": "forceCommunity:dashboard",
- "id": "d0f9abce-c4ac-4e23-a574-19da9a5024c3",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "e91e78ff-ac70-4d20-8301-fb1e76dedb9b",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "b1e7a1e2-39aa-47b7-a37d-75824027907a",
- "regionName": "footer",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "{!Record._Object}: {!Record._Title}"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "6d83a6d3-edaf-4f22-ac0c-92d6b220fd30",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "558015ea-19cc-4c77-aba2-c53f3cc764d9",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "detail-01Z"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "4544a0e2-5ddb-49d0-b154-3903b3e7fb68",
+ "label" : "Dashboard Detail",
+ "regions" : [ {
+ "id" : "cf059051-9545-478c-a076-e7ff4543d95f",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "height" : "1065",
+ "recordId" : "{!recordId}"
+ },
+ "componentName" : "forceCommunity:dashboard",
+ "id" : "a3426236-d100-4c2a-9655-6d6e3930b6df",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "38ddc7db-4ed1-42e3-9ee6-ef8459588b7f",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "d8f6f3ba-bac7-47a6-aa9c-12121409f9f2",
+ "regionName" : "footer",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "{!Record._Object}: {!Record._Title}"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "d12ac0ed-4451-4546-bb3f-07f3465b5d33",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "f48d58f3-43e0-47a0-ab8b-61f57ce68b15",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "detail-01Z"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/dashboardList.json b/force-app/main/default/experiences/Consumable1/views/dashboardList.json
index 2061c6b..0f0e0f3 100644
--- a/force-app/main/default/experiences/Consumable1/views/dashboardList.json
+++ b/force-app/main/default/experiences/Consumable1/views/dashboardList.json
@@ -1,37 +1,31 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "b59c266b-a1ad-47f9-bf26-a8295147505c",
- "label": "Dashboard List",
- "regions": [
- {
- "id": "33cc3069-d9f2-464b-9053-91112d7480d4",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {},
- "componentName": "forceCommunity:dashboardList",
- "id": "760458df-b4cc-46a5-beac-b21fde008f88",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "e38cff0d-f391-468b-a4cc-cf69b7eeabff",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "1045796b-cf40-4b2b-867e-ce02ce0a02dc",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "list-01Z"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "f10a3529-b77e-4ebc-9b99-281160c97c7f",
+ "label" : "Dashboard List",
+ "regions" : [ {
+ "id" : "aace5538-56aa-4a21-bb35-9a40c211bcb0",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : { },
+ "componentName" : "forceCommunity:dashboardList",
+ "id" : "1b31f86d-98da-4daf-b754-b394d38a581a",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "45be9d35-4310-4df5-a2ce-56f3a70c91cb",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "54a7dd8d-3042-44ce-834f-6a590085586d",
+ "regionName" : "footer",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "list-01Z"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/error.json b/force-app/main/default/experiences/Consumable1/views/error.json
index a98e867..5a61280 100644
--- a/force-app/main/default/experiences/Consumable1/views/error.json
+++ b/force-app/main/default/experiences/Consumable1/views/error.json
@@ -1,57 +1,48 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "48f1f5ec-b27a-4874-83fa-15e857b27699",
- "label": "Error",
- "regions": [
- {
- "id": "01af81bd-4eb5-4add-bd2a-5af47ca64f31",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "richTextValue": " <div class='slds-grid slds-grid--vertical slds-align--absolute-center slds-container--large'> <div class='slds-align-middle slds-m-bottom--xx-large slds-m-top--xx-large' alt='Page not available'> <img src='/sfsites/c/img/community/slds/messaging/illustration-page-not-found.png' class='slds-p-horizontal--large'/> </div> <h4 class='slds-text-align--center slds-text-heading--large slds-text-color--weak slds-m-bottom--small'>Page not available</h4> <p class='slds-text-align--center slds-text-heading--medium slds-text-color--weak'>Maybe the page was deleted, the URL is incorrect, or something else went wrong. If you know the page exists but you still can鈥檛 get to it, please ask the community administrator for help.</p> </div>"
- },
- "componentName": "forceCommunity:htmlBlock",
- "id": "24077521-3224-4633-840d-25c26a493f1d",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "748f88b6-3627-4078-9abe-c618059a8613",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "25077bd2-d3e5-440d-aa48-322dd23c2177",
- "regionName": "footer",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "Error"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "5ba201e2-05bb-479d-b173-7efc99ae56c5",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "d8d0e969-4c0d-4f6f-aa06-be29638f5fa3",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "error"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "f02c5a75-f64e-4716-b209-f9f1ef46d49a",
+ "label" : "Error",
+ "regions" : [ {
+ "id" : "04daa4a0-4d2d-46f9-bc70-f4ef28375c2d",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "richTextValue" : "<div class='slds-grid slds-grid--vertical slds-align--absolute-center slds-container--large'> <div class='slds-align-middle slds-m-bottom--xx-large slds-m-top--xx-large' alt='Page not available'> <img src='/sfsites/c/img/community/slds/messaging/illustration-page-not-found.png' class='slds-p-horizontal--large'/> </div> <h4 class='slds-text-align--center slds-text-heading--large slds-text-color--weak slds-m-bottom--small'>Page not available</h4> <p class='slds-text-align--center slds-text-heading--medium slds-text-color--weak'>Maybe the page was deleted, the URL is incorrect, or something else went wrong. If you know the page exists but you still can鈥檛 get to it, please ask the community administrator for help.</p> </div>"
+ },
+ "componentName" : "forceCommunity:htmlBlock",
+ "id" : "8f1aad62-6fd8-4a0a-bf73-603d03724841",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "a801a07b-dbc3-4650-9e01-934eabb7a789",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "e59b2192-4edb-4144-8f08-755e9e111518",
+ "regionName" : "footer",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "Error"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "f322e8e2-b32f-471c-a992-fdb40e009539",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "ac65174b-2219-479b-8ca4-6f679e28f7d4",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "error"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/feedDetail.json b/force-app/main/default/experiences/Consumable1/views/feedDetail.json
index 839f04a..237324c 100644
--- a/force-app/main/default/experiences/Consumable1/views/feedDetail.json
+++ b/force-app/main/default/experiences/Consumable1/views/feedDetail.json
@@ -1,39 +1,33 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "fefd7f80-945b-489b-8a4e-615884934641",
- "label": "Feed Detail",
- "regions": [
- {
- "id": "b3c377f9-ebc1-4ae5-8c28-f78f8bc9cdca",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "id": "{!recordId}"
- },
- "componentName": "forceCommunity:feedItemDetail",
- "id": "41ed8fa1-1f73-4385-a28f-faa0ecd561e3",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "2bf7238a-fe13-4617-8f6b-cd74a8ee0780",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "ba025857-7cad-4cea-9780-b8b86e89a9bf",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "feeditem-generic"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "eb28719b-06b5-4397-bf8d-667ec408ca46",
+ "label" : "Feed Detail",
+ "regions" : [ {
+ "id" : "6a9400e1-ad64-47ea-829f-6ce793c4ad02",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "id" : "{!recordId}"
+ },
+ "componentName" : "forceCommunity:feedItemDetail",
+ "id" : "59f29841-0c8d-40d7-83ba-c590f2214d4e",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "d66f961b-0bba-4472-9a69-13676f89b28e",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "04b45900-4d8a-4452-86c8-ca0c8b030bd5",
+ "regionName" : "footer",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "feeditem-generic"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/fileDetail.json b/force-app/main/default/experiences/Consumable1/views/fileDetail.json
index 29cc081..985d7df 100644
--- a/force-app/main/default/experiences/Consumable1/views/fileDetail.json
+++ b/force-app/main/default/experiences/Consumable1/views/fileDetail.json
@@ -1,37 +1,31 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "cbccf1c1-b50f-4c66-9dbd-9be4accededd",
- "label": "File Detail",
- "regions": [
- {
- "id": "f14be551-933a-4a05-944a-68e824e2f1f5",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {},
- "componentName": "forceCommunity:fileDetailPage",
- "id": "122674c6-a847-4043-ae63-b059b3963a61",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "c1598287-4d0a-4195-8935-e6bd18495b19",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "2c5abc89-16a5-4df8-a4c8-e3bc22a258dd",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "detail-069"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "2322115a-ac65-4862-9104-912d42fca69a",
+ "label" : "File Detail",
+ "regions" : [ {
+ "id" : "d076ed42-1664-4b15-96ee-70c0eb0707ef",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : { },
+ "componentName" : "forceCommunity:fileDetailPage",
+ "id" : "1782e7b6-53ac-4493-bffe-00fe18a9a42f",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "89a0e125-284e-4240-bf7a-52e32979cf3e",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "efd311f4-16ab-4cf8-9d82-bdeda1722dfb",
+ "regionName" : "footer",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "detail-069"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/fileList.json b/force-app/main/default/experiences/Consumable1/views/fileList.json
index 433007d..90ef0b1 100644
--- a/force-app/main/default/experiences/Consumable1/views/fileList.json
+++ b/force-app/main/default/experiences/Consumable1/views/fileList.json
@@ -1,39 +1,33 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "eace253f-203f-4414-a7a4-a2d9c47deb3d",
- "label": "File List",
- "regions": [
- {
- "id": "86a4e739-1949-4199-9687-9d9e5a0e8b7b",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "pageSize": 25
- },
- "componentName": "forceCommunity:filesList",
- "id": "8d8b9ad4-91c1-44c2-b566-b5ddec17c62d",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "0ceef01d-d0aa-44fa-87e6-a36a92fe73ce",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "91694ac3-024d-4480-b8f2-b82180070fd1",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "list-069"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "193807a6-e99f-4075-9811-62dda5b13d43",
+ "label" : "File List",
+ "regions" : [ {
+ "id" : "af6a54e4-65cf-4412-831e-3d55625076ae",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "pageSize" : 25
+ },
+ "componentName" : "forceCommunity:filesList",
+ "id" : "11e918ad-fc08-4907-8d8c-5aaddd9a92e8",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "4a7c43a0-6939-4ea5-b8a4-b69789506c76",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "f720b89f-67f7-40d3-9eb0-f56d0fc7d379",
+ "regionName" : "footer",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "list-069"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/flow.json b/force-app/main/default/experiences/Consumable1/views/flow.json
index 17bf5ff..88012be 100644
--- a/force-app/main/default/experiences/Consumable1/views/flow.json
+++ b/force-app/main/default/experiences/Consumable1/views/flow.json
@@ -1,37 +1,34 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "17c9c45c-4c81-49d0-985e-d6281d899320",
- "label": "Flow",
- "regions": [
- {
- "id": "bf7ef746-6791-4aa9-a096-0038d427dee1",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {},
- "componentName": "c:RetrospectiveWeeklyReport",
- "id": "fadeafaa-5cf8-497e-8561-cb2c463012c0",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "1e71465d-b903-4a32-b4bc-21003f85b882",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "496f34a6-ba4c-4796-8afd-00fed3cb7882",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "flow"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "4aa9507c-1470-43b3-8000-390325f6bd7d",
+ "label" : "Flow",
+ "regions" : [ {
+ "id" : "4d7e2fae-45a7-4b69-9005-de342f942f38",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "flowArguments" : "",
+ "flowName" : "{!flowName}"
+ },
+ "componentName" : "forceCommunity:flowCommunity",
+ "id" : "45d0d38f-558e-4351-99c6-e14557f11731",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "96c3caa0-6524-4903-8de2-aad59a4c6e03",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "6ac44c78-d53b-4560-bbff-73d0b87baa93",
+ "regionName" : "footer",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "flow"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/forgotPassword.json b/force-app/main/default/experiences/Consumable1/views/forgotPassword.json
index b6503fe..ca32b4f 100644
--- a/force-app/main/default/experiences/Consumable1/views/forgotPassword.json
+++ b/force-app/main/default/experiences/Consumable1/views/forgotPassword.json
@@ -1,79 +1,69 @@
{
- "appPageId": "bfbf7350-cdcd-4e2c-97a5-ab51f2aa3b9d",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "367df6e8-480c-4b75-9718-1ebcfc8d57c1",
- "label": "Forgot Password",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {
- "richTextValue": "<p style=\"text-align: center;\"><span style=\"color: rgb(255, 255, 255); font-size: 22px;\">閲嶇疆瀵嗙爜</span></p>"
- },
- "componentName": "forceCommunity:richTextInline",
- "id": "78431e15-96d3-47e5-90a4-060c0580d9f1",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- },
- {
- "componentAttributes": {
- "richTextValue": "<p style=\"text-align: center;\"><span style=\"color: rgb(255, 255, 255);\">璇疯緭鍏ユ偍鐨勭敤鎴峰悕</span></p>"
- },
- "componentName": "forceCommunity:richTextInline",
- "id": "391e2f6e-25ba-4d60-8429-fa83c865f188",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- },
- {
- "componentAttributes": {
- "checkEmailUrl": "./CheckPasswordResetEmail",
- "submitButtonLabel": "閲嶇疆瀵嗙爜",
- "usernameLabel": "鐢ㄦ埛鍚�"
- },
- "componentName": "salesforceIdentity:forgotPassword2",
- "id": "ef09e7c2-8849-4559-a007-267530809bdb",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- },
- {
- "componentAttributes": {
- "richTextValue": "<p style=\"text-align: center;\"><a href=\"./\" rel=\"noopener noreferrer\" target=\"_self\" style=\"color: rgb(255, 255, 255); font-size: 16px;\">鍙栨秷</a></p>"
- },
- "componentName": "forceCommunity:richTextInline",
- "id": "79792fe3-b6d6-41d1-aeb6-912471e1b013",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "53a5629c-91b2-4f5b-91ef-76d991ec923a",
- "regionName": "content",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "Forgot Password"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "a506de7f-74b7-47e4-84d0-8579f8925ebb",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "842b093a-48db-4342-b4f9-d7953055c798",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Login",
- "type": "view",
- "viewType": "forgot-password"
-}
+ "appPageId" : "7756c67f-7774-4fe1-b1c2-eecb19f9c6a5",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "eac49d21-4e4d-4e8e-997e-42dfce021ff4",
+ "label" : "Forgot Password",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : {
+ "richTextValue" : "<p style=\"text-align: center;\"><span style=\"font-size: 22px; color: rgb(255, 255, 255);\">閲嶇疆瀵嗙爜</span></p>"
+ },
+ "componentName" : "forceCommunity:richTextInline",
+ "id" : "2b141c57-9556-45f3-9e15-90ac1419a02f",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ }, {
+ "componentAttributes" : {
+ "richTextValue" : "<p style=\"text-align: center;\"><span style=\"font-size: 16px; color: rgb(255, 255, 255);\">璇疯緭鍏ユ偍鐨勭敤鎴峰悕</span></p>"
+ },
+ "componentName" : "forceCommunity:richTextInline",
+ "id" : "203ce0df-48b9-4b50-85af-ba98cff2599e",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ }, {
+ "componentAttributes" : {
+ "checkEmailUrl" : "./CheckPasswordResetEmail",
+ "submitButtonLabel" : "閲嶇疆瀵嗙爜",
+ "usernameLabel" : "鐢ㄦ埛鍚�"
+ },
+ "componentName" : "salesforceIdentity:forgotPassword2",
+ "id" : "9afeb3da-d8a0-41df-8b00-4ca493eda07b",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ }, {
+ "componentAttributes" : {
+ "richTextValue" : "<p style=\"text-align: center;\"><span style=\"color: rgb(255, 255, 255);\">鍙栨秷</span></p>"
+ },
+ "componentName" : "forceCommunity:richTextInline",
+ "id" : "ac7cc923-2a73-45a7-a124-b94477b33e34",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "e9992f81-cb4b-4485-a34c-4a7db847cad9",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "Forgot Password"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "973d922a-76bf-4c04-91b9-f10851baf1c3",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "47d9db7d-c4bd-478e-9a55-3d796c30b606",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Login",
+ "type" : "view",
+ "viewType" : "forgot-password"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/groupDetail.json b/force-app/main/default/experiences/Consumable1/views/groupDetail.json
index 4f22c23..7870e0a 100644
--- a/force-app/main/default/experiences/Consumable1/views/groupDetail.json
+++ b/force-app/main/default/experiences/Consumable1/views/groupDetail.json
@@ -1,62 +1,53 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "1f22553d-fa1f-41e2-afa6-bf930865e2fa",
- "label": "Group Detail",
- "regions": [
- {
- "id": "330444b1-bbd6-493f-8e30-9c7d914f351e",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "detailsTabLabel": "Details",
- "engagementManagersOnly": false,
- "engagementTabLabel": "Engagement",
- "feedTabLabel": "Feed",
- "recordId": "{!recordId}",
- "relatedTabLabel": "Related"
- },
- "componentName": "forceCommunity:groupRecordHomeTabs",
- "id": "04f2c0f0-ba9f-4aba-87c9-fc060e93e50c",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "fd783466-f338-443f-b168-79fdb31885b4",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "8dd0118d-278b-4e47-a977-f67e4e0fe115",
- "regionName": "footer",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "{!Record._Object}: {!Record._Title}"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "ae88a178-5983-43d9-87ba-7613de4d54ec",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "cabd2974-2029-44be-b37f-b7fd95ebb879",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "detail-0F9"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "7b772cb6-1146-4bb7-8567-853ebfe7bb2c",
+ "label" : "Group Detail",
+ "regions" : [ {
+ "id" : "060923b0-77f7-42e7-b254-d75fc65bc96b",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "detailsTabLabel" : "Details",
+ "engagementManagersOnly" : false,
+ "engagementTabLabel" : "Engagement",
+ "feedTabLabel" : "Feed",
+ "recordId" : "{!recordId}",
+ "relatedTabLabel" : "Related"
+ },
+ "componentName" : "forceCommunity:groupRecordHomeTabs",
+ "id" : "c30496d8-d218-46e9-895f-fa9ef9e054e2",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "9c183d6e-53c2-4b3a-a3db-5c3657024407",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "ac91d64b-2f65-4f8a-ab26-d6ec7656960d",
+ "regionName" : "footer",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "{!Record._Object}: {!Record._Title}"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "fdab4c93-fa91-4bc1-9c74-e99e5a54315c",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "162e1f76-59b0-40b1-98fd-e38e325cce5e",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "detail-0F9"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/groupList.json b/force-app/main/default/experiences/Consumable1/views/groupList.json
index dae0738..50a859c 100644
--- a/force-app/main/default/experiences/Consumable1/views/groupList.json
+++ b/force-app/main/default/experiences/Consumable1/views/groupList.json
@@ -1,47 +1,40 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "87a9b140-31e2-4c28-9fa4-82135022e59d",
- "label": "Group List",
- "regions": [
- {
- "id": "89649989-257d-4c62-ac2d-cfb067a7dab9",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "richTextValue": " <h1 style=\"text-align: center;\"> <b style=\"font-size: 20px; color: #1e2443;\">Group List</b> </h1> "
- },
- "componentName": "forceCommunity:richTextInline",
- "id": "0c8f9c88-77cb-432b-aad6-bfb98bb54388",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- },
- {
- "componentAttributes": {},
- "componentName": "forceCommunity:groupObjectHome",
- "id": "0856cb72-ce49-46cb-b936-e908c1096841",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "b21ee870-d315-48be-93c1-d4d79e5f1b53",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "08886110-b15a-4ff9-9de1-3a1f81708cb5",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "list-0F9"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "949c0ee3-6484-4ed7-a44f-aa417cec1835",
+ "label" : "Group List",
+ "regions" : [ {
+ "id" : "9a5c8668-57b0-4ed9-b08f-7db30276d775",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "richTextValue" : " <h1 style=\"text-align: center;\"> <b style=\"font-size: 20px; color: #1e2443;\">Group List</b> </h1> "
+ },
+ "componentName" : "forceCommunity:richTextInline",
+ "id" : "cbff4378-dadd-486b-b610-0c737fcc355a",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ }, {
+ "componentAttributes" : { },
+ "componentName" : "forceCommunity:groupObjectHome",
+ "id" : "c5348791-4e5f-4115-bc57-297af7a3560b",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "e9583cc1-1d2d-49a3-bab1-4e826e4cce53",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "cc1ad297-48af-47cf-b66f-373b81e275f1",
+ "regionName" : "footer",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "list-0F9"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/home.json b/force-app/main/default/experiences/Consumable1/views/home.json
index 0b033aa..fba6335 100644
--- a/force-app/main/default/experiences/Consumable1/views/home.json
+++ b/force-app/main/default/experiences/Consumable1/views/home.json
@@ -1,254 +1,217 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:sldsTwoCol84Layout",
- "dataProviders": [],
- "id": "060f3385-936a-41da-8086-58f66522aeea",
- "label": "Home",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {
- "richTextValue": " <h1 style=\"text-align: center;\"> <b style=\"font-size: 28px; color: #1e2443;\">Welcome!</b> </h1> <p style=\"text-align: center;\"> <span style=\"font-size: 20px;\">Work on leads, register deals, and track progress with analytics.</span> </p> "
- },
- "componentName": "forceCommunity:richTextInline",
- "id": "757bc2a8-8fc2-4080-8a6c-79cd5c948d16",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "8f13358a-c852-482b-ac84-0aa6ead20c98",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "richTextValue": "<img src='/sfsites/c/img/community/prm/prm-default-banner.png' alt='Banner image for Partner Central template' style='width:100%;'/>"
- },
- "componentName": "forceCommunity:richTextInline",
- "id": "c0931ab3-1d66-4aba-8bdf-76d43261d6da",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- },
- {
- "componentAttributes": {
- "tabsetConfig": {
- "UUID": "be388d96-ba83-4ae5-bc04-71413fcb1c48",
- "activeTab": "tab1",
- "tabs": [
- {
- "UUID": "d174ad4b-8cba-41fa-ba18-dff027c9c474",
- "allowGuestUser": true,
- "locked": false,
- "seedComponents": [
- {
- "attributes": {},
- "fqn": "forceCommunity:dashboard"
- }
- ],
- "tabKey": "tab1",
- "tabName": "Business Summary"
- },
- {
- "UUID": "26e87aa3-7dba-4973-a3c4-041aec610bb5",
- "allowGuestUser": true,
- "locked": false,
- "seedComponents": [
- {
- "attributes": {
- "type": "Home"
- },
- "fqn": "forceCommunity:forceCommunityFeed"
- }
- ],
- "tabKey": "tab2",
- "tabName": "News & Updates"
- }
- ],
- "useOverflowMenu": false
- }
- },
- "componentName": "forceCommunity:tabset",
- "id": "be388d96-ba83-4ae5-bc04-71413fcb1c48",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {
- "height": "485",
- "recordId": "01Z100000013zqGEAQ"
- },
- "componentName": "forceCommunity:dashboard",
- "id": "d4f4c8c7-e1cc-43e0-bdf7-a91c8f3f7d77",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "d174ad4b-8cba-41fa-ba18-dff027c9c474",
- "regionLabel": "Business Summary",
- "regionName": "tab1",
- "renditionMap": {},
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "canChangeSorting": true,
- "defaultFilter": "",
- "defaultSortOrderHomeFeed": "Relevance",
- "defaultSortOrderTopicsFeed": "Relevance",
- "feedDesign": "DEFAULT",
- "hasFeedSearch": true,
- "subjectId": "{!recordId}",
- "type": "Home"
- },
- "componentName": "forceCommunity:forceCommunityFeed",
- "id": "89169035-2123-484c-a320-aa12d136b737",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "26e87aa3-7dba-4973-a3c4-041aec610bb5",
- "regionLabel": "News & Updates",
- "regionName": "tab2",
- "renditionMap": {},
- "type": "region"
- }
- ],
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "d0a93f84-0c8e-4330-91fa-ae3a171ac07c",
- "regionName": "content",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "actions": [
- {
- "isPublic": true,
- "name": "NewLead"
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:sldsTwoCol84Layout",
+ "dataProviders" : [ ],
+ "id" : "d47db83f-301d-4624-a8db-4474a6a30bd9",
+ "label" : "Home",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : {
+ "richTextValue" : " <h1 style=\"text-align: center;\"> <b style=\"font-size: 28px; color: #1e2443;\">Welcome!</b> </h1> <p style=\"text-align: center;\"> <span style=\"font-size: 20px;\">Work on leads, register deals, and track progress with analytics.</span> </p> "
+ },
+ "componentName" : "forceCommunity:richTextInline",
+ "id" : "19cbd1e7-a45d-47b4-bdad-385c5562b1b8",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "10ac200f-b20b-4ad8-8f0d-040c3a4ba494",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "richTextValue" : "<img src='/sfsites/c/img/community/prm/prm-default-banner.png' alt='Banner image for Partner Central template' style='width:100%;'/>"
+ },
+ "componentName" : "forceCommunity:richTextInline",
+ "id" : "f55d8364-8d18-4c91-b733-ef2e9fbeead2",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ }, {
+ "componentAttributes" : {
+ "tabsetConfig" : {
+ "UUID" : "77ed0454-75bd-4886-bc4b-6e90cc656e73",
+ "activeTab" : "tab1",
+ "tabs" : [ {
+ "UUID" : "c6a30d6c-fc5b-4287-ae6c-eeb943d82d95",
+ "allowGuestUser" : true,
+ "locked" : false,
+ "seedComponents" : [ {
+ "attributes" : { },
+ "fqn" : "forceCommunity:dashboard"
+ } ],
+ "tabKey" : "tab1",
+ "tabName" : "Business Summary"
+ }, {
+ "UUID" : "f0c897ae-e9b5-4eff-b7e8-b3b461359b4c",
+ "allowGuestUser" : true,
+ "locked" : false,
+ "seedComponents" : [ {
+ "attributes" : {
+ "type" : "Home"
},
- {
- "isPublic": true,
- "name": "NewOpportunity"
- },
- {
- "isPublic": true,
- "name": "NewTask"
- },
- {
- "isPublic": true,
- "name": "NewCase"
- }
- ],
- "label": "Quick Create"
- },
- "componentName": "forceCommunity:createRecordButton",
- "id": "a794a745-990f-481b-9cf2-5cdd5eec12e6",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- },
- {
- "componentAttributes": {
- "listViewIdForNavigation": "FOLLOW",
- "navigateToListView": true,
- "pageSize": 5,
- "sortBy": "CreatedDate",
- "title": "Lead Inbox"
- },
- "componentName": "forceCommunity:leadInbox",
- "id": "cc30815c-4721-411d-94ad-af5c53d4af0d",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- },
- {
- "componentAttributes": {
- "enableInlineEdit": true,
- "filterName": "MyOpportunities",
- "layout": "COMPACT",
- "pageSize": 5,
- "scope": "Opportunity",
- "showActionBar": true,
- "showChartsPanel": true,
- "showDisplay": "showall",
- "showFilterPanel": true,
- "showImageIcon": true,
- "showManualRefreshButton": true,
- "showObjectName": true,
- "showPinnedList": true,
- "showSearchBar": true
- },
- "componentName": "forceCommunity:objectHome",
- "id": "ec72b889-1cee-4d5a-a9a6-87f43359b3b5",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- },
- {
- "componentAttributes": {
- "enableInlineEdit": true,
- "filterName": "OPEN",
- "layout": "COMPACT",
- "pageSize": 5,
- "scope": "Task",
- "showActionBar": true,
- "showChartsPanel": true,
- "showDisplay": "showall",
- "showFilterPanel": true,
- "showImageIcon": true,
- "showManualRefreshButton": true,
- "showObjectName": true,
- "showPinnedList": true,
- "showSearchBar": true
- },
- "componentName": "forceCommunity:objectHome",
- "id": "7653914f-b749-49f2-a483-6b268b59369f",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
+ "fqn" : "forceCommunity:forceCommunityFeed"
+ } ],
+ "tabKey" : "tab2",
+ "tabName" : "News & Updates"
+ } ],
+ "useOverflowMenu" : false
}
- ],
- "id": "e39b35aa-8bd4-4a48-b7e7-dc1e2505aaeb",
- "regionName": "sidebar",
- "type": "region"
- },
- {
- "id": "864fe56c-bda6-4c9a-8869-8025ac329f4a",
- "regionName": "footer",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "娑堣�楀搧绠＄悊绯荤粺"
+ },
+ "componentName" : "forceCommunity:tabset",
+ "id" : "77ed0454-75bd-4886-bc4b-6e90cc656e73",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : {
+ "height" : "485",
+ "recordId" : "01Z10000001cpWqEAI"
},
- "componentName": "forceCommunity:seoAssistant",
- "id": "b403e241-261c-4abc-a01c-4960c5b43ea3",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "0110900c-6b38-40f9-a6fb-16fe86ceaabe",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "home"
-}
+ "componentName" : "forceCommunity:dashboard",
+ "id" : "8a7ab317-f6e5-4781-8734-86cf083bef93",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "c6a30d6c-fc5b-4287-ae6c-eeb943d82d95",
+ "regionLabel" : "Business Summary",
+ "regionName" : "tab1",
+ "renditionMap" : { },
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "canChangeSorting" : true,
+ "defaultFilter" : "",
+ "defaultSortOrderHomeFeed" : "Relevance",
+ "defaultSortOrderTopicsFeed" : "Relevance",
+ "feedDesign" : "DEFAULT",
+ "hasFeedSearch" : true,
+ "subjectId" : "{!recordId}",
+ "type" : "Home"
+ },
+ "componentName" : "forceCommunity:forceCommunityFeed",
+ "id" : "0965c626-6474-43f8-8064-7f2a06272adc",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "f0c897ae-e9b5-4eff-b7e8-b3b461359b4c",
+ "regionLabel" : "News & Updates",
+ "regionName" : "tab2",
+ "renditionMap" : { },
+ "type" : "region"
+ } ],
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "8642333f-fe8d-4b21-8526-34a61169f1dc",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "actions" : [ {
+ "isPublic" : true,
+ "name" : "NewLead"
+ }, {
+ "isPublic" : true,
+ "name" : "NewOpportunity"
+ }, {
+ "isPublic" : true,
+ "name" : "NewTask"
+ }, {
+ "isPublic" : true,
+ "name" : "NewCase"
+ } ],
+ "label" : "Quick Create"
+ },
+ "componentName" : "forceCommunity:createRecordButton",
+ "id" : "bd29d6d1-7296-4e0f-b89b-6670b88e8415",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ }, {
+ "componentAttributes" : {
+ "listViewIdForNavigation" : "FOLLOW",
+ "navigateToListView" : true,
+ "pageSize" : 5,
+ "sortBy" : "CreatedDate",
+ "title" : "Lead Inbox"
+ },
+ "componentName" : "forceCommunity:leadInbox",
+ "id" : "330e6363-913a-4cc3-a7bc-042c71d21073",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ }, {
+ "componentAttributes" : {
+ "enableInlineEdit" : true,
+ "filterName" : "MyOpportunities",
+ "layout" : "COMPACT",
+ "pageSize" : 5,
+ "scope" : "Opportunity",
+ "showActionBar" : true,
+ "showChartsPanel" : true,
+ "showDisplay" : "showall",
+ "showFilterPanel" : true,
+ "showImageIcon" : true,
+ "showManualRefreshButton" : true,
+ "showObjectName" : true,
+ "showPinnedList" : true,
+ "showSearchBar" : true
+ },
+ "componentName" : "forceCommunity:objectHome",
+ "id" : "b1ba9dd2-888a-4d31-9d43-863a18ae7a92",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ }, {
+ "componentAttributes" : {
+ "enableInlineEdit" : true,
+ "filterName" : "OPEN",
+ "layout" : "COMPACT",
+ "pageSize" : 5,
+ "scope" : "Task",
+ "showActionBar" : true,
+ "showChartsPanel" : true,
+ "showDisplay" : "showall",
+ "showFilterPanel" : true,
+ "showImageIcon" : true,
+ "showManualRefreshButton" : true,
+ "showObjectName" : true,
+ "showPinnedList" : true,
+ "showSearchBar" : true
+ },
+ "componentName" : "forceCommunity:objectHome",
+ "id" : "94bf80cd-edef-47dd-b710-bbcbeab44d75",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "78ad9488-9cad-453f-9ee1-053f31dd7d83",
+ "regionName" : "sidebar",
+ "type" : "region"
+ }, {
+ "id" : "5640820f-3232-4372-8fbb-2ab9bf9b9979",
+ "regionName" : "footer",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "娑堣�楀搧绠＄悊绯荤粺"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "0dfbf9f2-6bd0-4150-b2a2-29107b376fef",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "9b4f717e-09a8-44bd-8e53-d8e807d0d800",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "home"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/homeFlexible.json b/force-app/main/default/experiences/Consumable1/views/homeFlexible.json
index 36f6629..6cfc7e9 100644
--- a/force-app/main/default/experiences/Consumable1/views/homeFlexible.json
+++ b/force-app/main/default/experiences/Consumable1/views/homeFlexible.json
@@ -1,102 +1,87 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:dynamicLayout",
- "dataProviders": [],
- "id": "d22f1a01-e0a0-44df-b5e2-808abb2391f5",
- "label": "Home_Flexible",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {
- "background": "background: rgba(0,0,0,0)",
- "backgroundOverlay": "rgba(0,0,0,0.5)",
- "contentAreaWidth": 100,
- "sectionConfig": {
- "UUID": "41cc4b3a-7166-49bc-b065-8d15e99a7937",
- "columns": [
- {
- "UUID": "b6706b54-3422-40d2-a719-0162d2a20aa5",
- "columnKey": "1",
- "columnName": "Column 1",
- "columnWidth": "12",
- "seedComponents": []
- }
- ]
- },
- "sectionHeight": 300
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:dynamicLayout",
+ "dataProviders" : [ ],
+ "id" : "0b3166bc-2eec-43fa-8adf-532f629e9392",
+ "label" : "Home_Flexible",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : {
+ "background" : "background: rgba(0,0,0,0)",
+ "backgroundOverlay" : "rgba(0,0,0,0.5)",
+ "contentAreaWidth" : 100,
+ "sectionConfig" : {
+ "UUID" : "8ae08b67-88c4-492b-98a8-924b20bb1544",
+ "columns" : [ {
+ "UUID" : "10b668a2-336e-4764-b5b8-303f9939b7e3",
+ "columnKey" : "1",
+ "columnName" : "Column 1",
+ "columnWidth" : "12",
+ "seedComponents" : [ ]
+ } ]
+ },
+ "sectionHeight" : 300
+ },
+ "componentName" : "forceCommunity:section",
+ "id" : "8ae08b67-88c4-492b-98a8-924b20bb1544",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : {
+ "richTextValue" : "<p style=\"text-align: center;\"><span style=\"font-size: 48px; font-family: sans-serif; color: rgb(0, 71, 178);\">娆㈣繋鐧诲綍娑堣�楀搧杩芥函绯荤粺</span></p>"
},
- "componentName": "forceCommunity:section",
- "id": "41cc4b3a-7166-49bc-b065-8d15e99a7937",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {
- "richTextValue": "<p style=\"text-align: center;\"><span style=\"font-size: 48px; color: rgb(0, 71, 178);\">娆㈣繋鐧诲綍娑堣�楀搧杩芥函绯荤粺</span></p>"
- },
- "componentName": "forceCommunity:richTextInline",
- "id": "a970dbc1-3bd6-4786-9358-4d23aefe0476",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- },
- {
- "componentAttributes": {},
- "componentName": "c:lexLicenceReminder",
- "id": "5f083ad9-6878-4cea-9c61-ab8a1c17593b",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- },
- {
- "componentAttributes": {
- "height": "800",
- "recordId": "01Z0l000000cnvqEAA"
- },
- "componentName": "forceCommunity:dashboard",
- "id": "345cf353-5531-484c-a94c-a120ecb854e5",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "b6706b54-3422-40d2-a719-0162d2a20aa5",
- "regionLabel": "Column 1",
- "regionName": "1",
- "renditionMap": {},
- "type": "region"
- }
- ],
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "52b2abe8-346e-43db-b1ca-9254d387e8db",
- "regionName": "content",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "娑堣�楀搧绠＄悊绯荤粺"
+ "componentName" : "forceCommunity:richTextInline",
+ "id" : "d14e9b8c-a3d9-40cb-8ad0-5161fe285a74",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ }, {
+ "componentAttributes" : { },
+ "componentName" : "c:lexLicenceReminder",
+ "id" : "e0232bc3-f6c4-4671-b26e-160b3d73a0a4",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ }, {
+ "componentAttributes" : {
+ "height" : "800",
+ "recordId" : "01Z6D000000EyGYUA0"
},
- "componentName": "forceCommunity:seoAssistant",
- "id": "2762cc02-0105-42d7-9e2e-08ed9a61c1ca",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "f04df81d-a2d5-4a8b-b937-e0c26399e6b2",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "home"
-}
+ "componentName" : "forceCommunity:dashboard",
+ "id" : "e0024c07-3f6e-4822-9079-47ad41f4c3a8",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "10b668a2-336e-4764-b5b8-303f9939b7e3",
+ "regionLabel" : "Column 1",
+ "regionName" : "1",
+ "renditionMap" : { },
+ "type" : "region"
+ } ],
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "1bac6fb4-0163-4896-8cd7-85b1f34df29f",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "娑堣�楀搧绠＄悊绯荤粺"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "84e91754-c40d-4c64-a0e4-9bfae8320536",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "1c72742c-4f76-41b6-b8f2-7582c4245d05",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "home"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/lexAgencyInfo.json b/force-app/main/default/experiences/Consumable1/views/lexAgencyInfo.json
index 95648ca..e5162b1 100644
--- a/force-app/main/default/experiences/Consumable1/views/lexAgencyInfo.json
+++ b/force-app/main/default/experiences/Consumable1/views/lexAgencyInfo.json
@@ -1,81 +1,68 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:dynamicLayout",
- "dataProviders": [],
- "id": "ace4cc2b-a063-40be-94c6-c5bdabeb00e0",
- "label": "lexAgencyInfo",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {
- "background": "background: rgba(0,0,0,0)",
- "backgroundOverlay": "rgba(0,0,0,0.5)",
- "contentAreaWidth": 100,
- "sectionConfig": {
- "UUID": "5bae00dc-a841-45bc-af8f-3607536ecc2b",
- "columns": [
- {
- "UUID": "55056592-e02c-455e-b831-5f29ba25ae8b",
- "columnKey": "1",
- "columnName": "Column 1",
- "columnWidth": "12",
- "seedComponents": []
- }
- ]
- },
- "sectionHeight": 300
- },
- "componentName": "forceCommunity:section",
- "id": "5bae00dc-a841-45bc-af8f-3607536ecc2b",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {},
- "componentName": "c:lexAgencyInfo",
- "id": "6324c43f-2751-4e38-bf86-5a8d7d2df87d",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "55056592-e02c-455e-b831-5f29ba25ae8b",
- "regionLabel": "Column 1",
- "regionName": "1",
- "renditionMap": {},
- "type": "region"
- }
- ],
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "d0b67e99-b73f-4016-b342-44b5bd5004de",
- "regionName": "content",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "娑堣�楀搧绠＄悊绯荤粺"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "dea6c82c-c9c5-41cc-960b-f7be4c8540ff",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "74d33395-e564-480d-9df2-5ca9d246845d",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "custom-lexagencyinfo"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:dynamicLayout",
+ "dataProviders" : [ ],
+ "id" : "376ad65a-00b6-4198-aa04-19a6360969bc",
+ "label" : "LexAgencyInfo",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : {
+ "background" : "background: rgba(0,0,0,0)",
+ "backgroundOverlay" : "rgba(0,0,0,0.5)",
+ "contentAreaWidth" : 100,
+ "sectionConfig" : {
+ "UUID" : "d682942a-eb4a-46cc-b2ba-ee37ee9f7974",
+ "columns" : [ {
+ "UUID" : "2db9074f-7efa-4fc1-aef6-e94f4af43def",
+ "columnKey" : "1",
+ "columnName" : "Column 1",
+ "columnWidth" : "12",
+ "seedComponents" : [ ]
+ } ]
+ },
+ "sectionHeight" : 300
+ },
+ "componentName" : "forceCommunity:section",
+ "id" : "d682942a-eb4a-46cc-b2ba-ee37ee9f7974",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : { },
+ "componentName" : "c:lexAgencyInfo",
+ "id" : "7762e10b-5ce6-4594-ac4e-648a78b6c9b2",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "2db9074f-7efa-4fc1-aef6-e94f4af43def",
+ "regionLabel" : "Column 1",
+ "regionName" : "1",
+ "renditionMap" : { },
+ "type" : "region"
+ } ],
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "2f459a20-131e-4548-ab46-f9920697d1d7",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "缁忛攢鍟嗕俊鎭� ~ 娑堣�楀搧绠＄悊绯荤粺"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "2bacf8a5-3038-42e9-b2e0-3fee8cc95ea3",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "ce682a09-6e95-438e-9f22-d2fb11703354",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "custom-lexagencyinfo"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/lexArriveGoods.json b/force-app/main/default/experiences/Consumable1/views/lexArriveGoods.json
index bd314d1..a30530c 100644
--- a/force-app/main/default/experiences/Consumable1/views/lexArriveGoods.json
+++ b/force-app/main/default/experiences/Consumable1/views/lexArriveGoods.json
@@ -1,81 +1,68 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:dynamicLayout",
- "dataProviders": [],
- "id": "23ddff87-c778-4457-b0f7-07029a8a9ffd",
- "label": "LexArriveGoods",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {
- "background": "background: rgba(0,0,0,0)",
- "backgroundOverlay": "rgba(0,0,0,0.5)",
- "contentAreaWidth": 100,
- "sectionConfig": {
- "UUID": "888145dd-72c9-4e26-a813-21c7346e0e39",
- "columns": [
- {
- "UUID": "ea876df4-d4fa-4c11-8588-6076a3b87f79",
- "columnKey": "1",
- "columnName": "Column 1",
- "columnWidth": "12",
- "seedComponents": []
- }
- ]
- },
- "sectionHeight": 300
- },
- "componentName": "forceCommunity:section",
- "id": "888145dd-72c9-4e26-a813-21c7346e0e39",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {},
- "componentName": "c:lexArriveGoods",
- "id": "3483355f-5db7-43e9-9501-a0868434e472",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "ea876df4-d4fa-4c11-8588-6076a3b87f79",
- "regionLabel": "Column 1",
- "regionName": "1",
- "renditionMap": {},
- "type": "region"
- }
- ],
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "a09b4773-f3c4-45c1-9d61-7a08c3e9b1b2",
- "regionName": "content",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "娑堣�楀搧绠＄悊绯荤粺"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "3363f170-a3c6-42c2-8615-cb89c4665710",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "03bed34c-102a-4081-9ffa-5a71d359716b",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "custom-lexarrivegoods"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:dynamicLayout",
+ "dataProviders" : [ ],
+ "id" : "ec872079-c8a8-4c21-a0f2-84a95d4a93e5",
+ "label" : "LexArriveGoods",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : {
+ "background" : "background: rgba(0,0,0,0)",
+ "backgroundOverlay" : "rgba(0,0,0,0.5)",
+ "contentAreaWidth" : 100,
+ "sectionConfig" : {
+ "UUID" : "8aedf101-f8cf-43c7-bb42-da69a742aa74",
+ "columns" : [ {
+ "UUID" : "c73eacf8-7d9a-4ed8-a53a-833c19b39b47",
+ "columnKey" : "1",
+ "columnName" : "Column 1",
+ "columnWidth" : "12",
+ "seedComponents" : [ ]
+ } ]
+ },
+ "sectionHeight" : 300
+ },
+ "componentName" : "forceCommunity:section",
+ "id" : "8aedf101-f8cf-43c7-bb42-da69a742aa74",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : { },
+ "componentName" : "c:lexArriveGoods",
+ "id" : "76c84633-d7e3-48e5-bea6-6b9bd9d53b84",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "c73eacf8-7d9a-4ed8-a53a-833c19b39b47",
+ "regionLabel" : "Column 1",
+ "regionName" : "1",
+ "renditionMap" : { },
+ "type" : "region"
+ } ],
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "54f6208b-cf85-4f6d-ab18-a932c63b5761",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "鍏ュ簱/杩斿搧 ~ 娑堣�楀搧绠＄悊绯荤粺"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "930825d9-d67b-4d95-8ebf-1b16db181e7c",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "7fbb47ad-d923-4a89-ae79-922b35d71571",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "custom-lexarrivegoods"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/lexArriveGoodsMain.json b/force-app/main/default/experiences/Consumable1/views/lexArriveGoodsMain.json
index 89f83c4..a3d2e83 100644
--- a/force-app/main/default/experiences/Consumable1/views/lexArriveGoodsMain.json
+++ b/force-app/main/default/experiences/Consumable1/views/lexArriveGoodsMain.json
@@ -1,81 +1,68 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:dynamicLayout",
- "dataProviders": [],
- "id": "e8d527e1-b86c-4449-bf5c-1ed05301648b",
- "label": "LexArriveGoodsMain",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {
- "background": "background: rgba(0,0,0,0)",
- "backgroundOverlay": "rgba(0,0,0,0.5)",
- "contentAreaWidth": 100,
- "sectionConfig": {
- "UUID": "196f0047-adf4-4653-b3b1-502f0132ac63",
- "columns": [
- {
- "UUID": "8d475e45-01bc-4767-849a-8386d433285d",
- "columnKey": "1",
- "columnName": "Column 1",
- "columnWidth": "12",
- "seedComponents": []
- }
- ]
- },
- "sectionHeight": 300
- },
- "componentName": "forceCommunity:section",
- "id": "196f0047-adf4-4653-b3b1-502f0132ac63",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {},
- "componentName": "c:lexArriveGoodsMain",
- "id": "af3b9e79-413e-4e41-94a5-9e22511c69da",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "8d475e45-01bc-4767-849a-8386d433285d",
- "regionLabel": "Column 1",
- "regionName": "1",
- "renditionMap": {},
- "type": "region"
- }
- ],
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "6d407bee-c7b6-4862-928b-6ace9e3b1e07",
- "regionName": "content",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "娑堣�楀搧绠＄悊绯荤粺"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "505a452b-9d0e-4607-9c6e-5a1de7c8d722",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "260b9853-f9b6-4b32-be09-325a251d890a",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "custom-lexarrivegoodsmain"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:dynamicLayout",
+ "dataProviders" : [ ],
+ "id" : "f46aba62-01c3-4a20-93c6-f9b2362717e6",
+ "label" : "LexArriveGoodsMain",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : {
+ "background" : "background: rgba(0,0,0,0)",
+ "backgroundOverlay" : "rgba(0,0,0,0.5)",
+ "contentAreaWidth" : 100,
+ "sectionConfig" : {
+ "UUID" : "c31d034f-cc57-4be4-ad72-4431e59d3dc3",
+ "columns" : [ {
+ "UUID" : "d25ba467-5924-40aa-bcdd-e1ac8643be08",
+ "columnKey" : "1",
+ "columnName" : "Column 1",
+ "columnWidth" : "12",
+ "seedComponents" : [ ]
+ } ]
+ },
+ "sectionHeight" : 300
+ },
+ "componentName" : "forceCommunity:section",
+ "id" : "c31d034f-cc57-4be4-ad72-4431e59d3dc3",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : { },
+ "componentName" : "c:lexArriveGoodsMain",
+ "id" : "1d0f8205-b81b-446f-866b-237e69f338d9",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "d25ba467-5924-40aa-bcdd-e1ac8643be08",
+ "regionLabel" : "Column 1",
+ "regionName" : "1",
+ "renditionMap" : { },
+ "type" : "region"
+ } ],
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "7efb4626-0f15-4ee3-9418-cb6419fb0bcd",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "鍏ュ簱/杩斿搧 ~ 娑堣�楀搧绠＄悊绯荤粺"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "71e9fe84-4f41-453b-a6b5-35ed5cdbfadc",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "da8c93ee-69b0-47b5-83bb-61150b2aa560",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "custom-lexarrivegoodsmain"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/lexArriveGsDetails.json b/force-app/main/default/experiences/Consumable1/views/lexArriveGsDetails.json
index ed62c68..578cd6c 100644
--- a/force-app/main/default/experiences/Consumable1/views/lexArriveGsDetails.json
+++ b/force-app/main/default/experiences/Consumable1/views/lexArriveGsDetails.json
@@ -1,81 +1,68 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:dynamicLayout",
- "dataProviders": [],
- "id": "ccdc4c02-3ec5-4c8c-bb43-af7c391c0876",
- "label": "LexArriveGsDetails",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {
- "background": "background: rgba(0,0,0,0)",
- "backgroundOverlay": "rgba(0,0,0,0.5)",
- "contentAreaWidth": 100,
- "sectionConfig": {
- "UUID": "8743236b-840d-4987-8168-2449baaa559c",
- "columns": [
- {
- "UUID": "861293f5-2153-4223-b8a6-ae59bc2843f0",
- "columnKey": "1",
- "columnName": "Column 1",
- "columnWidth": "12",
- "seedComponents": []
- }
- ]
- },
- "sectionHeight": 300
- },
- "componentName": "forceCommunity:section",
- "id": "8743236b-840d-4987-8168-2449baaa559c",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {},
- "componentName": "c:lexArriveGsDetails",
- "id": "967bc21a-73f4-4af3-90e3-8961f1903457",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "861293f5-2153-4223-b8a6-ae59bc2843f0",
- "regionLabel": "Column 1",
- "regionName": "1",
- "renditionMap": {},
- "type": "region"
- }
- ],
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "fed879a2-37ad-4d00-ac2b-6a7d45f219e0",
- "regionName": "content",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "娑堣�楀搧绠＄悊绯荤粺"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "1bde528a-2d7c-4e45-a5ae-cf6b4e730c1b",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "123c9d6e-48b4-4a79-9c2c-cf348022512a",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "custom-lexarrivegsdetails"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:dynamicLayout",
+ "dataProviders" : [ ],
+ "id" : "91695311-fdcc-4e42-87ca-c97cfd56a2b0",
+ "label" : "LexArriveGsDetails",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : {
+ "background" : "background: rgba(0,0,0,0)",
+ "backgroundOverlay" : "rgba(0,0,0,0.5)",
+ "contentAreaWidth" : 100,
+ "sectionConfig" : {
+ "UUID" : "08f6ef6f-e105-4de7-9aaa-1f114864bdc7",
+ "columns" : [ {
+ "UUID" : "08d81f90-ef1a-4686-a0e9-cc3913ed0973",
+ "columnKey" : "1",
+ "columnName" : "Column 1",
+ "columnWidth" : "12",
+ "seedComponents" : [ ]
+ } ]
+ },
+ "sectionHeight" : 300
+ },
+ "componentName" : "forceCommunity:section",
+ "id" : "08f6ef6f-e105-4de7-9aaa-1f114864bdc7",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : { },
+ "componentName" : "c:lexArriveGsDetails",
+ "id" : "18ff9dd3-7039-4ffb-8d15-faa606335456",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "08d81f90-ef1a-4686-a0e9-cc3913ed0973",
+ "regionLabel" : "Column 1",
+ "regionName" : "1",
+ "renditionMap" : { },
+ "type" : "region"
+ } ],
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "2ed898cb-77b1-437e-8eca-16a3a98927e0",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "鍒拌揣 ~ 娑堣�楀搧绠＄悊绯荤粺"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "961b31ea-175a-4e22-8256-be31f553c70c",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "034871d6-1f2c-43f2-81d3-0e46a864ad33",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "custom-lexarrivegsdetails"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/lexCancelRemoveBox.json b/force-app/main/default/experiences/Consumable1/views/lexCancelRemoveBox.json
index 7705705..4289cbd 100644
--- a/force-app/main/default/experiences/Consumable1/views/lexCancelRemoveBox.json
+++ b/force-app/main/default/experiences/Consumable1/views/lexCancelRemoveBox.json
@@ -1,81 +1,68 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:dynamicLayout",
- "dataProviders": [],
- "id": "b7569df4-3d59-4e39-9916-b444d62da530",
- "label": "lexCancelRemoveBox",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {
- "background": "background: rgba(0,0,0,0)",
- "backgroundOverlay": "rgba(0,0,0,0.5)",
- "contentAreaWidth": 100,
- "sectionConfig": {
- "UUID": "67efdf26-a8b9-4ccc-a78a-7c4237367233",
- "columns": [
- {
- "UUID": "9e34f640-834f-4c40-b4e2-86cbb2f8eb01",
- "columnKey": "1",
- "columnName": "Column 1",
- "columnWidth": "12",
- "seedComponents": []
- }
- ]
- },
- "sectionHeight": 300
- },
- "componentName": "forceCommunity:section",
- "id": "67efdf26-a8b9-4ccc-a78a-7c4237367233",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {},
- "componentName": "c:lexCancelRemoveBox",
- "id": "18cfcc0d-2e74-4439-b0e4-374d6173769c",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "9e34f640-834f-4c40-b4e2-86cbb2f8eb01",
- "regionLabel": "Column 1",
- "regionName": "1",
- "renditionMap": {},
- "type": "region"
- }
- ],
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "144d67b6-b37a-48bb-8d3f-c5a642a2eb15",
- "regionName": "content",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "鍙栨秷鎷嗙洅~娑堣�楀搧绠＄悊绯荤粺"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "9a46d997-620e-4c7b-b471-14f9f099ed5f",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "b0e97eeb-db76-4ec4-9d1a-4020dcecb04e",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "custom-lexcancelremovebox"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:dynamicLayout",
+ "dataProviders" : [ ],
+ "id" : "5fd84b73-2065-46d3-b121-2f8a77b76a3a",
+ "label" : "LexCancelRemoveBox",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : {
+ "background" : "background: rgba(0,0,0,0)",
+ "backgroundOverlay" : "rgba(0,0,0,0.5)",
+ "contentAreaWidth" : 100,
+ "sectionConfig" : {
+ "UUID" : "e015f78b-3948-452d-9df3-fb57eaf1144a",
+ "columns" : [ {
+ "UUID" : "dda851ea-a46f-4c8b-8cf7-52db66e6864a",
+ "columnKey" : "1",
+ "columnName" : "Column 1",
+ "columnWidth" : "12",
+ "seedComponents" : [ ]
+ } ]
+ },
+ "sectionHeight" : 300
+ },
+ "componentName" : "forceCommunity:section",
+ "id" : "e015f78b-3948-452d-9df3-fb57eaf1144a",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : { },
+ "componentName" : "c:lexCancelRemoveBox",
+ "id" : "de961c6a-bc79-4956-aaf1-9b9a9329cd7b",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "dda851ea-a46f-4c8b-8cf7-52db66e6864a",
+ "regionLabel" : "Column 1",
+ "regionName" : "1",
+ "renditionMap" : { },
+ "type" : "region"
+ } ],
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "63a06f7d-bca6-430e-b51f-04c307c741f9",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "鍙栨秷鎷嗙洅 ~ 娑堣�楀搧绠＄悊绯荤粺"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "495b4819-9802-4a8b-af22-b33a65ed6dde",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "fc3783d1-cb91-473f-87a0-62c480010a60",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "custom-lexcancelremovebox"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/lexConInvoiceView.json b/force-app/main/default/experiences/Consumable1/views/lexConInvoiceView.json
index 0c2cdbf..e871711 100644
--- a/force-app/main/default/experiences/Consumable1/views/lexConInvoiceView.json
+++ b/force-app/main/default/experiences/Consumable1/views/lexConInvoiceView.json
@@ -1,55 +1,68 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "def29cb0-a769-4ec4-8e98-f1d9e4433e76",
- "label": "LexConInvoiceView",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {},
- "componentName": "c:lexConInvoiceView",
- "id": "188f5457-5ba8-4c48-b154-fac11122d6fa",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "97ef1ee1-bf76-4af8-8fb0-67e0f93c9b20",
- "regionName": "header",
- "type": "region"
- },
- {
- "id": "01bd66d3-16ee-49b0-8957-6c65fc9e6d35",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "d892a453-fd5d-41e9-a86a-2a5939d74274",
- "regionName": "footer",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "娑堣�楀搧绠＄悊绯荤粺"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "c117564e-23b4-4cd3-8d91-0f58a569c5b5",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "0499e9da-7082-412c-8a76-3a002f26f75f",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "custom-lexconinvoiceview"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:dynamicLayout",
+ "dataProviders" : [ ],
+ "id" : "4bbfb3d2-f8f2-4b23-b5cf-711d448a2b51",
+ "label" : "LexConInvoiceView",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : {
+ "background" : "background: rgba(0,0,0,0)",
+ "backgroundOverlay" : "rgba(0,0,0,0.5)",
+ "contentAreaWidth" : 100,
+ "sectionConfig" : {
+ "UUID" : "d52f86d0-b463-43a9-9817-40d500fcc2ad",
+ "columns" : [ {
+ "UUID" : "73c51c99-c8ed-45c9-ab83-89ff66ca5239",
+ "columnKey" : "1",
+ "columnName" : "Column 1",
+ "columnWidth" : "12",
+ "seedComponents" : [ ]
+ } ]
+ },
+ "sectionHeight" : 300
+ },
+ "componentName" : "forceCommunity:section",
+ "id" : "d52f86d0-b463-43a9-9817-40d500fcc2ad",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : { },
+ "componentName" : "c:lexConInvoiceView",
+ "id" : "af1fd8e8-0495-4aa4-a724-b200588463eb",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "73c51c99-c8ed-45c9-ab83-89ff66ca5239",
+ "regionLabel" : "Column 1",
+ "regionName" : "1",
+ "renditionMap" : { },
+ "type" : "region"
+ } ],
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "87b7dcd5-40d6-4441-9443-26d7647ded5c",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "鍙戠エ ~ 娑堣�楀搧绠＄悊绯荤粺"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "0dacce9e-e531-41b1-ad79-6a6efefc9dd1",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "d415f744-fe96-4c81-90b0-73d1b66dafbb",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "custom-lexconinvoiceview"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/lexConsumable.json b/force-app/main/default/experiences/Consumable1/views/lexConsumable.json
index baea46d..eabf5b9 100644
--- a/force-app/main/default/experiences/Consumable1/views/lexConsumable.json
+++ b/force-app/main/default/experiences/Consumable1/views/lexConsumable.json
@@ -1,81 +1,68 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:dynamicLayout",
- "dataProviders": [],
- "id": "a3a6bd48-fa28-4210-b2f1-396f0169df2f",
- "label": "LexConsumable",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {
- "background": "background: rgba(0,0,0,0)",
- "backgroundOverlay": "rgba(0,0,0,0.5)",
- "contentAreaWidth": 100,
- "sectionConfig": {
- "UUID": "105e0268-90b6-4f6e-b018-41d4f9d70489",
- "columns": [
- {
- "UUID": "b4cd3a78-9020-48a5-947f-c39b796b7d5f",
- "columnKey": "1",
- "columnName": "Column 1",
- "columnWidth": "12",
- "seedComponents": []
- }
- ]
- },
- "sectionHeight": 300
- },
- "componentName": "forceCommunity:section",
- "id": "105e0268-90b6-4f6e-b018-41d4f9d70489",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {},
- "componentName": "c:lexConsumable",
- "id": "28c07586-c606-4466-93f4-7da43f4323cb",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "b4cd3a78-9020-48a5-947f-c39b796b7d5f",
- "regionLabel": "Column 1",
- "regionName": "1",
- "renditionMap": {},
- "type": "region"
- }
- ],
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "2094f211-8183-43a9-84d9-2b41cbc84990",
- "regionName": "content",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "娑堣�楀搧绠＄悊绯荤粺"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "19440ece-25e3-40df-ae9d-788b112b92f1",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "d3987b2a-05ec-4b44-a249-70a07a38d553",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "custom-lexconsumable"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:dynamicLayout",
+ "dataProviders" : [ ],
+ "id" : "756785e1-4fb5-4ab3-b38a-58ea679a4361",
+ "label" : "LexConsumable",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : {
+ "background" : "background: rgba(0,0,0,0)",
+ "backgroundOverlay" : "rgba(0,0,0,0.5)",
+ "contentAreaWidth" : 100,
+ "sectionConfig" : {
+ "UUID" : "57a191f6-fa19-4876-98e5-da8c72cb9258",
+ "columns" : [ {
+ "UUID" : "6972e5ef-d04e-4c93-a2e6-07c797f78748",
+ "columnKey" : "1",
+ "columnName" : "Column 1",
+ "columnWidth" : "12",
+ "seedComponents" : [ ]
+ } ]
+ },
+ "sectionHeight" : 300
+ },
+ "componentName" : "forceCommunity:section",
+ "id" : "57a191f6-fa19-4876-98e5-da8c72cb9258",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : { },
+ "componentName" : "c:lexConsumable",
+ "id" : "f9cc8cb4-e94e-4c9e-aeac-91e4cc01875f",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "6972e5ef-d04e-4c93-a2e6-07c797f78748",
+ "regionLabel" : "Column 1",
+ "regionName" : "1",
+ "renditionMap" : { },
+ "type" : "region"
+ } ],
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "c7989e63-0c78-4086-8ad3-f9db0c99411a",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "璁㈠崟绠＄悊 ~ 娑堣�楀搧绠＄悊绯荤粺"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "ee494697-6008-45fc-a3c8-0bc4b904974b",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "77747bb3-667b-42f0-8885-822eb331d6c9",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "custom-lexconsumable"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/lexConsumableAccount.json b/force-app/main/default/experiences/Consumable1/views/lexConsumableAccount.json
index 7e80884..77619fe 100644
--- a/force-app/main/default/experiences/Consumable1/views/lexConsumableAccount.json
+++ b/force-app/main/default/experiences/Consumable1/views/lexConsumableAccount.json
@@ -1,55 +1,68 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "f724180a-789f-4a5f-909f-a3b6926cff21",
- "label": "LexConsumableAccount",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {},
- "componentName": "c:lexConsumableAccount",
- "id": "918c23ca-5bf3-4ed0-80cf-70c22fdc15e5",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "53e16625-5ad6-4555-a03e-5ddfc7ed6200",
- "regionName": "header",
- "type": "region"
- },
- {
- "id": "08d8f81e-8b77-4c51-bc72-53efd131a367",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "684378e9-c38e-49ee-acc0-ea99f8730e7d",
- "regionName": "footer",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "娑堣�楀搧绠＄悊绯荤粺"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "8922f5cd-dab7-49b9-98d6-dc3193827188",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "0890434c-63ef-4621-b17e-8b995d014686",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "custom-lexconsumableaccount"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:dynamicLayout",
+ "dataProviders" : [ ],
+ "id" : "65a5c9a4-0cc9-4b00-872b-b90bc1e47411",
+ "label" : "LexConsumableAccount",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : {
+ "background" : "background: rgba(0,0,0,0)",
+ "backgroundOverlay" : "rgba(0,0,0,0.5)",
+ "contentAreaWidth" : 100,
+ "sectionConfig" : {
+ "UUID" : "21aff1b6-3fc5-4eaa-9c90-3909310f21fa",
+ "columns" : [ {
+ "UUID" : "600f91f5-1068-4b1f-8a86-d0a193bce882",
+ "columnKey" : "1",
+ "columnName" : "Column 1",
+ "columnWidth" : "12",
+ "seedComponents" : [ ]
+ } ]
+ },
+ "sectionHeight" : 300
+ },
+ "componentName" : "forceCommunity:section",
+ "id" : "21aff1b6-3fc5-4eaa-9c90-3909310f21fa",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : { },
+ "componentName" : "c:lexConsumableAccount",
+ "id" : "5ad65eac-4ab2-4e31-823f-241cd8a31b77",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "600f91f5-1068-4b1f-8a86-d0a193bce882",
+ "regionLabel" : "Column 1",
+ "regionName" : "1",
+ "renditionMap" : { },
+ "type" : "region"
+ } ],
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "da25695d-f912-48f0-a829-ff77681dea16",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "瀹㈡埛 ~ 娑堣�楀搧绠＄悊绯荤粺"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "34026022-6682-46cb-920f-4c24fbf656f8",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "149173b3-ab4a-47d1-824b-c73e4cee068d",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "custom-lexconsumableaccount"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/lexConsumableAccountInfoPrint.json b/force-app/main/default/experiences/Consumable1/views/lexConsumableAccountInfoPrint.json
index cfda22f..421f8fd 100644
--- a/force-app/main/default/experiences/Consumable1/views/lexConsumableAccountInfoPrint.json
+++ b/force-app/main/default/experiences/Consumable1/views/lexConsumableAccountInfoPrint.json
@@ -1,81 +1,68 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:dynamicLayout",
- "dataProviders": [],
- "id": "469dc013-dd9c-46d5-a4e8-57e7b4718b74",
- "label": "LexConsumableAccountInfoPrint",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {
- "background": "background: rgba(0,0,0,0)",
- "backgroundOverlay": "rgba(0,0,0,0.5)",
- "contentAreaWidth": 100,
- "sectionConfig": {
- "UUID": "74ce3d06-cf05-449f-882f-88400116354b",
- "columns": [
- {
- "UUID": "1803a98f-aa73-4a73-b8ec-518365d169ec",
- "columnKey": "1",
- "columnName": "Column 1",
- "columnWidth": "12",
- "seedComponents": []
- }
- ]
- },
- "sectionHeight": 300
- },
- "componentName": "forceCommunity:section",
- "id": "74ce3d06-cf05-449f-882f-88400116354b",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {},
- "componentName": "c:lexConsumableAccountInfoPrint",
- "id": "4b082cd8-767e-43f5-94b6-cb5a3113c88a",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "1803a98f-aa73-4a73-b8ec-518365d169ec",
- "regionLabel": "Column 1",
- "regionName": "1",
- "renditionMap": {},
- "type": "region"
- }
- ],
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "66e4d1fa-43ae-4e10-8387-2fc761caf3d9",
- "regionName": "content",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "LexConsumableAccountInfoPrint"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "41c17f3c-ec08-40cd-b41f-2e14e13f3277",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "fc6c01a8-09c5-4bd9-80eb-e36d3a65bb84",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "custom-lexconsumableaccountinfoprint"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:dynamicLayout",
+ "dataProviders" : [ ],
+ "id" : "5d615179-dd62-4481-a874-de16a69d7374",
+ "label" : "LexConsumableAccountInfoPrint",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : {
+ "background" : "background: rgba(0,0,0,0)",
+ "backgroundOverlay" : "rgba(0,0,0,0.5)",
+ "contentAreaWidth" : 100,
+ "sectionConfig" : {
+ "UUID" : "e9f987a3-92bd-470f-9afb-7804ecfcf578",
+ "columns" : [ {
+ "UUID" : "81d173bc-f9c3-4758-bc9e-570e99d92545",
+ "columnKey" : "1",
+ "columnName" : "Column 1",
+ "columnWidth" : "12",
+ "seedComponents" : [ ]
+ } ]
+ },
+ "sectionHeight" : 300
+ },
+ "componentName" : "forceCommunity:section",
+ "id" : "e9f987a3-92bd-470f-9afb-7804ecfcf578",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : { },
+ "componentName" : "c:lexConsumableAccountInfoPrint",
+ "id" : "03fc88cd-8285-4d6e-878b-5c75456032a2",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "81d173bc-f9c3-4758-bc9e-570e99d92545",
+ "regionLabel" : "Column 1",
+ "regionName" : "1",
+ "renditionMap" : { },
+ "type" : "region"
+ } ],
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "4ff49dcd-f175-4fb8-a368-30195f218e22",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "瀹㈡埛璇︾粏淇℃伅 ~ 娑堣�楀搧绠＄悊绯荤粺"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "d08e3a38-3069-4275-b3f5-6db7c28ced59",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "6b25d2b2-bb26-48ff-9e0f-226821b3d62a",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "custom-lexconsumableaccountinfoprint"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/lexConsumableOrderManage.json b/force-app/main/default/experiences/Consumable1/views/lexConsumableOrderManage.json
index 25c9d5a..68ad8cb 100644
--- a/force-app/main/default/experiences/Consumable1/views/lexConsumableOrderManage.json
+++ b/force-app/main/default/experiences/Consumable1/views/lexConsumableOrderManage.json
@@ -1,81 +1,68 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:dynamicLayout",
- "dataProviders": [],
- "id": "adc3f3b5-03a9-4f8d-9284-7ff06dc338af",
- "label": "LexConsumableOrderManage",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {
- "background": "background: rgba(0,0,0,0)",
- "backgroundOverlay": "rgba(0,0,0,0.5)",
- "contentAreaWidth": 100,
- "sectionConfig": {
- "UUID": "e755f4ef-9468-4884-b2d6-db7da95af5f6",
- "columns": [
- {
- "UUID": "c3e44009-7b50-45e6-b4e1-81dc6b85c17c",
- "columnKey": "1",
- "columnName": "Column 1",
- "columnWidth": "12",
- "seedComponents": []
- }
- ]
- },
- "sectionHeight": 300
- },
- "componentName": "forceCommunity:section",
- "id": "e755f4ef-9468-4884-b2d6-db7da95af5f6",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {},
- "componentName": "c:lexConsumableOrderManage",
- "id": "bcc9fb43-5bc7-4e22-b4db-4590542b0d63",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "c3e44009-7b50-45e6-b4e1-81dc6b85c17c",
- "regionLabel": "Column 1",
- "regionName": "1",
- "renditionMap": {},
- "type": "region"
- }
- ],
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "61d4e85c-8cf2-4c5a-9a25-5f7dd8797e86",
- "regionName": "content",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "娑堣�楀搧绠＄悊绯荤粺"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "ecb86434-590f-47cf-a6b7-b4a2e03f8a45",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "ea264f2a-7bd5-4f4a-97e8-fbddc045e948",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "custom-lexconsumableordermanage"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:dynamicLayout",
+ "dataProviders" : [ ],
+ "id" : "0c6f8778-bba4-4726-97f6-b639cce7c99e",
+ "label" : "LexConsumableOrderManage",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : {
+ "background" : "background: rgba(0,0,0,0)",
+ "backgroundOverlay" : "rgba(0,0,0,0.5)",
+ "contentAreaWidth" : 100,
+ "sectionConfig" : {
+ "UUID" : "c816a792-e9df-4280-a595-4f7a2de81a72",
+ "columns" : [ {
+ "UUID" : "0dc2ef0d-dfb8-4347-814b-251e3e16b10b",
+ "columnKey" : "1",
+ "columnName" : "Column 1",
+ "columnWidth" : "12",
+ "seedComponents" : [ ]
+ } ]
+ },
+ "sectionHeight" : 300
+ },
+ "componentName" : "forceCommunity:section",
+ "id" : "c816a792-e9df-4280-a595-4f7a2de81a72",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : { },
+ "componentName" : "c:lexConsumableOrderManage",
+ "id" : "480e4dee-4c0b-43d9-b81a-ba3ecd96f4e3",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "0dc2ef0d-dfb8-4347-814b-251e3e16b10b",
+ "regionLabel" : "Column 1",
+ "regionName" : "1",
+ "renditionMap" : { },
+ "type" : "region"
+ } ],
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "5425b128-bc13-4529-9741-c37eca368806",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "璁㈠崟绠＄悊 ~ 娑堣�楀搧绠＄悊绯荤粺"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "01bf62a2-fff9-4f38-8cea-6c4a8df40eda",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "44d87bc4-7c1d-43ce-acc5-e20a018fc57d",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "custom-lexconsumableordermanage"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/lexInventory.json b/force-app/main/default/experiences/Consumable1/views/lexInventory.json
index 72aebf5..dee87a7 100644
--- a/force-app/main/default/experiences/Consumable1/views/lexInventory.json
+++ b/force-app/main/default/experiences/Consumable1/views/lexInventory.json
@@ -1,81 +1,68 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:dynamicLayout",
- "dataProviders": [],
- "id": "86cd7e17-9d77-47e1-906e-f87e8a36b5e0",
- "label": "lexInventory",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {
- "background": "background: rgba(0,0,0,0)",
- "backgroundOverlay": "rgba(0,0,0,0.5)",
- "contentAreaWidth": 100,
- "sectionConfig": {
- "UUID": "d5972ccb-1ae1-42b2-bc91-1de65e0b8821",
- "columns": [
- {
- "UUID": "fed2ff4a-a0a3-4358-ab0a-593e1ce77c14",
- "columnKey": "1",
- "columnName": "Column 1",
- "columnWidth": "12",
- "seedComponents": []
- }
- ]
- },
- "sectionHeight": 300
- },
- "componentName": "forceCommunity:section",
- "id": "d5972ccb-1ae1-42b2-bc91-1de65e0b8821",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {},
- "componentName": "c:lexInventory",
- "id": "f87bb2fd-5cac-490f-ad2b-c0c96882413c",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "fed2ff4a-a0a3-4358-ab0a-593e1ce77c14",
- "regionLabel": "Column 1",
- "regionName": "1",
- "renditionMap": {},
- "type": "region"
- }
- ],
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "6f5860dd-27a5-44e6-8c5d-2d1011245d0d",
- "regionName": "content",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "鐩樼偣~娑堣�楀搧绠＄悊绯荤粺"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "7eb8f5a5-046e-44af-ba4f-c2805b21ef82",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "e30387d3-bc5d-45e1-9b2f-4c232581c35a",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "custom-lex-inventory"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:dynamicLayout",
+ "dataProviders" : [ ],
+ "id" : "5a24538d-0a99-40a3-a6a1-4496d0333a05",
+ "label" : "LexInventory",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : {
+ "background" : "background: rgba(0,0,0,0)",
+ "backgroundOverlay" : "rgba(0,0,0,0.5)",
+ "contentAreaWidth" : 100,
+ "sectionConfig" : {
+ "UUID" : "01395e1f-fbd3-4be4-9cf0-24df23b8b820",
+ "columns" : [ {
+ "UUID" : "c27de1cb-1805-4399-a99e-cbd7ff3ecd10",
+ "columnKey" : "1",
+ "columnName" : "Column 1",
+ "columnWidth" : "12",
+ "seedComponents" : [ ]
+ } ]
+ },
+ "sectionHeight" : 300
+ },
+ "componentName" : "forceCommunity:section",
+ "id" : "01395e1f-fbd3-4be4-9cf0-24df23b8b820",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : { },
+ "componentName" : "c:lexInventory",
+ "id" : "567f3188-aa85-40b7-b2fa-9caf501e4b44",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "c27de1cb-1805-4399-a99e-cbd7ff3ecd10",
+ "regionLabel" : "Column 1",
+ "regionName" : "1",
+ "renditionMap" : { },
+ "type" : "region"
+ } ],
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "45b8b9b5-bc3e-45f2-b8fb-a5c5b77924b6",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "搴撳瓨鐩樼偣 ~ 娑堣�楀搧绠＄悊绯荤粺"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "49bde76e-3088-4ae0-91e2-a0d7f68a7ca6",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "9e364a81-0317-445a-b308-8746e418eea6",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "custom-lexinventory"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/lexInventoryView.json b/force-app/main/default/experiences/Consumable1/views/lexInventoryView.json
index 2f7118e..3c32a58 100644
--- a/force-app/main/default/experiences/Consumable1/views/lexInventoryView.json
+++ b/force-app/main/default/experiences/Consumable1/views/lexInventoryView.json
@@ -1,81 +1,68 @@
{
- "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
- "componentName": "siteforce:dynamicLayout",
- "dataProviders": [],
- "id": "afb34dd9-404b-4bea-949d-07c42681d821",
- "label": "LexInventoryView",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {
- "background": "background: rgba(0,0,0,0)",
- "backgroundOverlay": "rgba(0,0,0,0.5)",
- "contentAreaWidth": 100,
- "sectionConfig": {
- "UUID": "747680b6-fa7d-40b9-9fb2-5eeedec2111f",
- "columns": [
- {
- "UUID": "7dae9038-fe28-4dd2-beda-d90442f650d1",
- "columnKey": "1",
- "columnName": "Column 1",
- "columnWidth": "12",
- "seedComponents": []
- }
- ]
- },
- "sectionHeight": 300
- },
- "componentName": "forceCommunity:section",
- "id": "747680b6-fa7d-40b9-9fb2-5eeedec2111f",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {},
- "componentName": "c:lexinventoryViewLWC",
- "id": "2db28040-90b0-4c1c-8793-28479780c069",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "7dae9038-fe28-4dd2-beda-d90442f650d1",
- "regionLabel": "Column 1",
- "regionName": "1",
- "renditionMap": {},
- "type": "region"
- }
- ],
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "f951952b-7e3c-4622-bef8-b6c333c9913d",
- "regionName": "content",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "搴撳瓨 ~ 娑堣�楀搧绠＄悊绯荤粺"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "54a2e6e2-68ec-4ad2-9e6d-e2ab853931bc",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "417422ac-dd59-4afe-bf23-e35fda0bc023",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "custom-lexinventoryview"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:dynamicLayout",
+ "dataProviders" : [ ],
+ "id" : "afb34dd9-404b-4bea-949d-07c42681d821",
+ "label" : "LexInventoryView",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : {
+ "background" : "background: rgba(0,0,0,0)",
+ "backgroundOverlay" : "rgba(0,0,0,0.5)",
+ "contentAreaWidth" : 100,
+ "sectionConfig" : {
+ "UUID" : "747680b6-fa7d-40b9-9fb2-5eeedec2111f",
+ "columns" : [ {
+ "UUID" : "7dae9038-fe28-4dd2-beda-d90442f650d1",
+ "columnKey" : "1",
+ "columnName" : "Column 1",
+ "columnWidth" : "12",
+ "seedComponents" : [ ]
+ } ]
+ },
+ "sectionHeight" : 300
+ },
+ "componentName" : "forceCommunity:section",
+ "id" : "747680b6-fa7d-40b9-9fb2-5eeedec2111f",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : { },
+ "componentName" : "c:lexinventoryViewLWC",
+ "id" : "2db28040-90b0-4c1c-8793-28479780c069",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "7dae9038-fe28-4dd2-beda-d90442f650d1",
+ "regionLabel" : "Column 1",
+ "regionName" : "1",
+ "renditionMap" : { },
+ "type" : "region"
+ } ],
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "f951952b-7e3c-4622-bef8-b6c333c9913d",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "搴撳瓨 ~ 娑堣�楀搧绠＄悊绯荤粺"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "54a2e6e2-68ec-4ad2-9e6d-e2ab853931bc",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "417422ac-dd59-4afe-bf23-e35fda0bc023",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "custom-lexinventoryview"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/lexOutboundorderImport.json b/force-app/main/default/experiences/Consumable1/views/lexOutboundorderImport.json
index 514a9da..8201e8f 100644
--- a/force-app/main/default/experiences/Consumable1/views/lexOutboundorderImport.json
+++ b/force-app/main/default/experiences/Consumable1/views/lexOutboundorderImport.json
@@ -1,55 +1,68 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "f8b18a5a-4f37-46d3-946e-3c5307c081e6",
- "label": "LexOutboundorderImport",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {},
- "componentName": "c:lexOutboundorderImport",
- "id": "3a2da04d-2fb3-4dc7-aadc-40c9a0fb049e",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "280aa141-39f4-4ce6-8d22-f8c7132cc3bf",
- "regionName": "header",
- "type": "region"
- },
- {
- "id": "396f0d91-64bb-48dd-a3c8-428458d7b4d1",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "a2a09aa1-691c-44b4-b20a-6450cfe54c0b",
- "regionName": "footer",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "娑堣�楀搧绠＄悊绯荤粺"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "20aa6845-e7bd-4cec-814f-c8a4422f0dd6",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "bb3f92d2-e08e-411c-9a7b-196a86da29d6",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "custom-lexoutboundorderimport"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:dynamicLayout",
+ "dataProviders" : [ ],
+ "id" : "e8224149-f1b9-4c44-8839-4d9737739c72",
+ "label" : "LexOutboundorderImport",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : {
+ "background" : "background: rgba(0,0,0,0)",
+ "backgroundOverlay" : "rgba(0,0,0,0.5)",
+ "contentAreaWidth" : 100,
+ "sectionConfig" : {
+ "UUID" : "83050955-aa3b-4e32-80a6-da5359b8362a",
+ "columns" : [ {
+ "UUID" : "fbfcccd6-3c29-49b4-9a8b-ce0fadccab60",
+ "columnKey" : "1",
+ "columnName" : "Column 1",
+ "columnWidth" : "12",
+ "seedComponents" : [ ]
+ } ]
+ },
+ "sectionHeight" : 300
+ },
+ "componentName" : "forceCommunity:section",
+ "id" : "83050955-aa3b-4e32-80a6-da5359b8362a",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : { },
+ "componentName" : "c:lexOutboundorderImport",
+ "id" : "68e59073-ba5b-46d7-b8cd-552587a748a2",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "fbfcccd6-3c29-49b4-9a8b-ce0fadccab60",
+ "regionLabel" : "Column 1",
+ "regionName" : "1",
+ "renditionMap" : { },
+ "type" : "region"
+ } ],
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "f58362fc-b12d-41ba-bb99-fce2e6dba3fb",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "鍑哄簱 ~ 娑堣�楀搧绠＄悊绯荤粺"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "e562ea3b-ac29-4271-9010-481f74d59780",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "ddc00cfb-8eb3-49b7-8d9a-44ac4fe1979b",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "custom-lexoutboundorderimport"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/lexOverdueStock.json b/force-app/main/default/experiences/Consumable1/views/lexOverdueStock.json
index 7d8b505..d329553 100644
--- a/force-app/main/default/experiences/Consumable1/views/lexOverdueStock.json
+++ b/force-app/main/default/experiences/Consumable1/views/lexOverdueStock.json
@@ -1,55 +1,68 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "38d1e97a-0728-46a2-bee1-0c72ff1d6570",
- "label": "LexOverdueStock",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {},
- "componentName": "c:lexOverdueStock",
- "id": "4a56ea96-8dbf-466a-8bae-c63c91494b47",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "a4b13816-1cc1-4942-aac1-cd4a877f682a",
- "regionName": "header",
- "type": "region"
- },
- {
- "id": "1bef605d-91f2-4557-bd39-00d4b2427d95",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "e77e1337-6376-42be-847a-d4bd459d81ce",
- "regionName": "footer",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "杩囨湡搴撳瓨閿�瀛榽娑堣�楀搧绠＄悊绯荤粺"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "0f5328a8-e4da-44d4-aa05-943f2aeb1a05",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "6da76625-3ea0-4b35-b08e-99dd6de43df8",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "custom-lexoverduestock"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:dynamicLayout",
+ "dataProviders" : [ ],
+ "id" : "b0f2e8e7-62fd-42f3-bf3a-4bdf40b02bf4",
+ "label" : "LexOverdueStock",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : {
+ "background" : "background: rgba(0,0,0,0)",
+ "backgroundOverlay" : "rgba(0,0,0,0.5)",
+ "contentAreaWidth" : 100,
+ "sectionConfig" : {
+ "UUID" : "cdbb12a5-9c06-495c-97bd-111a00ed0880",
+ "columns" : [ {
+ "UUID" : "4d9b4158-4336-47ad-8d7f-f2814c843237",
+ "columnKey" : "1",
+ "columnName" : "Column 1",
+ "columnWidth" : "12",
+ "seedComponents" : [ ]
+ } ]
+ },
+ "sectionHeight" : 300
+ },
+ "componentName" : "forceCommunity:section",
+ "id" : "cdbb12a5-9c06-495c-97bd-111a00ed0880",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : { },
+ "componentName" : "c:lexOverdueStock",
+ "id" : "1840dac3-e335-4628-b86b-d46d31831af5",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "4d9b4158-4336-47ad-8d7f-f2814c843237",
+ "regionLabel" : "Column 1",
+ "regionName" : "1",
+ "renditionMap" : { },
+ "type" : "region"
+ } ],
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "70a9cbdd-d242-44d6-9ade-f12aa57a6101",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "杩囨湡搴撳瓨閿�瀛� ~ 娑堣�楀搧绠＄悊绯荤粺"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "65ba038f-9318-496d-9863-751d9b084cb0",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "87ad5976-ac2f-446f-aa1e-f9a0d34525fb",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "custom-lexoverduestock"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/lexProductLimitEdit.json b/force-app/main/default/experiences/Consumable1/views/lexProductLimitEdit.json
index 99f9a97..d330d96 100644
--- a/force-app/main/default/experiences/Consumable1/views/lexProductLimitEdit.json
+++ b/force-app/main/default/experiences/Consumable1/views/lexProductLimitEdit.json
@@ -1,81 +1,68 @@
{
- "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
- "componentName": "siteforce:dynamicLayout",
- "dataProviders": [],
- "id": "57a80c74-e471-4b90-b214-580f7d3b66cd",
- "label": "LexProductLimitEdit",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {
- "background": "background: rgba(0,0,0,0)",
- "backgroundOverlay": "rgba(0,0,0,0.5)",
- "contentAreaWidth": 100,
- "sectionConfig": {
- "UUID": "59856db5-4bb3-414f-83d5-8ae14ccfc0d6",
- "columns": [
- {
- "UUID": "b78140a7-5f4e-4685-a3c4-0a92ba950dc7",
- "columnKey": "1",
- "columnName": "Column 1",
- "columnWidth": "12",
- "seedComponents": []
- }
- ]
- },
- "sectionHeight": 300
- },
- "componentName": "forceCommunity:section",
- "id": "59856db5-4bb3-414f-83d5-8ae14ccfc0d6",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {},
- "componentName": "c:lexProductLimitEdit",
- "id": "a096dd49-afe0-4796-8af0-cedd62664f2c",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "b78140a7-5f4e-4685-a3c4-0a92ba950dc7",
- "regionLabel": "Column 1",
- "regionName": "1",
- "renditionMap": {},
- "type": "region"
- }
- ],
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "d17f6f02-da3e-4235-81d9-1502e0ec6ca3",
- "regionName": "content",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "搴撳瓨涓婁笅闄� ~ 娑堣�楀搧绠＄悊绯荤粺"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "f5b7eb44-8ce3-40c9-b71a-d5d9f3552955",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "2257c0fb-ca9b-4e22-9e82-b20b1c22eb1d",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "custom-lexproductlimitedit"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:dynamicLayout",
+ "dataProviders" : [ ],
+ "id" : "57a80c74-e471-4b90-b214-580f7d3b66cd",
+ "label" : "LexProductLimitEdit",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : {
+ "background" : "background: rgba(0,0,0,0)",
+ "backgroundOverlay" : "rgba(0,0,0,0.5)",
+ "contentAreaWidth" : 100,
+ "sectionConfig" : {
+ "UUID" : "59856db5-4bb3-414f-83d5-8ae14ccfc0d6",
+ "columns" : [ {
+ "UUID" : "b78140a7-5f4e-4685-a3c4-0a92ba950dc7",
+ "columnKey" : "1",
+ "columnName" : "Column 1",
+ "columnWidth" : "12",
+ "seedComponents" : [ ]
+ } ]
+ },
+ "sectionHeight" : 300
+ },
+ "componentName" : "forceCommunity:section",
+ "id" : "59856db5-4bb3-414f-83d5-8ae14ccfc0d6",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : { },
+ "componentName" : "c:lexProductLimitEdit",
+ "id" : "a096dd49-afe0-4796-8af0-cedd62664f2c",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "b78140a7-5f4e-4685-a3c4-0a92ba950dc7",
+ "regionLabel" : "Column 1",
+ "regionName" : "1",
+ "renditionMap" : { },
+ "type" : "region"
+ } ],
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "d17f6f02-da3e-4235-81d9-1502e0ec6ca3",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "搴撳瓨涓婁笅闄� ~ 娑堣�楀搧绠＄悊绯荤粺"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "f5b7eb44-8ce3-40c9-b71a-d5d9f3552955",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "2257c0fb-ca9b-4e22-9e82-b20b1c22eb1d",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "custom-lexproductlimitedit"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/lexRemoveBox.json b/force-app/main/default/experiences/Consumable1/views/lexRemoveBox.json
index e431d91..9f85c79 100644
--- a/force-app/main/default/experiences/Consumable1/views/lexRemoveBox.json
+++ b/force-app/main/default/experiences/Consumable1/views/lexRemoveBox.json
@@ -1,81 +1,68 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:dynamicLayout",
- "dataProviders": [],
- "id": "8feef62c-b227-4815-b93f-fe0fe07a34bd",
- "label": "lexRemoveBox",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {
- "background": "background: rgba(0,0,0,0)",
- "backgroundOverlay": "rgba(0,0,0,0.5)",
- "contentAreaWidth": 100,
- "sectionConfig": {
- "UUID": "f3c5d228-c50a-4ecc-8a29-f06be86bb4ac",
- "columns": [
- {
- "UUID": "c05d007d-f593-42c1-a4b4-1cbf7095d56b",
- "columnKey": "1",
- "columnName": "Column 1",
- "columnWidth": "12",
- "seedComponents": []
- }
- ]
- },
- "sectionHeight": 300
- },
- "componentName": "forceCommunity:section",
- "id": "f3c5d228-c50a-4ecc-8a29-f06be86bb4ac",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {},
- "componentName": "c:lexRemoveBox",
- "id": "d16c00a3-c5f4-4385-91f3-834488f39600",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "c05d007d-f593-42c1-a4b4-1cbf7095d56b",
- "regionLabel": "Column 1",
- "regionName": "1",
- "renditionMap": {},
- "type": "region"
- }
- ],
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "8e5500f1-3f43-475d-a41f-26a35a4fd06e",
- "regionName": "content",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "鎷嗙洅 ~娑堣�楀搧绠＄悊绯荤粺"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "c044df7e-0f7d-459b-9082-4e5b89bca9e1",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "06074999-fc27-4540-a8d6-a467900db79e",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "custom-lexremovebox"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:dynamicLayout",
+ "dataProviders" : [ ],
+ "id" : "b4a2ba1b-3827-4ec7-8f8e-5461c3893ce0",
+ "label" : "LexRemoveBox",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : {
+ "background" : "background: rgba(0,0,0,0)",
+ "backgroundOverlay" : "rgba(0,0,0,0.5)",
+ "contentAreaWidth" : 100,
+ "sectionConfig" : {
+ "UUID" : "c8d284bf-b761-4de7-88ad-d976e03783c2",
+ "columns" : [ {
+ "UUID" : "74d9ee71-cdf0-46f9-87e0-56feb724f0de",
+ "columnKey" : "1",
+ "columnName" : "Column 1",
+ "columnWidth" : "12",
+ "seedComponents" : [ ]
+ } ]
+ },
+ "sectionHeight" : 300
+ },
+ "componentName" : "forceCommunity:section",
+ "id" : "c8d284bf-b761-4de7-88ad-d976e03783c2",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : { },
+ "componentName" : "c:lexRemoveBox",
+ "id" : "ff8f68eb-eb9b-40db-94ca-6aec9fb379c3",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "74d9ee71-cdf0-46f9-87e0-56feb724f0de",
+ "regionLabel" : "Column 1",
+ "regionName" : "1",
+ "renditionMap" : { },
+ "type" : "region"
+ } ],
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "e555311d-b588-4ab1-add1-4f830b0ebc03",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "鎷嗙洅 ~ 娑堣�楀搧绠＄悊绯荤粺"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "ad6dcd28-5872-4bac-b016-ea09e096a6c3",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "7c28cb01-e082-404a-81a8-7afe5f78c023",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "custom-lexremovebox"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/lexSaleAndDelivery.json b/force-app/main/default/experiences/Consumable1/views/lexSaleAndDelivery.json
index 1a65064..0d525f5 100644
--- a/force-app/main/default/experiences/Consumable1/views/lexSaleAndDelivery.json
+++ b/force-app/main/default/experiences/Consumable1/views/lexSaleAndDelivery.json
@@ -1,55 +1,68 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "f5a6e76f-41cd-4eb3-8652-695bcce0e678",
- "label": "LexSaleAndDelivery",
- "regions": [
- {
- "id": "1f0946e1-1735-4650-a205-dd61df8759d4",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {},
- "componentName": "c:lexSaleAndDelivery",
- "id": "e3313269-05be-4724-aa4e-db0958a1ddd0",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "3367d193-f337-49ca-95ca-6ac1caaa7349",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "e25f498e-41fb-4f4d-8dfe-fbf9a069cb93",
- "regionName": "footer",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "娑堣�楀搧绠＄悊绯荤粺"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "84ec3d27-0378-42f8-a3ac-3fd350b72067",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "430f1ad6-c368-493e-b311-28818c66e9cd",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "custom-lexsaleanddelivery"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:dynamicLayout",
+ "dataProviders" : [ ],
+ "id" : "e5d81e8f-b0a5-4bf3-b11b-08dd8fef1a3c",
+ "label" : "LexSaleAndDelivery",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : {
+ "background" : "background: rgba(0,0,0,0)",
+ "backgroundOverlay" : "rgba(0,0,0,0.5)",
+ "contentAreaWidth" : 100,
+ "sectionConfig" : {
+ "UUID" : "02b47908-d44c-4ffe-89b4-6aad09343bd0",
+ "columns" : [ {
+ "UUID" : "a1846e1c-c395-4e77-9218-5375bac83cb8",
+ "columnKey" : "1",
+ "columnName" : "Column 1",
+ "columnWidth" : "12",
+ "seedComponents" : [ ]
+ } ]
+ },
+ "sectionHeight" : 300
+ },
+ "componentName" : "forceCommunity:section",
+ "id" : "02b47908-d44c-4ffe-89b4-6aad09343bd0",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : { },
+ "componentName" : "c:lexSaleAndDelivery",
+ "id" : "b77b243f-d2ce-42ff-8349-048ba0100837",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "a1846e1c-c395-4e77-9218-5375bac83cb8",
+ "regionLabel" : "Column 1",
+ "regionName" : "1",
+ "renditionMap" : { },
+ "type" : "region"
+ } ],
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "ed598892-294e-43c2-b91c-4df7dae88a1b",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "鍑哄簱 ~ 娑堣�楀搧绠＄悊绯荤粺"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "5ee61636-ae06-4737-9d50-20fd9a6971db",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "e27b9d74-50aa-4022-bffa-7f6a08f707b8",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "custom-lexsaleanddelivery"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/lexSummonsCreat.json b/force-app/main/default/experiences/Consumable1/views/lexSummonsCreat.json
index 27b35e2..b12431a 100644
--- a/force-app/main/default/experiences/Consumable1/views/lexSummonsCreat.json
+++ b/force-app/main/default/experiences/Consumable1/views/lexSummonsCreat.json
@@ -1,55 +1,68 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "b7e402c5-b5ed-4d2c-8cd1-a7c189bfbcda",
- "label": "LexSummonsCreat",
- "regions": [
- {
- "id": "6388ef86-a800-4056-811f-d56f7381b8a1",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {},
- "componentName": "c:lexSummonsCreat",
- "id": "2cf76214-9746-4039-aa9f-8d956261bf1e",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "5080fa3e-dede-46af-8878-00cefafbea4a",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "9138e351-3acd-45bd-8f86-81f98fc33515",
- "regionName": "footer",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "娑堣�楀搧绠＄悊绯荤粺"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "08468c2f-c8ee-4a89-b3a4-e8a329634e17",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "29505c19-f110-4803-a463-159e2e71fb3d",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "custom-lexsummonscreat"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:dynamicLayout",
+ "dataProviders" : [ ],
+ "id" : "c2e9c913-ab1c-4b38-899b-136fb95066fb",
+ "label" : "LexSummonsCreat",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : {
+ "background" : "background: rgba(0,0,0,0)",
+ "backgroundOverlay" : "rgba(0,0,0,0.5)",
+ "contentAreaWidth" : 100,
+ "sectionConfig" : {
+ "UUID" : "2f081513-f8b1-4a18-93ed-07528785644e",
+ "columns" : [ {
+ "UUID" : "0034a928-ed12-4a8f-8b61-e2a879be675e",
+ "columnKey" : "1",
+ "columnName" : "Column 1",
+ "columnWidth" : "12",
+ "seedComponents" : [ ]
+ } ]
+ },
+ "sectionHeight" : 300
+ },
+ "componentName" : "forceCommunity:section",
+ "id" : "2f081513-f8b1-4a18-93ed-07528785644e",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : { },
+ "componentName" : "c:lexSummonsCreat",
+ "id" : "78274e15-2cc6-4863-8ce4-2d10e89d802f",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "0034a928-ed12-4a8f-8b61-e2a879be675e",
+ "regionLabel" : "Column 1",
+ "regionName" : "1",
+ "renditionMap" : { },
+ "type" : "region"
+ } ],
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "74103ed0-eb74-4ae0-a9f5-aa1bed790517",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "鍑哄簱鍗曟槑缁� ~ 娑堣�楀搧绠＄悊绯荤粺"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "569ba6aa-c702-4a13-aed6-79a792706f37",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "cf2865b2-d5a1-434f-b53f-927218bca79c",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "custom-lexsummonscreat"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/lexTopPage.json b/force-app/main/default/experiences/Consumable1/views/lexTopPage.json
index b467e71..53afc76 100644
--- a/force-app/main/default/experiences/Consumable1/views/lexTopPage.json
+++ b/force-app/main/default/experiences/Consumable1/views/lexTopPage.json
@@ -1,81 +1,68 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:dynamicLayout",
- "dataProviders": [],
- "id": "bda75bd7-499d-4d41-ad47-2d49173854dd",
- "label": "lexTopPage",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {
- "background": "background: rgba(0,0,0,0)",
- "backgroundOverlay": "rgba(0,0,0,0.5)",
- "contentAreaWidth": 100,
- "sectionConfig": {
- "UUID": "5d2f345c-27a4-493e-b41b-0aa663636b99",
- "columns": [
- {
- "UUID": "c9d294f7-8319-44f8-ba80-34ec0c7b6bc7",
- "columnKey": "1",
- "columnName": "Column 1",
- "columnWidth": "12",
- "seedComponents": []
- }
- ]
- },
- "sectionHeight": 300
- },
- "componentName": "forceCommunity:section",
- "id": "5d2f345c-27a4-493e-b41b-0aa663636b99",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {},
- "componentName": "c:lexTopPage",
- "id": "bcc522fd-ec7f-44db-a05e-54157d9c1f3b",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "c9d294f7-8319-44f8-ba80-34ec0c7b6bc7",
- "regionLabel": "Column 1",
- "regionName": "1",
- "renditionMap": {},
- "type": "region"
- }
- ],
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "34880e8c-124a-46db-ab66-c8ab4dc1af9c",
- "regionName": "content",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "娑堣�楀搧绠＄悊绯荤粺"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "638a5a1c-d763-42b1-9ffa-f45692336891",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "9f86202b-a3f8-4a98-9255-352caf7a80c8",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "custom-lextoppage"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:dynamicLayout",
+ "dataProviders" : [ ],
+ "id" : "09c93676-a531-4ba7-8708-cc47f8458c90",
+ "label" : "LexTopPage",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : {
+ "background" : "background: rgba(0,0,0,0)",
+ "backgroundOverlay" : "rgba(0,0,0,0.5)",
+ "contentAreaWidth" : 100,
+ "sectionConfig" : {
+ "UUID" : "3493c458-56a0-4990-8499-772754716049",
+ "columns" : [ {
+ "UUID" : "9eb85cd6-22f0-4d6c-89bf-bfdf13eb4889",
+ "columnKey" : "1",
+ "columnName" : "Column 1",
+ "columnWidth" : "12",
+ "seedComponents" : [ ]
+ } ]
+ },
+ "sectionHeight" : 300
+ },
+ "componentName" : "forceCommunity:section",
+ "id" : "3493c458-56a0-4990-8499-772754716049",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : { },
+ "componentName" : "c:lexTopPage",
+ "id" : "a987052c-27fc-4881-a10a-76813f6f1a37",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "9eb85cd6-22f0-4d6c-89bf-bfdf13eb4889",
+ "regionLabel" : "Column 1",
+ "regionName" : "1",
+ "renditionMap" : { },
+ "type" : "region"
+ } ],
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "fef29330-80e6-40e7-83ce-74b60dd68887",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "璁㈠崟鎻愮ず ~ 娑堣�楀搧绠＄悊绯荤粺"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "6dbf3064-0f5f-4648-a787-4a09f1d915fe",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "8cd1759d-130c-40a0-99b0-395cdd92cdc8",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "custom-lextoppage"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/login.json b/force-app/main/default/experiences/Consumable1/views/login.json
index bd6d05d..d80ae2e 100644
--- a/force-app/main/default/experiences/Consumable1/views/login.json
+++ b/force-app/main/default/experiences/Consumable1/views/login.json
@@ -1,91 +1,65 @@
{
- "appPageId": "bfbf7350-cdcd-4e2c-97a5-ab51f2aa3b9d",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "4c2e26c5-f1ea-42e0-85f6-371bc184fe49",
- "label": "Login",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {
- "forgotPasswordLabel": "蹇樿瀵嗙爜锛�",
- "forgotPasswordUrl": "/ForgotPassword",
- "loginButtonLabel": "鐧诲綍",
- "passwordLabel": "瀵嗙爜",
- "selfRegisterLabel": "Not a member?",
- "selfRegisterUrl": "/SelfRegister",
- "startUrl": "",
- "usernameLabel": "鐢ㄦ埛鍚�"
- },
- "componentName": "salesforceIdentity:loginForm2",
- "id": "d6a2d892-7104-4e50-8da1-d4b81c2fd790",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "0249aee3-9513-4ce4-bc73-57051629556f",
- "regionName": "content",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "Login"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "a508199c-9ac8-499b-9259-710b933385c9",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "b1f4c1e9-2975-469b-8450-23c36497bdb0",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {},
- "componentName": "salesforceIdentity:communityLogo2",
- "id": "44fd503d-4872-47ae-bd55-4e249e60eaac",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- },
- {
- "componentAttributes": {
- "headerText": "",
- "showHeader": false,
- "useCommunityDomainSso": true
- },
- "componentName": "salesforceIdentity:socialLogin2",
- "id": "5197f70b-55e5-4e64-827c-54630cc74b0c",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "ad5d0647-ce12-47ee-8439-a47a35d876ce",
- "regionName": "header",
- "type": "region"
- },
- {
- "id": "70260364-5f55-47f8-9e09-bf445957eea1",
- "regionName": "sidebar",
- "type": "region"
- },
- {
- "id": "b50b01b5-4352-4dce-850c-f4d477bb871b",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Login",
- "type": "view",
- "viewType": "login-home"
-}
+ "appPageId" : "7756c67f-7774-4fe1-b1c2-eecb19f9c6a5",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "7c2dd152-d6d3-4652-bbfe-cb8e11d83c43",
+ "label" : "Login",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : { },
+ "componentName" : "salesforceIdentity:communityLogo2",
+ "id" : "a96beff8-2727-4f74-b08a-e908ab6e72be",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ }, {
+ "componentAttributes" : {
+ "forgotPasswordLabel" : "蹇樿瀵嗙爜锛�",
+ "forgotPasswordUrl" : "/ForgotPassword",
+ "loginButtonLabel" : "鐧诲綍",
+ "passwordLabel" : "瀵嗙爜",
+ "selfRegisterLabel" : "Not a member?",
+ "selfRegisterUrl" : "/SelfRegister",
+ "startUrl" : "",
+ "usernameLabel" : "鐢ㄦ埛鍚�"
+ },
+ "componentName" : "salesforceIdentity:loginForm2",
+ "id" : "2de8135d-cb57-4614-9afe-2453f1cbe676",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ }, {
+ "componentAttributes" : {
+ "headerText" : "",
+ "showHeader" : false,
+ "useCommunityDomainSso" : true
+ },
+ "componentName" : "salesforceIdentity:socialLogin2",
+ "id" : "f4d72a64-5e5f-48d8-8bb7-4253a8309b40",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "11b4798e-fa84-4594-beea-500d991e23f2",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "Login"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "c72bcc7d-29ea-40e6-969c-c818f267f8f4",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "02d41dc1-9a37-47cf-90c8-438d40bba670",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Login",
+ "type" : "view",
+ "viewType" : "login-home"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/loginError.json b/force-app/main/default/experiences/Consumable1/views/loginError.json
index 69201dc..6648673 100644
--- a/force-app/main/default/experiences/Consumable1/views/loginError.json
+++ b/force-app/main/default/experiences/Consumable1/views/loginError.json
@@ -1,57 +1,48 @@
{
- "appPageId": "bfbf7350-cdcd-4e2c-97a5-ab51f2aa3b9d",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "a8ddd7f3-7895-497a-bb20-7f0ce5c387aa",
- "label": "Login Error",
- "regions": [
- {
- "id": "79334ce5-8806-43ed-824a-36948d933f87",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "richTextValue": "<div style=\"text-align: center;\">Invalid Page</div>"
- },
- "componentName": "forceCommunity:richTextInline",
- "id": "a7518e76-7f61-466f-a82a-9880b806f1af",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "72829da8-38fa-478c-a4d8-70e3cbb74749",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "0e1faede-f160-45cf-83d8-9c0256af66dc",
- "regionName": "footer",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "Login Error"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "8afbbb1d-2436-4920-83de-2485490447f8",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "d30d0bbc-dc48-4a9e-a6a4-56831143992b",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Login",
- "type": "view",
- "viewType": "login-error"
-}
+ "appPageId" : "7756c67f-7774-4fe1-b1c2-eecb19f9c6a5",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "ba40442c-80fc-411f-8c02-9cfce2ab1372",
+ "label" : "Login Error",
+ "regions" : [ {
+ "id" : "18c0d543-48fc-4503-82bf-96cb3cb61e53",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "richTextValue" : "<div style=\"text-align: center;\">Invalid Page</div>"
+ },
+ "componentName" : "forceCommunity:richTextInline",
+ "id" : "98a859f9-d38a-4454-b376-39558ba5a564",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "6778281e-69dc-4122-abff-15414362a3e3",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "562ba090-15e4-4844-baa3-568c08ef67be",
+ "regionName" : "footer",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "Login Error"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "1367586b-b337-4e9b-b465-e2acd34738f8",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "012e5756-ea8f-4d49-9778-29654974830d",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Login",
+ "type" : "view",
+ "viewType" : "login-error"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/mDFAndCoop.json b/force-app/main/default/experiences/Consumable1/views/mDFAndCoop.json
index 8b7da27..31a52e7 100644
--- a/force-app/main/default/experiences/Consumable1/views/mDFAndCoop.json
+++ b/force-app/main/default/experiences/Consumable1/views/mDFAndCoop.json
@@ -1,198 +1,171 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "51554054-4eaf-44f6-96bd-b90145e6e078",
- "label": "MDF and Coop",
- "regions": [
- {
- "id": "698ada79-fc75-4ade-807e-75c384962660",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "richTextValue": " <p> <span style=\"font-size: 20px;\">Request and Manage your Market Developments Funds.</span> </p> "
- },
- "componentName": "forceCommunity:richTextInline",
- "id": "f49e0798-27c8-4219-84fa-8b3c270c0052",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- },
- {
- "componentAttributes": {
- "tabsetConfig": {
- "UUID": "e9ff9632-77ea-4754-b16c-2bce71e42671",
- "activeTab": "tab1",
- "tabs": [
- {
- "UUID": "37fc97f7-cde7-4498-aee2-80be33c2c147",
- "allowGuestUser": false,
- "locked": false,
- "seedComponents": [
- {
- "attributes": {
- "filterName": "Recent",
- "scope": "PartnerFundAllocation"
- },
- "fqn": "forceCommunity:objectHome"
- }
- ],
- "tabKey": "tab1",
- "tabName": "Fund Allocations"
- },
- {
- "UUID": "0c982ce9-9469-4a57-83f8-9dafc5a699cf",
- "allowGuestUser": false,
- "locked": false,
- "seedComponents": [
- {
- "attributes": {
- "filterName": "Recent",
- "scope": "PartnerFundRequest"
- },
- "fqn": "forceCommunity:objectHome"
- }
- ],
- "tabKey": "tab2",
- "tabName": "Fund Requests"
- },
- {
- "UUID": "cd13853b-84c0-4cd1-ae7d-efeb14ded580",
- "allowGuestUser": false,
- "locked": false,
- "seedComponents": [
- {
- "attributes": {
- "filterName": "Recent",
- "scope": "PartnerFundClaim"
- },
- "fqn": "forceCommunity:objectHome"
- }
- ],
- "tabKey": "tab3",
- "tabName": "Fund Claims"
- }
- ],
- "useOverflowMenu": false
- }
- },
- "componentName": "forceCommunity:tabset",
- "id": "e9ff9632-77ea-4754-b16c-2bce71e42671",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {
- "enableInlineEdit": true,
- "filterName": "Recent",
- "layout": "FULL",
- "pageSize": 25,
- "scope": "PartnerFundAllocation",
- "showActionBar": true,
- "showChartsPanel": true,
- "showDisplay": "showall",
- "showFilterPanel": true,
- "showImageIcon": true,
- "showManualRefreshButton": true,
- "showObjectName": true,
- "showPinnedList": true,
- "showSearchBar": true
- },
- "componentName": "forceCommunity:objectHome",
- "id": "3531b597-cb4c-4535-a558-8092b6fa8978",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "37fc97f7-cde7-4498-aee2-80be33c2c147",
- "regionLabel": "Fund Allocations",
- "regionName": "tab1",
- "renditionMap": {},
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "enableInlineEdit": true,
- "filterName": "Recent",
- "layout": "FULL",
- "pageSize": 25,
- "scope": "PartnerFundRequest",
- "showActionBar": true,
- "showChartsPanel": true,
- "showDisplay": "showall",
- "showFilterPanel": true,
- "showImageIcon": true,
- "showManualRefreshButton": true,
- "showObjectName": true,
- "showPinnedList": true,
- "showSearchBar": true
- },
- "componentName": "forceCommunity:objectHome",
- "id": "78d6e688-cf9c-4af1-ade6-6daeb2457ba7",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "0c982ce9-9469-4a57-83f8-9dafc5a699cf",
- "regionLabel": "Fund Requests",
- "regionName": "tab2",
- "renditionMap": {},
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "enableInlineEdit": true,
- "filterName": "Recent",
- "layout": "FULL",
- "pageSize": 25,
- "scope": "PartnerFundClaim",
- "showActionBar": true,
- "showChartsPanel": true,
- "showDisplay": "showall",
- "showFilterPanel": true,
- "showImageIcon": true,
- "showManualRefreshButton": true,
- "showObjectName": true,
- "showPinnedList": true,
- "showSearchBar": true
- },
- "componentName": "forceCommunity:objectHome",
- "id": "2b94ac35-0ffc-4846-a564-8ce23c8c82b5",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "cd13853b-84c0-4cd1-ae7d-efeb14ded580",
- "regionLabel": "Fund Claims",
- "regionName": "tab3",
- "renditionMap": {},
- "type": "region"
- }
- ],
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "b253bc1d-fe4a-4156-91f4-88f4725a3616",
+ "label" : "MDF and Coop",
+ "regions" : [ {
+ "id" : "b9dd4ac2-817d-4d34-874f-58def515fa47",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "richTextValue" : " <p> <span style=\"font-size: 20px;\">Request and Manage your Market Developments Funds.</span> </p> "
+ },
+ "componentName" : "forceCommunity:richTextInline",
+ "id" : "d8f1484b-ac5d-4563-adc7-7c5635d6cf40",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ }, {
+ "componentAttributes" : {
+ "tabsetConfig" : {
+ "UUID" : "08adad9c-71b1-4370-8572-a165f1f855a9",
+ "activeTab" : "tab1",
+ "tabs" : [ {
+ "UUID" : "dcaa5816-93b6-44fe-ae88-a3854c2c8863",
+ "allowGuestUser" : false,
+ "locked" : false,
+ "seedComponents" : [ {
+ "attributes" : {
+ "filterName" : "Recent",
+ "scope" : "PartnerFundAllocation"
+ },
+ "fqn" : "forceCommunity:objectHome"
+ } ],
+ "tabKey" : "tab1",
+ "tabName" : "Fund Allocations"
+ }, {
+ "UUID" : "24cea51a-4f10-469b-ab68-750473d6a847",
+ "allowGuestUser" : false,
+ "locked" : false,
+ "seedComponents" : [ {
+ "attributes" : {
+ "filterName" : "Recent",
+ "scope" : "PartnerFundRequest"
+ },
+ "fqn" : "forceCommunity:objectHome"
+ } ],
+ "tabKey" : "tab2",
+ "tabName" : "Fund Requests"
+ }, {
+ "UUID" : "46f65d8c-5983-4c38-9ea8-df27e49d3084",
+ "allowGuestUser" : false,
+ "locked" : false,
+ "seedComponents" : [ {
+ "attributes" : {
+ "filterName" : "Recent",
+ "scope" : "PartnerFundClaim"
+ },
+ "fqn" : "forceCommunity:objectHome"
+ } ],
+ "tabKey" : "tab3",
+ "tabName" : "Fund Claims"
+ } ],
+ "useOverflowMenu" : false
}
- ],
- "id": "8af61955-d97e-44f2-b708-b0b1f86dd6e4",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "1b5dacc9-d26b-484f-8de0-f7bee7b2b519",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "mdf"
-}
+ },
+ "componentName" : "forceCommunity:tabset",
+ "id" : "08adad9c-71b1-4370-8572-a165f1f855a9",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : {
+ "enableInlineEdit" : true,
+ "filterName" : "Recent",
+ "layout" : "FULL",
+ "pageSize" : 25,
+ "scope" : "PartnerFundAllocation",
+ "showActionBar" : true,
+ "showChartsPanel" : true,
+ "showDisplay" : "showall",
+ "showFilterPanel" : true,
+ "showImageIcon" : true,
+ "showManualRefreshButton" : true,
+ "showObjectName" : true,
+ "showPinnedList" : true,
+ "showSearchBar" : true
+ },
+ "componentName" : "forceCommunity:objectHome",
+ "id" : "26811630-f8f1-4326-91cc-25e8d8f712b3",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "dcaa5816-93b6-44fe-ae88-a3854c2c8863",
+ "regionLabel" : "Fund Allocations",
+ "regionName" : "tab1",
+ "renditionMap" : { },
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "enableInlineEdit" : true,
+ "filterName" : "Recent",
+ "layout" : "FULL",
+ "pageSize" : 25,
+ "scope" : "PartnerFundRequest",
+ "showActionBar" : true,
+ "showChartsPanel" : true,
+ "showDisplay" : "showall",
+ "showFilterPanel" : true,
+ "showImageIcon" : true,
+ "showManualRefreshButton" : true,
+ "showObjectName" : true,
+ "showPinnedList" : true,
+ "showSearchBar" : true
+ },
+ "componentName" : "forceCommunity:objectHome",
+ "id" : "8a6128de-fe3d-4cf1-b3a3-a81eefa1afd5",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "24cea51a-4f10-469b-ab68-750473d6a847",
+ "regionLabel" : "Fund Requests",
+ "regionName" : "tab2",
+ "renditionMap" : { },
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "enableInlineEdit" : true,
+ "filterName" : "Recent",
+ "layout" : "FULL",
+ "pageSize" : 25,
+ "scope" : "PartnerFundClaim",
+ "showActionBar" : true,
+ "showChartsPanel" : true,
+ "showDisplay" : "showall",
+ "showFilterPanel" : true,
+ "showImageIcon" : true,
+ "showManualRefreshButton" : true,
+ "showObjectName" : true,
+ "showPinnedList" : true,
+ "showSearchBar" : true
+ },
+ "componentName" : "forceCommunity:objectHome",
+ "id" : "d838a652-cd5d-4c9c-bce0-37ec29b10b2b",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "46f65d8c-5983-4c38-9ea8-df27e49d3084",
+ "regionLabel" : "Fund Claims",
+ "regionName" : "tab3",
+ "renditionMap" : { },
+ "type" : "region"
+ } ],
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "4a8ad10b-ad7d-4821-90e2-73e4e75738fe",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "d8a1fe61-f24d-4969-bfa9-9745db5d1021",
+ "regionName" : "footer",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "mdf"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/messages.json b/force-app/main/default/experiences/Consumable1/views/messages.json
index f1212ce..a949573 100644
--- a/force-app/main/default/experiences/Consumable1/views/messages.json
+++ b/force-app/main/default/experiences/Consumable1/views/messages.json
@@ -1,27 +1,23 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "a4397b8d-c4ab-44d4-b2dc-cce577b9d2c8",
- "label": "Messages",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {},
- "componentName": "forceChatter:messages",
- "id": "76859eb9-b786-4b53-9285-b3a81a95cd53",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "665047c1-c182-448a-bab3-d5a0d581d5bb",
- "regionName": "content",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "messages"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "55f1ae5d-c9ac-44ad-bb27-4c22dddc2a2e",
+ "label" : "Messages",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : { },
+ "componentName" : "forceChatter:messages",
+ "id" : "e42525c8-73ea-4e9f-8306-81021473d168",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "a60f42f5-2ed2-4a01-93e5-dff8f3f5552f",
+ "regionName" : "content",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "messages"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/myAccount.json b/force-app/main/default/experiences/Consumable1/views/myAccount.json
index 1659cc3..cf14ad8 100644
--- a/force-app/main/default/experiences/Consumable1/views/myAccount.json
+++ b/force-app/main/default/experiences/Consumable1/views/myAccount.json
@@ -1,109 +1,93 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:dynamicLayout",
- "dataProviders": [],
- "id": "25eab78c-263e-4a55-8bff-ad852efc15c9",
- "label": "My Account",
- "regions": [
- {
- "id": "c1b1b648-5ba6-4a83-8907-be9c4abd0d6d",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "background": "background: rgba(0,0,0,0)",
- "backgroundOverlay": "rgba(0,0,0,0.5)",
- "contentAreaWidth": 100,
- "sectionConfig": {
- "UUID": "dd822d23-1af7-4fff-b81a-8b05999fc3d8",
- "columns": [
- {
- "UUID": "8086ee04-373f-44dc-a32d-1b3949308dcf",
- "columnKey": "col1",
- "columnName": "column 1",
- "columnWidth": "12",
- "seedComponents": [
- {
- "attributes": {
- "recordId": "{!CurrentUser.accountId}",
- "sfdc:identifier": "forceCommunity_recordHeadline"
- },
- "fqn": "forceCommunity:recordHeadline"
- },
- {
- "attributes": {
- "recordId": "{!CurrentUser.accountId}",
- "sfdc:identifier": "forceCommunity_recordHomeTabs"
- },
- "fqn": "forceCommunity:recordHomeTabs"
- }
- ]
- }
- ]
- },
- "sectionHeight": 32
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:dynamicLayout",
+ "dataProviders" : [ ],
+ "id" : "2cd7a2df-9e65-4663-9e35-9b4134b4beb1",
+ "label" : "My Account",
+ "regions" : [ {
+ "id" : "23da0649-b638-4675-96dc-b2c9ab32b443",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "background" : "background: rgba(0,0,0,0)",
+ "backgroundOverlay" : "rgba(0,0,0,0.5)",
+ "contentAreaWidth" : 100,
+ "sectionConfig" : {
+ "UUID" : "f07182ad-75fc-4431-b6ba-400214c3d0ac",
+ "columns" : [ {
+ "UUID" : "3e85aad9-15c8-45da-bc0d-22dc37dd17d0",
+ "columnKey" : "col1",
+ "columnName" : "column 1",
+ "columnWidth" : "12",
+ "seedComponents" : [ {
+ "attributes" : {
+ "recordId" : "{!CurrentUser.accountId}",
+ "sfdc:identifier" : "forceCommunity_recordHeadline"
+ },
+ "fqn" : "forceCommunity:recordHeadline"
+ }, {
+ "attributes" : {
+ "recordId" : "{!CurrentUser.accountId}",
+ "sfdc:identifier" : "forceCommunity_recordHomeTabs"
+ },
+ "fqn" : "forceCommunity:recordHomeTabs"
+ } ]
+ } ]
+ },
+ "sectionHeight" : 32
+ },
+ "componentName" : "forceCommunity:section",
+ "id" : "f07182ad-75fc-4431-b6ba-400214c3d0ac",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : {
+ "recordId" : "{!CurrentUser.accountId}"
},
- "componentName": "forceCommunity:section",
- "id": "dd822d23-1af7-4fff-b81a-8b05999fc3d8",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {
- "recordId": "{!CurrentUser.accountId}"
- },
- "componentName": "forceCommunity:recordHeadline",
- "id": "0498afe2-2170-4e41-9a7b-5d96e1a9820b",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- },
- {
- "componentAttributes": {
- "detailsTabLabel": "Details",
- "discussionsTabLabel": "Feed",
- "recordId": "{!CurrentUser.accountId}",
- "relatedTabLabel": "Related",
- "showLegacyActivityComposer": false,
- "tab1Type": "details",
- "tab2Type": "related",
- "tab3Type": "chatter",
- "tab4Type": "none",
- "timelineTabLabel": "Activity"
- },
- "componentName": "forceCommunity:recordHomeTabs",
- "id": "9151bf03-f322-4ccf-93dc-3367571ea0f6",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "8086ee04-373f-44dc-a32d-1b3949308dcf",
- "regionLabel": "column 1",
- "regionName": "col1",
- "renditionMap": {},
- "type": "region"
- }
- ],
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "c12e8d8d-e1f3-43b9-8543-5c285db3c848",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "c6a9fc30-77e8-458b-a7f2-2f4d9fefc79b",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "my-account"
-}
+ "componentName" : "forceCommunity:recordHeadline",
+ "id" : "76e15d29-c38a-4c72-94b5-08c54a39de76",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ }, {
+ "componentAttributes" : {
+ "detailsTabLabel" : "Details",
+ "discussionsTabLabel" : "Feed",
+ "recordId" : "{!CurrentUser.accountId}",
+ "relatedTabLabel" : "Related",
+ "showLegacyActivityComposer" : false,
+ "tab1Type" : "details",
+ "tab2Type" : "related",
+ "tab3Type" : "chatter",
+ "tab4Type" : "none",
+ "timelineTabLabel" : "Activity"
+ },
+ "componentName" : "forceCommunity:recordHomeTabs",
+ "id" : "7d8fefed-3819-4d75-8e8a-4757c623ab25",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "3e85aad9-15c8-45da-bc0d-22dc37dd17d0",
+ "regionLabel" : "column 1",
+ "regionName" : "col1",
+ "renditionMap" : { },
+ "type" : "region"
+ } ],
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "b79a556f-e9df-45e1-bdab-1be9be91cfff",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "f4a5b0fd-e283-47e3-9183-5364ef798372",
+ "regionName" : "footer",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "my-account"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/questionDetail.json b/force-app/main/default/experiences/Consumable1/views/questionDetail.json
index c422177..6753ddd 100644
--- a/force-app/main/default/experiences/Consumable1/views/questionDetail.json
+++ b/force-app/main/default/experiences/Consumable1/views/questionDetail.json
@@ -1,105 +1,90 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:sldsTwoCol84Layout",
- "dataProviders": [],
- "id": "d4ed7ed0-3745-461e-acd3-32108749ab93",
- "label": "Question Detail",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {
- "bannerText": "",
- "bannerTextWithKnowledge": "Explore other <a href=\"javascript:void(0)\" class=\"headlineArticles\">articles</a> and <a href=\"javascript:void(0)\" class=\"headlineDiscussions\">discussions</a> on this topic.",
- "bannerTextWithoutKnowledge": "Explore other <a href=\"javascript:void(0)\" class=\"headlineDiscussions\">discussions</a> on this topic.",
- "pageType": "discussion",
- "showSubTopics": true,
- "title": "Welcome!",
- "uniqueNameOrId": "{!recordId}"
- },
- "componentName": "forceCommunity:headline",
- "id": "30e7636a-9f44-4386-927f-dc05e6dca7c3",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "5dc8a770-ab6e-425f-9737-c564f0ff61b8",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "id": "{!feedItemId}"
- },
- "componentName": "forceCommunity:feedItemDetail",
- "id": "541c18f5-73d0-4d1e-a815-5a6779bde321",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "d3c4b9c8-ec9d-4b90-bc4b-c0553ae852e6",
- "regionName": "content",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "numberOfItems": 5,
- "showViewCounts": true,
- "title": "Related Questions"
- },
- "componentName": "selfService:similarQuestions",
- "id": "3ec73f50-3c08-4ffa-9e59-13ffc1fd8262",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- },
- {
- "componentAttributes": {
- "channel": "DefaultChannel",
- "title": ""
- },
- "componentName": "forceCommunity:recommendations",
- "id": "034fc1f4-bc73-4cc7-b3de-62ce6abadbd5",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "c3057ca7-1e03-44b2-854d-944c6b2710c6",
- "regionName": "sidebar",
- "type": "region"
- },
- {
- "id": "9b430d39-728f-4c02-8d61-7140d62ff5b7",
- "regionName": "footer",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "{!Record.Title}"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "b5bcdcc8-6b0b-4742-916f-7690109d3a8e",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "e66b0876-ced9-4b9e-a9dc-d3ca8b04dd3b",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "feeditem"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:sldsTwoCol84Layout",
+ "dataProviders" : [ ],
+ "id" : "c29033d4-ea89-4311-9a8f-9b1cee010f96",
+ "label" : "Question Detail",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : {
+ "bannerText" : "",
+ "bannerTextWithKnowledge" : "Explore other <a href=\"javascript:void(0)\" class=\"headlineArticles\">articles</a> and <a href=\"javascript:void(0)\" class=\"headlineDiscussions\">discussions</a> on this topic.",
+ "bannerTextWithoutKnowledge" : "Explore other <a href=\"javascript:void(0)\" class=\"headlineDiscussions\">discussions</a> on this topic.",
+ "pageType" : "discussion",
+ "showSubTopics" : true,
+ "title" : "Welcome!",
+ "uniqueNameOrId" : "{!recordId}"
+ },
+ "componentName" : "forceCommunity:headline",
+ "id" : "84f7129f-6ae2-44fa-8479-fda420f20cf4",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "eb922188-1611-42f3-be3f-671128373c93",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "id" : "{!feedItemId}"
+ },
+ "componentName" : "forceCommunity:feedItemDetail",
+ "id" : "5f16c8ce-8910-4700-bf92-03bebb56d251",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "23ae6845-c63c-4df8-b294-1460939daf5b",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "numberOfItems" : 5,
+ "showViewCounts" : true,
+ "title" : "Related Questions"
+ },
+ "componentName" : "selfService:similarQuestions",
+ "id" : "2560050a-7f4a-4fe3-833b-4086f89d7cae",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ }, {
+ "componentAttributes" : {
+ "channel" : "DefaultChannel",
+ "title" : ""
+ },
+ "componentName" : "forceCommunity:recommendations",
+ "id" : "fefd9c6b-eac3-425b-a0a6-2721a4131d4f",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "386f4a49-d920-4888-a249-1ae1f4c1b0d8",
+ "regionName" : "sidebar",
+ "type" : "region"
+ }, {
+ "id" : "efd4c33f-e3bf-4021-abf9-be0b741a0cd7",
+ "regionName" : "footer",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "{!Record.Title}"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "f0017168-74ce-4587-8af7-4c5e0dc965eb",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "05ba98f5-e29b-47ce-8099-b16e50e34f30",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "feeditem"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/quipDocsRelatedList.json b/force-app/main/default/experiences/Consumable1/views/quipDocsRelatedList.json
index 11e89cc..95cf954 100644
--- a/force-app/main/default/experiences/Consumable1/views/quipDocsRelatedList.json
+++ b/force-app/main/default/experiences/Consumable1/views/quipDocsRelatedList.json
@@ -1,39 +1,33 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "b076cb5b-405f-4199-b9be-7429234ce226",
- "label": "Quip Docs Related List",
- "regions": [
- {
- "id": "e701d724-1504-44c7-92a3-ea1ec941cf73",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "parentRecordId": "{!recordId}"
- },
- "componentName": "forceCommunity:relatedQuipItemsView",
- "id": "a9d4f298-cfdd-48b7-ace5-0c47aadf2876",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "b12e6374-255d-413c-93a1-d14857aaf21a",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "a6b90480-6c77-4df3-a631-065e1f4f2c1b",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "extrelated-quip"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "be244254-9e8f-46bd-83e0-a6cdb3780540",
+ "label" : "Quip Docs Related List",
+ "regions" : [ {
+ "id" : "2a9b05d7-cafd-4e4d-8f30-067e7e2f45ed",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "parentRecordId" : "{!recordId}"
+ },
+ "componentName" : "forceCommunity:relatedQuipItemsView",
+ "id" : "a2c16258-72fb-4eb3-8b04-b80f8b4beafb",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "9bc5f2b8-7b65-47fc-a3d5-1d83ada44a72",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "73a8a853-5872-4055-8a42-9723c11db0e9",
+ "regionName" : "footer",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "extrelated-quip"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/recordDetail.json b/force-app/main/default/experiences/Consumable1/views/recordDetail.json
index 95616d5..898f432 100644
--- a/force-app/main/default/experiences/Consumable1/views/recordDetail.json
+++ b/force-app/main/default/experiences/Consumable1/views/recordDetail.json
@@ -1,76 +1,66 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "c8075095-c3fd-4d07-8079-0eb063287ad7",
- "label": "Record Detail",
- "regions": [
- {
- "id": "6da91020-2e9a-45bb-824c-c649aa91eb2b",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "recordId": "{!recordId}"
- },
- "componentName": "forceCommunity:recordHeadline",
- "id": "90d97e07-565d-4df0-b939-466bdcd3af4a",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- },
- {
- "componentAttributes": {
- "detailsTabLabel": "Details",
- "discussionsTabLabel": "Feed",
- "recordId": "{!recordId}",
- "relatedTabLabel": "Related",
- "showLegacyActivityComposer": false,
- "tab1Type": "details",
- "tab2Type": "related",
- "tab3Type": "chatter",
- "tab4Type": "none",
- "timelineTabLabel": "Activity"
- },
- "componentName": "forceCommunity:recordHomeTabs",
- "id": "8857f111-6bd5-4e6e-aeaf-c5222f826b61",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "bf3bbcd3-bf99-43a1-a4d8-139ede220c94",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "b0395436-3796-48d1-be24-0fdc721d91a3",
- "regionName": "footer",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "{!Record._Object}: {!Record._Title}"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "0a293aa4-d48c-4b46-8a04-30d0a0e02f54",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "24d73a32-25b2-404e-8b51-64f354ada477",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "detail"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "d30889c1-09fc-407a-8d9d-155b305cce6f",
+ "label" : "Record Detail",
+ "regions" : [ {
+ "id" : "58b8dc89-c614-4b2a-be76-1cd2733c7a2d",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "recordId" : "{!recordId}"
+ },
+ "componentName" : "forceCommunity:recordHeadline",
+ "id" : "d6471194-6314-4cc2-ad8d-8844760b584f",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ }, {
+ "componentAttributes" : {
+ "detailsTabLabel" : "Details",
+ "discussionsTabLabel" : "Feed",
+ "recordId" : "{!recordId}",
+ "relatedTabLabel" : "Related",
+ "showLegacyActivityComposer" : false,
+ "tab1Type" : "details",
+ "tab2Type" : "related",
+ "tab3Type" : "none",
+ "tab4Type" : "none",
+ "timelineTabLabel" : "Activity"
+ },
+ "componentName" : "forceCommunity:recordHomeTabs",
+ "id" : "43f7a144-34dd-4fe7-a4d6-9b4ce60a2633",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "79ac024a-2855-4c3d-ad2e-1529cb3588a7",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "73ccaf9e-c514-4a24-aaf6-c5c0d176c356",
+ "regionName" : "footer",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "{!Record._Object}: {!Record._Title}"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "23c28297-68e4-4693-b7c2-eddb3a672965",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "06f1cca0-baa5-4d1c-b943-72735f101956",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "detail"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/recordList.json b/force-app/main/default/experiences/Consumable1/views/recordList.json
index 9635931..2f5ef13 100644
--- a/force-app/main/default/experiences/Consumable1/views/recordList.json
+++ b/force-app/main/default/experiences/Consumable1/views/recordList.json
@@ -1,37 +1,46 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "568148b6-8356-45bb-a31e-e8c320ff9726",
- "label": "Record List",
- "regions": [
- {
- "id": "26cdcc22-9daa-47ef-99dc-be188646430f",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {},
- "componentName": "c:RetrospectiveWeeklyReport",
- "id": "9a2492e1-96b7-48dc-bfb4-c01067848016",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "e56df536-cc19-4136-97d0-fe33a9209a61",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "24a8ec26-2d89-4203-9025-61f05c4d8a2b",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "list"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "f14a9999-9077-4660-a62f-b9df05228f6c",
+ "label" : "Record List",
+ "regions" : [ {
+ "id" : "c142f9c9-d513-4938-8678-c78cb05ca097",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "enableInlineEdit" : true,
+ "filterName" : "{!filterId}",
+ "layout" : "FULL",
+ "pageSize" : 25,
+ "scope" : "{!objectName}",
+ "showActionBar" : true,
+ "showChartsPanel" : true,
+ "showDisplay" : "showall",
+ "showFilterPanel" : true,
+ "showImageIcon" : true,
+ "showManualRefreshButton" : true,
+ "showObjectName" : true,
+ "showPinnedList" : true,
+ "showSearchBar" : true
+ },
+ "componentName" : "forceCommunity:objectHome",
+ "id" : "9cf46f79-994f-4674-9cf3-8f1309488f9e",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "2d62ef08-0512-4116-8b2c-877e41412967",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "53ed7ccf-2c5e-428f-84aa-9c122f0a2031",
+ "regionName" : "footer",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "list"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/register.json b/force-app/main/default/experiences/Consumable1/views/register.json
index e46899e..59a32d5 100644
--- a/force-app/main/default/experiences/Consumable1/views/register.json
+++ b/force-app/main/default/experiences/Consumable1/views/register.json
@@ -1,96 +1,85 @@
{
- "appPageId": "bfbf7350-cdcd-4e2c-97a5-ab51f2aa3b9d",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "3af8afbb-87fe-417d-818c-7e8a8f00faf6",
- "label": "Register",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {},
- "componentName": "salesforceIdentity:communityLogo2",
- "id": "9c0037ff-0d41-4d35-b8c6-4dc80d41c19a",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- },
- {
- "componentAttributes": {
- "richTextValue": "<div style=\"text-align: center;\" class=\"inverseTextColor\">Join the community to receive personalized information and customer support.</div>"
- },
- "componentName": "forceCommunity:richTextInline",
- "id": "76521ecb-efe5-42bf-870c-0689113e2470",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- },
- {
- "componentAttributes": {
- "confirmPasswordLabel": "Confirm Password",
- "emailLabel": "Email",
- "extraFieldsFieldSet": "",
- "firstnameLabel": "First Name",
- "includePasswordField": false,
- "lastnameLabel": "Last Name",
- "passwordLabel": "Create Password",
- "regConfirmUrl": "./CheckPasswordResetEmail",
- "startUrl": "",
- "submitButtonLabel": "Sign Up"
- },
- "componentName": "salesforceIdentity:selfRegister2",
- "id": "a9570792-c915-4d1a-9118-10d822a486ca",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- },
- {
- "componentAttributes": {
- "headerText": "",
- "showHeader": false,
- "useCommunityDomainSso": true
- },
- "componentName": "salesforceIdentity:socialLogin2",
- "id": "ebe05af6-96dc-4fce-9e84-4d4f3431c32a",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- },
- {
- "componentAttributes": {
- "richTextValue": "<div style=\"text-align: center;\"><a class=\"inverseTextColor\" href=\"./\">Already have an account?</a></div>"
- },
- "componentName": "forceCommunity:richTextInline",
- "id": "b28a8b4b-abd0-4e0e-a7d3-906c8325d1b6",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "8ba378ad-f887-47f5-854b-ad866edaecc6",
- "regionName": "content",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "Register"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "14c2fe6e-169e-43ca-9cba-8b06e14820b5",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "e6ab04a5-8f13-41ee-bc2c-f40309ba6b5e",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Login",
- "type": "view",
- "viewType": "self-register"
-}
+ "appPageId" : "7756c67f-7774-4fe1-b1c2-eecb19f9c6a5",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "7cadb098-b80c-40d4-a33c-714c36f8a2f3",
+ "label" : "Register",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : { },
+ "componentName" : "salesforceIdentity:communityLogo2",
+ "id" : "03d0e758-407a-4e8e-83ee-5a0ab3c4e2a0",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ }, {
+ "componentAttributes" : {
+ "richTextValue" : "<div style=\"text-align: center;\" class=\"inverseTextColor\">Join the community to receive personalized information and customer support.</div>"
+ },
+ "componentName" : "forceCommunity:richTextInline",
+ "id" : "59a3555f-3c74-470e-a473-bb10cbe44afb",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ }, {
+ "componentAttributes" : {
+ "confirmPasswordLabel" : "Confirm Password",
+ "emailLabel" : "Email",
+ "extraFieldsFieldSet" : "",
+ "firstnameLabel" : "First Name",
+ "includePasswordField" : false,
+ "lastnameLabel" : "Last Name",
+ "passwordLabel" : "Create Password",
+ "regConfirmUrl" : "./CheckPasswordResetEmail",
+ "startUrl" : "",
+ "submitButtonLabel" : "Sign Up"
+ },
+ "componentName" : "salesforceIdentity:selfRegister2",
+ "id" : "b4dd7cc4-4fc4-4f38-bd0e-c89b1f32590b",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ }, {
+ "componentAttributes" : {
+ "headerText" : "",
+ "showHeader" : false,
+ "useCommunityDomainSso" : true
+ },
+ "componentName" : "salesforceIdentity:socialLogin2",
+ "id" : "3af49aa2-c5df-472d-a9f8-d1320b632c9a",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ }, {
+ "componentAttributes" : {
+ "richTextValue" : "<div style=\"text-align: center;\"><a class=\"inverseTextColor\" href=\"./\">Already have an account?</a></div>"
+ },
+ "componentName" : "forceCommunity:richTextInline",
+ "id" : "a1dd5955-819a-4921-80e5-29882955ca7e",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "4d46ac5c-75c6-4730-a2ac-bc191a179149",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "Register"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "fce946a1-2d69-4ed8-bf94-2a246fc10291",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "7d12b5c7-f9c8-45e9-a4e8-71d4639011af",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Login",
+ "type" : "view",
+ "viewType" : "self-register"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/relatedRecordList.json b/force-app/main/default/experiences/Consumable1/views/relatedRecordList.json
index 59d57d6..0dcf2ec 100644
--- a/force-app/main/default/experiences/Consumable1/views/relatedRecordList.json
+++ b/force-app/main/default/experiences/Consumable1/views/relatedRecordList.json
@@ -1,45 +1,39 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "172db5bf-c37b-4cee-853b-212bf73517d7",
- "label": "Related Record List",
- "regions": [
- {
- "id": "0b2e1664-3809-4c37-b7e4-20b63faf9e5e",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customTitle": "",
- "parentRecordId": "{!recordId}",
- "relatedListName": "{!relationshipApiName}",
- "showBreadCrumbs": true,
- "showCustomTitle": false,
- "showManualRefreshButton": true,
- "showRowNumbers": true
- },
- "componentName": "forceCommunity:relatedList",
- "id": "2ba8fce5-1fdb-4d3d-804e-f6790c20e360",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "766cafb3-a3bf-47f0-aca8-e6358ffe63e7",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "e07e0baf-8c53-44c3-b957-5e12464c2137",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "relatedlist"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "2a182209-2527-4335-b672-176196ee6a0d",
+ "label" : "Related Record List",
+ "regions" : [ {
+ "id" : "6caa2d71-5392-4b0c-b738-9ac48f16aa52",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customTitle" : "",
+ "parentRecordId" : "{!recordId}",
+ "relatedListName" : "{!relationshipApiName}",
+ "showBreadCrumbs" : true,
+ "showCustomTitle" : false,
+ "showManualRefreshButton" : true,
+ "showRowNumbers" : true
+ },
+ "componentName" : "forceCommunity:relatedList",
+ "id" : "d476d8c7-4802-4819-951f-39a101f6be63",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "715ead5b-8d41-4edc-bf80-4daebe3464c7",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "d6ef29fb-2766-4065-a1c9-2e251d3a24da",
+ "regionName" : "footer",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "relatedlist"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/reportBuilder.json b/force-app/main/default/experiences/Consumable1/views/reportBuilder.json
index e62d8ef..c332605 100644
--- a/force-app/main/default/experiences/Consumable1/views/reportBuilder.json
+++ b/force-app/main/default/experiences/Consumable1/views/reportBuilder.json
@@ -1,39 +1,33 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "8e5cdbce-69e6-41cf-9d28-bf22b82ab29f",
- "label": "Report Builder",
- "regions": [
- {
- "id": "dba98a8a-984b-42ed-9b2c-c979fbc59d0b",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "recordId": "{!recordId}"
- },
- "componentName": "forceCommunity:reportBuilder",
- "id": "6beb6fa8-c9bf-4990-b075-edd5e3022e32",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "d727fea1-1d73-48c4-b2ac-be189e71a38b",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "529179bd-e9d3-4070-b7b8-e657e5f5a36b",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "createreport"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "059d5f4a-e616-4540-be96-a34b294fb2a4",
+ "label" : "Report Builder",
+ "regions" : [ {
+ "id" : "b0668fae-e6be-4e0f-85ad-0bd2ff51e3f4",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "recordId" : "{!recordId}"
+ },
+ "componentName" : "forceCommunity:reportBuilder",
+ "id" : "2d38f9cf-474d-490e-92d0-ab02343f9c7a",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "69520259-ca39-49a9-bc51-28a53ce45025",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "2bcf6747-9ca7-4726-8e9a-dd1334643433",
+ "regionName" : "footer",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "createreport"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/reportDetail.json b/force-app/main/default/experiences/Consumable1/views/reportDetail.json
index ebc47e2..4811dcc 100644
--- a/force-app/main/default/experiences/Consumable1/views/reportDetail.json
+++ b/force-app/main/default/experiences/Consumable1/views/reportDetail.json
@@ -1,57 +1,48 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "ac90421b-0cd9-4c2e-a836-ee4567ce8d1f",
- "label": "Report Detail",
- "regions": [
- {
- "id": "b8a2ac35-b501-4034-a616-5f54591b17d0",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "recordId": "{!recordId}"
- },
- "componentName": "forceCommunity:reportPage",
- "id": "abe06f62-acc2-41c3-809c-1f150f8841da",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "8cdd6f99-9662-4a58-b0ee-4065486d0ef4",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "a10f13ff-f8c2-433d-82e5-20397d085c0c",
- "regionName": "footer",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "{!Record._Object}: {!Record._Title}"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "bdc1ac10-229a-4c7b-97c7-eb30938a33db",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "d1410883-3540-4f4c-9b28-06294a5a0248",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "detail-00O"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "66e48eb0-9203-4842-9fde-8b4e7e63b8ac",
+ "label" : "Report Detail",
+ "regions" : [ {
+ "id" : "993df7e2-02c2-4043-80f2-75b1fc26b624",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "recordId" : "{!recordId}"
+ },
+ "componentName" : "forceCommunity:reportPage",
+ "id" : "a1126338-71f3-4c8b-9fad-fdb3915a12a4",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "993ff9cc-3b17-46b6-a40d-f1f97c4db48c",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "8429749f-ee7b-4be7-b953-ce1a28fe724e",
+ "regionName" : "footer",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "{!Record._Object}: {!Record._Title}"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "a848b6bf-1473-4426-ad50-f3e85894c8c2",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "c3a6a3e2-ce86-4417-ba50-39bb2e8d6939",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "detail-00O"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/reportList.json b/force-app/main/default/experiences/Consumable1/views/reportList.json
index 6f78fc8..d090e71 100644
--- a/force-app/main/default/experiences/Consumable1/views/reportList.json
+++ b/force-app/main/default/experiences/Consumable1/views/reportList.json
@@ -1,37 +1,31 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "f71c1609-6433-4cf0-8846-695e50897517",
- "label": "Report List",
- "regions": [
- {
- "id": "dca7f9b0-515d-46aa-8122-e600b7eb2b35",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {},
- "componentName": "forceCommunity:reportList",
- "id": "6687e39c-5cf3-478c-9a1c-214f17e3c358",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "612fbb2a-1b08-4491-aa90-af9c07e3077b",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "1bb69df7-0e36-45ef-853e-3c9367670818",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "list-00O"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "cbac51d9-cfc4-4fa7-bf92-603361ff1747",
+ "label" : "Report List",
+ "regions" : [ {
+ "id" : "21fd7f4b-ed35-4d5e-ba32-40b7cabd6c5a",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : { },
+ "componentName" : "forceCommunity:reportList",
+ "id" : "48d0998f-cc83-4f4d-8467-473e2648f1d5",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "165cdeb7-c542-4a6a-8c42-214baade96e1",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "1fce8eb4-ac5b-4828-9fea-364d5916925b",
+ "regionName" : "footer",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "list-00O"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/resources.json b/force-app/main/default/experiences/Consumable1/views/resources.json
index 495ee4c..f958ce9 100644
--- a/force-app/main/default/experiences/Consumable1/views/resources.json
+++ b/force-app/main/default/experiences/Consumable1/views/resources.json
@@ -1,75 +1,63 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:sldsTwoCol84Layout",
- "dataProviders": [],
- "id": "2feda9aa-a785-4e98-9448-352e28d95b34",
- "label": "Resources",
- "regions": [
- {
- "id": "6372864b-d004-480d-a164-80d5c483d6d5",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "librariesHeaderLabel": "Libraries",
- "showWorkspaceImage": true
- },
- "componentName": "forceCommunity:workspacesList",
- "id": "2e0e0428-6e7c-4b95-9e9e-4e82022fa404",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "eb700be4-2afe-4df5-94b6-0f0cc019d588",
- "regionName": "content",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "title": "Popular Now"
- },
- "componentName": "forceChatter:recommendationsBig",
- "id": "285d61be-06fc-4a6f-aaee-3ecbb483b948",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "180d635c-3d79-40c1-a9be-466504176d9e",
- "regionName": "sidebar",
- "type": "region"
- },
- {
- "id": "0d2455d9-0fcf-4a57-b9b9-85ef03129973",
- "regionName": "footer",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "Resources"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "413ba905-225b-4c23-aa6a-e07b7f2d8b28",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "a81d27b2-b367-40c4-a1f2-d24a2bb0f930",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "files"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:sldsTwoCol84Layout",
+ "dataProviders" : [ ],
+ "id" : "dc215254-3731-423c-ba11-3d87746598e8",
+ "label" : "Resources",
+ "regions" : [ {
+ "id" : "72cef312-c96f-46e1-859d-1dfc1ac2c05a",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "librariesHeaderLabel" : "Libraries",
+ "showWorkspaceImage" : true
+ },
+ "componentName" : "forceCommunity:workspacesList",
+ "id" : "d02b982c-c404-4ee6-b7eb-81cc247d2e58",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "a5fb005e-9493-44c8-be82-daa9ed4855db",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "title" : "Popular Now"
+ },
+ "componentName" : "forceChatter:recommendationsBig",
+ "id" : "2a81731a-6fd2-4087-a360-23531384ce7b",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "5f304697-36f3-4e31-985d-b54afad66c28",
+ "regionName" : "sidebar",
+ "type" : "region"
+ }, {
+ "id" : "31ffad04-7009-47aa-b99a-01f08cb17d10",
+ "regionName" : "footer",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "Resources"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "a49b7653-081c-4721-ab11-85ec5590cf32",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "85fe3418-3e87-45e0-ab01-9530875c41c3",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "files"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/search.json b/force-app/main/default/experiences/Consumable1/views/search.json
index 126c0f2..52a6e2f 100644
--- a/force-app/main/default/experiences/Consumable1/views/search.json
+++ b/force-app/main/default/experiences/Consumable1/views/search.json
@@ -1,59 +1,45 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "99b69c91-c8d8-42fe-91af-6f71e4612910",
- "label": "Search",
- "regions": [
- {
- "id": "d3a00bfd-a6c5-494e-9dd0-9d01699c5557",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "scopes": [
- {
- "isPublic": false,
- "name": "Lead"
- },
- {
- "isPublic": false,
- "name": "Opportunity"
- },
- {
- "isPublic": false,
- "name": "Campaign"
- },
- {
- "isPublic": false,
- "name": "ContentDocument"
- }
- ],
- "searchResultFiltering": true,
- "searchTerm": "{!term}",
- "showTopResults": true
- },
- "componentName": "forceCommunity:search",
- "id": "300943f3-7e89-43b5-986d-013d1e677bad",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "0cca2c58-a0c4-4cba-857b-7a81fb548c6e",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "76ff2160-08e4-42e2-bf3a-85c8cc7f50c1",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "global-search"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "74aeae6d-8d40-433e-8168-45175ee356a6",
+ "label" : "Search",
+ "regions" : [ {
+ "id" : "f0168968-61fd-41cb-b7af-1eff3f8b32f3",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "scopes" : [ {
+ "isPublic" : false,
+ "name" : "ContentDocument"
+ }, {
+ "isPublic" : true,
+ "name" : "Consumable_order__c"
+ }, {
+ "isPublic" : true,
+ "name" : "Consumable_order_details2__c"
+ } ],
+ "searchResultFiltering" : true,
+ "searchTerm" : "{!term}",
+ "showTopResults" : true
+ },
+ "componentName" : "forceCommunity:search",
+ "id" : "5f9e6d47-2bcc-4097-a92c-1ed613352db1",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "5724ab02-cf0e-4aa8-b6d9-27c93918f75f",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "de00bfc5-bb66-40f6-8d83-e45d83c02f17",
+ "regionName" : "footer",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "global-search"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/streamDetail.json b/force-app/main/default/experiences/Consumable1/views/streamDetail.json
index cb1cd2f..bafe92c 100644
--- a/force-app/main/default/experiences/Consumable1/views/streamDetail.json
+++ b/force-app/main/default/experiences/Consumable1/views/streamDetail.json
@@ -1,39 +1,33 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "0c2c3b1a-34ee-493b-af35-596aa83568d6",
- "label": "Stream Detail",
- "regions": [
- {
- "id": "f1637238-82ab-4cef-a8b0-1278d67c9d5a",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "id": "{!recordId}"
- },
- "componentName": "forceCommunity:streamDetail",
- "id": "60702a91-77e0-4289-a4ca-a5161a96550a",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "825c9a77-bb20-48f2-a7f3-02e2b65a7523",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "fa8bc833-0127-4936-acb3-7ddb285df900",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "detail-0Fq"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "e3ef5ec3-0aba-44b3-b608-6f939cf49c88",
+ "label" : "Stream Detail",
+ "regions" : [ {
+ "id" : "48e57d3b-e3d0-4f72-be2f-a2fae7b65a0a",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "id" : "{!recordId}"
+ },
+ "componentName" : "forceCommunity:streamDetail",
+ "id" : "8c078f23-692d-4f99-a755-99025f03a1b5",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "cd36c50d-c89e-4a33-a381-6e21077775b9",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "a16a1ef4-47ac-4970-9d30-9cc7d15dd873",
+ "regionName" : "footer",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "detail-0Fq"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/streamList.json b/force-app/main/default/experiences/Consumable1/views/streamList.json
index b3182ec..d0537d9 100644
--- a/force-app/main/default/experiences/Consumable1/views/streamList.json
+++ b/force-app/main/default/experiences/Consumable1/views/streamList.json
@@ -1,27 +1,23 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "6ef6f17a-0dda-4824-8310-e283e961890f",
- "label": "Stream List",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {},
- "componentName": "forceCommunity:streamList",
- "id": "b37e561b-bcc1-471e-a893-29ce0f7bac79",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "f37c8024-a2e2-43ee-bb73-7ce689c4d6d9",
- "regionName": "content",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "list-0Fq"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "e1275716-f06a-4a27-a667-19c49eefb083",
+ "label" : "Stream List",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : { },
+ "componentName" : "forceCommunity:streamList",
+ "id" : "c55e158b-0343-40b2-bca0-888ab4e1ae18",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "e93a4c80-2373-4f62-a413-6b91c74928e1",
+ "regionName" : "content",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "list-0Fq"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/topicCatalog.json b/force-app/main/default/experiences/Consumable1/views/topicCatalog.json
index 560723e..6616412 100644
--- a/force-app/main/default/experiences/Consumable1/views/topicCatalog.json
+++ b/force-app/main/default/experiences/Consumable1/views/topicCatalog.json
@@ -1,73 +1,62 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "bc041b32-bf8f-47ac-8c7d-35d8b4167ee7",
- "label": "Topic Catalog",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {
- "bannerText": "",
- "bannerTextWithKnowledge": "Explore other <a href=\"javascript:void(0)\" class=\"headlineArticles\">articles</a> and <a href=\"javascript:void(0)\" class=\"headlineDiscussions\">discussions</a> on this topic.",
- "bannerTextWithoutKnowledge": "Explore other <a href=\"javascript:void(0)\" class=\"headlineDiscussions\">discussions</a> on this topic.",
- "pageType": "",
- "showSubTopics": true,
- "title": "Topics",
- "uniqueNameOrId": ""
- },
- "componentName": "forceCommunity:headline",
- "id": "2dea3547-05b7-4553-b77d-4792aac6c392",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "4aa7eaf6-e706-4e57-9ce3-9c8f3cf26246",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {},
- "componentName": "forceCommunity:topicCatalog",
- "id": "ca681efe-4067-4a6c-b442-e95f316babae",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "6b2ab383-10e2-4ce7-aed3-1d8ab837fa13",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "266bf649-4b83-43f8-a08c-d227b505ca84",
- "regionName": "footer",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "Topic Catalog"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "a8fbeba0-f3a7-46c8-93d9-7aaa0035f1ab",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "dd88451a-81bf-48c6-bea8-1f411e587fb7",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "topic-catalog"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "3912430c-3c10-4bf3-bf37-5a619a596491",
+ "label" : "Topic Catalog",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : {
+ "bannerText" : "",
+ "bannerTextWithKnowledge" : "Explore other <a href=\"javascript:void(0)\" class=\"headlineArticles\">articles</a> and <a href=\"javascript:void(0)\" class=\"headlineDiscussions\">discussions</a> on this topic.",
+ "bannerTextWithoutKnowledge" : "Explore other <a href=\"javascript:void(0)\" class=\"headlineDiscussions\">discussions</a> on this topic.",
+ "pageType" : "",
+ "showSubTopics" : true,
+ "title" : "Topics",
+ "uniqueNameOrId" : ""
+ },
+ "componentName" : "forceCommunity:headline",
+ "id" : "bb3cf42e-7839-4d1b-9397-61f43400e885",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "e0161633-e87a-4873-a308-f87278393077",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : { },
+ "componentName" : "forceCommunity:topicCatalog",
+ "id" : "c4149a20-518c-4518-8f16-363ca10cb9fd",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "0250f471-2b7a-48e8-894e-775d5d3edb11",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "36965db0-cc03-4916-b508-0b3747f12f39",
+ "regionName" : "footer",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "Topic Catalog"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "e81daa52-bbe0-4f2d-bd9e-a43f4156623b",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "44a8bb9f-9013-450a-ab7d-d6da72269e33",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "topic-catalog"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/topicDetail.json b/force-app/main/default/experiences/Consumable1/views/topicDetail.json
index a3504a2..faa8550 100644
--- a/force-app/main/default/experiences/Consumable1/views/topicDetail.json
+++ b/force-app/main/default/experiences/Consumable1/views/topicDetail.json
@@ -1,93 +1,79 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:sldsTwoCol84Layout",
- "dataProviders": [],
- "id": "8f8238dc-8f81-4994-9933-b4dcb285776e",
- "label": "Topic Detail",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {
- "recordId": "{!recordId}"
- },
- "componentName": "forceCommunity:recordHeadline",
- "id": "13faad2b-64b9-4f9d-8d5a-94eba2bcaa34",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "6e67d805-16ce-4e1c-8b47-21f7add68528",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "canChangeSorting": false,
- "defaultFilter": "",
- "defaultSortOrderHomeFeed": "Relevance",
- "defaultSortOrderTopicsFeed": "Relevance",
- "feedDesign": "DEFAULT",
- "hasFeedSearch": false,
- "subjectId": "{!recordId}",
- "type": "Topics"
- },
- "componentName": "forceCommunity:forceCommunityFeed",
- "id": "a38781d5-55f1-4c8d-9052-33b5b6bb86c4",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "7060705f-116c-43a2-b035-fc6e4711f9cc",
- "regionName": "content",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "recordId": "{!recordId}"
- },
- "componentName": "forceCommunity:recordDetail",
- "id": "dd3773a2-2efd-4ba6-9fc7-cf8fa7b7abc1",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "450ad7df-3edc-4c67-90e2-ab7edac4a4d2",
- "regionName": "sidebar",
- "type": "region"
- },
- {
- "id": "9ed58d0e-69ea-4d40-8ffa-446f944e7137",
- "regionName": "footer",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "{!Record.Description}",
- "title": "{!Record._Title}"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "5d9718ca-83b1-45dc-aca9-2e4f947ef338",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "1a11e61a-6963-4a58-8497-681783af4954",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "topic"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:sldsTwoCol84Layout",
+ "dataProviders" : [ ],
+ "id" : "060ff5da-04b3-49de-8fb8-03decd8c188c",
+ "label" : "Topic Detail",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : {
+ "recordId" : "{!recordId}"
+ },
+ "componentName" : "forceCommunity:recordHeadline",
+ "id" : "09e98f13-f206-43ee-bf41-828332156a3f",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "e0e7dbc4-3b5b-442a-b4ee-700038c2f223",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "canChangeSorting" : false,
+ "defaultFilter" : "",
+ "defaultSortOrderHomeFeed" : "Relevance",
+ "defaultSortOrderTopicsFeed" : "Relevance",
+ "feedDesign" : "DEFAULT",
+ "hasFeedSearch" : false,
+ "subjectId" : "{!recordId}",
+ "type" : "Topics"
+ },
+ "componentName" : "forceCommunity:forceCommunityFeed",
+ "id" : "6016edf0-5479-47bd-83af-b01e58fe5b1c",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "0ed07a83-ddeb-4f62-ae37-d5b0acfc6584",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "recordId" : "{!recordId}"
+ },
+ "componentName" : "forceCommunity:recordDetail",
+ "id" : "33d2426c-2eb9-4abf-8059-25a02fdc20a1",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "ca54845f-e7c2-4d40-9243-8e253709523b",
+ "regionName" : "sidebar",
+ "type" : "region"
+ }, {
+ "id" : "f2cc39b9-f4a1-44dd-98eb-928de7f45b4f",
+ "regionName" : "footer",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "{!Record.Description}",
+ "title" : "{!Record._Title}"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "e3d92037-2073-4756-a86f-90c4c43998ec",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "c559cbc3-8107-4482-b65e-0fc253417b1c",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "topic"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/userProfile.json b/force-app/main/default/experiences/Consumable1/views/userProfile.json
index 8c4b3b0..6b43583 100644
--- a/force-app/main/default/experiences/Consumable1/views/userProfile.json
+++ b/force-app/main/default/experiences/Consumable1/views/userProfile.json
@@ -1,121 +1,100 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "2245cd19-8057-487b-8284-d7f20c56e1f7",
- "label": "User Profile",
- "regions": [
- {
- "id": "14612469-280a-47d6-a13e-c7c856cebb73",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "id": "{!recordId}",
- "showFullPhotoAsCircle": true,
- "showReputation": false
- },
- "componentName": "forceCommunity:userProfileHeader",
- "id": "9f2b692c-0288-4aaa-af5d-112c2d8d0165",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- },
- {
- "componentAttributes": {
- "tabsetConfig": {
- "UUID": "3a8d28a4-31ff-4150-a1ad-636515efc06d",
- "activeTab": "tab1",
- "tabs": [
- {
- "UUID": "40b895c3-98e0-43f8-a2d2-a6f0dc9cbe94",
- "allowGuestUser": false,
- "locked": false,
- "seedComponents": [
- {
- "attributes": {},
- "fqn": "forceCommunity:userProfileDetail"
- }
- ],
- "tabKey": "tab1",
- "tabName": "Details"
- },
- {
- "UUID": "17b13b59-193d-4b7a-8ab4-e435ba96b750",
- "allowGuestUser": false,
- "locked": false,
- "seedComponents": [
- {
- "attributes": {},
- "fqn": "forceCommunity:userRelatedList"
- }
- ],
- "tabKey": "tab2",
- "tabName": "Related"
- }
- ],
- "useOverflowMenu": false
- }
- },
- "componentName": "forceCommunity:tabset",
- "id": "3a8d28a4-31ff-4150-a1ad-636515efc06d",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {
- "id": "{!recordId}"
- },
- "componentName": "forceCommunity:userProfileDetail",
- "id": "263079c1-25b9-4a89-ad82-ff789f1cec6b",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "40b895c3-98e0-43f8-a2d2-a6f0dc9cbe94",
- "regionLabel": "Details",
- "regionName": "tab1",
- "renditionMap": {},
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "userId": "{!recordId}"
- },
- "componentName": "forceCommunity:userRelatedList",
- "id": "f2d05739-3021-4c7b-8a2c-ef986d23c0e7",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "17b13b59-193d-4b7a-8ab4-e435ba96b750",
- "regionLabel": "Related",
- "regionName": "tab2",
- "renditionMap": {},
- "type": "region"
- }
- ],
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "b3764d11-d26d-4554-8747-e7f30fb722bd",
+ "label" : "User Profile",
+ "regions" : [ {
+ "id" : "089ae725-a61b-476e-aab7-3ea5bf1ef011",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "id" : "{!recordId}",
+ "showFullPhotoAsCircle" : true,
+ "showReputation" : false
+ },
+ "componentName" : "forceCommunity:userProfileHeader",
+ "id" : "7ef45f8f-cc14-404a-8867-e6d3557f32d3",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ }, {
+ "componentAttributes" : {
+ "tabsetConfig" : {
+ "UUID" : "b4db8bb9-4fa9-4f41-8919-a300735d0ef6",
+ "activeTab" : "tab1",
+ "tabs" : [ {
+ "UUID" : "ffc31b37-4e88-44ab-a58e-8c8952bddf50",
+ "allowGuestUser" : false,
+ "locked" : false,
+ "seedComponents" : [ {
+ "attributes" : { },
+ "fqn" : "forceCommunity:userProfileDetail"
+ } ],
+ "tabKey" : "tab1",
+ "tabName" : "Details"
+ }, {
+ "UUID" : "02c71e1a-5c7b-4265-8ff5-486737b59caf",
+ "allowGuestUser" : false,
+ "locked" : false,
+ "seedComponents" : [ {
+ "attributes" : { },
+ "fqn" : "forceCommunity:userRelatedList"
+ } ],
+ "tabKey" : "tab2",
+ "tabName" : "Related"
+ } ],
+ "useOverflowMenu" : false
}
- ],
- "id": "4eee041e-a134-466c-ad5a-39b2189c9de6",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "1943f596-5d30-46eb-aec0-c155ebebf201",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "detail-005"
-}
+ },
+ "componentName" : "forceCommunity:tabset",
+ "id" : "b4db8bb9-4fa9-4f41-8919-a300735d0ef6",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : {
+ "id" : "{!recordId}"
+ },
+ "componentName" : "forceCommunity:userProfileDetail",
+ "id" : "3910b7ed-af10-4a8e-9858-6780fc312390",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "ffc31b37-4e88-44ab-a58e-8c8952bddf50",
+ "regionLabel" : "Details",
+ "regionName" : "tab1",
+ "renditionMap" : { },
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "userId" : "{!recordId}"
+ },
+ "componentName" : "forceCommunity:userRelatedList",
+ "id" : "ffeb3b47-04b8-455c-be55-69b69096f017",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "02c71e1a-5c7b-4265-8ff5-486737b59caf",
+ "regionLabel" : "Related",
+ "regionName" : "tab2",
+ "renditionMap" : { },
+ "type" : "region"
+ } ],
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "4ad735e0-ad67-4c2b-9b52-717f1be31466",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "d9fb20dc-9a48-4767-b7ab-fc7c8a5cb56a",
+ "regionName" : "footer",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "detail-005"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Consumable1/views/userSettings.json b/force-app/main/default/experiences/Consumable1/views/userSettings.json
index 39db8cb..dc559ab 100644
--- a/force-app/main/default/experiences/Consumable1/views/userSettings.json
+++ b/force-app/main/default/experiences/Consumable1/views/userSettings.json
@@ -1,60 +1,54 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "55bd4245-fde3-4919-8a43-b7e2ffc3aed7",
- "label": "User Settings",
- "regions": [
- {
- "id": "661a308a-163f-4685-aec7-5d617a450359",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "accountSectionTitle": "Account",
- "accountTabName": "Account Management",
- "connectedSourcesTabName": "Connected Sources",
- "deleteAccountButtonTitle": "Deactivate My Account",
- "deleteAccountConfirmationPopupBody": "After you deactivate your account, you'll lose access to this site.",
- "deleteAccountConfirmationPopupButtonTitle": "Got It",
- "deleteAccountConfirmationPopupTitle": "Deactivate your account?",
- "deleteAccountErrorMessage": "Something went wrong. Contact your site administrator.",
- "deleteAccountSectionTitle": "Deactivate Account",
- "emailNotificationsTitle": "Email Notifications",
- "emailSectionDescText": "When email notifications are enabled, email me when someone:",
- "hideAccountDeleteSection": true,
- "hideChatterNotificationSettings": false,
- "hideConnectedSources": false,
- "hideEmailNotificationSettings": false,
- "hideProfileVisibilitySettings": false,
- "id": "{!recordId}",
- "locationTitle": "Location",
- "profileSectionDescText": "Customize who is able to see what on your profile page",
- "profileSectionToolTipText": "Restricted: Visible to the employees of the company that created the site. Members: Visible to logged-in members. Public: Visible to anyone viewing pages that don't require login.",
- "profileVisibilityTitle": "Profile Visibility",
- "settingsPageTitle": "My Settings"
- },
- "componentName": "forceCommunity:userSettingsCustomizable",
- "id": "1a67d89b-1f40-4cd5-ac5b-c655aa5043ee",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "c3d59adc-a0ce-40a8-85de-f06d2a758226",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "455997bb-5cc3-45cf-9da7-0a28c22be1f5",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "usersettings"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "8225f2be-2536-4868-afe9-ed11e1c1eb15",
+ "label" : "User Settings",
+ "regions" : [ {
+ "id" : "0e29e12f-82e2-4770-9056-00412cb4914b",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "accountSectionTitle" : "Account",
+ "accountTabName" : "Account Management",
+ "connectedSourcesTabName" : "Connected Sources",
+ "deleteAccountButtonTitle" : "Deactivate My Account",
+ "deleteAccountConfirmationPopupBody" : "After you deactivate your account, you'll lose access to this site.",
+ "deleteAccountConfirmationPopupButtonTitle" : "Got It",
+ "deleteAccountConfirmationPopupTitle" : "Deactivate your account?",
+ "deleteAccountErrorMessage" : "Something went wrong. Contact your site administrator.",
+ "deleteAccountSectionTitle" : "Deactivate Account",
+ "emailNotificationsTitle" : "Email Notifications",
+ "emailSectionDescText" : "When email notifications are enabled, email me when someone:",
+ "hideAccountDeleteSection" : true,
+ "hideChatterNotificationSettings" : false,
+ "hideConnectedSources" : false,
+ "hideEmailNotificationSettings" : false,
+ "hideProfileVisibilitySettings" : false,
+ "id" : "{!recordId}",
+ "locationTitle" : "Location",
+ "profileSectionDescText" : "Customize who is able to see what on your profile page",
+ "profileSectionToolTipText" : "Restricted: Visible to the employees of the company that created the site. Members: Visible to logged-in members. Public: Visible to anyone viewing pages that don't require login.",
+ "profileVisibilityTitle" : "Profile Visibility",
+ "settingsPageTitle" : "My Settings"
+ },
+ "componentName" : "forceCommunity:userSettingsCustomizable",
+ "id" : "be9a963a-9ad1-4190-845c-c1f479b4c9f2",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "7eb02000-7cb9-48f9-8463-eae4dfa60e4c",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "f99dd3f8-ab5f-49e4-b57e-b51dc2ab9ccd",
+ "regionName" : "footer",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "usersettings"
+}
\ No newline at end of file
diff --git "a/force-app/main/default/experiences/Consumable1/views/\344\273\252\350\241\250\346\235\277\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json" "b/force-app/main/default/experiences/Consumable1/views/\344\273\252\350\241\250\346\235\277\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
index 1dd0eff..ab87d3e 100644
--- "a/force-app/main/default/experiences/Consumable1/views/\344\273\252\350\241\250\346\235\277\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
+++ "b/force-app/main/default/experiences/Consumable1/views/\344\273\252\350\241\250\346\235\277\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
@@ -1,45 +1,39 @@
{
- "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "97ed2657-7949-4aed-9e5d-cae9c935f730",
- "label": "浠〃鏉� 闁㈤�ｃ儶銈广儓",
- "regions": [
- {
- "id": "c5f2427e-9a5d-4db5-9929-e3d6e633475f",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customTitle": "",
- "parentRecordId": "{!recordId}",
- "relatedListName": "{!relationshipApiName}",
- "showBreadCrumbs": true,
- "showCustomTitle": false,
- "showManualRefreshButton": true,
- "showRowNumbers": true
- },
- "componentName": "forceCommunity:relatedList",
- "id": "eafc91e0-39e9-432d-b9c2-680c80c3601d",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "4b9072b6-40de-478a-a460-c3aa1d3e286d",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "d682a0cb-7ab6-47e0-8f11-c18f2d49ea91",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "relatedlist-01Z"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "97ed2657-7949-4aed-9e5d-cae9c935f730",
+ "label" : "浠〃鏉� 闁㈤�ｃ儶銈广儓",
+ "regions" : [ {
+ "id" : "c5f2427e-9a5d-4db5-9929-e3d6e633475f",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customTitle" : "",
+ "parentRecordId" : "{!recordId}",
+ "relatedListName" : "{!relationshipApiName}",
+ "showBreadCrumbs" : true,
+ "showCustomTitle" : false,
+ "showManualRefreshButton" : true,
+ "showRowNumbers" : true
+ },
+ "componentName" : "forceCommunity:relatedList",
+ "id" : "eafc91e0-39e9-432d-b9c2-680c80c3601d",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "4b9072b6-40de-478a-a460-c3aa1d3e286d",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "d682a0cb-7ab6-47e0-8f11-c18f2d49ea91",
+ "regionName" : "footer",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "relatedlist-01Z"
+}
\ No newline at end of file
diff --git "a/force-app/main/default/experiences/Consumable1/views/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255\350\251\263\347\264\260.json" "b/force-app/main/default/experiences/Consumable1/views/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255\350\251\263\347\264\260.json"
index 4d166f4..e68449d 100644
--- "a/force-app/main/default/experiences/Consumable1/views/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255\350\251\263\347\264\260.json"
+++ "b/force-app/main/default/experiences/Consumable1/views/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255\350\251\263\347\264\260.json"
@@ -1,76 +1,66 @@
{
- "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "0ad6b8ab-53a5-4a50-a8e4-2cb763631aab",
- "label": "瀛︿細銉诲煿璁� 瑭崇窗",
- "regions": [
- {
- "id": "a8e33a85-eba0-4b3c-972d-7829e6b042b4",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "recordId": "{!recordId}"
- },
- "componentName": "forceCommunity:recordHeadline",
- "id": "592d5f10-3298-4046-9188-b6d553c00d61",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- },
- {
- "componentAttributes": {
- "detailsTabLabel": "Details",
- "discussionsTabLabel": "Feed",
- "recordId": "{!recordId}",
- "relatedTabLabel": "Related",
- "showLegacyActivityComposer": false,
- "tab1Type": "details",
- "tab2Type": "related",
- "tab3Type": "chatter",
- "tab4Type": "none",
- "timelineTabLabel": "Activity"
- },
- "componentName": "forceCommunity:recordHomeTabs",
- "id": "d832effc-9f0a-4aca-bc93-87384e150066",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "898fe2f9-0d89-483a-b133-91df0a115989",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "3c9b71ac-95f1-4237-b65e-45a8dbcbf70e",
- "regionName": "footer",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "{!Record._Object}: {!Record._Title}"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "f68810fc-4086-4193-a0d7-a8e8d181c7e2",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "b9a30282-520a-436a-9688-5153df33ee48",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "detail-701"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "0ad6b8ab-53a5-4a50-a8e4-2cb763631aab",
+ "label" : "瀛︿細銉诲煿璁� 瑭崇窗",
+ "regions" : [ {
+ "id" : "a8e33a85-eba0-4b3c-972d-7829e6b042b4",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "recordId" : "{!recordId}"
+ },
+ "componentName" : "forceCommunity:recordHeadline",
+ "id" : "592d5f10-3298-4046-9188-b6d553c00d61",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ }, {
+ "componentAttributes" : {
+ "detailsTabLabel" : "Details",
+ "discussionsTabLabel" : "Feed",
+ "recordId" : "{!recordId}",
+ "relatedTabLabel" : "Related",
+ "showLegacyActivityComposer" : false,
+ "tab1Type" : "details",
+ "tab2Type" : "related",
+ "tab3Type" : "chatter",
+ "tab4Type" : "none",
+ "timelineTabLabel" : "Activity"
+ },
+ "componentName" : "forceCommunity:recordHomeTabs",
+ "id" : "d832effc-9f0a-4aca-bc93-87384e150066",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "898fe2f9-0d89-483a-b133-91df0a115989",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "3c9b71ac-95f1-4237-b65e-45a8dbcbf70e",
+ "regionName" : "footer",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "{!Record._Object}: {!Record._Title}"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "f68810fc-4086-4193-a0d7-a8e8d181c7e2",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "b9a30282-520a-436a-9688-5153df33ee48",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "detail-701"
+}
\ No newline at end of file
diff --git "a/force-app/main/default/experiences/Consumable1/views/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json" "b/force-app/main/default/experiences/Consumable1/views/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
index 50ce61e..d6a69ee 100644
--- "a/force-app/main/default/experiences/Consumable1/views/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
+++ "b/force-app/main/default/experiences/Consumable1/views/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
@@ -1,45 +1,39 @@
{
- "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "4cf18bf4-7c54-4746-b895-ec877e8fcd43",
- "label": "瀛︿細銉诲煿璁� 闁㈤�ｃ儶銈广儓",
- "regions": [
- {
- "id": "bbdd3f25-7b32-4aaa-bb84-0fd898f088da",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customTitle": "",
- "parentRecordId": "{!recordId}",
- "relatedListName": "{!relationshipApiName}",
- "showBreadCrumbs": true,
- "showCustomTitle": false,
- "showManualRefreshButton": true,
- "showRowNumbers": true
- },
- "componentName": "forceCommunity:relatedList",
- "id": "fe11ad25-e5fb-406f-95c5-ff7b7f461956",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "ca0496e5-65f5-481b-80db-1aa60c6eb160",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "024970ab-9ccf-4185-8637-88e1279fa959",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "relatedlist-701"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "4cf18bf4-7c54-4746-b895-ec877e8fcd43",
+ "label" : "瀛︿細銉诲煿璁� 闁㈤�ｃ儶銈广儓",
+ "regions" : [ {
+ "id" : "bbdd3f25-7b32-4aaa-bb84-0fd898f088da",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customTitle" : "",
+ "parentRecordId" : "{!recordId}",
+ "relatedListName" : "{!relationshipApiName}",
+ "showBreadCrumbs" : true,
+ "showCustomTitle" : false,
+ "showManualRefreshButton" : true,
+ "showRowNumbers" : true
+ },
+ "componentName" : "forceCommunity:relatedList",
+ "id" : "fe11ad25-e5fb-406f-95c5-ff7b7f461956",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "ca0496e5-65f5-481b-80db-1aa60c6eb160",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "024970ab-9ccf-4185-8637-88e1279fa959",
+ "regionName" : "footer",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "relatedlist-701"
+}
\ No newline at end of file
diff --git "a/force-app/main/default/experiences/Consumable1/views/\345\260\217\347\273\204\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json" "b/force-app/main/default/experiences/Consumable1/views/\345\260\217\347\273\204\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
index f89e7c9..293d243 100644
--- "a/force-app/main/default/experiences/Consumable1/views/\345\260\217\347\273\204\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
+++ "b/force-app/main/default/experiences/Consumable1/views/\345\260\217\347\273\204\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
@@ -1,45 +1,39 @@
{
- "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "6c787120-bb1e-4d47-b4b2-7fa80ac6d3fb",
- "label": "灏忕粍 闁㈤�ｃ儶銈广儓",
- "regions": [
- {
- "id": "adf7a874-f08a-4835-9975-94719db0529e",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customTitle": "",
- "parentRecordId": "{!recordId}",
- "relatedListName": "{!relationshipApiName}",
- "showBreadCrumbs": true,
- "showCustomTitle": false,
- "showManualRefreshButton": true,
- "showRowNumbers": true
- },
- "componentName": "forceCommunity:relatedList",
- "id": "3efd7ea2-7bc2-44d6-8b5a-03a4be12b602",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "df80875a-1086-4356-98d6-a7300c39507e",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "1a614d08-a4e0-4aba-9233-cfab0ef016f3",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "relatedlist-0F9"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "6c787120-bb1e-4d47-b4b2-7fa80ac6d3fb",
+ "label" : "灏忕粍 闁㈤�ｃ儶銈广儓",
+ "regions" : [ {
+ "id" : "adf7a874-f08a-4835-9975-94719db0529e",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customTitle" : "",
+ "parentRecordId" : "{!recordId}",
+ "relatedListName" : "{!relationshipApiName}",
+ "showBreadCrumbs" : true,
+ "showCustomTitle" : false,
+ "showManualRefreshButton" : true,
+ "showRowNumbers" : true
+ },
+ "componentName" : "forceCommunity:relatedList",
+ "id" : "3efd7ea2-7bc2-44d6-8b5a-03a4be12b602",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "df80875a-1086-4356-98d6-a7300c39507e",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "1a614d08-a4e0-4aba-9233-cfab0ef016f3",
+ "regionName" : "footer",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "relatedlist-0F9"
+}
\ No newline at end of file
diff --git "a/force-app/main/default/experiences/Consumable1/views/\346\212\245\350\241\250\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json" "b/force-app/main/default/experiences/Consumable1/views/\346\212\245\350\241\250\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
index f08a1a1..29e37b1 100644
--- "a/force-app/main/default/experiences/Consumable1/views/\346\212\245\350\241\250\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
+++ "b/force-app/main/default/experiences/Consumable1/views/\346\212\245\350\241\250\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
@@ -1,45 +1,39 @@
{
- "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "4dff72f1-db87-40bc-a8d6-36073e365a18",
- "label": "鎶ヨ〃 闁㈤�ｃ儶銈广儓",
- "regions": [
- {
- "id": "255f30d3-0419-4484-a86a-69463e5ecf61",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customTitle": "",
- "parentRecordId": "{!recordId}",
- "relatedListName": "{!relationshipApiName}",
- "showBreadCrumbs": true,
- "showCustomTitle": false,
- "showManualRefreshButton": true,
- "showRowNumbers": true
- },
- "componentName": "forceCommunity:relatedList",
- "id": "cac72015-0863-46e3-870d-ca43f081d76c",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "9e86bc1f-69aa-47e8-95ef-91fb76147818",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "7d5f8a26-65a3-408e-a2f1-ac0e6e5aab59",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "relatedlist-00O"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "4dff72f1-db87-40bc-a8d6-36073e365a18",
+ "label" : "鎶ヨ〃 闁㈤�ｃ儶銈广儓",
+ "regions" : [ {
+ "id" : "255f30d3-0419-4484-a86a-69463e5ecf61",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customTitle" : "",
+ "parentRecordId" : "{!recordId}",
+ "relatedListName" : "{!relationshipApiName}",
+ "showBreadCrumbs" : true,
+ "showCustomTitle" : false,
+ "showManualRefreshButton" : true,
+ "showRowNumbers" : true
+ },
+ "componentName" : "forceCommunity:relatedList",
+ "id" : "cac72015-0863-46e3-870d-ca43f081d76c",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "9e86bc1f-69aa-47e8-95ef-91fb76147818",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "7d5f8a26-65a3-408e-a2f1-ac0e6e5aab59",
+ "regionName" : "footer",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "relatedlist-00O"
+}
\ No newline at end of file
diff --git "a/force-app/main/default/experiences/Consumable1/views/\346\226\207\344\273\266\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json" "b/force-app/main/default/experiences/Consumable1/views/\346\226\207\344\273\266\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
index a45f8a0..980c3cc 100644
--- "a/force-app/main/default/experiences/Consumable1/views/\346\226\207\344\273\266\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
+++ "b/force-app/main/default/experiences/Consumable1/views/\346\226\207\344\273\266\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
@@ -1,45 +1,39 @@
{
- "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "3d5f9dc6-9374-4d60-8e41-d9ae76e732e3",
- "label": "鏂囦欢 闁㈤�ｃ儶銈广儓",
- "regions": [
- {
- "id": "746cff4c-6e69-4feb-a676-a5a1d40dda0b",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customTitle": "",
- "parentRecordId": "{!recordId}",
- "relatedListName": "{!relationshipApiName}",
- "showBreadCrumbs": true,
- "showCustomTitle": false,
- "showManualRefreshButton": true,
- "showRowNumbers": true
- },
- "componentName": "forceCommunity:relatedList",
- "id": "966621e8-a647-4bdb-9a9e-63d9f46132d4",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "5f5b300a-ff22-4632-8889-d9ed5bc3399d",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "2ce507fd-d529-4d11-a2cc-e0c9cd56c0f1",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "relatedlist-069"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "3d5f9dc6-9374-4d60-8e41-d9ae76e732e3",
+ "label" : "鏂囦欢 闁㈤�ｃ儶銈广儓",
+ "regions" : [ {
+ "id" : "746cff4c-6e69-4feb-a676-a5a1d40dda0b",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customTitle" : "",
+ "parentRecordId" : "{!recordId}",
+ "relatedListName" : "{!relationshipApiName}",
+ "showBreadCrumbs" : true,
+ "showCustomTitle" : false,
+ "showManualRefreshButton" : true,
+ "showRowNumbers" : true
+ },
+ "componentName" : "forceCommunity:relatedList",
+ "id" : "966621e8-a647-4bdb-9a9e-63d9f46132d4",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "5f5b300a-ff22-4632-8889-d9ed5bc3399d",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "2ce507fd-d529-4d11-a2cc-e0c9cd56c0f1",
+ "regionName" : "footer",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "relatedlist-069"
+}
\ No newline at end of file
diff --git "a/force-app/main/default/experiences/Consumable1/views/\346\265\201\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json" "b/force-app/main/default/experiences/Consumable1/views/\346\265\201\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
index 6fba246..7be41c4 100644
--- "a/force-app/main/default/experiences/Consumable1/views/\346\265\201\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
+++ "b/force-app/main/default/experiences/Consumable1/views/\346\265\201\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
@@ -1,27 +1,23 @@
{
- "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "cd0d3153-1cca-4111-ae2a-08454a8fe698",
- "label": "娴� 闁㈤�ｃ儶銈广儓",
- "regions": [
- {
- "id": "97c8b536-fe44-45cf-ab4d-c97c3b43ef67",
- "regionName": "header",
- "type": "region"
- },
- {
- "id": "13171fdc-cefa-466f-8796-f827886547e4",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "f0cd4e02-22fe-4c43-ad6d-fb48a0ee400a",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "relatedlist-0Fq"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "cd0d3153-1cca-4111-ae2a-08454a8fe698",
+ "label" : "娴� 闁㈤�ｃ儶銈广儓",
+ "regions" : [ {
+ "id" : "97c8b536-fe44-45cf-ab4d-c97c3b43ef67",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "id" : "13171fdc-cefa-466f-8796-f827886547e4",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "f0cd4e02-22fe-4c43-ad6d-fb48a0ee400a",
+ "regionName" : "footer",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "relatedlist-0Fq"
+}
\ No newline at end of file
diff --git "a/force-app/main/default/experiences/Consumable1/views/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\345\210\227\350\241\250.json" "b/force-app/main/default/experiences/Consumable1/views/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\345\210\227\350\241\250.json"
index 0774402..336680e 100644
--- "a/force-app/main/default/experiences/Consumable1/views/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\345\210\227\350\241\250.json"
+++ "b/force-app/main/default/experiences/Consumable1/views/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\345\210\227\350\241\250.json"
@@ -1,52 +1,46 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "c331401c-5c71-4d88-9350-c5e8a79202c5",
- "label": "娑堣�楀搧璁㈠崟 鍒楄〃",
- "regions": [
- {
- "id": "9c56ed8b-747d-4b08-8651-5fc2f53ea168",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "enableInlineEdit": false,
- "filterName": "Overdue",
- "layout": "FULL",
- "pageSize": 25,
- "scope": "Consumable_order__c",
- "showActionBar": true,
- "showChartsPanel": true,
- "showDisplay": "showall",
- "showFilterPanel": true,
- "showImageIcon": true,
- "showManualRefreshButton": true,
- "showObjectName": true,
- "showPinnedList": true,
- "showSearchBar": true
- },
- "componentName": "forceCommunity:objectHome",
- "id": "e91f7d10-dc6c-4a2e-af8c-706f73f7a8cc",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "f603c8cc-3519-4e8c-a262-eef3a9fe442a",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "4efaa155-2075-4409-82e7-71e9abc62284",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "list-a2K"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "293921b6-1a37-49a3-a225-be2f3471a41c",
+ "label" : "娑堣�楀搧璁㈠崟 鍒楄〃",
+ "regions" : [ {
+ "id" : "c1c91ef1-d313-4e66-b600-3b5ece7f6488",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "enableInlineEdit" : false,
+ "filterName" : "D00_approved_view",
+ "layout" : "FULL",
+ "pageSize" : 25,
+ "scope" : "Consumable_order__c",
+ "showActionBar" : false,
+ "showChartsPanel" : false,
+ "showDisplay" : "grid",
+ "showFilterPanel" : false,
+ "showImageIcon" : true,
+ "showManualRefreshButton" : true,
+ "showObjectName" : true,
+ "showPinnedList" : false,
+ "showSearchBar" : true
+ },
+ "componentName" : "forceCommunity:objectHome",
+ "id" : "5a679d55-a414-4a30-9e45-410f58926560",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "5b054b02-44fa-4d1a-a233-bc406c227ab1",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "93caa3c5-152b-4c37-a27c-6711bafd7493",
+ "regionName" : "footer",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "list-a2K"
+}
\ No newline at end of file
diff --git "a/force-app/main/default/experiences/Consumable1/views/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\347\233\270\345\205\263\345\210\227\350\241\250.json" "b/force-app/main/default/experiences/Consumable1/views/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\347\233\270\345\205\263\345\210\227\350\241\250.json"
index d556f9c..913a289 100644
--- "a/force-app/main/default/experiences/Consumable1/views/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\347\233\270\345\205\263\345\210\227\350\241\250.json"
+++ "b/force-app/main/default/experiences/Consumable1/views/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\347\233\270\345\205\263\345\210\227\350\241\250.json"
@@ -1,45 +1,39 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "3dd9b830-a644-429b-8b1c-e2770454179a",
- "label": "娑堣�楀搧璁㈠崟 鐩稿叧鍒楄〃",
- "regions": [
- {
- "id": "55e18a02-9472-4658-914e-755e9a83c302",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customTitle": "",
- "parentRecordId": "{!recordId}",
- "relatedListName": "{!relationshipApiName}",
- "showBreadCrumbs": true,
- "showCustomTitle": false,
- "showManualRefreshButton": true,
- "showRowNumbers": true
- },
- "componentName": "forceCommunity:relatedList",
- "id": "a4e0f988-e956-4c9d-b02c-83866661cf0e",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "d576983a-e7b9-4910-bf69-4ad5909303da",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "430d0911-909b-499d-9e55-ef40f5e938d0",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "relatedlist-a2K"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "54811d17-d3d4-47f5-b3a5-a9efd7a62afa",
+ "label" : "娑堣�楀搧璁㈠崟 鐩稿叧鍒楄〃",
+ "regions" : [ {
+ "id" : "19e75fde-55d3-4d05-ad35-859e9253f3e3",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customTitle" : "",
+ "parentRecordId" : "{!recordId}",
+ "relatedListName" : "{!relationshipApiName}",
+ "showBreadCrumbs" : true,
+ "showCustomTitle" : false,
+ "showManualRefreshButton" : true,
+ "showRowNumbers" : true
+ },
+ "componentName" : "forceCommunity:relatedList",
+ "id" : "a56b04ba-b611-4311-b693-60df1d15bc41",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "b73a78fe-8a2a-495c-a415-0e6b1f3d5bba",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "508cdb2d-9f19-489c-88ea-d56da66f3360",
+ "regionName" : "footer",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "relatedlist-a2K"
+}
\ No newline at end of file
diff --git "a/force-app/main/default/experiences/Consumable1/views/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\350\257\246\347\273\206\344\277\241\346\201\257.json" "b/force-app/main/default/experiences/Consumable1/views/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\350\257\246\347\273\206\344\277\241\346\201\257.json"
index cf01ca2..395514a 100644
--- "a/force-app/main/default/experiences/Consumable1/views/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\350\257\246\347\273\206\344\277\241\346\201\257.json"
+++ "b/force-app/main/default/experiences/Consumable1/views/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\350\257\246\347\273\206\344\277\241\346\201\257.json"
@@ -1,76 +1,66 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "bea87922-55fe-41d0-9a2f-6647aa020e56",
- "label": "娑堣�楀搧璁㈠崟 璇︾粏淇℃伅",
- "regions": [
- {
- "id": "f3e32491-d89a-467a-97cb-099c98bc5ba1",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "recordId": "{!recordId}"
- },
- "componentName": "forceCommunity:recordHeadline",
- "id": "c7db25b2-0eb2-4e2e-b369-9af45d0c76e0",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- },
- {
- "componentAttributes": {
- "detailsTabLabel": "Details",
- "discussionsTabLabel": "Feed",
- "recordId": "{!recordId}",
- "relatedTabLabel": "Related",
- "showLegacyActivityComposer": false,
- "tab1Type": "details",
- "tab2Type": "related",
- "tab3Type": "none",
- "tab4Type": "none",
- "timelineTabLabel": "Activity"
- },
- "componentName": "forceCommunity:recordHomeTabs",
- "id": "44e2d9e9-5aa0-437e-b32b-4eea960c1ac9",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "d0496ef7-ef71-40b4-8673-c38781880436",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "09482c1a-f6b6-422f-9433-6a2fcfd13ddf",
- "regionName": "footer",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "{!Record._Object}: {!Record._Title}"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "fbb0fc4c-2c29-4451-a499-0ac072e7e7e6",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "fbe33d47-5a71-489d-8a79-5d95f1a00c3d",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "detail-a2K"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "2757e7e7-c2ba-4c5b-9480-4877420e6c40",
+ "label" : "娑堣�楀搧璁㈠崟 璇︾粏淇℃伅",
+ "regions" : [ {
+ "id" : "002e3e28-a40b-4f71-924f-b04dbb3aad57",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "recordId" : "{!recordId}"
+ },
+ "componentName" : "forceCommunity:recordHeadline",
+ "id" : "e347f5d6-b40e-48b3-ad46-ed15d001bfc2",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ }, {
+ "componentAttributes" : {
+ "detailsTabLabel" : "Details",
+ "discussionsTabLabel" : "Feed",
+ "recordId" : "{!recordId}",
+ "relatedTabLabel" : "Related",
+ "showLegacyActivityComposer" : false,
+ "tab1Type" : "details",
+ "tab2Type" : "related",
+ "tab3Type" : "chatter",
+ "tab4Type" : "none",
+ "timelineTabLabel" : "Activity"
+ },
+ "componentName" : "forceCommunity:recordHomeTabs",
+ "id" : "777d94b0-f4e1-4de6-93ff-6b5126fc0ba4",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "4e4ee28e-35eb-4682-95d4-3279649fa4fe",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "19a87d46-ec32-40b1-b8b5-c4fd0a79b588",
+ "regionName" : "footer",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "{!Record._Object}: {!Record._Title}"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "7cf01a81-80f5-40bf-a99a-131727098aea",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "5ce72d1c-5178-4e9a-8405-5fb99e32ed6b",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "detail-a2K"
+}
\ No newline at end of file
diff --git "a/force-app/main/default/experiences/Consumable1/views/\347\224\250\346\210\267\343\203\252\343\202\271\343\203\210.json" "b/force-app/main/default/experiences/Consumable1/views/\347\224\250\346\210\267\343\203\252\343\202\271\343\203\210.json"
index 9b3863d..f85f2a9 100644
--- "a/force-app/main/default/experiences/Consumable1/views/\347\224\250\346\210\267\343\203\252\343\202\271\343\203\210.json"
+++ "b/force-app/main/default/experiences/Consumable1/views/\347\224\250\346\210\267\343\203\252\343\202\271\343\203\210.json"
@@ -1,27 +1,23 @@
{
- "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "09574ae1-7a1d-465b-852b-6604abee87c2",
- "label": "鐢ㄦ埛 銉偣銉�",
- "regions": [
- {
- "id": "4b35d932-84a2-442d-9b0c-e5cb790b6580",
- "regionName": "header",
- "type": "region"
- },
- {
- "id": "b109e1ab-8757-414e-ba5d-cddeafb4eff1",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "6c741f21-5b6e-443a-a0af-4b7fb5151480",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "list-005"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "09574ae1-7a1d-465b-852b-6604abee87c2",
+ "label" : "鐢ㄦ埛 銉偣銉�",
+ "regions" : [ {
+ "id" : "4b35d932-84a2-442d-9b0c-e5cb790b6580",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "id" : "b109e1ab-8757-414e-ba5d-cddeafb4eff1",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "6c741f21-5b6e-443a-a0af-4b7fb5151480",
+ "regionName" : "footer",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "list-005"
+}
\ No newline at end of file
diff --git "a/force-app/main/default/experiences/Consumable1/views/\347\224\250\346\210\267\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json" "b/force-app/main/default/experiences/Consumable1/views/\347\224\250\346\210\267\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
index 482dc3d..632316f 100644
--- "a/force-app/main/default/experiences/Consumable1/views/\347\224\250\346\210\267\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
+++ "b/force-app/main/default/experiences/Consumable1/views/\347\224\250\346\210\267\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
@@ -1,45 +1,39 @@
{
- "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "a7a75c83-a63d-4031-8a1a-524e45f77737",
- "label": "鐢ㄦ埛 闁㈤�ｃ儶銈广儓",
- "regions": [
- {
- "id": "5504b9cc-87ba-4a13-a6de-882db87b1ef9",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customTitle": "",
- "parentRecordId": "{!recordId}",
- "relatedListName": "{!relationshipApiName}",
- "showBreadCrumbs": true,
- "showCustomTitle": false,
- "showManualRefreshButton": true,
- "showRowNumbers": true
- },
- "componentName": "forceCommunity:relatedList",
- "id": "99b7c2fd-07f6-4cca-bc65-4801c3c91a29",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "90a88344-631c-4a99-bfb9-5b5918c98cdc",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "c8110fe8-136a-4078-a991-8810167e994a",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "relatedlist-005"
-}
+ "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "a7a75c83-a63d-4031-8a1a-524e45f77737",
+ "label" : "鐢ㄦ埛 闁㈤�ｃ儶銈广儓",
+ "regions" : [ {
+ "id" : "5504b9cc-87ba-4a13-a6de-882db87b1ef9",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customTitle" : "",
+ "parentRecordId" : "{!recordId}",
+ "relatedListName" : "{!relationshipApiName}",
+ "showBreadCrumbs" : true,
+ "showCustomTitle" : false,
+ "showManualRefreshButton" : true,
+ "showRowNumbers" : true
+ },
+ "componentName" : "forceCommunity:relatedList",
+ "id" : "99b7c2fd-07f6-4cca-bc65-4801c3c91a29",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "90a88344-631c-4a99-bfb9-5b5918c98cdc",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "c8110fe8-136a-4078-a991-8810167e994a",
+ "regionName" : "footer",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "relatedlist-005"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Site3.site-meta.xml b/force-app/main/default/experiences/Site3.site-meta.xml
index 2984504..ba41589 100644
--- a/force-app/main/default/experiences/Site3.site-meta.xml
+++ b/force-app/main/default/experiences/Site3.site-meta.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
<ExperienceBundle xmlns="http://soap.sforce.com/2006/04/metadata">
<label>鐢靛瓙绛炬敹绯荤粺</label>
<type>ChatterNetworkPicasso</type>
diff --git a/force-app/main/default/experiences/Site3/brandingSets/buildYourOwn.json b/force-app/main/default/experiences/Site3/brandingSets/buildYourOwn.json
index bfc3f2a..7ff6f41 100644
--- a/force-app/main/default/experiences/Site3/brandingSets/buildYourOwn.json
+++ b/force-app/main/default/experiences/Site3/brandingSets/buildYourOwn.json
@@ -1,54 +1,54 @@
{
- "definitionName": "starter:branding-starter",
- "id": "9ba9ab62-f2a8-47e3-8267-adedbceaab7f",
- "label": "Build Your Own",
- "type": "brandingSet",
- "values": {
- "ActionColor": "#2574A9",
- "BorderColor": "#D4D4D4",
- "CardBackgroundColor": "rgba(255, 255, 255, 0)",
- "CompanyLogo": "",
- "DetailTextColor": "#696969",
- "ErrorFontColor": "#ff9e9e",
- "HeaderFonts": "Montserrat",
- "LinkColor": "#2574A9",
- "LoginBackgroundColor": "#F4F4F4",
- "LoginBackgroundImage": "../../../../sfsites/picasso/core/external/salesforceIdentity/images/background.jpg?v=1",
- "OverlayTextColor": "#FFFFFF",
- "PrimaryFont": "Lato",
- "TextColor": "#333",
- "TextTransformStyle": "uppercase",
- "_ActionColorDarker": "#1c577f",
- "_ActionColorTrans": "rgba(37, 116, 169, 0.9)",
- "_BackgroundColor1": "rgb(235, 235, 235)",
- "_BackgroundColor2": "rgb(194, 194, 194)",
- "_BackgroundColor3": "rgb(133, 133, 133)",
- "_DxpPageBackgroundColor": "#FFFFFF",
- "_HoverColor": "rgba(37, 116, 169, 0.05)",
- "_LinkColorDarker": "#135F90",
- "_NeutralColor": "#ecebea",
- "_NeutralColor1": "rgb(217, 215, 213)",
- "_NeutralColor2": "rgb(178, 174, 170)",
- "_NeutralColor3": "rgb(118, 113, 107)",
- "_NeutralForegroundColor": "#000",
- "_NeutralForegroundColor1": "#000",
- "_NeutralForegroundColor2": "#000",
- "_NeutralForegroundColor3": "#fff",
- "_OverlayTextColorShadow": "#000",
- "_PrimaryAccentColor1": "rgb(30, 93, 136)",
- "_PrimaryAccentColor2": "rgb(15, 47, 69)",
- "_PrimaryAccentColor3": "rgb(0, 0, 0)",
- "_PrimaryAccentForegroundColor1": "rgb(255, 255, 255)",
- "_PrimaryAccentForegroundColor2": "rgb(255, 255, 255)",
- "_PrimaryAccentForegroundColor3": "rgb(255, 255, 255)",
- "_TextColor1": "rgb(31, 31, 31)",
- "_TextColor2": "rgb(0, 0, 0)",
- "_TextColor3": "rgb(0, 0, 0)",
- "_brandNavigationBarBackgroundColor": "rgba(128,128,128,.75)",
- "_brandNavigationItemBackgroundColorHover": "rgba(0,0,0,.2)",
- "_brandNavigationItemDividerColor": "rgba(255, 255, 255, 0.2)",
- "brandNavigationBackgroundColor": "rgb(128,128,128)",
- "brandNavigationBarBackgroundColor": "rgba(128,128,128,.75)",
- "brandNavigationColorText": "#FFFFFF"
+ "definitionName" : "starter:branding-starter",
+ "id" : "9ba9ab62-f2a8-47e3-8267-adedbceaab7f",
+ "label" : "Build Your Own",
+ "type" : "brandingSet",
+ "values" : {
+ "ActionColor" : "#2574A9",
+ "BorderColor" : "#D4D4D4",
+ "CardBackgroundColor" : "rgba(255, 255, 255, 0)",
+ "CompanyLogo" : "",
+ "DetailTextColor" : "#696969",
+ "ErrorFontColor" : "#ff9e9e",
+ "HeaderFonts" : "Montserrat",
+ "LinkColor" : "#2574A9",
+ "LoginBackgroundColor" : "#F4F4F4",
+ "LoginBackgroundImage" : "../../../../sfsites/picasso/core/external/salesforceIdentity/images/background.jpg?v=1",
+ "OverlayTextColor" : "#FFFFFF",
+ "PrimaryFont" : "Lato",
+ "TextColor" : "#333",
+ "TextTransformStyle" : "uppercase",
+ "_ActionColorDarker" : "#1c577f",
+ "_ActionColorTrans" : "rgba(37, 116, 169, 0.9)",
+ "_BackgroundColor1" : "rgb(235, 235, 235)",
+ "_BackgroundColor2" : "rgb(194, 194, 194)",
+ "_BackgroundColor3" : "rgb(133, 133, 133)",
+ "_DxpPageBackgroundColor" : "#FFFFFF",
+ "_HoverColor" : "rgba(37, 116, 169, 0.05)",
+ "_LinkColorDarker" : "#135F90",
+ "_NeutralColor" : "#ecebea",
+ "_NeutralColor1" : "rgb(217, 215, 213)",
+ "_NeutralColor2" : "rgb(178, 174, 170)",
+ "_NeutralColor3" : "rgb(118, 113, 107)",
+ "_NeutralForegroundColor" : "#000",
+ "_NeutralForegroundColor1" : "#000",
+ "_NeutralForegroundColor2" : "#000",
+ "_NeutralForegroundColor3" : "#fff",
+ "_OverlayTextColorShadow" : "#000",
+ "_PrimaryAccentColor1" : "rgb(30, 93, 136)",
+ "_PrimaryAccentColor2" : "rgb(15, 47, 69)",
+ "_PrimaryAccentColor3" : "rgb(0, 0, 0)",
+ "_PrimaryAccentForegroundColor1" : "rgb(255, 255, 255)",
+ "_PrimaryAccentForegroundColor2" : "rgb(255, 255, 255)",
+ "_PrimaryAccentForegroundColor3" : "rgb(255, 255, 255)",
+ "_TextColor1" : "rgb(31, 31, 31)",
+ "_TextColor2" : "rgb(0, 0, 0)",
+ "_TextColor3" : "rgb(0, 0, 0)",
+ "_brandNavigationBarBackgroundColor" : "rgba(128,128,128,.75)",
+ "_brandNavigationItemBackgroundColorHover" : "rgba(0,0,0,.2)",
+ "_brandNavigationItemDividerColor" : "rgba(255, 255, 255, 0.2)",
+ "brandNavigationBackgroundColor" : "rgb(128,128,128)",
+ "brandNavigationBarBackgroundColor" : "rgba(128,128,128,.75)",
+ "brandNavigationColorText" : "#FFFFFF"
}
-}
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Site3/config/languages.json b/force-app/main/default/experiences/Site3/config/languages.json
index c2f83eb..20c4236 100644
--- a/force-app/main/default/experiences/Site3/config/languages.json
+++ b/force-app/main/default/experiences/Site3/config/languages.json
@@ -1,6 +1,6 @@
{
- "defaultCode": "en_US",
- "defaultLabel": "English (US)",
- "id": "5d0232d2-9794-4c56-9bf0-642e72abe504",
- "type": "languageContainer"
-}
+ "defaultCode" : "en_US",
+ "defaultLabel" : "English (US)",
+ "id" : "5d0232d2-9794-4c56-9bf0-642e72abe504",
+ "type" : "languageContainer"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Site3/config/loginAppPage.json b/force-app/main/default/experiences/Site3/config/loginAppPage.json
index 5fd11c3..a3491ed 100644
--- a/force-app/main/default/experiences/Site3/config/loginAppPage.json
+++ b/force-app/main/default/experiences/Site3/config/loginAppPage.json
@@ -1,7 +1,7 @@
{
- "cmsSettings": {},
- "id": "2bcb651a-3bf1-4ba0-bf17-8f52e81c95c6",
- "label": "login",
- "templateName": "Login Template",
- "type": "appPage"
-}
+ "cmsSettings" : { },
+ "id" : "2bcb651a-3bf1-4ba0-bf17-8f52e81c95c6",
+ "label" : "login",
+ "templateName" : "Login Template",
+ "type" : "appPage"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Site3/config/mainAppPage.json b/force-app/main/default/experiences/Site3/config/mainAppPage.json
index 0349243..36530d9 100644
--- a/force-app/main/default/experiences/Site3/config/mainAppPage.json
+++ b/force-app/main/default/experiences/Site3/config/mainAppPage.json
@@ -1,10 +1,10 @@
{
- "cmsSettings": {},
- "currentThemeId": "64870c02-e4cf-4464-8930-7aed413f325b",
- "headMarkup": null,
- "id": "7f290f39-4245-4612-9453-2b0c9f9e3701",
- "isRelaxedCSPLevel": false,
- "label": "main",
- "templateName": "Starter Template",
- "type": "appPage"
-}
+ "cmsSettings" : { },
+ "currentThemeId" : "64870c02-e4cf-4464-8930-7aed413f325b",
+ "headMarkup" : null,
+ "id" : "7f290f39-4245-4612-9453-2b0c9f9e3701",
+ "isRelaxedCSPLevel" : false,
+ "label" : "main",
+ "templateName" : "Starter Template",
+ "type" : "appPage"
+}
\ No newline at end of file
diff --git "a/force-app/main/default/experiences/Site3/config/\347\224\265\345\255\220\347\255\276\346\224\266\347\263\273\347\273\237.json" "b/force-app/main/default/experiences/Site3/config/\347\224\265\345\255\220\347\255\276\346\224\266\347\263\273\347\273\237.json"
index a413c7a..193cd06 100644
--- "a/force-app/main/default/experiences/Site3/config/\347\224\265\345\255\220\347\255\276\346\224\266\347\263\273\347\273\237.json"
+++ "b/force-app/main/default/experiences/Site3/config/\347\224\265\345\255\220\347\255\276\346\224\266\347\263\273\347\273\237.json"
@@ -1,11 +1,11 @@
{
- "forgotPasswordRouteId": "3ca12776-63d6-4edc-bc9a-dc6b0640e27a",
- "isAvailableToGuests": true,
- "isFilteredComponentsView": false,
- "isProgressiveRenderingEnabled": false,
- "loginAppPageId": "2bcb651a-3bf1-4ba0-bf17-8f52e81c95c6",
- "mainAppPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
- "preferredDomain": "none",
- "selfRegistrationRouteId": "57c8022e-eb0c-43b6-97dc-a37a1d91b2ca",
- "type": "site"
-}
+ "forgotPasswordRouteId" : "3ca12776-63d6-4edc-bc9a-dc6b0640e27a",
+ "isAvailableToGuests" : true,
+ "isFilteredComponentsView" : false,
+ "isProgressiveRenderingEnabled" : false,
+ "loginAppPageId" : "2bcb651a-3bf1-4ba0-bf17-8f52e81c95c6",
+ "mainAppPageId" : "7f290f39-4245-4612-9453-2b0c9f9e3701",
+ "preferredDomain" : "none",
+ "selfRegistrationRouteId" : "57c8022e-eb0c-43b6-97dc-a37a1d91b2ca",
+ "type" : "site"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Site3/routes/checkPassword.json b/force-app/main/default/experiences/Site3/routes/checkPassword.json
index 2ac915f..8debb71 100644
--- a/force-app/main/default/experiences/Site3/routes/checkPassword.json
+++ b/force-app/main/default/experiences/Site3/routes/checkPassword.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "a0810e9f-b4d6-4a64-80aa-02d99f2c8234",
- "appPageId": "2bcb651a-3bf1-4ba0-bf17-8f52e81c95c6",
- "id": "babb4f4f-dc0c-4409-9525-eaded47bc05a",
- "label": "Check Password",
- "routeType": "check-password",
- "type": "route",
- "urlPrefix": "CheckPasswordResetEmail"
-}
+ "activeViewId" : "a0810e9f-b4d6-4a64-80aa-02d99f2c8234",
+ "appPageId" : "2bcb651a-3bf1-4ba0-bf17-8f52e81c95c6",
+ "id" : "babb4f4f-dc0c-4409-9525-eaded47bc05a",
+ "label" : "Check Password",
+ "routeType" : "check-password",
+ "type" : "route",
+ "urlPrefix" : "CheckPasswordResetEmail"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Site3/routes/createRecord.json b/force-app/main/default/experiences/Site3/routes/createRecord.json
index 667f93d..653aca5 100644
--- a/force-app/main/default/experiences/Site3/routes/createRecord.json
+++ b/force-app/main/default/experiences/Site3/routes/createRecord.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "9cb0795b-6c6d-4948-9dcd-68a568028499",
- "appPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
- "id": "478d6a03-0784-4adc-ace3-eb9cd6b2915e",
- "label": "Create Record",
- "routeType": "createrecord",
- "type": "route",
- "urlPrefix": "createrecord"
-}
+ "activeViewId" : "9cb0795b-6c6d-4948-9dcd-68a568028499",
+ "appPageId" : "7f290f39-4245-4612-9453-2b0c9f9e3701",
+ "id" : "478d6a03-0784-4adc-ace3-eb9cd6b2915e",
+ "label" : "Create Record",
+ "routeType" : "createrecord",
+ "type" : "route",
+ "urlPrefix" : "createrecord"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Site3/routes/error.json b/force-app/main/default/experiences/Site3/routes/error.json
index ea9cbeb..5c7577e 100644
--- a/force-app/main/default/experiences/Site3/routes/error.json
+++ b/force-app/main/default/experiences/Site3/routes/error.json
@@ -1,10 +1,10 @@
{
- "activeViewId": "c792b011-93b7-4274-aa53-359303ca2567",
- "appPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
- "id": "c684094f-3175-42c3-9fab-eb858aa3e806",
- "label": "Error",
- "pageAccess": "UseParent",
- "routeType": "error",
- "type": "route",
- "urlPrefix": "error"
-}
+ "activeViewId" : "c792b011-93b7-4274-aa53-359303ca2567",
+ "appPageId" : "7f290f39-4245-4612-9453-2b0c9f9e3701",
+ "id" : "c684094f-3175-42c3-9fab-eb858aa3e806",
+ "label" : "Error",
+ "pageAccess" : "UseParent",
+ "routeType" : "error",
+ "type" : "route",
+ "urlPrefix" : "error"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Site3/routes/forgotPassword.json b/force-app/main/default/experiences/Site3/routes/forgotPassword.json
index 62f3dd7..c019c71 100644
--- a/force-app/main/default/experiences/Site3/routes/forgotPassword.json
+++ b/force-app/main/default/experiences/Site3/routes/forgotPassword.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "cb26bb2a-86d2-4d95-813b-a1b4e00337e5",
- "appPageId": "2bcb651a-3bf1-4ba0-bf17-8f52e81c95c6",
- "id": "3ca12776-63d6-4edc-bc9a-dc6b0640e27a",
- "label": "Forgot Password",
- "routeType": "forgot-password",
- "type": "route",
- "urlPrefix": "ForgotPassword"
-}
+ "activeViewId" : "cb26bb2a-86d2-4d95-813b-a1b4e00337e5",
+ "appPageId" : "2bcb651a-3bf1-4ba0-bf17-8f52e81c95c6",
+ "id" : "3ca12776-63d6-4edc-bc9a-dc6b0640e27a",
+ "label" : "Forgot Password",
+ "routeType" : "forgot-password",
+ "type" : "route",
+ "urlPrefix" : "ForgotPassword"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Site3/routes/home.json b/force-app/main/default/experiences/Site3/routes/home.json
index 4d78d72..b468aa5 100644
--- a/force-app/main/default/experiences/Site3/routes/home.json
+++ b/force-app/main/default/experiences/Site3/routes/home.json
@@ -1,10 +1,10 @@
{
- "activeViewId": "e2e60370-e191-4f54-8b77-7da2fdc0c01f",
- "appPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
- "id": "b57a9b81-a622-4699-9467-83854f1b4d90",
- "label": "Home",
- "pageAccess": "Public",
- "routeType": "home",
- "type": "route",
- "urlPrefix": ""
-}
+ "activeViewId" : "e2e60370-e191-4f54-8b77-7da2fdc0c01f",
+ "appPageId" : "7f290f39-4245-4612-9453-2b0c9f9e3701",
+ "id" : "b57a9b81-a622-4699-9467-83854f1b4d90",
+ "label" : "Home",
+ "pageAccess" : "Public",
+ "routeType" : "home",
+ "type" : "route",
+ "urlPrefix" : ""
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Site3/routes/login.json b/force-app/main/default/experiences/Site3/routes/login.json
index 5b9ae5f..78a117e 100644
--- a/force-app/main/default/experiences/Site3/routes/login.json
+++ b/force-app/main/default/experiences/Site3/routes/login.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "6d2b638e-a48b-49d3-a675-e36e30791e1c",
- "appPageId": "2bcb651a-3bf1-4ba0-bf17-8f52e81c95c6",
- "id": "c2fc667a-c580-447e-bd1e-717b8fe1a209",
- "label": "Login",
- "routeType": "login-home",
- "type": "route",
- "urlPrefix": ""
-}
+ "activeViewId" : "6d2b638e-a48b-49d3-a675-e36e30791e1c",
+ "appPageId" : "2bcb651a-3bf1-4ba0-bf17-8f52e81c95c6",
+ "id" : "c2fc667a-c580-447e-bd1e-717b8fe1a209",
+ "label" : "Login",
+ "routeType" : "login-home",
+ "type" : "route",
+ "urlPrefix" : ""
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Site3/routes/loginError.json b/force-app/main/default/experiences/Site3/routes/loginError.json
index ff782e2..618b776 100644
--- a/force-app/main/default/experiences/Site3/routes/loginError.json
+++ b/force-app/main/default/experiences/Site3/routes/loginError.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "acfc3c4f-6e34-4219-a88a-39af60aece24",
- "appPageId": "2bcb651a-3bf1-4ba0-bf17-8f52e81c95c6",
- "id": "c727420f-bf9b-4029-b55f-92bdb38610b5",
- "label": "Login Error",
- "routeType": "login-error",
- "type": "route",
- "urlPrefix": "error"
-}
+ "activeViewId" : "acfc3c4f-6e34-4219-a88a-39af60aece24",
+ "appPageId" : "2bcb651a-3bf1-4ba0-bf17-8f52e81c95c6",
+ "id" : "c727420f-bf9b-4029-b55f-92bdb38610b5",
+ "label" : "Login Error",
+ "routeType" : "login-error",
+ "type" : "route",
+ "urlPrefix" : "error"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Site3/routes/recordDetail.json b/force-app/main/default/experiences/Site3/routes/recordDetail.json
index a01186c..d97cb89 100644
--- a/force-app/main/default/experiences/Site3/routes/recordDetail.json
+++ b/force-app/main/default/experiences/Site3/routes/recordDetail.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "bb2f4e25-0c5a-46a4-adb6-431ecad42732",
- "appPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
- "id": "30ad0f59-ccc2-4e2a-94af-c6895d29948d",
- "label": "Record Detail",
- "routeType": "detail",
- "type": "route",
- "urlPrefix": "detail"
-}
+ "activeViewId" : "bb2f4e25-0c5a-46a4-adb6-431ecad42732",
+ "appPageId" : "7f290f39-4245-4612-9453-2b0c9f9e3701",
+ "id" : "30ad0f59-ccc2-4e2a-94af-c6895d29948d",
+ "label" : "Record Detail",
+ "routeType" : "detail",
+ "type" : "route",
+ "urlPrefix" : "detail"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Site3/routes/recordList.json b/force-app/main/default/experiences/Site3/routes/recordList.json
index d89ab24..a7be53b 100644
--- a/force-app/main/default/experiences/Site3/routes/recordList.json
+++ b/force-app/main/default/experiences/Site3/routes/recordList.json
@@ -1,10 +1,10 @@
{
- "activeViewId": "45ab1ac9-68f0-43e8-af03-88f2f479f2c3",
- "appPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
- "id": "6af539ff-d338-4c8b-9712-cbf354a750df",
- "label": "Record List",
- "pageAccess": "UseParent",
- "routeType": "list",
- "type": "route",
- "urlPrefix": "recordlist"
-}
+ "activeViewId" : "45ab1ac9-68f0-43e8-af03-88f2f479f2c3",
+ "appPageId" : "7f290f39-4245-4612-9453-2b0c9f9e3701",
+ "id" : "6af539ff-d338-4c8b-9712-cbf354a750df",
+ "label" : "Record List",
+ "pageAccess" : "UseParent",
+ "routeType" : "list",
+ "type" : "route",
+ "urlPrefix" : "recordlist"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Site3/routes/register.json b/force-app/main/default/experiences/Site3/routes/register.json
index 21864e4..c4e22c6 100644
--- a/force-app/main/default/experiences/Site3/routes/register.json
+++ b/force-app/main/default/experiences/Site3/routes/register.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "f7082e1e-e1e4-4b79-a271-59037e25c845",
- "appPageId": "2bcb651a-3bf1-4ba0-bf17-8f52e81c95c6",
- "id": "57c8022e-eb0c-43b6-97dc-a37a1d91b2ca",
- "label": "Register",
- "routeType": "self-register",
- "type": "route",
- "urlPrefix": "SelfRegister"
-}
+ "activeViewId" : "f7082e1e-e1e4-4b79-a271-59037e25c845",
+ "appPageId" : "2bcb651a-3bf1-4ba0-bf17-8f52e81c95c6",
+ "id" : "57c8022e-eb0c-43b6-97dc-a37a1d91b2ca",
+ "label" : "Register",
+ "routeType" : "self-register",
+ "type" : "route",
+ "urlPrefix" : "SelfRegister"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Site3/routes/relatedRecordList.json b/force-app/main/default/experiences/Site3/routes/relatedRecordList.json
index e871efd..525f48d 100644
--- a/force-app/main/default/experiences/Site3/routes/relatedRecordList.json
+++ b/force-app/main/default/experiences/Site3/routes/relatedRecordList.json
@@ -1,10 +1,10 @@
{
- "activeViewId": "df2fbc80-2a44-4533-b646-40276661a5cf",
- "appPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
- "id": "b568f84d-743c-40dc-a171-62223c7c0acc",
- "label": "Related Record List",
- "pageAccess": "UseParent",
- "routeType": "relatedlist",
- "type": "route",
- "urlPrefix": "relatedlist"
-}
+ "activeViewId" : "df2fbc80-2a44-4533-b646-40276661a5cf",
+ "appPageId" : "7f290f39-4245-4612-9453-2b0c9f9e3701",
+ "id" : "b568f84d-743c-40dc-a171-62223c7c0acc",
+ "label" : "Related Record List",
+ "pageAccess" : "UseParent",
+ "routeType" : "relatedlist",
+ "type" : "route",
+ "urlPrefix" : "relatedlist"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Site3/routes/search.json b/force-app/main/default/experiences/Site3/routes/search.json
index c1fce47..0b51c11 100644
--- a/force-app/main/default/experiences/Site3/routes/search.json
+++ b/force-app/main/default/experiences/Site3/routes/search.json
@@ -1,10 +1,10 @@
{
- "activeViewId": "1b73e50d-9811-4744-8c07-ffc097aa102a",
- "appPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
- "id": "05a1e535-f562-40c8-b5e5-e892d06167a8",
- "label": "Search",
- "pageAccess": "UseParent",
- "routeType": "global-search",
- "type": "route",
- "urlPrefix": "global-search"
-}
+ "activeViewId" : "1b73e50d-9811-4744-8c07-ffc097aa102a",
+ "appPageId" : "7f290f39-4245-4612-9453-2b0c9f9e3701",
+ "id" : "05a1e535-f562-40c8-b5e5-e892d06167a8",
+ "label" : "Search",
+ "pageAccess" : "UseParent",
+ "routeType" : "global-search",
+ "type" : "route",
+ "urlPrefix" : "global-search"
+}
\ No newline at end of file
diff --git "a/force-app/main/default/experiences/Site3/routes/\345\245\245\346\236\227\345\267\264\346\226\257\347\224\265\345\255\220\347\255\276\346\224\266\347\263\273\347\273\237.json" "b/force-app/main/default/experiences/Site3/routes/\345\245\245\346\236\227\345\267\264\346\226\257\347\224\265\345\255\220\347\255\276\346\224\266\347\263\273\347\273\237.json"
index f4fa600..d8d8b0c 100644
--- "a/force-app/main/default/experiences/Site3/routes/\345\245\245\346\236\227\345\267\264\346\226\257\347\224\265\345\255\220\347\255\276\346\224\266\347\263\273\347\273\237.json"
+++ "b/force-app/main/default/experiences/Site3/routes/\345\245\245\346\236\227\345\267\264\346\226\257\347\224\265\345\255\220\347\255\276\346\224\266\347\263\273\347\273\237.json"
@@ -1,10 +1,10 @@
{
- "activeViewId": "224c5f58-859e-49e8-9564-18d11e2ddf47",
- "appPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
- "id": "819d167a-e9e0-46e2-be56-8e5e20dc4a0e",
- "label": "濂ユ灄宸存柉鐢靛瓙绛炬敹绯荤粺",
- "pageAccess": "Public",
- "routeType": "custom-esign-data-entry",
- "type": "route",
- "urlPrefix": "EsignDataEntry"
-}
+ "activeViewId" : "224c5f58-859e-49e8-9564-18d11e2ddf47",
+ "appPageId" : "7f290f39-4245-4612-9453-2b0c9f9e3701",
+ "id" : "819d167a-e9e0-46e2-be56-8e5e20dc4a0e",
+ "label" : "濂ユ灄宸存柉鐢靛瓙绛炬敹绯荤粺",
+ "pageAccess" : "Public",
+ "routeType" : "custom-esign-data-entry",
+ "type" : "route",
+ "urlPrefix" : "EsignDataEntry"
+}
\ No newline at end of file
diff --git "a/force-app/main/default/experiences/Site3/routes/\350\277\233\345\217\243\345\215\225\350\257\201\346\230\216\347\273\206.json" "b/force-app/main/default/experiences/Site3/routes/\350\277\233\345\217\243\345\215\225\350\257\201\346\230\216\347\273\206.json"
new file mode 100644
index 0000000..2074292
--- /dev/null
+++ "b/force-app/main/default/experiences/Site3/routes/\350\277\233\345\217\243\345\215\225\350\257\201\346\230\216\347\273\206.json"
@@ -0,0 +1,10 @@
+{
+ "activeViewId" : "793767ac-c71a-49a2-ba5a-591a85646551",
+ "appPageId" : "7f290f39-4245-4612-9453-2b0c9f9e3701",
+ "id" : "62cd6cac-031d-4d5d-a256-7117468729df",
+ "label" : "杩涘彛鍗曡瘉鏄庣粏",
+ "pageAccess" : "UseParent",
+ "routeType" : "custom-attachment-display",
+ "type" : "route",
+ "urlPrefix" : "AttachmentDisplay"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Site3/themes/buildYourOwn.json b/force-app/main/default/experiences/Site3/themes/buildYourOwn.json
index bf8a3f0..6c81b4c 100644
--- a/force-app/main/default/experiences/Site3/themes/buildYourOwn.json
+++ b/force-app/main/default/experiences/Site3/themes/buildYourOwn.json
@@ -1,149 +1,126 @@
{
- "activeBrandingSetId": "9ba9ab62-f2a8-47e3-8267-adedbceaab7f",
- "customCSS": "",
- "developerName": "starter",
- "id": "64870c02-e4cf-4464-8930-7aed413f325b",
- "label": "Build Your Own",
- "layouts": {
- "Inner": "bf29ed2d-40ed-45cd-b4d1-c6ff6e1b20c6",
- "Login": "a33c4bb6-054d-4319-a5bb-f27d28d0db18",
- "ServiceNotAvailable": "1664c7f7-6090-4a0d-bfc2-3191064ecd96"
+ "activeBrandingSetId" : "9ba9ab62-f2a8-47e3-8267-adedbceaab7f",
+ "customCSS" : "",
+ "developerName" : "starter",
+ "id" : "64870c02-e4cf-4464-8930-7aed413f325b",
+ "label" : "Build Your Own",
+ "layouts" : {
+ "Inner" : "bf29ed2d-40ed-45cd-b4d1-c6ff6e1b20c6",
+ "Login" : "a33c4bb6-054d-4319-a5bb-f27d28d0db18",
+ "ServiceNotAvailable" : "1664c7f7-6090-4a0d-bfc2-3191064ecd96"
},
- "type": "theme",
- "views": [
- {
- "componentAttributes": {},
- "componentName": "salesforceIdentity:loginBody2",
- "id": "a33c4bb6-054d-4319-a5bb-f27d28d0db18",
- "label": "Login",
- "regions": [
- {
- "id": "c7939c0b-7063-4e10-8c4f-45f5e9a33b91",
- "regionName": "header",
- "type": "region"
- },
- {
- "id": "fd5ba3cd-84a7-4c49-bce0-730c85b9ce14",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "fdc32d28-41af-4381-a451-e0574e1e2263",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "type": "view"
+ "type" : "theme",
+ "views" : [ {
+ "componentAttributes" : { },
+ "componentName" : "salesforceIdentity:loginBody2",
+ "id" : "a33c4bb6-054d-4319-a5bb-f27d28d0db18",
+ "label" : "Login",
+ "regions" : [ {
+ "id" : "c7939c0b-7063-4e10-8c4f-45f5e9a33b91",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "id" : "fd5ba3cd-84a7-4c49-bce0-730c85b9ce14",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "fdc32d28-41af-4381-a451-e0574e1e2263",
+ "regionName" : "footer",
+ "type" : "region"
+ } ],
+ "type" : "view"
+ }, {
+ "componentAttributes" : {
+ "fixedPageWidth" : 1440,
+ "isPageWidthFixed" : true
},
- {
- "componentAttributes": {
- "fixedPageWidth": 1440,
- "isPageWidthFixed": true
- },
- "componentName": "siteforce:starterBody",
- "id": "bf29ed2d-40ed-45cd-b4d1-c6ff6e1b20c6",
- "label": "Default",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {
- "maxAutoCompleteResults": 5,
- "searchLabel": "Search...",
- "searchObjects": [
- {
- "isPublic": true,
- "name": "Account"
- }
- ]
- },
- "componentName": "forceCommunity:globalSearchInput",
- "id": "6b6bd259-0936-4573-8301-b6c3c47991f5",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "e1e03672-2dfc-493e-8a59-2cedaf4bdaed",
- "regionName": "search",
- "type": "region"
+ "componentName" : "siteforce:starterBody",
+ "id" : "bf29ed2d-40ed-45cd-b4d1-c6ff6e1b20c6",
+ "label" : "Default",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : {
+ "maxAutoCompleteResults" : 5,
+ "searchLabel" : "Search...",
+ "searchObjects" : [ {
+ "isPublic" : true,
+ "name" : "Account"
+ } ]
},
- {
- "components": [
- {
- "componentAttributes": {
- "accountManagementLabel": "Account Management",
- "communityBuilderLabel": "Experience Builder",
- "communitySetupLabel": "Salesforce Setup",
- "contactSupportLabel": "Contact Support",
- "filterName": "MyCases",
- "homeLabel": "Home",
- "includeContactSupport": true,
- "includeMessages": false,
- "loginLabel": "Login",
- "logoutLabel": "Logout",
- "myAccountLabel": "My Account",
- "showAccountManagement": true,
- "showUserSettings": true,
- "userSettingsLabel": "My Settings",
- "viewProfileLabel": "My Profile"
- },
- "componentName": "selfService:userProfileMenu",
- "id": "886ade64-9894-4fb5-9f0a-91f718f37a7c",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "b93ff3ad-6fb8-46b2-90fd-d85ca8c9b475",
- "regionName": "profileMenu",
- "type": "region"
+ "componentName" : "forceCommunity:globalSearchInput",
+ "id" : "6b6bd259-0936-4573-8301-b6c3c47991f5",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "e1e03672-2dfc-493e-8a59-2cedaf4bdaed",
+ "regionName" : "search",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "accountManagementLabel" : "Account Management",
+ "communityBuilderLabel" : "Experience Builder",
+ "communitySetupLabel" : "Salesforce Setup",
+ "contactSupportLabel" : "Contact Support",
+ "filterName" : "MyCases",
+ "homeLabel" : "Home",
+ "includeContactSupport" : true,
+ "includeMessages" : false,
+ "loginLabel" : "Login",
+ "logoutLabel" : "Logout",
+ "myAccountLabel" : "My Account",
+ "showAccountManagement" : true,
+ "showUserSettings" : true,
+ "userSettingsLabel" : "My Settings",
+ "viewProfileLabel" : "My Profile"
},
- {
- "components": [
- {
- "componentAttributes": {
- "NavigationMenuEditorRefresh": "",
- "hideAppLauncher": true,
- "hideHomeText": true
- },
- "componentName": "forceCommunity:globalNavigation",
- "id": "74de3519-3e37-45f7-a9b0-686b6d576293",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "32f4c679-a1ec-4d0f-8227-f766aff2348b",
- "regionName": "navBar",
- "type": "region"
- }
- ],
- "type": "view"
+ "componentName" : "selfService:userProfileMenu",
+ "id" : "886ade64-9894-4fb5-9f0a-91f718f37a7c",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "b93ff3ad-6fb8-46b2-90fd-d85ca8c9b475",
+ "regionName" : "profileMenu",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "NavigationMenuEditorRefresh" : "",
+ "hideAppLauncher" : true,
+ "hideHomeText" : true
+ },
+ "componentName" : "forceCommunity:globalNavigation",
+ "id" : "74de3519-3e37-45f7-a9b0-686b6d576293",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "32f4c679-a1ec-4d0f-8227-f766aff2348b",
+ "regionName" : "navBar",
+ "type" : "region"
+ } ],
+ "type" : "view"
+ }, {
+ "componentAttributes" : {
+ "fixedPageWidth" : 1170,
+ "headerBgColor" : "rgba(0, 0, 0, 0)",
+ "isHeaderPinned" : false,
+ "isHeroUnderHeader" : false,
+ "isPageWidthFixed" : true,
+ "showHeader" : true,
+ "showHero" : true
},
- {
- "componentAttributes": {
- "fixedPageWidth": 1170,
- "headerBgColor": "rgba(0, 0, 0, 0)",
- "isHeaderPinned": false,
- "isHeroUnderHeader": false,
- "isPageWidthFixed": true,
- "showHeader": true,
- "showHero": true
- },
- "componentName": "siteforce:themeLayoutStarter",
- "id": "1664c7f7-6090-4a0d-bfc2-3191064ecd96",
- "label": "ServiceNotAvailable",
- "regions": [
- {
- "id": "2bf842b8-e94c-4694-bf82-3f82bfb626fc",
- "regionName": "themeHeader",
- "type": "region"
- },
- {
- "id": "e598c1cc-513c-4cff-9029-ace967593639",
- "regionName": "themeFooter",
- "type": "region"
- }
- ],
- "type": "view"
- }
- ]
-}
+ "componentName" : "siteforce:themeLayoutStarter",
+ "id" : "1664c7f7-6090-4a0d-bfc2-3191064ecd96",
+ "label" : "ServiceNotAvailable",
+ "regions" : [ {
+ "id" : "2bf842b8-e94c-4694-bf82-3f82bfb626fc",
+ "regionName" : "themeHeader",
+ "type" : "region"
+ }, {
+ "id" : "e598c1cc-513c-4cff-9029-ace967593639",
+ "regionName" : "themeFooter",
+ "type" : "region"
+ } ],
+ "type" : "view"
+ } ]
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Site3/views/checkPassword.json b/force-app/main/default/experiences/Site3/views/checkPassword.json
index 6754b89..69f4837 100644
--- a/force-app/main/default/experiences/Site3/views/checkPassword.json
+++ b/force-app/main/default/experiences/Site3/views/checkPassword.json
@@ -1,67 +1,58 @@
{
- "appPageId": "2bcb651a-3bf1-4ba0-bf17-8f52e81c95c6",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "a0810e9f-b4d6-4a64-80aa-02d99f2c8234",
- "label": "Check Password",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {
- "richTextValue": "<div style=\"text-align: center;\"><span style=\"font-size:22px\">NOW, CHECK YOUR EMAIL</span></div>"
- },
- "componentName": "forceCommunity:richTextInline",
- "id": "79101fac-0f27-4968-b69b-af30771dcccf",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- },
- {
- "componentAttributes": {
- "richTextValue": "<div style=\"text-align: center;\">Check the email account associated with your user name for instructions on resetting your password. Remember to look in your spam folder, where automated messages sometimes filter. If you still can't log in, contact your administrator.</div>"
- },
- "componentName": "forceCommunity:richTextInline",
- "id": "c19aadfa-f932-405c-9d25-5d6f43361035",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- },
- {
- "componentAttributes": {
- "richTextValue": "<div style=\"text-align: center;\"><a href=\"./\">Back to login</a></div>"
- },
- "componentName": "forceCommunity:richTextInline",
- "id": "2a4826d1-54c0-4e91-8d77-23c4152e281d",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "aff6a477-e89c-4adf-865f-a6ed3bf3b795",
- "regionName": "content",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "Check Password"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "51b9427e-2b7e-49f7-a4b1-ccf0eafa56a3",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "c4dd2d29-9f0d-412d-9a48-08d0464ba417",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Login",
- "type": "view",
- "viewType": "check-password"
-}
+ "appPageId" : "2bcb651a-3bf1-4ba0-bf17-8f52e81c95c6",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "a0810e9f-b4d6-4a64-80aa-02d99f2c8234",
+ "label" : "Check Password",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : {
+ "richTextValue" : "<div style=\"text-align: center;\"><span style=\"font-size:22px\">NOW, CHECK YOUR EMAIL</span></div>"
+ },
+ "componentName" : "forceCommunity:richTextInline",
+ "id" : "79101fac-0f27-4968-b69b-af30771dcccf",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ }, {
+ "componentAttributes" : {
+ "richTextValue" : "<div style=\"text-align: center;\">Check the email account associated with your user name for instructions on resetting your password. Remember to look in your spam folder, where automated messages sometimes filter. If you still can't log in, contact your administrator.</div>"
+ },
+ "componentName" : "forceCommunity:richTextInline",
+ "id" : "c19aadfa-f932-405c-9d25-5d6f43361035",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ }, {
+ "componentAttributes" : {
+ "richTextValue" : "<div style=\"text-align: center;\"><a href=\"./\">Back to login</a></div>"
+ },
+ "componentName" : "forceCommunity:richTextInline",
+ "id" : "2a4826d1-54c0-4e91-8d77-23c4152e281d",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "aff6a477-e89c-4adf-865f-a6ed3bf3b795",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "Check Password"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "51b9427e-2b7e-49f7-a4b1-ccf0eafa56a3",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "c4dd2d29-9f0d-412d-9a48-08d0464ba417",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Login",
+ "type" : "view",
+ "viewType" : "check-password"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Site3/views/createRecord.json b/force-app/main/default/experiences/Site3/views/createRecord.json
index b69c06a..9c37491 100644
--- a/force-app/main/default/experiences/Site3/views/createRecord.json
+++ b/force-app/main/default/experiences/Site3/views/createRecord.json
@@ -1,39 +1,33 @@
{
- "appPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "9cb0795b-6c6d-4948-9dcd-68a568028499",
- "label": "Create Record",
- "regions": [
- {
- "id": "d451ff76-e162-4234-bfff-bc56db891edd",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "actionApiName": "{!actionApiName}"
- },
- "componentName": "forceCommunity:createRecordForm",
- "id": "b561a15a-51cf-485f-b7f6-3218203e6325",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "4f97e4bd-c420-46f2-80c4-4aefec37a12b",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "5a882757-dc4e-4c73-9191-6d0edb0dcb95",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "createrecord"
-}
+ "appPageId" : "7f290f39-4245-4612-9453-2b0c9f9e3701",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "9cb0795b-6c6d-4948-9dcd-68a568028499",
+ "label" : "Create Record",
+ "regions" : [ {
+ "id" : "d451ff76-e162-4234-bfff-bc56db891edd",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "actionApiName" : "{!actionApiName}"
+ },
+ "componentName" : "forceCommunity:createRecordForm",
+ "id" : "b561a15a-51cf-485f-b7f6-3218203e6325",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "4f97e4bd-c420-46f2-80c4-4aefec37a12b",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "5a882757-dc4e-4c73-9191-6d0edb0dcb95",
+ "regionName" : "footer",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "createrecord"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Site3/views/error.json b/force-app/main/default/experiences/Site3/views/error.json
index 25673b8..4b1d515 100644
--- a/force-app/main/default/experiences/Site3/views/error.json
+++ b/force-app/main/default/experiences/Site3/views/error.json
@@ -1,57 +1,48 @@
{
- "appPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "c792b011-93b7-4274-aa53-359303ca2567",
- "label": "Error",
- "regions": [
- {
- "id": "1789e5dc-0771-4bbe-bacd-189f7ff243ab",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "richTextValue": "<div style='text-align: center;'>Invalid Page</div>"
- },
- "componentName": "forceCommunity:richTextInline",
- "id": "cdc3e240-9222-48c5-a1d6-aa93804b982d",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "3410ec75-14f6-435d-b4e3-e8fb3844d9c1",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "c0398406-6a67-4006-abdf-c90203f0aa48",
- "regionName": "footer",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "Error"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "4683476f-e4bf-4709-a9b4-5a4fca5d1c9a",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "f7aafc3f-c920-4c75-9d02-5d4140ca0048",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "error"
-}
+ "appPageId" : "7f290f39-4245-4612-9453-2b0c9f9e3701",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "c792b011-93b7-4274-aa53-359303ca2567",
+ "label" : "Error",
+ "regions" : [ {
+ "id" : "1789e5dc-0771-4bbe-bacd-189f7ff243ab",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "richTextValue" : "<p style=\"text-align: center;\">Invalid Page</p>"
+ },
+ "componentName" : "forceCommunity:richTextInline",
+ "id" : "cdc3e240-9222-48c5-a1d6-aa93804b982d",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "3410ec75-14f6-435d-b4e3-e8fb3844d9c1",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "c0398406-6a67-4006-abdf-c90203f0aa48",
+ "regionName" : "footer",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "Error"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "4683476f-e4bf-4709-a9b4-5a4fca5d1c9a",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "f7aafc3f-c920-4c75-9d02-5d4140ca0048",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "error"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Site3/views/forgotPassword.json b/force-app/main/default/experiences/Site3/views/forgotPassword.json
index fd261d2..1905b64 100644
--- a/force-app/main/default/experiences/Site3/views/forgotPassword.json
+++ b/force-app/main/default/experiences/Site3/views/forgotPassword.json
@@ -1,79 +1,69 @@
{
- "appPageId": "2bcb651a-3bf1-4ba0-bf17-8f52e81c95c6",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "cb26bb2a-86d2-4d95-813b-a1b4e00337e5",
- "label": "Forgot Password",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {
- "richTextValue": "<div style=\"text-align: center;\"><span style=\"font-size:22px\">PASSWORD RESET</span></div>"
- },
- "componentName": "forceCommunity:richTextInline",
- "id": "25fd1614-b90d-4eb1-964f-67dea4fb6cea",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- },
- {
- "componentAttributes": {
- "richTextValue": "<div style=\"text-align: center;\">To reset your password, we'll need your username.<br/> We'll send password reset instructions to the email address associated with your account.</div>"
- },
- "componentName": "forceCommunity:richTextInline",
- "id": "eec833d5-5d1f-4b8b-8c7e-3adf0247e716",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- },
- {
- "componentAttributes": {
- "checkEmailUrl": "./CheckPasswordResetEmail",
- "submitButtonLabel": "Reset Password",
- "usernameLabel": "Username"
- },
- "componentName": "salesforceIdentity:forgotPassword2",
- "id": "4d5a81cc-11bf-44f7-84a1-193068441987",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- },
- {
- "componentAttributes": {
- "richTextValue": "<div style=\"text-align: center;\"><a href=\"./\">Cancel</a></div>"
- },
- "componentName": "forceCommunity:richTextInline",
- "id": "9ca7bc62-3ac5-4dc6-a6bc-52501b674509",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "231c935f-3d29-4c7c-8e69-5cb4c7c2ba99",
- "regionName": "content",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "Forgot Password"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "2ec7e376-133b-41d9-a0be-2b65d7fa4274",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "8a72b39f-ec8c-4f9a-9f34-10cd245d9e18",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Login",
- "type": "view",
- "viewType": "forgot-password"
-}
+ "appPageId" : "2bcb651a-3bf1-4ba0-bf17-8f52e81c95c6",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "cb26bb2a-86d2-4d95-813b-a1b4e00337e5",
+ "label" : "Forgot Password",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : {
+ "richTextValue" : "<div style=\"text-align: center;\"><span style=\"font-size:22px\">PASSWORD RESET</span></div>"
+ },
+ "componentName" : "forceCommunity:richTextInline",
+ "id" : "25fd1614-b90d-4eb1-964f-67dea4fb6cea",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ }, {
+ "componentAttributes" : {
+ "richTextValue" : "<div style=\"text-align: center;\">To reset your password, we'll need your username.<br/> We'll send password reset instructions to the email address associated with your account.</div>"
+ },
+ "componentName" : "forceCommunity:richTextInline",
+ "id" : "eec833d5-5d1f-4b8b-8c7e-3adf0247e716",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ }, {
+ "componentAttributes" : {
+ "checkEmailUrl" : "./CheckPasswordResetEmail",
+ "submitButtonLabel" : "Reset Password",
+ "usernameLabel" : "Username"
+ },
+ "componentName" : "salesforceIdentity:forgotPassword2",
+ "id" : "4d5a81cc-11bf-44f7-84a1-193068441987",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ }, {
+ "componentAttributes" : {
+ "richTextValue" : "<div style=\"text-align: center;\"><a href=\"./\">Cancel</a></div>"
+ },
+ "componentName" : "forceCommunity:richTextInline",
+ "id" : "9ca7bc62-3ac5-4dc6-a6bc-52501b674509",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "231c935f-3d29-4c7c-8e69-5cb4c7c2ba99",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "Forgot Password"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "2ec7e376-133b-41d9-a0be-2b65d7fa4274",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "8a72b39f-ec8c-4f9a-9f34-10cd245d9e18",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Login",
+ "type" : "view",
+ "viewType" : "forgot-password"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Site3/views/home.json b/force-app/main/default/experiences/Site3/views/home.json
index f8ba033..48b86f8 100644
--- a/force-app/main/default/experiences/Site3/views/home.json
+++ b/force-app/main/default/experiences/Site3/views/home.json
@@ -1,45 +1,38 @@
{
- "appPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "e2e60370-e191-4f54-8b77-7da2fdc0c01f",
- "label": "Home",
- "regions": [
- {
- "id": "497754d6-c23e-4ff5-baab-fe8d842e18fd",
- "regionName": "header",
- "type": "region"
- },
- {
- "id": "22e5790e-e557-47ce-be11-77ca9b9517bd",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "e0652978-bbe3-47ab-83f1-f659fcf2427a",
- "regionName": "footer",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "Home"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "b37194eb-0306-407c-9bba-88c9e30b2b42",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "bd9053b8-fc17-48bf-8ab2-f56e8071fb82",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "home"
-}
+ "appPageId" : "7f290f39-4245-4612-9453-2b0c9f9e3701",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "e2e60370-e191-4f54-8b77-7da2fdc0c01f",
+ "label" : "Home",
+ "regions" : [ {
+ "id" : "497754d6-c23e-4ff5-baab-fe8d842e18fd",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "id" : "22e5790e-e557-47ce-be11-77ca9b9517bd",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "e0652978-bbe3-47ab-83f1-f659fcf2427a",
+ "regionName" : "footer",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "Home"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "b37194eb-0306-407c-9bba-88c9e30b2b42",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "bd9053b8-fc17-48bf-8ab2-f56e8071fb82",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "home"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Site3/views/login.json b/force-app/main/default/experiences/Site3/views/login.json
index 4ca7bb1..4c47b88 100644
--- a/force-app/main/default/experiences/Site3/views/login.json
+++ b/force-app/main/default/experiences/Site3/views/login.json
@@ -1,84 +1,74 @@
{
- "appPageId": "2bcb651a-3bf1-4ba0-bf17-8f52e81c95c6",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "6d2b638e-a48b-49d3-a675-e36e30791e1c",
- "label": "Login",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {},
- "componentName": "salesforceIdentity:communityLogo2",
- "id": "6ee68cfc-86b4-4a2b-b8d3-0eae20c8c71e",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- },
- {
- "componentAttributes": {
- "forgotPasswordLabel": "Forgot your password?",
- "forgotPasswordUrl": "/ForgotPassword",
- "loginButtonLabel": "Log in",
- "passwordLabel": "Password",
- "selfRegisterLabel": "Not a member?",
- "selfRegisterUrl": "/SelfRegister",
- "startUrl": "",
- "usernameLabel": "Username"
- },
- "componentName": "salesforceIdentity:loginForm2",
- "id": "e3131b45-1a93-41a0-9226-8042b9c3fda2",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- },
- {
- "componentAttributes": {
- "headerText": "",
- "showHeader": false,
- "useCommunityDomainSso": false
- },
- "componentName": "salesforceIdentity:socialLogin2",
- "id": "11821772-7bd0-4462-871a-2f1d3643c6fe",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- },
- {
- "componentAttributes": {
- "employeeLoginLinkLabel": "Are you an employee? Login here"
- },
- "componentName": "salesforceIdentity:employeeLoginLink2",
- "id": "04362051-cb7e-4dc6-8a26-bec13247eb84",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "e58b0f5b-923e-4126-aa5c-610c548487ce",
- "regionName": "content",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "Login"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "23ceab67-1956-4a59-918a-a65cd1da2c0d",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "5fc9f8cd-81d0-4209-9177-e7267fad5d99",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Login",
- "type": "view",
- "viewType": "login-home"
-}
+ "appPageId" : "2bcb651a-3bf1-4ba0-bf17-8f52e81c95c6",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "6d2b638e-a48b-49d3-a675-e36e30791e1c",
+ "label" : "Login",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : { },
+ "componentName" : "salesforceIdentity:communityLogo2",
+ "id" : "6ee68cfc-86b4-4a2b-b8d3-0eae20c8c71e",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ }, {
+ "componentAttributes" : {
+ "forgotPasswordLabel" : "Forgot your password?",
+ "forgotPasswordUrl" : "/ForgotPassword",
+ "loginButtonLabel" : "Log in",
+ "passwordLabel" : "Password",
+ "selfRegisterLabel" : "Not a member?",
+ "selfRegisterUrl" : "/SelfRegister",
+ "startUrl" : "",
+ "usernameLabel" : "Username"
+ },
+ "componentName" : "salesforceIdentity:loginForm2",
+ "id" : "e3131b45-1a93-41a0-9226-8042b9c3fda2",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ }, {
+ "componentAttributes" : {
+ "headerText" : "",
+ "showHeader" : false,
+ "useCommunityDomainSso" : false
+ },
+ "componentName" : "salesforceIdentity:socialLogin2",
+ "id" : "11821772-7bd0-4462-871a-2f1d3643c6fe",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ }, {
+ "componentAttributes" : {
+ "employeeLoginLinkLabel" : "Are you an employee? Login here"
+ },
+ "componentName" : "salesforceIdentity:employeeLoginLink2",
+ "id" : "04362051-cb7e-4dc6-8a26-bec13247eb84",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "e58b0f5b-923e-4126-aa5c-610c548487ce",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "Login"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "23ceab67-1956-4a59-918a-a65cd1da2c0d",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "5fc9f8cd-81d0-4209-9177-e7267fad5d99",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Login",
+ "type" : "view",
+ "viewType" : "login-home"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Site3/views/loginError.json b/force-app/main/default/experiences/Site3/views/loginError.json
index 0391d79..cb274d5 100644
--- a/force-app/main/default/experiences/Site3/views/loginError.json
+++ b/force-app/main/default/experiences/Site3/views/loginError.json
@@ -1,57 +1,48 @@
{
- "appPageId": "2bcb651a-3bf1-4ba0-bf17-8f52e81c95c6",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "acfc3c4f-6e34-4219-a88a-39af60aece24",
- "label": "Login Error",
- "regions": [
- {
- "id": "f0dbcd6d-92d7-48ee-bdfe-878dee8e9a77",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "richTextValue": "<div style=\"text-align: center;\">Invalid Page</div>"
- },
- "componentName": "forceCommunity:richTextInline",
- "id": "178cb7f3-fed5-4bcb-8b17-8d42d49f03d9",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "ecdce3fb-0b9b-44ae-b7b0-fbf42f12e826",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "d7969d47-f741-49af-8879-5d2aa4a8b92b",
- "regionName": "footer",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "Login Error"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "7124e5aa-b506-4383-acf2-cd508614a65c",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "e86aa86c-d5f8-481b-becd-f641d6dddb07",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Login",
- "type": "view",
- "viewType": "login-error"
-}
+ "appPageId" : "2bcb651a-3bf1-4ba0-bf17-8f52e81c95c6",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "acfc3c4f-6e34-4219-a88a-39af60aece24",
+ "label" : "Login Error",
+ "regions" : [ {
+ "id" : "f0dbcd6d-92d7-48ee-bdfe-878dee8e9a77",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "richTextValue" : "<div style=\"text-align: center;\">Invalid Page</div>"
+ },
+ "componentName" : "forceCommunity:richTextInline",
+ "id" : "178cb7f3-fed5-4bcb-8b17-8d42d49f03d9",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "ecdce3fb-0b9b-44ae-b7b0-fbf42f12e826",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "d7969d47-f741-49af-8879-5d2aa4a8b92b",
+ "regionName" : "footer",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "Login Error"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "7124e5aa-b506-4383-acf2-cd508614a65c",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "e86aa86c-d5f8-481b-becd-f641d6dddb07",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Login",
+ "type" : "view",
+ "viewType" : "login-error"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Site3/views/recordDetail.json b/force-app/main/default/experiences/Site3/views/recordDetail.json
index 61c55e4..bd724a6 100644
--- a/force-app/main/default/experiences/Site3/views/recordDetail.json
+++ b/force-app/main/default/experiences/Site3/views/recordDetail.json
@@ -1,75 +1,65 @@
{
- "appPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "bb2f4e25-0c5a-46a4-adb6-431ecad42732",
- "label": "Record Detail",
- "regions": [
- {
- "id": "d7e0c80b-0785-4368-b355-8df9b74d7585",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "recordId": "{!recordId}"
- },
- "componentName": "forceCommunity:recordHeadline",
- "id": "cc81febf-e90c-4506-a6ae-49118bcc9561",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- },
- {
- "componentAttributes": {
- "detailsTabLabel": "Details",
- "discussionsTabLabel": "Feed",
- "recordId": "{!recordId}",
- "relatedTabLabel": "Related",
- "tab1Type": "details",
- "tab2Type": "related",
- "tab3Type": "chatter",
- "tab4Type": "none",
- "timelineTabLabel": "Activity"
- },
- "componentName": "forceCommunity:recordHomeTabs",
- "id": "49358887-7f6c-49d2-b870-bca6628902cc",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "431670c5-9b29-44ff-9abb-08da1f5bc596",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "ef26bfcc-676c-44ae-bba2-ef9d4e139000",
- "regionName": "footer",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "{!Record._Object}: {!Record._Title}"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "e54f6f0f-9bb6-49c5-874b-e0cb6df5aac9",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "545512d3-d5b2-48c3-81d7-08d3a34ca75a",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "detail"
-}
+ "appPageId" : "7f290f39-4245-4612-9453-2b0c9f9e3701",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "bb2f4e25-0c5a-46a4-adb6-431ecad42732",
+ "label" : "Record Detail",
+ "regions" : [ {
+ "id" : "d7e0c80b-0785-4368-b355-8df9b74d7585",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "recordId" : "{!recordId}"
+ },
+ "componentName" : "forceCommunity:recordHeadline",
+ "id" : "cc81febf-e90c-4506-a6ae-49118bcc9561",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ }, {
+ "componentAttributes" : {
+ "detailsTabLabel" : "Details",
+ "discussionsTabLabel" : "Feed",
+ "recordId" : "{!recordId}",
+ "relatedTabLabel" : "Related",
+ "tab1Type" : "details",
+ "tab2Type" : "related",
+ "tab3Type" : "chatter",
+ "tab4Type" : "none",
+ "timelineTabLabel" : "Activity"
+ },
+ "componentName" : "forceCommunity:recordHomeTabs",
+ "id" : "49358887-7f6c-49d2-b870-bca6628902cc",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "431670c5-9b29-44ff-9abb-08da1f5bc596",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "ef26bfcc-676c-44ae-bba2-ef9d4e139000",
+ "regionName" : "footer",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "{!Record._Object}: {!Record._Title}"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "e54f6f0f-9bb6-49c5-874b-e0cb6df5aac9",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "545512d3-d5b2-48c3-81d7-08d3a34ca75a",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "detail"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Site3/views/recordList.json b/force-app/main/default/experiences/Site3/views/recordList.json
index 41cc9ae..82f1f5a 100644
--- a/force-app/main/default/experiences/Site3/views/recordList.json
+++ b/force-app/main/default/experiences/Site3/views/recordList.json
@@ -1,52 +1,46 @@
{
- "appPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "45ab1ac9-68f0-43e8-af03-88f2f479f2c3",
- "label": "Record List",
- "regions": [
- {
- "id": "f55ac5c7-e89e-4a0c-b673-369053d0ccbb",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "enableInlineEdit": true,
- "filterName": "{!filterId}",
- "layout": "FULL",
- "pageSize": 25,
- "scope": "{!objectName}",
- "showActionBar": true,
- "showChartsPanel": true,
- "showDisplay": "showall",
- "showFilterPanel": true,
- "showImageIcon": true,
- "showManualRefreshButton": true,
- "showObjectName": true,
- "showPinnedList": true,
- "showSearchBar": true
- },
- "componentName": "forceCommunity:objectHome",
- "id": "5b78a56c-dcaf-4366-a3fc-eb5c2f685ebc",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "9657d9bf-f46a-400c-a19f-252c3878377f",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "abde8654-b5ac-4f5b-83d1-52935c514cd0",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "list"
-}
+ "appPageId" : "7f290f39-4245-4612-9453-2b0c9f9e3701",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "45ab1ac9-68f0-43e8-af03-88f2f479f2c3",
+ "label" : "Record List",
+ "regions" : [ {
+ "id" : "f55ac5c7-e89e-4a0c-b673-369053d0ccbb",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "enableInlineEdit" : true,
+ "filterName" : "{!filterId}",
+ "layout" : "FULL",
+ "pageSize" : 25,
+ "scope" : "{!objectName}",
+ "showActionBar" : true,
+ "showChartsPanel" : true,
+ "showDisplay" : "showall",
+ "showFilterPanel" : true,
+ "showImageIcon" : true,
+ "showManualRefreshButton" : true,
+ "showObjectName" : true,
+ "showPinnedList" : true,
+ "showSearchBar" : true
+ },
+ "componentName" : "forceCommunity:objectHome",
+ "id" : "5b78a56c-dcaf-4366-a3fc-eb5c2f685ebc",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "9657d9bf-f46a-400c-a19f-252c3878377f",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "abde8654-b5ac-4f5b-83d1-52935c514cd0",
+ "regionName" : "footer",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "list"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Site3/views/register.json b/force-app/main/default/experiences/Site3/views/register.json
index d09e199..63524d8 100644
--- a/force-app/main/default/experiences/Site3/views/register.json
+++ b/force-app/main/default/experiences/Site3/views/register.json
@@ -1,96 +1,85 @@
{
- "appPageId": "2bcb651a-3bf1-4ba0-bf17-8f52e81c95c6",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "f7082e1e-e1e4-4b79-a271-59037e25c845",
- "label": "Register",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {},
- "componentName": "salesforceIdentity:communityLogo2",
- "id": "e21ea511-10c6-4a67-82ef-ec485b7617bf",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- },
- {
- "componentAttributes": {
- "richTextValue": "<div style=\"text-align: center;\" class=\"inverseTextColor\">Join the community to receive personalized information and customer support.</div>"
- },
- "componentName": "forceCommunity:richTextInline",
- "id": "e111c87b-bc77-4bb5-99e3-93e3cb872acb",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- },
- {
- "componentAttributes": {
- "confirmPasswordLabel": "Confirm Password",
- "emailLabel": "Email",
- "extraFieldsFieldSet": "",
- "firstnameLabel": "First Name",
- "includePasswordField": false,
- "lastnameLabel": "Last Name",
- "passwordLabel": "Create Password",
- "regConfirmUrl": "./CheckPasswordResetEmail",
- "startUrl": "",
- "submitButtonLabel": "Sign Up"
- },
- "componentName": "salesforceIdentity:selfRegister2",
- "id": "1708fe03-f5d1-40aa-8a0a-6eadddb49426",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- },
- {
- "componentAttributes": {
- "headerText": "",
- "showHeader": false,
- "useCommunityDomainSso": false
- },
- "componentName": "salesforceIdentity:socialLogin2",
- "id": "6f29eeb7-b358-4b9b-abfd-69c860e4f50e",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- },
- {
- "componentAttributes": {
- "richTextValue": "<div style=\"text-align: center;\"><a class=\"inverseTextColor\" href=\"./\">Already have an account?</a></div>"
- },
- "componentName": "forceCommunity:richTextInline",
- "id": "bf2597c2-b7f9-4dd9-830f-e350ee96b0d1",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "6b062d85-f6af-410f-bc27-1a1da6da32b8",
- "regionName": "content",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "Register"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "4a889e5c-547a-48d9-bd3a-9e87166e7a82",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "6e5174c2-5e4d-4e3e-a1a2-ec60126f3596",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Login",
- "type": "view",
- "viewType": "self-register"
-}
+ "appPageId" : "2bcb651a-3bf1-4ba0-bf17-8f52e81c95c6",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "f7082e1e-e1e4-4b79-a271-59037e25c845",
+ "label" : "Register",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : { },
+ "componentName" : "salesforceIdentity:communityLogo2",
+ "id" : "e21ea511-10c6-4a67-82ef-ec485b7617bf",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ }, {
+ "componentAttributes" : {
+ "richTextValue" : "<div style=\"text-align: center;\" class=\"inverseTextColor\">Join the community to receive personalized information and customer support.</div>"
+ },
+ "componentName" : "forceCommunity:richTextInline",
+ "id" : "e111c87b-bc77-4bb5-99e3-93e3cb872acb",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ }, {
+ "componentAttributes" : {
+ "confirmPasswordLabel" : "Confirm Password",
+ "emailLabel" : "Email",
+ "extraFieldsFieldSet" : "",
+ "firstnameLabel" : "First Name",
+ "includePasswordField" : false,
+ "lastnameLabel" : "Last Name",
+ "passwordLabel" : "Create Password",
+ "regConfirmUrl" : "./CheckPasswordResetEmail",
+ "startUrl" : "",
+ "submitButtonLabel" : "Sign Up"
+ },
+ "componentName" : "salesforceIdentity:selfRegister2",
+ "id" : "1708fe03-f5d1-40aa-8a0a-6eadddb49426",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ }, {
+ "componentAttributes" : {
+ "headerText" : "",
+ "showHeader" : false,
+ "useCommunityDomainSso" : false
+ },
+ "componentName" : "salesforceIdentity:socialLogin2",
+ "id" : "6f29eeb7-b358-4b9b-abfd-69c860e4f50e",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ }, {
+ "componentAttributes" : {
+ "richTextValue" : "<div style=\"text-align: center;\"><a class=\"inverseTextColor\" href=\"./\">Already have an account?</a></div>"
+ },
+ "componentName" : "forceCommunity:richTextInline",
+ "id" : "bf2597c2-b7f9-4dd9-830f-e350ee96b0d1",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "6b062d85-f6af-410f-bc27-1a1da6da32b8",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "Register"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "4a889e5c-547a-48d9-bd3a-9e87166e7a82",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "6e5174c2-5e4d-4e3e-a1a2-ec60126f3596",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Login",
+ "type" : "view",
+ "viewType" : "self-register"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Site3/views/relatedRecordList.json b/force-app/main/default/experiences/Site3/views/relatedRecordList.json
index 48041e9..79ce541 100644
--- a/force-app/main/default/experiences/Site3/views/relatedRecordList.json
+++ b/force-app/main/default/experiences/Site3/views/relatedRecordList.json
@@ -1,45 +1,39 @@
{
- "appPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "df2fbc80-2a44-4533-b646-40276661a5cf",
- "label": "Related Record List",
- "regions": [
- {
- "id": "176c742a-9692-4939-927d-411b650ed76f",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customTitle": "",
- "parentRecordId": "{!recordId}",
- "relatedListName": "{!relationshipApiName}",
- "showBreadCrumbs": true,
- "showCustomTitle": false,
- "showManualRefreshButton": true,
- "showRowNumbers": true
- },
- "componentName": "forceCommunity:relatedList",
- "id": "187579cb-db3f-4766-b5fa-33db1ecd8ef9",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "2672648c-0a4a-48c9-9ba6-af6a3630da20",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "08fd2e61-7c7e-41b8-9aff-4910b70422cd",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "relatedlist"
-}
+ "appPageId" : "7f290f39-4245-4612-9453-2b0c9f9e3701",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "df2fbc80-2a44-4533-b646-40276661a5cf",
+ "label" : "Related Record List",
+ "regions" : [ {
+ "id" : "176c742a-9692-4939-927d-411b650ed76f",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customTitle" : "",
+ "parentRecordId" : "{!recordId}",
+ "relatedListName" : "{!relationshipApiName}",
+ "showBreadCrumbs" : true,
+ "showCustomTitle" : false,
+ "showManualRefreshButton" : true,
+ "showRowNumbers" : true
+ },
+ "componentName" : "forceCommunity:relatedList",
+ "id" : "187579cb-db3f-4766-b5fa-33db1ecd8ef9",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "2672648c-0a4a-48c9-9ba6-af6a3630da20",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "08fd2e61-7c7e-41b8-9aff-4910b70422cd",
+ "regionName" : "footer",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "relatedlist"
+}
\ No newline at end of file
diff --git a/force-app/main/default/experiences/Site3/views/search.json b/force-app/main/default/experiences/Site3/views/search.json
index a943f5a..525f450 100644
--- a/force-app/main/default/experiences/Site3/views/search.json
+++ b/force-app/main/default/experiences/Site3/views/search.json
@@ -1,59 +1,48 @@
{
- "appPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "1b73e50d-9811-4744-8c07-ffc097aa102a",
- "label": "Search",
- "regions": [
- {
- "id": "5a6cc49b-d707-4df0-a634-7c716a793f2a",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "scopes": [
- {
- "isPublic": true,
- "name": "FeedPost"
- },
- {
- "isPublic": true,
- "name": "KnowledgeArticleVersion"
- },
- {
- "isPublic": false,
- "name": "Case"
- },
- {
- "isPublic": true,
- "name": "CollaborationGroup"
- }
- ],
- "searchResultFiltering": true,
- "searchTerm": "{!term}",
- "showTopResults": true
- },
- "componentName": "forceCommunity:search",
- "id": "822bf1c5-6d8a-493f-aa12-4265f394c257",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "72128e90-ca44-4078-be1e-37490d727222",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "cdba3ee9-b011-4e7c-a760-0b9c5401d719",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "global-search"
-}
+ "appPageId" : "7f290f39-4245-4612-9453-2b0c9f9e3701",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "1b73e50d-9811-4744-8c07-ffc097aa102a",
+ "label" : "Search",
+ "regions" : [ {
+ "id" : "5a6cc49b-d707-4df0-a634-7c716a793f2a",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "scopes" : [ {
+ "isPublic" : true,
+ "name" : "FeedPost"
+ }, {
+ "isPublic" : true,
+ "name" : "KnowledgeArticleVersion"
+ }, {
+ "isPublic" : false,
+ "name" : "Case"
+ }, {
+ "isPublic" : true,
+ "name" : "CollaborationGroup"
+ } ],
+ "searchResultFiltering" : true,
+ "searchTerm" : "{!term}",
+ "showTopResults" : true
+ },
+ "componentName" : "forceCommunity:search",
+ "id" : "822bf1c5-6d8a-493f-aa12-4265f394c257",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "72128e90-ca44-4078-be1e-37490d727222",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "cdba3ee9-b011-4e7c-a760-0b9c5401d719",
+ "regionName" : "footer",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "global-search"
+}
\ No newline at end of file
diff --git "a/force-app/main/default/experiences/Site3/views/\345\245\245\346\236\227\345\267\264\346\226\257\347\224\265\345\255\220\347\255\276\346\224\266\347\263\273\347\273\237.json" "b/force-app/main/default/experiences/Site3/views/\345\245\245\346\236\227\345\267\264\346\226\257\347\224\265\345\255\220\347\255\276\346\224\266\347\263\273\347\273\237.json"
index c788032..dc963e5 100644
--- "a/force-app/main/default/experiences/Site3/views/\345\245\245\346\236\227\345\267\264\346\226\257\347\224\265\345\255\220\347\255\276\346\224\266\347\263\273\347\273\237.json"
+++ "b/force-app/main/default/experiences/Site3/views/\345\245\245\346\236\227\345\267\264\346\226\257\347\224\265\345\255\220\347\255\276\346\224\266\347\263\273\347\273\237.json"
@@ -1,55 +1,46 @@
{
- "appPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "224c5f58-859e-49e8-9564-18d11e2ddf47",
- "label": "濂ユ灄宸存柉鐢靛瓙绛炬敹绯荤粺",
- "regions": [
- {
- "id": "518d33a9-c0b3-4d07-bc99-314ad3b41419",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {},
- "componentName": "c:eSignHomePage",
- "id": "ea68fcac-c35d-415e-86e8-040f4a6820d5",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "6ff94da4-7138-452e-a15c-ddfbb167b364",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "c7a5b214-989d-437e-b11b-19c533e37cf3",
- "regionName": "footer",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "濂ユ灄宸存柉鐢靛瓙绛炬敹绯荤粺"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "528b9108-2ebf-4ba1-8e2b-9ebec00fa61a",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "d2699d17-8cc3-4386-a7db-72e53dea52e4",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "custom-esign-data-entry"
-}
+ "appPageId" : "7f290f39-4245-4612-9453-2b0c9f9e3701",
+ "componentName" : "siteforce:sldsOneColLayout",
+ "dataProviders" : [ ],
+ "id" : "224c5f58-859e-49e8-9564-18d11e2ddf47",
+ "label" : "濂ユ灄宸存柉鐢靛瓙绛炬敹绯荤粺",
+ "regions" : [ {
+ "id" : "518d33a9-c0b3-4d07-bc99-314ad3b41419",
+ "regionName" : "header",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : { },
+ "componentName" : "c:eSignHomePage",
+ "id" : "ea68fcac-c35d-415e-86e8-040f4a6820d5",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "6ff94da4-7138-452e-a15c-ddfbb167b364",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "id" : "c7a5b214-989d-437e-b11b-19c533e37cf3",
+ "regionName" : "footer",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "濂ユ灄宸存柉鐢靛瓙绛炬敹绯荤粺"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "528b9108-2ebf-4ba1-8e2b-9ebec00fa61a",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "d2699d17-8cc3-4386-a7db-72e53dea52e4",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "custom-esign-data-entry"
+}
\ No newline at end of file
diff --git "a/force-app/main/default/experiences/Site3/views/\350\277\233\345\217\243\345\215\225\350\257\201\346\230\216\347\273\206.json" "b/force-app/main/default/experiences/Site3/views/\350\277\233\345\217\243\345\215\225\350\257\201\346\230\216\347\273\206.json"
new file mode 100644
index 0000000..51334c4
--- /dev/null
+++ "b/force-app/main/default/experiences/Site3/views/\350\277\233\345\217\243\345\215\225\350\257\201\346\230\216\347\273\206.json"
@@ -0,0 +1,68 @@
+{
+ "appPageId" : "7f290f39-4245-4612-9453-2b0c9f9e3701",
+ "componentName" : "siteforce:dynamicLayout",
+ "dataProviders" : [ ],
+ "id" : "793767ac-c71a-49a2-ba5a-591a85646551",
+ "label" : "杩涘彛鍗曡瘉鏄庣粏",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : {
+ "background" : "background: rgba(0,0,0,0)",
+ "backgroundOverlay" : "rgba(0,0,0,0.5)",
+ "contentAreaWidth" : 100,
+ "sectionConfig" : {
+ "UUID" : "f248bb54-1de0-4045-a694-6878661820df",
+ "columns" : [ {
+ "UUID" : "73f32934-3d6d-4797-b1fd-7b87702e1e1e",
+ "columnKey" : "1",
+ "columnName" : "Column 1",
+ "columnWidth" : "12",
+ "seedComponents" : [ ]
+ } ]
+ },
+ "sectionHeight" : 300
+ },
+ "componentName" : "forceCommunity:section",
+ "id" : "f248bb54-1de0-4045-a694-6878661820df",
+ "regions" : [ {
+ "components" : [ {
+ "componentAttributes" : { },
+ "componentName" : "c:AttachmentDisplay",
+ "id" : "e1758a66-b8a1-45af-ae6e-03125b843456",
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "73f32934-3d6d-4797-b1fd-7b87702e1e1e",
+ "regionLabel" : "Column 1",
+ "regionName" : "1",
+ "renditionMap" : { },
+ "type" : "region"
+ } ],
+ "renderPriority" : "NEUTRAL",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "5ce20936-231e-48fd-8417-dba7d007a09f",
+ "regionName" : "content",
+ "type" : "region"
+ }, {
+ "components" : [ {
+ "componentAttributes" : {
+ "customHeadTags" : "",
+ "description" : "",
+ "title" : "杩涘彛鍗曡瘉鏄庣粏"
+ },
+ "componentName" : "forceCommunity:seoAssistant",
+ "id" : "f149154f-4929-4eb1-b363-1c35f2c0a852",
+ "renditionMap" : { },
+ "type" : "component"
+ } ],
+ "id" : "f6d5daee-acfb-4753-8635-5d29ed2e46e9",
+ "regionName" : "sfdcHiddenRegion",
+ "type" : "region"
+ } ],
+ "themeLayoutType" : "Inner",
+ "type" : "view",
+ "viewType" : "custom-attachment-display"
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/customShipmentNumberComp/customShipmentNumberComp.html b/force-app/main/default/lwc/customShipmentNumberComp/customShipmentNumberComp.html
index b3bbda8..4638662 100644
--- a/force-app/main/default/lwc/customShipmentNumberComp/customShipmentNumberComp.html
+++ b/force-app/main/default/lwc/customShipmentNumberComp/customShipmentNumberComp.html
@@ -1,8 +1,6 @@
<template>
- <lightning-input style="border:1px solid red" step="0" type="number" name="shipmentNumber" label="鍑鸿揣鏁伴噺"
- variant="label-hidden" onchange={dataChange} data-field="shipmentNumber" value={shipmentNumber}
- onblur={shipmentNumberBlur} min="0" class="inputFont"></lightning-input>
- <!-- <lightning-input style="border:1px solid red" name="shipmentNumber" label="鍑鸿揣鏁伴噺"
- variant="label-hidden" onchange={dataChange} data-field="shipmentNumber" value={shipmentNumber}
- onblur={shipmentNumberBlur}></lightning-input> -->
+ <c-common-toast></c-common-toast>
+ <lightning-input style="border:1px solid red;border-radius:5px;" step="any" type="number" name="shipmentNumber" label="鍑鸿揣鏁伴噺"
+ variant="label-hidden" onchange={dataChange} data-field="shipmentNumber" value={shipmentNumber}
+ onblur={shipmentNumberBlur} min="0" class="inputFont"></lightning-input>
</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/customShipmentNumberComp/customShipmentNumberComp.js b/force-app/main/default/lwc/customShipmentNumberComp/customShipmentNumberComp.js
index 4b9be8d..d16b48f 100644
--- a/force-app/main/default/lwc/customShipmentNumberComp/customShipmentNumberComp.js
+++ b/force-app/main/default/lwc/customShipmentNumberComp/customShipmentNumberComp.js
@@ -1,17 +1,37 @@
-import { LightningElement,api,track } from 'lwc';
+import { LightningElement, api, track } from 'lwc';
export default class CustomShipmentNumberComp extends LightningElement {
@api recordId;
@api shipmentNumber;
+ @api isConinvoice;
+ @api esdInvoiceProNotCount;
- connectedCallback(){
+ connectedCallback() {
console.log('shipmentNumber = ' + this.shipmentNumber);
}
- shipmentNumberBlur(event){
+ shipmentNumberBlur(event) {
+ debugger
console.log('shipmentNumberBlur')
this.shipmentNumber = event.target.value;
-
+ if (this.isConinvoice) {
+ if (this.hasDecimals(this.shipmentNumber)) {
+ this.showMyToast('閿欒', '璇疯緭鍏ユ暣鏁�', 'Error');
+ this.shipmentNumber = 0;
+ }else{
+ if(this.esdInvoiceProNotCount < this.shipmentNumber){
+ this.showMyToast('閿欒', '鍙戠エ鏁伴噺涓嶈兘瓒呰繃杩樻病鍙戠エ鏁伴噺锛�', 'Error');
+ this.shipmentNumber = 0;
+ }
+ }
+ } else {
+ //鍚戜笅鍙栨暣
+ if (this.hasDecimals(this.shipmentNumber)) {
+ this.showMyToast('閿欒', '璇疯緭鍏ユ暣鏁�', 'Error');
+ this.shipmentNumber = Math.floor(this.shipmentNumber)
+ }
+ }
+ event.target.value = this.shipmentNumber;
this.dispatchEvent(new CustomEvent('shipmentnumber', {
composed: true,
bubbles: true,
@@ -21,4 +41,30 @@
}
}));
}
+
+ hasDecimals(num) {
+ return !Number.isInteger(Number(num));
+ }
+
+ showMyToast(title, message, variant) {
+ this.isShowSpinner = false;
+ this.showLoadingSpinner = false;
+ this.showAttPop = false;
+ this.filesUploaded = [];
+ this.fileName = null;
+ console.log('show custom message');
+ var iconName = '';
+ var content = '';
+ if (variant.toLowerCase() == 'success') {
+ iconName = 'utility:check';
+ } else {
+ iconName = 'utility:error';
+ }
+ if (message != '') {
+ content = '<h2><strong>' + title + '<strong/></h2><h5>' + message + '</h5>';
+ } else {
+ content = '<h2><strong>' + title + '<strong/></h2>';
+ }
+ this.template.querySelector('c-common-toast').showToast(variant, content, iconName, 10000);
+ }
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/customShippingUnitPriceComp/customShippingUnitPriceComp.html b/force-app/main/default/lwc/customShippingUnitPriceComp/customShippingUnitPriceComp.html
index 87b0a65..b573650 100644
--- a/force-app/main/default/lwc/customShippingUnitPriceComp/customShippingUnitPriceComp.html
+++ b/force-app/main/default/lwc/customShippingUnitPriceComp/customShippingUnitPriceComp.html
@@ -1,5 +1,5 @@
<template>
- <lightning-input style="border:1px solid red" step="0.01" type="number" name="shipmentUnitPrice"
+ <lightning-input style="border:1px solid red;border-radius:5px" step="any" type="number" name="shipmentUnitPrice"
label="deliveryOrderNo" variant="label-hidden" data-field="shipmentUnitPrice" value={shippingUnitPrice}
- onblur={shipmentUnitPriceBlur} class="inputFont"></lightning-input>
+ onblur={shipmentUnitPriceBlur} min="0" class="inputFont" onchange={limitDecimals}></lightning-input>
</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/customShippingUnitPriceComp/customShippingUnitPriceComp.js b/force-app/main/default/lwc/customShippingUnitPriceComp/customShippingUnitPriceComp.js
index 6e1f1e7..fa196e7 100644
--- a/force-app/main/default/lwc/customShippingUnitPriceComp/customShippingUnitPriceComp.js
+++ b/force-app/main/default/lwc/customShippingUnitPriceComp/customShippingUnitPriceComp.js
@@ -8,6 +8,16 @@
console.log('shippingUnitPrice = ' + this.shippingUnitPrice);
}
+ limitDecimals(event) {
+ const value = parseFloat(event.target.value); // 灏嗚緭鍏ュ�艰浆鎹负鏁板瓧绫诲瀷
+ const roundedValue = Math.round(value * 100) / 100; // 灏嗘暟瀛楀洓鑸嶄簲鍏ュ埌涓や綅灏忔暟
+ if (isNaN(value) || isNaN(roundedValue)) { // 濡傛灉鏁板瓧鏃犳晥锛屽垯娓呯┖杈撳叆妗�
+ event.target.value = '';
+ } else if (roundedValue !== value) { // 濡傛灉杈撳叆妗嗙殑鍊艰秴鍑轰簡涓や綅灏忔暟锛屽垯淇敼涓轰袱浣嶅皬鏁�
+ event.target.value = roundedValue.toFixed(2);
+ }
+ }
+
shipmentUnitPriceBlur(event){
console.log('shipmentUnitPriceBlur')
this.shippingUnitPrice = event.target.value;
diff --git a/force-app/main/default/lwc/lexArriveGoodsMain/lexArriveGoodsMain.js b/force-app/main/default/lwc/lexArriveGoodsMain/lexArriveGoodsMain.js
index 5208da6..3284c42 100644
--- a/force-app/main/default/lwc/lexArriveGoodsMain/lexArriveGoodsMain.js
+++ b/force-app/main/default/lwc/lexArriveGoodsMain/lexArriveGoodsMain.js
@@ -55,8 +55,8 @@
type: 'Title',
recordId: { fieldName: "Id" }
},
- hideDefaultActions: true,initialWidth:200},
- {label:'SAP鍚堝悓鍙�',fieldName:'ContractNo__c',hideDefaultActions: true},
+ hideDefaultActions: true,initialWidth:200,wrapText:true},
+ {label:'SAP鍚堝悓鍙�',fieldName:'ContractNo__c',hideDefaultActions: true,wrapText:true,initialWidth:180},
{label:'璁㈠崟鎬绘暟',
type: "customOutputGood",
typeAttributes: {
diff --git a/force-app/main/default/lwc/lexArriveGsDetails/lexArriveGsDetails.html b/force-app/main/default/lwc/lexArriveGsDetails/lexArriveGsDetails.html
index 55e52c6..cd856c2 100644
--- a/force-app/main/default/lwc/lexArriveGsDetails/lexArriveGsDetails.html
+++ b/force-app/main/default/lwc/lexArriveGsDetails/lexArriveGsDetails.html
@@ -59,7 +59,7 @@
<div style="color:#696969;font-size:16px;">娑堣�楀搧璁㈠崟鍚嶇О<lightning-helptext style="--lwc-spacingXxSmall:0px;" content={label.helpText}></lightning-helptext></div>
</td>
<td style="width:200px;">
- <lightning-formatted-text style="font-size: 16px;" value={coc.arriveOrder}></lightning-formatted-text>
+ <a style="text-decoration: underline;color:black;" onclick={clickOrder}><lightning-formatted-text style="font-size: 16px;" value={coc.arriveOrder}></lightning-formatted-text></a>
<!-- <lightning-formatted-text value={coc.Arrive_Order__r.Name}></lightning-formatted-text> -->
</td>
<td></td>
@@ -81,7 +81,7 @@
<!-- <p style="font-size: 16px;"><strong>鍦ㄥ簱鍟嗗搧搴撳瓨涓�瑙�</strong></p> -->
</div>
<div style="padding:10px;">
- <lightning-datatable class="wrapped-header-datatable" hide-checkbox-column key-field="recordId" columns={colms} data={consumableorderdetailsRecords}></lightning-datatable>
+ <lightning-datatable class="wrapped-header-datatable" style="word-wrap:break-word; word-break:break-all;" hide-checkbox-column key-field="recordId" columns={colms} data={consumableorderdetailsRecords}></lightning-datatable>
</div>
</div>
</div>
diff --git a/force-app/main/default/lwc/lexArriveGsDetails/lexArriveGsDetails.js b/force-app/main/default/lwc/lexArriveGsDetails/lexArriveGsDetails.js
index c3e3de9..30c135b 100644
--- a/force-app/main/default/lwc/lexArriveGsDetails/lexArriveGsDetails.js
+++ b/force-app/main/default/lwc/lexArriveGsDetails/lexArriveGsDetails.js
@@ -30,7 +30,7 @@
{label:'娉ㄥ唽璇佺紪鐮佸彿' , fieldName:'approbation_No', hideDefaultActions: true,wrapText:true,initialWidth:125},
{label:'娉ㄥ唽璇佹晥鏈�' , fieldName:'expiration_DateStr', hideDefaultActions: true,wrapText:true,initialWidth:115},
{label:'浣跨敤鏈熼檺' , fieldName:'Sterilization_limitStr', hideDefaultActions: true,wrapText:true,initialWidth:115},
- {label:'BarCode' , fieldName:'barCode', hideDefaultActions: true,initialWidth:250},
+ {label:'BarCode' , fieldName:'barCode', hideDefaultActions: true,initialWidth:250,wrapText:true},
{label:'閲囪喘鍗曚环' ,type:'number',fieldName:'intraTradeList', hideDefaultActions: true,wrapText:true,initialWidth:120,typeAttributes:{minimumFractionDigits: 2},cellAttributes: { alignment: "right" }}
];
label = {helpText};
@@ -109,7 +109,8 @@
proSale({
cocStr : JSON.stringify(this.coc),
orderallcountParm : this.orderallcount,
- consumableorderdetailsCountParm : this.consumableorderdetailsCount
+ consumableorderdetailsCountParm : this.consumableorderdetailsCount,
+ eSetIdStr : this.eSetId
})
.then(result=>{
if(result.result == 'Success'){
@@ -123,7 +124,7 @@
this[NavigationMixin.Navigate](config);
}else {
this.showSpinner = false;
- console.log("error:"+error);
+ console.log("error:"+result.errorMsg);
this.showMyToast('鍑哄簱澶辫触',result.errorMsg,'error');
}
})
@@ -135,6 +136,18 @@
})
}
+ clickOrder(){
+ if(this.coc.Arrive_Order__c != null && this.coc.Arrive_Order__c != ''){
+ const config = {
+ type: 'standard__webPage',
+ attributes: {
+ url: '/detail/'+this.coc.Arrive_Order__c
+ }
+ };
+ this[NavigationMixin.Navigate](config);
+ }
+ }
+
showMyToast(title, message, variant) {
console.log('show custom message');
var iconName = '';
diff --git a/force-app/main/default/lwc/lexCancelRemoveBox/lexCancelRemoveBox.html b/force-app/main/default/lwc/lexCancelRemoveBox/lexCancelRemoveBox.html
index 26a054f..095debc 100644
--- a/force-app/main/default/lwc/lexCancelRemoveBox/lexCancelRemoveBox.html
+++ b/force-app/main/default/lwc/lexCancelRemoveBox/lexCancelRemoveBox.html
@@ -208,4 +208,4 @@
</div>
</div>
</div>
-</template>
+</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexCancelRemoveBox/lexCancelRemoveBox.js b/force-app/main/default/lwc/lexCancelRemoveBox/lexCancelRemoveBox.js
index a894763..6d9e08d 100644
--- a/force-app/main/default/lwc/lexCancelRemoveBox/lexCancelRemoveBox.js
+++ b/force-app/main/default/lwc/lexCancelRemoveBox/lexCancelRemoveBox.js
@@ -242,4 +242,4 @@
.querySelector("c-common-toast")
.showToast(variant, content, iconName, 10000);
}
-}
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexConInvoiceView/lexConInvoiceView.css b/force-app/main/default/lwc/lexConInvoiceView/lexConInvoiceView.css
index 6742585..f6deee2 100644
--- a/force-app/main/default/lwc/lexConInvoiceView/lexConInvoiceView.css
+++ b/force-app/main/default/lwc/lexConInvoiceView/lexConInvoiceView.css
@@ -42,4 +42,9 @@
}
.fontWeight{
font-size:16px;
+}
+
+.fileUpload {
+ font-size: 16px;
+ --lwc-formLabelFontSize:16px;
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexConInvoiceView/lexConInvoiceView.html b/force-app/main/default/lwc/lexConInvoiceView/lexConInvoiceView.html
index dd1a7c4..b4d54fe 100644
--- a/force-app/main/default/lwc/lexConInvoiceView/lexConInvoiceView.html
+++ b/force-app/main/default/lwc/lexConInvoiceView/lexConInvoiceView.html
@@ -3,7 +3,7 @@
<template>
<c-common-toast></c-common-toast>
<template if:true={isShowSpinner}>
- <lightning-spinner alternative-text="Loading" size="large"></lightning-spinner>
+ <lightning-spinner size="medium" variant="brand"></lightning-spinner>
</template>
@@ -11,55 +11,64 @@
<template if:false={isConInvoiceList}>
<!-- 鎼滅储瀹㈡埛鍚� -->
<template if:true={isModalOpen}>
- <!-- Modal/Popup Box LWC starts here -->
<section role="dialog" tabindex="-1" aria-labelledby="modal-heading-01" aria-modal="true"
- aria-describedby="modal-content-id-1" class="slds-modal slds-fade-in-open">
+ aria-describedby="modal-content-id-1" class="slds-modal slds-fade-in-open slds-modal_medium"
+ style="border: 1px solid #D4D4D4;">
<div class="slds-modal__container">
- <!-- Modal/Popup Box LWC header here -->
- <header class="slds-modal__header">
- <button class="slds-button slds-button_icon slds-modal__close slds-button_icon-inverse"
+ <header class="slds-modal__header" style="background-color: #F3F3F3;">
+ <button style="" class="slds-button slds-button_icon slds-modal__close slds-button_icon-inverse"
title="Close" onclick={closeModal}>
<lightning-icon icon-name="utility:close" alternative-text="close" variant="inverse"
size="small"></lightning-icon>
<span class="slds-assistive-text">Close</span>
</button>
- <h2 id="modal-heading-01" class="slds-text-heading_medium slds-hyphenate">
- 缁忛攢鍟嗗尰闄㈡绱�
- </h2>
+ <h2 id="modal-heading-01" class="slds-text-heading_medium slds-hyphenate">缁忛攢鍟嗗尰闄㈡绱�</h2>
</header>
- <!-- Modal/Popup Box LWC body starts here -->
- <div class="slds-modal__content slds-p-around_medium" id="modal-content-id-1">
- <lightning-layout>
- <lightning-layout-item flexibility="auto" padding="around-small">
- <lightning-input type="text" label="鍖婚櫌鍚嶇О" onchange={dataChange}
- data-field="searchHospitalName" value={searchHospitalName}
- variant="label-inline" class="inputFont"></lightning-input>
- </lightning-layout-item>
- <lightning-layout-item flexibility="auto" padding="around-small"
- style="padding-top: 16px;">
- <!-- <lightning-button label="妫�绱�" onclick={searchHospital}></lightning-button> -->
- <button class="slds-button slds-button_neutral" onclick={searchHospital}
- title="searchHospital" style="font-size: 16px;">
- 妫�绱�
- </button>
- </lightning-layout-item>
- </lightning-layout>
-
- <div class="tableColumn">
- <lightning-layout class="datatable" style="height: 250px;">
+ <div class="slds-modal__content slds-p-around_medium" id="modal-content-id-1"
+ style="border: 1px solid #F3F3F3;">
+ <table style="width: 100%;">
+ <tbody>
+ <tr>
+ <td style="width: 74px;">
+ <div style="color:#696969;font-size:16px;text-align: left;">鍖婚櫌鍚嶇О</div>
+ </td>
+ <td style="width: 60%;"><lightning-input class="inputFont" label="鍖婚櫌鍚嶇О"
+ variant="label-hidden" placeholder="璇疯緭鍏ュ尰闄㈠悕绉�" value={searchHospitalName}
+ data-field="searchHospitalName" onchange={dataChange}></lightning-input></td>
+ <td style="width: 10px;"></td>
+ <td><button class="slds-button slds-button_neutral slds-button_stretch lexsearchStyle"
+ style="height: 32px;" label="鎼滅储" onclick={searchHospital}>鎼滅储</button></td>
+ </tr>
+ </tbody>
+ </table>
+ <p style="height: 20px;"></p>
+ <!-- <p>宸查�夋嫨鍖婚櫌锛歿chooseHospital}</p> -->
+ <div
+ style="border: 1px solid #D4D4D4;border-top: 3px solid #51606E;border-radius:5px;margin-bottom:7px;">
+ <div style="border-bottom: 1px solid #D4D4D4;padding:3px;">
+ <lightning-layout>
+ <lightning-layout-item padding="around-small">
+ <p style="font-size: 18px">
+ <strong>鎼滅储缁撴灉</strong>
+ </p>
+ </lightning-layout-item>
+ </lightning-layout>
+ <!-- <p style="font-size: 16px;"><strong>鎼滅储缁撴灉</strong></p> -->
+ </div>
+ <div class="myTable" style="padding:10px;">
+ <!-- <lightning-datatable class="wrapped-header-datatable" key-field="id"
+ hide-checkbox-column="true" data={hospitalList} columns={hosCols}
+ onrowaction={chooseHos}></lightning-datatable> -->
<lightning-datatable class="datatabel slds-border_top wrapped-header-datatable"
- key-field="id" data={hospitalList} columns={hospitalColumns}
- hide-checkbox-column="true" onrowaction={searchHandleRowAction}>
+ key-field="id" data={hospitalList} columns={hospitalColumns} hide-checkbox-column="true"
+ onrowaction={searchHandleRowAction}>
</lightning-datatable>
- </lightning-layout>
+ </div>
</div>
</div>
- <!-- Modal/Popup Box LWC footer starts here -->
<footer class="slds-modal__footer">
- <button class="slds-button slds-button_neutral" onclick={closeModal} title="Cancel"
- style="font-size: 16px;">
- 鍏抽棴
- </button>
+ <button class="slds-button slds-button_neutral slds-button_stretch lexclearStyle" label="鍙栨秷"
+ onclick={closeModal}>鍙栨秷</button>
</footer>
</div>
</section>
@@ -73,69 +82,45 @@
<div lwc:dom="manual" class="resultDiv"></div>
<div draggable="false">
<template if:false={EditAble}>
- <lightning-layout>
- <lightning-layout-item size="12">
- <div class="slds-m-top_small slds-m-bottom_medium">
- <!-- <lightning-layout-item size="3">
- <lightning-input label="" name="涓婁紶闄勪欢" onchange={handleFilesChange}
- type="file" accept={acceptedType}
- disabled={isDisabledReopen}></lightning-input>
- </lightning-layout-item>
- <lightning-layout-item size="3">
- <span class="slds-form-element__label" data-form-label></span>
- </br>
- <lightning-button label="淇濆瓨闄勪欢" style="margin-top: 20px"
- onclick={saveAttachmentJs}
- disabled={isDisabledReopen}></lightning-button>
- </lightning-layout-item> -->
- <lightning-layout multiple-rows="true">
- <lightning-layout-item size="12">
- <button
- class="slds-button slds-button_neutral slds-button_stretch lexBorder"
- onclick={SetEditAbleJs} disabled={isDisabledEdit}
- style="width: 150px;">缂栬緫</button>
- <button
- class="slds-button slds-button_neutral slds-button_stretch lexBorder buttonminMarginLeft"
- onclick={approvalJs} disabled={isDisabledEdit}
- style="width: 150px;">鎻愪氦</button>
- <button
- class="slds-button slds-button_neutral slds-button_stretch lexBorder buttonminMarginLeft"
- onclick={openReportJs} disabled={isOpenReportDisabled}
- style="width: 150px;">鏄剧ず鏄庣粏</button>
- <button
- class="slds-button slds-button_neutral slds-button_stretch lexBorder buttonminMarginLeft"
- onclick={reopenJs} disabled={isDisabledReopen}
- style="width: 150px;">浣滃簾閲嶅紑</button>
- <button
- class="slds-button slds-button_neutral slds-button_stretch lexBorder buttonminMarginLeft"
- onclick={deleteButtonJs} disabled={isDisabledDelete}
- style="width: 150px;">鍒犻櫎</button>
+ <lightning-layout multiple-rows="true">
+ <lightning-layout-item size="2"></lightning-layout-item>
+ <lightning-layout-item size="10">
+ <button
+ class="slds-button slds-button_neutral slds-button_stretch lexBorder"
+ onclick={SetEditAbleJs} disabled={isDisabledEdit}
+ style="width: 150px;">缂栬緫</button>
+ <button
+ class="slds-button slds-button_neutral slds-button_stretch lexBorder buttonminMarginLeft"
+ onclick={approvalJs} disabled={isDisabledEdit}
+ style="width: 150px;">鎻愪氦</button>
+ <button
+ class="slds-button slds-button_neutral slds-button_stretch lexBorder buttonminMarginLeft"
+ onclick={openReportJs} disabled={isOpenReportDisabled}
+ style="width: 150px;">鏄剧ず鏄庣粏</button>
+ <button
+ class="slds-button slds-button_neutral slds-button_stretch lexBorder buttonminMarginLeft"
+ onclick={reopenJs} disabled={isDisabledReopen}
+ style="width: 150px;">浣滃簾閲嶅紑</button>
+ </lightning-layout-item>
+ </lightning-layout>
- <button
- class="slds-button slds-button_neutral slds-button_stretch lexBorder buttonminMarginLeft"
- disabled={isDisabledReopen} onclick={uploadOrder}
- style="width: 150px;">涓婁紶闄勪欢</button>
+ <lightning-layout multiple-rows="true" style="margin-top: 20px;">
+ <lightning-layout-item size="2"></lightning-layout-item>
+ <lightning-layout-item size="10">
+ <button
+ class="slds-button slds-button_neutral slds-button_stretch lexBorder"
+ onclick={deleteButtonJs} disabled={isDisabledDelete}
+ style="width: 150px;">鍒犻櫎</button>
- <button
- class="slds-button slds-button_neutral slds-button_stretch lexBorder buttonminMarginLeft"
- onclick={saveAttachmentJs} disabled={isDisabledReopen}
- style="width: 150px;">淇濆瓨闄勪欢</button>
- </lightning-layout-item>
- <!-- <lightning-layout-item size="2">
- <button
- class="slds-button slds-button_neutral slds-button_stretch lexBorder"
- disabled={isDisabledReopen}
- onclick={uploadOrder} style="width: 150px;">涓婁紶闄勪欢</button>
- </lightning-layout-item>
- <lightning-layout-item size="2">
- <button
- class="slds-button slds-button_neutral slds-button_stretch lexBorder"
- onclick={saveAttachmentJs}
- disabled={isDisabledReopen} style="margin-left: -50px;width: 150px;">淇濆瓨闄勪欢</button>
- </lightning-layout-item> -->
- </lightning-layout>
+ <button
+ class="slds-button slds-button_neutral slds-button_stretch lexBorder buttonminMarginLeft"
+ disabled={isDisabledReopen} onclick={uploadOrder}
+ style="width: 150px;">涓婁紶闄勪欢</button>
- </div>
+ <button
+ class="slds-button slds-button_neutral slds-button_stretch lexBorder buttonminMarginLeft"
+ onclick={saveAttachmentJs} disabled={isDisabledReopen}
+ style="width: 150px;">淇濆瓨闄勪欢</button>
</lightning-layout-item>
</lightning-layout>
</template>
@@ -165,7 +150,7 @@
id="modal-content-id-2" style="border: 1px solid #F3F3F3;">
<div class="slds-m-top_medium slds-m-bottom_x-large">
<div class="slds-p-around_medium lgc-bg">
- <lightning-input type="file" label="闄勪欢涓婁紶"
+ <lightning-input class="fileUpload" type="file" label="闄勪欢涓婁紶"
accept=".xlsx, .xls, .csv, .png, .doc, .docx, .pdf"
onchange={attChange}></lightning-input>
</div>
@@ -178,10 +163,14 @@
</div>
</div>
<footer class="slds-modal__footer">
- <lightning-button style="margin-left: 10px;" variant="neutral"
+ <!-- <lightning-button style="margin-left: 10px;" variant="neutral"
label="鍙栨秷" onclick={closePop}></lightning-button>
<lightning-button style="margin-left: 10px;" variant="neutral"
- label="涓婁紶" onclick={handleFilesChange}></lightning-button>
+ label="涓婁紶" onclick={handleFilesChange}></lightning-button> -->
+ <button class="slds-button slds-button_neutral slds-button_stretch lexclearStyle" style="margin-left: 10px;"
+ label="鍙栨秷" onclick={closePop}>鍙栨秷</button>
+ <button class="slds-button slds-button_neutral slds-button_stretch lexsearchStyle" style="margin-left: 10px;"
+ label="涓婁紶" onclick={handleFilesChange}>涓婁紶</button>
</footer>
</div>
</section>
@@ -258,23 +247,24 @@
<lightning-layout multiple-rows="true">
<lightning-layout-item size="1"></lightning-layout-item>
- <lightning-layout-item class="hehe-layoutItem" size="4">
+ <lightning-layout-item class="hehe-layoutItem" size="5">
<lightning-output-field field-name="Name"></lightning-output-field>
+ </lightning-layout-item>
+
+ <lightning-layout-item class="hehe-layoutItem" size="5" style="padding-left: 100px;">
+ <lightning-output-field
+ field-name="Invoice_status__c"></lightning-output-field>
</lightning-layout-item>
<lightning-layout-item size="1"></lightning-layout-item>
- <lightning-layout-item class="hehe-layoutItem" size="4">
- <lightning-output-field
- field-name="Invoice_status__c"></lightning-output-field>
- </lightning-layout-item>
</lightning-layout>
<!-- 鍙戠エ鏃ユ湡 -->
<lightning-layout multiple-rows="true">
<lightning-layout-item size="1"></lightning-layout-item>
- <lightning-layout-item class="hehe-layoutItem" size="4">
+ <lightning-layout-item class="hehe-layoutItem" size="5">
<lightning-output-field
field-name="Invoice_Date__c"></lightning-output-field>
</lightning-layout-item>
@@ -285,7 +275,7 @@
<lightning-layout-item size="1"></lightning-layout-item>
<lightning-layout multiple-rows="true">
- <lightning-layout-item class="hehe-layoutItem" size="4">
+ <lightning-layout-item class="hehe-layoutItem" size="5">
<lightning-output-field
field-name="Order_Dealer_Info__c"></lightning-output-field>
</lightning-layout-item>
@@ -296,7 +286,7 @@
<lightning-layout multiple-rows="true">
<lightning-layout-item size="1"></lightning-layout-item>
- <lightning-layout-item class="hehe-layoutItem" size="4">
+ <lightning-layout-item class="hehe-layoutItem" size="5">
<lightning-output-field field-name="ShipmentAccount__c"
class="hideHelpText"></lightning-output-field>
</lightning-layout-item>
@@ -306,23 +296,23 @@
<lightning-layout multiple-rows="true" style="height:35.5px">
<lightning-layout-item size="1"></lightning-layout-item>
- <lightning-layout-item class="hehe-layoutItem" size="4">
+ <lightning-layout-item class="hehe-layoutItem" size="5">
<lightning-output-field
field-name="Order_ForCustomerText__c"></lightning-output-field>
</lightning-layout-item>
- <lightning-layout-item size="1"></lightning-layout-item>
-
- <lightning-layout-item size="4" class="readOnly">
+ <lightning-layout-item size="5" class="readOnly" style="padding-left: 100px;">
<lightning-input label="鍙戠エ绁ㄩ潰閲戦(鍏�)" value={sumPrice} read-only
variant="label-inline"></lightning-input>
</lightning-layout-item>
+
+ <lightning-layout-item size="1"></lightning-layout-item>
</lightning-layout>
<!-- 澶囨敞 -->
<lightning-layout multiple-rows="true">
<lightning-layout-item size="1"></lightning-layout-item>
- <lightning-layout-item class="hehe-layoutItem" size="4">
+ <lightning-layout-item class="hehe-layoutItem" size="5">
<lightning-output-field
field-name="Invoice_Note__c"></lightning-output-field>
</lightning-layout-item>
@@ -332,24 +322,24 @@
<lightning-layout multiple-rows="true">
<lightning-layout-item size="1"></lightning-layout-item>
- <lightning-layout-item class="hehe-layoutItem" size="4">
+ <lightning-layout-item class="hehe-layoutItem" size="5">
<lightning-output-field
field-name="Invoice_attachment__c"></lightning-output-field>
</lightning-layout-item>
- <lightning-layout-item size="1"></lightning-layout-item>
-
- <lightning-layout-item class="hehe-layoutItem" size="4">
+ <lightning-layout-item class="hehe-layoutItem" size="5" style="padding-left: 100px;">
<lightning-output-field
field-name="Invoicedet_attachment__c"></lightning-output-field>
</lightning-layout-item>
+
+ <lightning-layout-item size="1"></lightning-layout-item>
</lightning-layout>
<!-- 闄勪欢棰勮 -->
<lightning-layout multiple-rows="true">
<lightning-layout-item size="1">
</lightning-layout-item>
- <lightning-layout-item size="11">
+ <lightning-layout-item size="10">
<lightning-card class="attListTitle" variant="Narrow" title="闄勪欢鍒楄〃"
icon-name="utility:attach">
@@ -362,9 +352,9 @@
style="margin-left: 20px;" icon-name="doctype:gform"
alternative-text={item.Title}
size="large"></lightning-icon><br />
- <span title={item.Title}>
- {item.fileName}
- </span>
+ <div title={item.Title} style="width: 100px;text-overflow: ellipsis;overflow: hidden;white-space: nowrap;">
+ {item.Title}
+ </div>
<p>
<!-- <a data-fileid ={item.documentId} onclick={previweAtt}> -->
<a href={item.attUrl} target="_blank">
@@ -373,7 +363,7 @@
<a href={item.downloadUrl}>
涓嬭浇
</a> 路
- <a data-fileid={item.recordId} onclick={deleteAtt}>
+ <a data-fileid={item.Id} onclick={deleteAtt}>
鍒犻櫎
</a>
</p>
@@ -394,25 +384,25 @@
<lightning-layout multiple-rows="true">
<lightning-layout-item size="1"></lightning-layout-item>
- <lightning-layout-item class="hehe-layoutItem" size="4">
+ <lightning-layout-item class="hehe-layoutItem" size="5">
<lightning-input label="鍙戠エ鍙�" value={OrderCode} data-field="OrderCode"
onchange={dataChange} variant="label-inline" required
class="inputFont"></lightning-input>
</lightning-layout-item>
- <lightning-layout-item size="1"></lightning-layout-item>
-
- <lightning-layout-item class="hehe-layoutItem" size="4">
+ <lightning-layout-item class="hehe-layoutItem" size="5" style="padding-left: 100px;">
<lightning-output-field
field-name="Invoice_status__c"></lightning-output-field>
</lightning-layout-item>
+
+ <lightning-layout-item size="1"></lightning-layout-item>
</lightning-layout>
<!-- 鍙戠エ鏃ユ湡 -->
<lightning-layout multiple-rows="true">
<lightning-layout-item size="1"></lightning-layout-item>
- <lightning-layout-item class="hehe-layoutItem" size="4">
+ <lightning-layout-item class="hehe-layoutItem" size="5">
<lightning-input type="date" label="鍙戠エ鏃ユ湡" variant="label-inline"
value={InvoiceDate} onchange={invoiceDateChange} required
class="inputFont"></lightning-input>
@@ -423,7 +413,7 @@
<lightning-layout multiple-rows="true">
<lightning-layout-item size="1"></lightning-layout-item>
- <lightning-layout-item class="hehe-layoutItem" size="4">
+ <lightning-layout-item class="hehe-layoutItem" size="5">
<div
class="slds-form-element__control slds-input-has-icon slds-input-has-icon_right">
<lightning-icon size="x-small"
@@ -436,41 +426,41 @@
</div>
</lightning-layout-item>
- <lightning-layout-item size="1"></lightning-layout-item>
-
- <lightning-layout-item class="hehe-layoutItem" size="4">
+ <lightning-layout-item class="hehe-layoutItem" size="5" style="padding-left: 100px;">
<lightning-combobox data-field="secondaryDistributor"
name="secondaryDistributor" label="浜岀骇缁忛攢鍟�"
value={secondaryDistributor} placeholder="璇烽�夋嫨..."
options={provinceOptsMap} variant="label-inline"
onchange={dataChange} class="inputFont"></lightning-combobox>
</lightning-layout-item>
+
+ <lightning-layout-item size="1"></lightning-layout-item>
</lightning-layout>
<!-- 绉戝 缁忛攢鍟�(褰曞叆) -->
<lightning-layout multiple-rows="true">
<lightning-layout-item size="1"></lightning-layout-item>
- <lightning-layout-item class="hehe-layoutItem" size="4">
+ <lightning-layout-item class="hehe-layoutItem" size="5">
<lightning-input-field onchange={dataChange}
data-field="ForCustomerText" value={ForCustomerText}
field-name="Order_ForCustomerText__c"
class="inputFont"></lightning-input-field>
</lightning-layout-item>
- <lightning-layout-item size="1"></lightning-layout-item>
-
- <lightning-layout-item class="hehe-layoutItem" size="4">
+ <lightning-layout-item class="hehe-layoutItem" size="5" style="padding-left: 100px;">
<lightning-output-field
field-name="Order_ForDealerText__c"></lightning-output-field>
</lightning-layout-item>
+
+ <lightning-layout-item size="1"></lightning-layout-item>
</lightning-layout>
<!-- 澶囨敞 -->
<lightning-layout multiple-rows="true">
<lightning-layout-item size="1"></lightning-layout-item>
- <lightning-layout-item class="hehe-layoutItem" size="4">
+ <lightning-layout-item class="hehe-layoutItem" size="5">
<lightning-input-field onchange={dataChange} data-field="InvoiceNote"
value={InvoiceNote} field-name="Invoice_Note__c"
class="inputFont"></lightning-input-field>
@@ -498,7 +488,8 @@
<lightning-layout-item padding="around-small">
<!-- <lightning-button label="　妫�绱�　"
onclick={InvoiceorderSearchJs}></lightning-button> -->
- <button class="slds-button slds-button_neutral slds-button_stretch lexsearchStyle"
+ <button
+ class="slds-button slds-button_neutral slds-button_stretch lexsearchStyle"
onclick={InvoiceorderSearchJs}>妫�绱�</button>
</lightning-layout-item>
</template>
@@ -645,7 +636,8 @@
<div class="slds-form-element__label ">鍑哄簱鏃�　浠�</div>
<lightning-input type="date" variant="label-hidden" label="鍑哄簱鏃� 浠�"
onchange={dataChange} data-field="deliveryFromDate"
- value={deliveryFromDate} class="inputFont"></lightning-input>
+ value={deliveryFromDate} class="inputFont"
+ style="max-width: 150px;"></lightning-input>
</div>
</br>
@@ -654,7 +646,8 @@
</div>
<lightning-input type="date" variant="label-hidden" label="鍒�"
onchange={dataChange} data-field="deliveryToDate"
- value={deliveryToDate} class="inputFont"></lightning-input>
+ value={deliveryToDate} class="inputFont"
+ style="max-width: 150px;"></lightning-input>
</div>
</div>
</lightning-layout-item>
@@ -662,16 +655,16 @@
<div class="slds-grid slds-grid_vertical-align-center">
<div class="slds-form-element__label ">鍙戠エ鍙�</div>
<lightning-input variant="label-hidden" label="鍙戠エ鍙�" onchange={dataChange}
- data-field="category1" value={category1}
- class="inputFont"></lightning-input>
+ data-field="category1" value={category1} class="inputFont"
+ style="max-width: 150px;"></lightning-input>
</div>
</lightning-layout-item>
<lightning-layout-item flexibility="auto">
<div class="slds-grid slds-grid_vertical-align-center">
<div class="slds-form-element__label ">瀹㈡埛鍚�</div>
<lightning-input variant="label-hidden" label="瀹㈡埛鍚�" onchange={dataChange}
- data-field="category2" value={category2}
- class="inputFont"></lightning-input>
+ data-field="category2" value={category2} class="inputFont"
+ style="max-width: 150px;"></lightning-input>
</div>
</lightning-layout-item>
<lightning-layout-item flexibility="auto">
@@ -680,24 +673,22 @@
<lightning-combobox data-field="invoiceStatus" name="invoiceStatus"
label="鐘舵��" value={invoiceStatusValue} placeholder="璇烽�夋嫨..."
options={Options} variant="label-hidden" onchange={dataChange}
- style="min-width: 100px;" class="inputFont"></lightning-combobox>
+ style="min-width: 100px;max-width: 200px;"
+ class="inputFont"></lightning-combobox>
</div>
</lightning-layout-item>
<lightning-layout-item flexibility="auto">
<div class="slds-grid slds-grid_vertical-align-center">
- <!-- <lightning-button label="妫�绱�"
- onclick={invoiceCodeSearchJs}></lightning-button> -->
<button
class="slds-button slds-button_neutral slds-button_stretch lexsearchStyle"
- onclick={invoiceCodeSearchJs}>妫�绱�</button>
+ onclick={invoiceCodeSearchJs} style="max-width: 110px;">妫�绱�</button>
</div>
</lightning-layout-item>
<lightning-layout-item flexibility="auto">
<div class="slds-grid slds-grid_vertical-align-center">
- <!-- <lightning-button label="娓呯┖" onclick={ClearJs}></lightning-button> -->
<button
class="slds-button slds-button_neutral slds-button_stretch lexclearStyle"
- onclick={ClearJs}>娓呯┖</button>
+ onclick={ClearJs} style="max-width: 110px;">娓呯┖</button>
</div>
</lightning-layout-item>
</lightning-layout>
@@ -763,21 +754,21 @@
<lightning-record-edit-form object-api-name="Consumable_order__c"
record-id={detailsInvoiceId} onload={handleLoad2}>
<lightning-layout multiple-rows="true">
- <lightning-layout-item size="2"></lightning-layout-item>
- <lightning-layout-item size="4">
+ <lightning-layout-item size="1"></lightning-layout-item>
+ <lightning-layout-item size="5">
<lightning-output-field field-name="Name"></lightning-output-field>
</lightning-layout-item>
</lightning-layout>
<lightning-layout multiple-rows="true">
- <lightning-layout-item size="2"></lightning-layout-item>
- <lightning-layout-item size="4" class="hehe-layoutItem">
+ <lightning-layout-item size="1"></lightning-layout-item>
+ <lightning-layout-item size="5" class="hehe-layoutItem">
<lightning-output-field field-name="ShipmentAccount__c"
class="hideHelpText"></lightning-output-field>
</lightning-layout-item>
</lightning-layout>
<lightning-layout multiple-rows="true">
- <lightning-layout-item size="2"></lightning-layout-item>
- <lightning-layout-item size="4">
+ <lightning-layout-item size="1"></lightning-layout-item>
+ <lightning-layout-item size="5">
<lightning-output-field
field-name="Order_ForCustomerText__c"></lightning-output-field>
</lightning-layout-item>
@@ -803,14 +794,14 @@
<div draggable="false">
<lightning-record-edit-form object-api-name="Consumable_order__c" record-id={detailsCocId}>
<lightning-layout multiple-rows="true">
- <lightning-layout-item size="2"></lightning-layout-item>
- <lightning-layout-item size="4">
+ <lightning-layout-item size="1"></lightning-layout-item>
+ <lightning-layout-item size="5">
<lightning-output-field field-name="Name"></lightning-output-field>
</lightning-layout-item>
</lightning-layout>
<lightning-layout multiple-rows="true">
- <lightning-layout-item size="2"></lightning-layout-item>
- <lightning-layout-item size="4">
+ <lightning-layout-item size="1"></lightning-layout-item>
+ <lightning-layout-item size="5">
<lightning-output-field field-name="Outbound_Date__c"></lightning-output-field>
</lightning-layout-item>
</lightning-layout>
@@ -839,7 +830,8 @@
<c-lex-custom-lightning-datatable key-field="Id" data={detailsData} columns={detailsColumns}
onunitchange={handleUnitChange} onshipmentnumber={handleShipmentNumber}
onrowselection={detailsGetSelectedRows} selected-rows={detailsSelectedRows}
- style="word-wrap:break-word; word-break:break-all; " class="wrapped-header-datatable">
+ style="word-wrap:break-word; word-break:break-all; " class="wrapped-header-datatable"
+ min-column-width="115">
</c-lex-custom-lightning-datatable>
<lightning-datatable class="datatabel slds-border_top wrapped-header-datatable"
key-field="id" data={invoiceAllpriceData} columns={detailsColumns} hide-checkbox-column
diff --git a/force-app/main/default/lwc/lexConInvoiceView/lexConInvoiceView.js b/force-app/main/default/lwc/lexConInvoiceView/lexConInvoiceView.js
index 0c4122c..032f8fc 100644
--- a/force-app/main/default/lwc/lexConInvoiceView/lexConInvoiceView.js
+++ b/force-app/main/default/lwc/lexConInvoiceView/lexConInvoiceView.js
@@ -13,7 +13,7 @@
import serContact from "@salesforce/apex/lexSearchAgencyHospitalController.serContact";
import detailsInit from "@salesforce/apex/LexConInvoicedetailsController.init";
import detailsSave from "@salesforce/apex/LexConInvoicedetailsController.save";
-import deleteAtt from '@salesforce/apex/LexConsumableController.deleteAtt';
+import deleteAtt from '@salesforce/apex/LexSummonsCreatController.deleteAtt';
import { NavigationMixin } from "lightning/navigation";
//table css
import { loadStyle } from "lightning/platformResourceLoader";
@@ -22,21 +22,10 @@
const hospitalColumns = [
{
- label: "鍖婚櫌鍚嶇О",
- fieldName: "Name",
- initialWidth: 400,
- hideDefaultActions: true,
- wrapText: true,
- },
- {
- label: "鐪佷唤",
- fieldName: "stateMasterName",
- hideDefaultActions: true,
- },
- {
- label: "閫夋嫨",
+ label: "",
fieldName: "Id1",
type: "button",
+ initialWidth: 90,
hideDefaultActions: true,
typeAttributes: {
label: "閫夋嫨",
@@ -44,6 +33,17 @@
size: 1,
},
},
+ {
+ label: "鍖婚櫌鍚嶇О",
+ fieldName: "Name",
+ hideDefaultActions: true,
+ wrapText: true,
+ },
+ {
+ label: "鐪佷唤",
+ fieldName: "stateMasterName",
+ hideDefaultActions: true,
+ }
];
const invoiceDetailsColumns = [
{
@@ -96,6 +96,7 @@
hideDefaultActions: true,
wrapText: true,
cellAttributes: { alignment: 'right' },
+ initialWidth:145,
type: "number",
typeAttributes: {
minimumFractionDigits: 2,
@@ -160,6 +161,7 @@
label: "浜у搧鍨嬪彿",
fieldName: "esdAssetModelNo",
hideDefaultActions: true,
+ initialWidth: 200,
wrapText: true,
},
{
@@ -240,6 +242,8 @@
typeAttributes: {
recordId: { fieldName: "recordId" },
shipmentNumber: { fieldName: "shipmentNumber" },
+ isConinvoice: { fieldName: "isConinvoice" },
+ esdInvoiceProNotCount: { fieldName: "esdInvoiceProNotCount" },
},
},
{
@@ -248,6 +252,7 @@
fieldName: "invoiceAllprice",
hideDefaultActions: true,
type: "number",
+ initialWidth: 150,
typeAttributes: {
minimumFractionDigits: 2,
},
@@ -258,7 +263,7 @@
}
export default class LexConInvoiceView extends NavigationMixin(LightningElement) {
- @track label=customLabel;
+ @track label = customLabel;
invoiceColumns = invoiceColumns;
detailsColumns = detailsColumns;
@track outboundColumns = [
@@ -369,6 +374,7 @@
//鏂囦欢涓婁紶
@track showLoadingSpinner = false;
+ @track showPopSpinner = false;
@track UploadFile = "Upload File";
@track fileName = "";
@track fileData = [];
@@ -517,6 +523,7 @@
this.detailsData[i]['esdInvoiceUnitprice'] = this.detailsData[i].esd.Invoice_Unitprice__c;
//鍙戠エ鏁伴噺
this.detailsData[i]['shipmentNumber'] = this.detailsData[i].invoiceCount;
+ this.detailsData[i]['isConinvoice'] = true;
this.detailsData[i]['invoiceAllprice'] = this.detailsData[i].invoiceAllprice;
if (this.detailsData[i].check) {
@@ -552,7 +559,7 @@
this.ConInvoiceListUserWorkLocation = r.entity.userWorkLocation;
this.ConInvoiceListAgencyProType = r.entity.agencyProType;
- if (this.ConInvoiceListAgencyProType != 'ET')
+ //if (this.ConInvoiceListAgencyProType != 'ET')
this.isOpenReportDisabled = false;
this.invoiceData = r.entity.raesList;
for (var i in this.invoiceData) {
@@ -660,7 +667,7 @@
this.HospitalName = r.entity.HospitalName;
this.HospitalInfo = r.entity.HospitalInfo;
this.agencyProType = r.entity.agencyProType;
- if (this.agencyProType != 'ET')
+ //if (this.agencyProType != 'ET')
this.isOpenReportDisabled = false;
//绉戝
this.ForCustomerText = this.coc.Order_ForCustomerText__c;
@@ -681,6 +688,7 @@
label: '瀹㈡埛鍚�',
fieldName: "hospitalName",
hideDefaultActions: true,
+ wrapText: true,
};
let object2 = {
label: '鍑鸿揣閲戦(鍏�)',
@@ -829,6 +837,15 @@
this.fileName = '';
}
+ //鏄惁鏄剧ず闄勪欢绉婚櫎
+ get attDelBtn() {
+ if (this.fileName != '' && this.fileName != null && this.fileName != '閫夋嫨涓�涓枃浠朵笂浼�') {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
keepTwoDecimalStr(num) {
const result = Number(num.toString().match(/^\d+(?:\.\d{0,2})?/));
let s = result.toString();
@@ -970,7 +987,7 @@
cloneData[i].check = true;
}
}
- if(!b){
+ if (!b) {
cloneData[i].check = false;
}
delete cloneData[i].esdOutboundDate;
@@ -1034,22 +1051,21 @@
console.log("handleFilesChange");
this.handleSave();
// if (event.target.files.length > 0) {
- // this.filesUploaded = event.target.files;
- // this.fileName = event.target.files[0].name;
- // this.handleSave();
- // }
- }
-
- handleSave() {
- this.isShowSpinner = true;
+ // this.filesUploaded = event.target.files;
+ // this.fileName = event.target.files[0].name;
+ // this.handleSave();
+ // }
+ }
+
+ handleSave() {
console.log("saveFile");
if (this.filesUploaded.length > 0) {
+ this.showPopSpinner = true;
this.file = this.filesUploaded[0];
if (this.file.size > this.MAX_FILE_SIZE) {
this.showMyToast('淇濆瓨澶辫触', '鏂囦欢杩囧ぇ', 'Error');
return;
}
- this.showLoadingSpinner = true;
this.fileReader = new FileReader();
this.fileReader.onloadend = () => {
@@ -1078,8 +1094,8 @@
r = JSON.parse(JSON.stringify(r));
console.log("r = " + JSON.stringify(r));
if (r != '') {
- this.showLoadingSpinner = false;
- this.showMyToast('闄勪欢涓婁紶鎴愬姛', '', 'Success');
+ this.showPopSpinner = false;
+ this.showMyToast('涓婁紶鎴愬姛', '', 'Success');
this.closePop();
this.init();
} else {
@@ -1117,8 +1133,9 @@
}
saveAttachmentJs() {
+ debugger
this.showLoadingSpinner = true;
- let cloneData = this.fileData
+ let cloneData = this.deepClone(this.fileData)
for (var i in cloneData) {
delete cloneData[i].Id;
delete cloneData[i].recordId;
@@ -1245,7 +1262,7 @@
cloneData[i].check = true;
}
}
- if(!b){
+ if (!b) {
cloneData[i].check = false;
}
delete cloneData[i].esdOutboundDate;
@@ -1286,8 +1303,8 @@
let index = 0;
this.selectedRows = [];
for (var i in this.outboundData) {
-
- if(this.outboundData[i].check)
+
+ if (this.outboundData[i].check)
this.selectedRows.push(this.outboundData[i].esd.Id)
this.outboundData[i].Id = this.outboundData[i].esd.Id;
this.outboundData[i]['esdOutboundDate'] = this.outboundData[i].esd.Outbound_Date__c;
@@ -1435,13 +1452,15 @@
let reportUrl = this.label.LexConInvoiceViewReport;
let reportFilters = '[{"operator":"equals","value":"' + this.OrderCode + '","column":"FK_NAME"}]';
console.log('reportUrl = ' + reportUrl);
- let url = "/report/"+ reportUrl +"?reportFilters=" + encodeURIComponent(reportFilters);
- this[NavigationMixin.Navigate]({
- type: "standard__webPage",
- attributes: {
- url: url,
- },
- });
+ let url = "/s/report/" + reportUrl + "?reportFilters=" + encodeURIComponent(reportFilters);
+ window.open(url);
+ // this[NavigationMixin.Navigate]({
+ // type: "standard__webPage",
+ // attributes: {
+ // url: url,
+ // target: '_blank'
+ // },
+ // });
}
reopenJs() {
@@ -1461,6 +1480,7 @@
showMyToast(title, message, variant) {
this.isShowSpinner = false;
this.showLoadingSpinner = false;
+ this.showPopSpinner = false;
this.showAttPop = false;
this.filesUploaded = [];
this.fileName = null;
@@ -1645,9 +1665,13 @@
console.log("this.data = " + JSON.stringify(this.data));
}
+ deepClone(obj) {
+ return JSON.parse(JSON.stringify(obj));
+ }
+
detailsSaveJs() {
this.isShowSpinner = true;
- let cloneData = this.detailsData;
+ let cloneData = this.deepClone(this.detailsData);
let selectedRows = this.template.querySelector('c-lex-custom-lightning-datatable').getSelectedRows();
console.log('selectedRows = ' + JSON.stringify(selectedRows));
@@ -1747,18 +1771,19 @@
console.log('attid:' + recordId);
deleteAtt({
contentVersionId: recordId
- }).then(result => {
- if (result.result == 'Success') {
+ }).then(r => {
+ r = JSON.parse(JSON.stringify(r));
+ if (r.status == "Success") {
this.showMyToast('鍒犻櫎鎴愬姛', '', 'Success');
if (this.fileData.length == 1)
window.location.reload();
else
this.init();
} else {
- this.showMyToast('鍒犻櫎澶辫触', result.errorMsg, 'Error');
+ this.showMyToast('鍒犻櫎澶辫触', r.msg, 'Error');
}
}).catch(error => {
- this.showMyToast('閿欒', '鍒犻櫎澶辫触', 'Error');
+ this.showMyToast('閿欒', error.message, 'Error');
})
}
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexConsumable/lexConsumable.html b/force-app/main/default/lwc/lexConsumable/lexConsumable.html
index 4564898..18170aa 100644
--- a/force-app/main/default/lwc/lexConsumable/lexConsumable.html
+++ b/force-app/main/default/lwc/lexConsumable/lexConsumable.html
@@ -130,9 +130,12 @@
<template for:each={attachmentRecoeds} for:item="item" for:index="index">
<lightning-layout-item padding="around-none" size="2" key={item.recordId} style="text-align: left;padding:5px">
<lightning-icon title={item.fileFullName} style="margin-left: 20px;" icon-name="doctype:gform" alternative-text={item.fileFullName} size="large"></lightning-icon><br/>
- <span title={item.fileFullName}>
+ <!-- <span style="word-wrap:break-word; word-break:break-all;width:80px;display:flex;" title={item.fileFullName}>
{item.fileName}
- </span>
+ </span> -->
+ <div title={item.fileFullName} style="width: 100px;text-overflow: ellipsis;overflow: hidden;white-space: nowrap;">
+ {item.fileName}
+ </div>
<p>
<!-- <a data-fileid ={item.documentId} onclick={previweAtt}> -->
<a href={item.attUrl} target="_blank">
@@ -165,11 +168,11 @@
<div style="padding:10px;">
<table>
<tbody>
- <tr>
- <td style="width: 90px;">
+ <!-- <tr>
+ <td style="width: 100px;">
<div style="color:#696969;font-size:16px;"><span style="color: red;">* </span>鍚堝悓</div>
</td>
- <td style="width:300px;">
+ <td style="width:320px;">
<div class="slds-form-element__control slds-input-has-icon slds-input-has-icon_right">
<lightning-icon size="x-small" class="iconMargin slds-icon slds-input__icon slds-input__icon_right slds-icon-text-default" icon-name="utility:search" ></lightning-icon>
<lightning-input class="inputFont" variant="label-hidden" label="鍚堝悓" placeholder="璇烽�夋嫨鍚堝悓" value={contractName} onchange={changeCon} onclick={showSearchCon}></lightning-input>
@@ -189,36 +192,13 @@
</div>
</template>
</td>
- <!-- <td style="width: 30px;"></td>
- <td style="width: 66px;"></td>
- <td style="width:150px;"></td> -->
<td style="width: 30px;"></td>
- <td style="width: 66px;"></td>
- <td style="width:140px;"></td>
- <td style="width: 30px;"></td>
- <td></td>
- </tr>
- <tr style="height: 10px;"></tr>
- <!-- <tr>
- <td><div style="color:#696969;font-size:14px;"><span style="color: red;">* </span>鍚堝悓</div></td>
- <td style="padding-bottom:5px;padding-top:5px;">
- <div class="slds-form-element__control slds-input-has-icon slds-input-has-icon_right">
- <lightning-icon size="x-small" class="iconMargin slds-icon slds-input__icon slds-input__icon_right slds-icon-text-default" icon-name="utility:search" ></lightning-icon>
- <lightning-input variant="label-hidden" label="鍚堝悓" placeholder="璇烽�夋嫨鍚堝悓" value={contractName} onchange={changeCon} onclick={showSearchCon}></lightning-input>
- </div>
+ <td colspan="4">
+ <button class="slds-button slds-button_neutral slds-button_stretch lexsearchStyle" style="width:130px;height:32px;margin-right: 10px;" label="娑堣�楀搧鎼滅储" onclick={searchProduct}>娑堣�楀搧鎼滅储</button>
+ <button class="slds-button slds-button_neutral slds-button_stretch lexclearStyle" style="width:80px;height:32px;" label="娓呯┖" onclick={clear}>娓呯┖</button>
</td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
</tr> -->
+ <!-- <tr style="height: 10px;"></tr> -->
<tr>
<td>
<div style="color:#696969;font-size:16px;">娑堣�楀搧鍚嶇О</div>
@@ -230,27 +210,51 @@
<td>
<div style="color:#696969;font-size:16px;">绗�3鍒嗙被</div>
</td>
- <td style="width:140px;">
+ <td>
<lightning-combobox class="inputFont" variant="label-hidden" label="绗�3鍒嗙被" value={category3} options={category3Option} onchange={category3Change}></lightning-combobox>
</td>
<td style="width:30px;"></td>
<td style="width:66px;">
<div style="color:#696969;font-size:16px;">绗�4鍒嗙被</div>
</td>
- <td style="width:140px;">
+ <td >
<lightning-combobox class="inputFont" variant="label-hidden" label="绗�4鍒嗙被" value={category4} options={category4Option} onchange={category4Change}></lightning-combobox>
</td>
<td></td>
- <td>
+ <td style="width: 66px;">
<div style="color:#696969;font-size:16px;">绗�5鍒嗙被</div>
</td>
- <td>
+ <td style="width: 160px;">
<lightning-combobox class="inputFont" variant="label-hidden" label="绗�5鍒嗙被" value={category5} options={category5Option} onchange={category5Change}></lightning-combobox>
</td>
- <td></td>
- <td>
- <!-- <lightning-button style="margin-right: 10px;margin-left: 15px;" label="娑堣�楀搧鎼滅储" onclick={searchProduct}></lightning-button>
- <lightning-button label="娓呯┖" onclick={clear}></lightning-button> -->
+ </tr>
+ <tr style="height: 10px;"></tr>
+ <tr>
+ <td style="width: 100px;">
+ <div style="color:#696969;font-size:16px;"><span style="color: red;">* </span>鍚堝悓</div>
+ </td>
+ <td style="width:320px;">
+ <div class="slds-form-element__control slds-input-has-icon slds-input-has-icon_right">
+ <lightning-icon size="x-small" class="iconMargin slds-icon slds-input__icon slds-input__icon_right slds-icon-text-default" icon-name="utility:search" ></lightning-icon>
+ <lightning-input class="inputFont" variant="label-hidden" label="鍚堝悓" placeholder="璇烽�夋嫨鍚堝悓" value={contractName} onchange={changeCon} onclick={showSearchCon}></lightning-input>
+ </div>
+ </td>
+ <td style="width: 30px;"></td>
+ <td style="width:66px;">
+ <template if:true={showHospital}>
+ <div style="color:#696969;font-size:16px;"><span style="color: red;">* </span>鍖婚櫌</div>
+ </template>
+ </td>
+ <td colspan="4" style="padding-bottom:5px;padding-top:5px;">
+ <template if:true={showHospital}>
+ <div class="slds-form-element__control slds-input-has-icon slds-input-has-icon_right">
+ <lightning-icon size="x-small" class="iconMargin slds-icon slds-input__icon slds-input__icon_right slds-icon-text-default" icon-name="utility:search" ></lightning-icon>
+ <lightning-input class="inputFont" variant="label-hidden" label="鍖婚櫌" placeholder="璇烽�夋嫨鍖婚櫌" value={hospitalName} onclick={showSearchHos} onchange={changeHos}></lightning-input>
+ </div>
+ </template>
+ </td>
+ <td style="width: 30px;"></td>
+ <td colspan="2">
<button class="slds-button slds-button_neutral slds-button_stretch lexsearchStyle" style="width:130px;height:32px;margin-right: 10px;" label="娑堣�楀搧鎼滅储" onclick={searchProduct}>娑堣�楀搧鎼滅储</button>
<button class="slds-button slds-button_neutral slds-button_stretch lexclearStyle" style="width:80px;height:32px;" label="娓呯┖" onclick={clear}>娓呯┖</button>
</td>
@@ -298,7 +302,7 @@
</div>
<div style="padding:10px;">
<template if:true={editAble}>
- <c-lex-custom-lightning-datatable class="wrapped-header-datatable" key-field="recordId" data={currentRecord} columns={cols}
+ <c-lex-custom-lightning-datatable class="wrapped-header-datatable" style="word-wrap:break-word; word-break:break-all;" key-field="recordId" data={currentRecord} columns={cols}
selected-rows={selectRows} onrowselection={checkRows} onchangevalue={conCountChange} onvalueblur={conCountBlur}
default-sort-direction="asc" sorted-direction={sortDirection} sorted-by={sortedBy} onsort={onHandleSort}></c-lex-custom-lightning-datatable>
<c-paginator onprevious={prePageClick} onnext={nextPageClick}
@@ -308,7 +312,7 @@
record-end={recordEnd} total-records={totalRecords}></c-paginator>
</template>
<template if:false={editAble}>
- <c-lex-custom-lightning-datatable class="wrapped-header-datatable" hide-checkbox-column key-field="recordId" data={consumableorderdetailsRecordsview} columns={cols}></c-lex-custom-lightning-datatable>
+ <c-lex-custom-lightning-datatable class="wrapped-header-datatable" style="word-wrap:break-word; word-break:break-all;" hide-checkbox-column key-field="recordId" data={consumableorderdetailsRecordsview} columns={cols}></c-lex-custom-lightning-datatable>
<c-paginator onprevious={prePageClick} onnext={nextPageClick}
onpageschange={pageSizeChange} onfirst={goFirstPage} onlast={goLastPage}
page-size-options={pageSizeOptions} previous-button-disabled={previousButtonDisabled}
diff --git a/force-app/main/default/lwc/lexConsumable/lexConsumable.js b/force-app/main/default/lwc/lexConsumable/lexConsumable.js
index 908f97e..9733513 100644
--- a/force-app/main/default/lwc/lexConsumable/lexConsumable.js
+++ b/force-app/main/default/lwc/lexConsumable/lexConsumable.js
@@ -1,1690 +1,1390 @@
-import { LightningElement, wire, api, track } from "lwc";
-import { CurrentPageReference } from "lightning/navigation";
-import { ShowToastEvent } from "lightning/platformShowToastEvent";
-import { NavigationMixin } from "lightning/navigation";
-import initPage from "@salesforce/apex/LexConsumableController.init";
-import categoryAllload from "@salesforce/apex/LexConsumableController.categoryAllload";
-import categoryload from "@salesforce/apex/LexConsumableController.categoryload";
-import searchConsumableorderdetails from "@salesforce/apex/LexConsumableController.searchConsumableorderdetails";
-import searchorderdetails from "@salesforce/apex/LexConsumableController.searchorderdetails";
-import save from "@salesforce/apex/LexConsumableController.save";
-import ordrCopy from "@salesforce/apex/LexConsumableController.ordrCopy";
-import setEditAble from "@salesforce/apex/LexConsumableController.setEditAble";
-import backOrder from "@salesforce/apex/LexConsumableController.backOrder";
-import delConsumable from "@salesforce/apex/LexConsumableController.delConsumable";
-import sorder from "@salesforce/apex/LexConsumableController.sorder";
-import filesUpload from "@salesforce/apex/LexConsumableController.filesUpload";
-import initHospital from "@salesforce/apex/LexSearchHospitalController.init";
-import searchHospital from "@salesforce/apex/LexSearchHospitalController.searchHospital";
-import initContract from "@salesforce/apex/LexSearchContractController.init";
-import searchContract from "@salesforce/apex/LexSearchContractController.searchContract";
-import deleteAtt from "@salesforce/apex/LexConsumableController.deleteAtt";
-//table css
+import { LightningElement,wire,api,track } from 'lwc';
+import { CurrentPageReference } from 'lightning/navigation';
+import { ShowToastEvent } from 'lightning/platformShowToastEvent';
+import { NavigationMixin } from 'lightning/navigation';
+import initPage from '@salesforce/apex/LexConsumableController.init';
+import categoryAllload from '@salesforce/apex/LexConsumableController.categoryAllload';
+import categoryload from '@salesforce/apex/LexConsumableController.categoryload';
+import searchConsumableorderdetails from '@salesforce/apex/LexConsumableController.searchConsumableorderdetails';
+import searchorderdetails from '@salesforce/apex/LexConsumableController.searchorderdetails';
+import save from '@salesforce/apex/LexConsumableController.save';
+import ordrCopy from '@salesforce/apex/LexConsumableController.ordrCopy';
+import setEditAble from '@salesforce/apex/LexConsumableController.setEditAble';
+import backOrder from '@salesforce/apex/LexConsumableController.backOrder';
+import delConsumable from '@salesforce/apex/LexConsumableController.delConsumable';
+import sorder from '@salesforce/apex/LexConsumableController.sorder';
+import filesUpload from '@salesforce/apex/LexConsumableController.filesUpload';
+import initHospital from '@salesforce/apex/LexSearchHospitalController.init';
+import searchHospital from '@salesforce/apex/LexSearchHospitalController.searchHospital';
+import initContract from '@salesforce/apex/LexSearchContractController.init';
+import searchContract from '@salesforce/apex/LexSearchContractController.searchContract';
+import deleteAtt from '@salesforce/apex/LexConsumableController.deleteAtt';
+//table css
import { loadStyle } from "lightning/platformResourceLoader";
import WrappedHeaderTable from "@salesforce/resourceUrl/lexdatatable";
export default class LexConsumable extends NavigationMixin(LightningElement) {
- //椤甸潰鍩虹鏁版嵁
- @track editAble;
- @track pageType;
- @track esetId;
- @track keyWords;
- @track coc;
- @track cocId;
- @track userWorkLocation;
- @track accountName;
- @track accountid;
- @track specialCampaign = false;
- @track dealerProductId = [];
- @track category1;
- @track category3 = "";
- @track category4 = "";
- @track category5 = "";
- @track category_Goods;
- @track category3Option = [];
- @track category4Option = [];
- @track category5Option = [];
- @track consumableorderdetailsRecordsview = [];
- @track currentRecord = []; //鍒嗛〉
- @track selectRows = [];
- @track attachmentRecoeds = [];
- @track contactDealer = [];
- @track proLimitAndDate = [];
- @track agencyProType;
- @track agencyProType1;
- @track OSHFLG = false;
- @track bargainPrice;
- @track showOrderDate = false;
- @track showAttUploadDate = false;
- @track edoffersPrice = false;
- @track editDelCommitBtnDisabled = false;
- @track showEditBtn = false;
- @track disabledEditBtn = false;
- @track showPrintSheetBtn = false;
- @track showUploadSheetBtn = false;
- @track disabledUploadSheetBtn = false;
- @track showSubOrderbtn = false;
- @track disabledSubOrderbtn = false;
- @track showSaveOrderbtn1 = false;
- @track showSaveOrderbtn2 = false;
- @track showDeleteBtn = false;
- @track disabledDeleteBtn = false;
- @track showOfferPriceInputBtn = false;
- @track disabledOfferPriceInputBtn = false;
- @track showReapplyBtn = false;
- @track showHospital = false;
- @track showPage = false;
- @track cansee = false;
- @track showSpinner = true;
- @track showPopSpinner = false;
- stylesLoaded = false;
- //鏄惁涓�鐩存樉绀烘彁绀�
- @track isNoteStay = true;
- //鎺掑簭鐩稿叧
- @track sortDirection = "asc";
- @track sortedBy;
- //鍒嗛〉
- @track currentPage = 1;
- @track pageSize = 10;
- // @track totalPage = 0;
- @track pageSizeOptions = [10, 25, 50, 100];
- @track recordStart = 0;
- @track recordEnd = 0;
- //鎶ラ敊鎻愰啋
- // @track hasError = false;
- @track errorMsgs = [];
- // @track hasWarning = false;
- @track warningMsgs = [];
- //闄勪欢涓婁紶
- @track showAttPop = false;
- @track filesUploaded = [];
- @track fileName;
- file;
- fileContents;
- fileReader;
- content;
- //鍖婚櫌鎼滅储
- @track showAttHosPop = false;
- @track hospitalList = [];
- @track searchNameHos;
- @track chooseHospital;
- @track chooseHospitalId;
- @track hospitalId;
- @track hospitalName;
- @track tempidHp;
- @track hosCols = [
- // {label:'鍖婚櫌鍚嶇О',fieldName:'Name',type:'button',typeAttributes:{label:{fieldName:'Name'},variant:'base'}},
- {
- label: "",
- type: "button",
- typeAttributes: { label: "閫夋嫨" },
- initialWidth: 90,
- hideDefaultActions: true,
- wrapText: true
- },
- {
- label: "鍖婚櫌鍚嶇О",
- fieldName: "Name",
- initialWidth: 380,
- wrapText: true,
- hideDefaultActions: true
- },
- {
- label: "鐪佷唤",
- fieldName: "StateMaster",
- initialWidth: 80,
- hideDefaultActions: true,
- wrapText: true
- },
- {
- label: "鍦板潃",
- fieldName: "Address__c",
- hideDefaultActions: true,
- wrapText: true
- }
- ];
- //鍚堝悓鎼滅储
- @track contractLabel;
- @track showConPop = false;
- @track contractList = [];
- @track searchNameCon;
- @track chooseContract;
- @track chooseContractId;
- @track contractId;
- @track contractName;
- @track tempidPp;
- @track conCols = [
- {
- label: "",
- type: "button",
- typeAttributes: { label: "閫夋嫨" },
- initialWidth: 90,
- hideDefaultActions: true,
- wrapText: true
- },
- {
- label: "鍚堝悓鍚嶇О",
- fieldName: "Name",
- wrapText: true,
- hideDefaultActions: true
- },
- {
- label: "鐪佷唤",
- fieldName: "StateMaster",
- initialWidth: 80,
- hideDefaultActions: true,
- wrapText: true
- },
- {
- label: "鐢宠閿�鍞",
- fieldName: "Sales_Section__c",
- initialWidth: 160,
- hideDefaultActions: true,
- wrapText: true
- },
- {
- label: "鍏佽鎶ヤ环鏈熼棿(寮�濮嬫棩)",
- fieldName: "Contract_Decide_Start_Date__c",
- initialWidth: 175,
- hideDefaultActions: true,
- wrapText: true
- },
- {
- label: "鍏佽鎶ヤ环鏈熼棿(缁撴潫鏃�)",
- fieldName: "Contract_Decide_End_Date__c",
- initialWidth: 175,
- hideDefaultActions: true,
- wrapText: true
- }
- ];
+
+ //椤甸潰鍩虹鏁版嵁
+ @track editAble;
+ @track pageType;
+ @track esetId;
+ @track keyWords;
+ @track coc;
+ @track cocId;
+ @track userWorkLocation;
+ @track accountName;
+ @track accountid;
+ @track specialCampaign = false;
+ @track dealerProductId = [];
+ @track category1;
+ @track category3 = '';
+ @track category4 = '';
+ @track category5 = '';
+ @track category_Goods;
+ @track category3Option = [];
+ @track category4Option = [];
+ @track category5Option = [];
+ @track consumableorderdetailsRecordsview = [];
+ @track currentRecord = [];//鍒嗛〉
+ @track selectRows = [];
+ @track attachmentRecoeds = [];
+ @track contactDealer = [];
+ @track proLimitAndDate = [];
+ @track agencyProType;
+ @track agencyProType1;
+ @track OSHFLG = false;
+ @track bargainPrice;
+ @track showOrderDate = false;
+ @track showAttUploadDate = false;
+ @track edoffersPrice = false;
+ @track editDelCommitBtnDisabled = false;
+ @track showEditBtn = false;
+ @track disabledEditBtn = false;
+ @track showPrintSheetBtn = false;
+ @track showUploadSheetBtn = false;
+ @track disabledUploadSheetBtn = false;
+ @track showSubOrderbtn = false;
+ @track disabledSubOrderbtn = false;
+ @track showSaveOrderbtn1 = false;
+ @track showSaveOrderbtn2 = false;
+ @track showDeleteBtn = false;
+ @track disabledDeleteBtn = false;
+ @track showOfferPriceInputBtn = false;
+ @track disabledOfferPriceInputBtn = false;
+ @track showReapplyBtn = false;
+ @track showHospital = false;
+ @track showPage = false;
+ @track cansee = false;
+ @track showSpinner = true;
+ @track showPopSpinner = false;
+ stylesLoaded = false;
+ //鏄惁涓�鐩存樉绀烘彁绀�
+ @track isNoteStay = true;
+ //鎺掑簭鐩稿叧
+ @track sortDirection = 'asc';
+ @track sortedBy;
+ //鍒嗛〉
+ @track currentPage = 1;
+ @track pageSize = 10;
+ // @track totalPage = 0;
+ @track pageSizeOptions = [10, 25, 50, 100];
+ @track recordStart = 0;
+ @track recordEnd = 0;
+ //鎶ラ敊鎻愰啋
+ // @track hasError = false;
+ @track errorMsgs = [];
+ // @track hasWarning = false;
+ @track warningMsgs = [];
+ //闄勪欢涓婁紶
+ @track showAttPop = false;
+ @track filesUploaded = [];
+ @track fileName;
+ file;
+ fileContents;
+ fileReader;
+ content;
+ //鍖婚櫌鎼滅储
+ @track showAttHosPop = false;
+ @track hospitalList = [];
+ @track searchNameHos;
+ @track chooseHospital;
+ @track chooseHospitalId;
+ @track hospitalId;
+ @track hospitalName;
+ @track tempidHp;
+ @track hosCols = [
+ // {label:'鍖婚櫌鍚嶇О',fieldName:'Name',type:'button',typeAttributes:{label:{fieldName:'Name'},variant:'base'}},
+ {label:'',type:'button',typeAttributes:{label:'閫夋嫨'},initialWidth:90,hideDefaultActions: true,wrapText:true},
+ {label:'鍖婚櫌鍚嶇О',fieldName:'Name',initialWidth:380,wrapText:true,hideDefaultActions: true},
+ {label:'鐪佷唤',fieldName:'StateMaster',initialWidth:80,hideDefaultActions: true,wrapText:true},
+ {label:'鍦板潃',fieldName:'Address__c',hideDefaultActions: true,wrapText:true}
+ ];
+ //鍚堝悓鎼滅储
+ @track contractLabel;
+ @track showConPop = false;
+ @track contractList = [];
+ @track searchNameCon;
+ @track chooseContract;
+ @track chooseContractId;
+ @track contractId;
+ @track contractName;
+ @track tempidPp;
+ @track conCols = [
+ {label:'',type:'button',typeAttributes:{label:'閫夋嫨'},initialWidth:90,hideDefaultActions: true,wrapText:true},
+ {label:'鍚堝悓鍚嶇О',fieldName:'Name',wrapText:true,hideDefaultActions: true},
+ {label:'鐪佷唤',fieldName:'StateMaster',initialWidth:80,hideDefaultActions: true,wrapText:true},
+ {label:'鐢宠閿�鍞',fieldName:'Sales_Section__c',initialWidth:160,hideDefaultActions: true,wrapText:true},
+ {label:'鍏佽鎶ヤ环鏈熼棿(寮�濮嬫棩)',fieldName:'Contract_Decide_Start_Date__c',initialWidth:175,hideDefaultActions: true,wrapText:true},
+ {label:'鍏佽鎶ヤ环鏈熼棿(缁撴潫鏃�)',fieldName:'Contract_Decide_End_Date__c',initialWidth:175,hideDefaultActions: true,wrapText:true}
+ ];
- //娑堣�楀搧鏁版嵁col
- get cols() {
- var cols = [];
- cols.push({
- label: "娑堣�楀搧鍚嶇О",
- fieldName: "prodName",
- wrapText: true,
- hideDefaultActions: true,
- sortable: true
- });
- cols.push({
- label: "瑙勬牸",
- fieldName: "packing_list",
- wrapText: true,
- hideDefaultActions: true,
- initialWidth: 50,
- cellAttributes: { alignment: "right" }
- });
- cols.push({
- label: "CFDA鐘舵��",
- fieldName: "prodSFDAStatus",
- wrapText: true,
- hideDefaultActions: true,
- initialWidth: 97
- });
- cols.push({
- label: "娉ㄥ唽璇佺紪鐮佸彿",
- fieldName: "approbation_No",
- wrapText: true,
- hideDefaultActions: true,
- initialWidth: 120
- });
- cols.push({
- label: "娉ㄥ唽璇佹晥鏈�",
- fieldName: "expiration_Date",
- wrapText: true,
- hideDefaultActions: true,
- initialWidth: 105
- });
- cols.push({
- label: "绗�3鍒嗙被",
- fieldName: "prodCategory3",
- wrapText: true,
- hideDefaultActions: true,
- initialWidth: 78,
- sortable: true
- });
- cols.push({
- label: "绗�4鍒嗙被",
- fieldName: "prodCategory4",
- wrapText: true,
- hideDefaultActions: true,
- initialWidth: 107,
- sortable: true
- });
- cols.push({
- label: "绗�5鍒嗙被",
- fieldName: "prodCategory5",
- wrapText: true,
- hideDefaultActions: true,
- initialWidth: 80,
- sortable: true
- });
- if (this.cansee) {
- cols.push({
- label: "鏍囧噯鍗曚环",
- type: "number",
- typeAttributes: { minimumFractionDigits: 2 },
- fieldName: "prodIntraTradeList",
- hideDefaultActions: true,
- initialWidth: 80
- });
- }
- if (this.editAble) {
- cols.push({
- label: "閲囪喘鏁伴噺",
- type: "customTableInput",
- typeAttributes: {
- recordId: { fieldName: "recordId" },
- inputValue: { fieldName: "consumableCount" },
- upperLimit: { fieldName: "upperlimit" },
- lowerLimit: { fieldName: "lowerlimit" },
- allnumber: { fieldName: "allnumber" },
- valueType: "Number"
- },
- hideDefaultActions: true,
- initialWidth: 80
- });
- } else {
- cols.push({
- label: "閲囪喘鏁伴噺",
- fieldName: "consumableCount",
- hideDefaultActions: true,
- initialWidth: 80,
- cellAttributes: { alignment: "right" }
- });
- }
- cols.push({
- label: "鍦ㄥ簱鏁颁笅闄�",
- fieldName: "lowerlimit",
- hideDefaultActions: true,
- initialWidth: 100,
- cellAttributes: { alignment: "right" }
- });
- cols.push({
- label: "鍦ㄥ簱鏁颁笂闄�",
- fieldName: "upperlimit",
- hideDefaultActions: true,
- initialWidth: 100,
- cellAttributes: { alignment: "right" }
- });
- // cols.push({label:'鏈夋晥鏈熷簱瀛�(鐩�)',fieldName:'allnumber',hideDefaultActions: true,initialWidth:105,sortable: true});
- cols.push({
- label: "鏈夋晥鏈熷簱瀛�(鐩�)",
- type: "customInventoryColor",
- typeAttributes: {
- value: { fieldName: "allnumber" },
- upperlimit: { fieldName: "upperlimit" },
- lowerlimit: { fieldName: "lowerlimit" },
- boxPrice: "鐩�"
- },
- hideDefaultActions: true,
- initialWidth: 126
- });
- cols.push({
- label: "鏈夋晥鏈熷簱瀛�(涓�)",
- fieldName: "allnumber_piece",
- hideDefaultActions: true,
- initialWidth: 126,
- cellAttributes: { alignment: "right" }
- });
- return cols;
- }
-
- //闄勪欢cols
- @track attCols = [
- {
- label: "鏍囬",
- fieldName: "attUrl",
- type: "url",
- typeAttributes: { label: { fieldName: "fileName" }, target: "_blank" },
- hideDefaultActions: true
- },
- {
- label: "鍒涘缓浜�",
- fieldName: "ownerUrl",
- type: "url",
- typeAttributes: { label: { fieldName: "ownerName" }, target: "_blank" },
- hideDefaultActions: true
- },
- { label: "涓婁紶鏃ユ湡", fieldName: "updateDate", hideDefaultActions: true },
- {
- label: "",
- type: "tableCellIcon",
- typeAttributes: {
- iconName: "utility:delete",
- recordId: { fieldName: "recordId" }
- },
- initialWidth: 50,
- hideDefaultActions: true
- }
- ];
-
- //鍙栧緱鎵�鏈夎鍕鹃�夌殑浜у搧id
- getAllChecked() {
- this.selectRows = [];
- for (var i in this.currentRecord) {
- if (this.currentRecord[i].check) {
- this.selectRows.push(this.currentRecord[i].recordId);
+ //娑堣�楀搧鏁版嵁col
+ get cols(){
+ var cols = [];
+ cols.push({label:'娑堣�楀搧鍚嶇О',fieldName:'prodName',wrapText:true,hideDefaultActions: true,sortable: true,initialWidth:150});
+ cols.push({label:'瑙勬牸',fieldName:'packing_list',wrapText:true,hideDefaultActions: true,initialWidth:50,cellAttributes: { alignment: "right" }});
+ cols.push({label:'CFDA鐘舵��',fieldName:'prodSFDAStatus',wrapText:true,hideDefaultActions: true,initialWidth:97});
+ cols.push({label:'娉ㄥ唽璇佺紪鐮佸彿',fieldName:'approbation_No',wrapText:true,hideDefaultActions: true,initialWidth:120});
+ cols.push({label:'娉ㄥ唽璇佹晥鏈�',fieldName:'expiration_Date',wrapText:true,hideDefaultActions: true,initialWidth:105});
+ cols.push({label:'绗�3鍒嗙被',fieldName:'prodCategory3',wrapText:true,hideDefaultActions: true,initialWidth:78,sortable: true});
+ cols.push({label:'绗�4鍒嗙被',fieldName:'prodCategory4',wrapText:true,hideDefaultActions: true,initialWidth:107,sortable: true});
+ cols.push({label:'绗�5鍒嗙被',fieldName:'prodCategory5',wrapText:true,hideDefaultActions: true,initialWidth:80,sortable: true});
+ if(this.cansee){
+ cols.push({label:'鏍囧噯鍗曚环',type:'number',typeAttributes:{minimumFractionDigits: 2},fieldName:'prodIntraTradeList',hideDefaultActions: true,initialWidth:80});
}
- }
- }
+ if(this.editAble){
+ cols.push(
+ {label:'閲囪喘鏁伴噺',
+ type: "customTableInput",typeAttributes: {
+ recordId: { fieldName: "recordId" },
+ inputValue: { fieldName: "consumableCount" },
+ upperLimit: { fieldName: "upperlimit" },
+ lowerLimit: { fieldName: "lowerlimit" },
+ allnumber: { fieldName: "allnumber" },
+ valueType: 'Number'
+ },
+ hideDefaultActions: true,initialWidth:80});
+ }else{
+ cols.push({label:'閲囪喘鏁伴噺',fieldName:'consumableCount',hideDefaultActions: true,initialWidth:80,cellAttributes: { alignment: "right" }});
+ }
+ cols.push({label:'鍦ㄥ簱鏁颁笅闄�',fieldName:'lowerlimit',hideDefaultActions: true,initialWidth:100,cellAttributes: { alignment: "right" }});
+ cols.push({label:'鍦ㄥ簱鏁颁笂闄�',fieldName:'upperlimit',hideDefaultActions: true,initialWidth:100,cellAttributes: { alignment: "right" }});
+ // cols.push({label:'鏈夋晥鏈熷簱瀛�(鐩�)',fieldName:'allnumber',hideDefaultActions: true,initialWidth:105,sortable: true});
+ cols.push(
+ {label:'鏈夋晥鏈熷簱瀛�(鐩�)',
+ type: "customInventoryColor",
+ typeAttributes: {
+ value: { fieldName: "allnumber" },
+ upperlimit: { fieldName: "upperlimit" },
+ lowerlimit: { fieldName: "lowerlimit" },
+ boxPrice: '鐩�'
+ },
+ hideDefaultActions: true,initialWidth:126});
+ cols.push({label:'鏈夋晥鏈熷簱瀛�(涓�)',fieldName:'allnumber_piece',hideDefaultActions: true,initialWidth:126,cellAttributes: { alignment: "right" }});
+ return cols;
+ }
- //鍕鹃�夋搷浣�
- checkRows(event) {
- this.selectRows = [];
- const selectedRows = event.detail.selectedRows;
- for (var i in this.consumableorderdetailsRecordsview) {
- var count = 0;
- for (var j in selectedRows) {
- if (
- this.consumableorderdetailsRecordsview[i].recordId ==
- selectedRows[j].recordId
- ) {
- count++;
- console.log(
- "checkId:" +
- selectedRows[j].recordId +
- "---" +
- this.consumableorderdetailsRecordsview[i].prodName
- );
- }
- }
- if (count == 0) {
- this.consumableorderdetailsRecordsview[i].check = false;
- } else {
- this.consumableorderdetailsRecordsview[i].check = true;
- this.selectRows.push(
- this.consumableorderdetailsRecordsview[i].recordId
- );
- }
- }
- for (var i in this.selectRows) {
- console.log("checkId1:" + this.selectRows[i]);
- for (var i in this.currentRecord) {
- if (this.currentRecord[i].recordId == this.selectRows[i]) {
- console.log("currentRecord:" + this.selectRows[i]);
- }
- }
- }
- }
+ //闄勪欢cols
+ @track attCols = [
+ {label:'鏍囬',fieldName:'attUrl',type:'url',typeAttributes:{label:{fieldName:'fileName'},target: "_blank"},hideDefaultActions: true},
+ {label:'鍒涘缓浜�',fieldName:'ownerUrl',type:'url',typeAttributes:{label:{fieldName:'ownerName'},target: "_blank"},hideDefaultActions: true},
+ {label:'涓婁紶鏃ユ湡',fieldName:'updateDate',hideDefaultActions: true},
+ {label:'',type:'tableCellIcon',typeAttributes:{iconName:'utility:delete',recordId:{fieldName : 'recordId'}},initialWidth:50,hideDefaultActions: true}
+ ];
- //閲囪喘鏁伴噺鑾峰彇
- conCountChange(event) {
- var recordId = event.detail.data.recordId;
- var conCount = event.detail.data.value;
- console.log("countChange:" + recordId + "---" + conCount);
- for (var i in this.consumableorderdetailsRecordsview) {
- if (this.consumableorderdetailsRecordsview[i].recordId == recordId) {
- this.consumableorderdetailsRecordsview[i].esd.Consumable_count__c =
- conCount;
- this.consumableorderdetailsRecordsview[i].consumableCount = conCount;
- if (conCount != null && conCount != 0 && conCount != "") {
- this.consumableorderdetailsRecordsview[i].check = true;
- } else {
- this.consumableorderdetailsRecordsview[i].check = false;
- this.consumableorderdetailsRecordsview[i].esd.Consumable_count__c =
- null;
- this.consumableorderdetailsRecordsview[i].consumableCount = null;
- }
+ //鍙栧緱鎵�鏈夎鍕鹃�夌殑浜у搧id
+ getAllChecked(){
+ this.selectRows = [];
+ for(var i in this.currentRecord){
+ if(this.currentRecord[i].check){
+ this.selectRows.push(this.currentRecord[i].recordId);
+ }
}
- }
- this.getAllChecked();
- for (var i in this.currentRecord) {
- if (this.currentRecord[i].recordId == recordId) {
- console.log(
- "currentRecord1:" + this.currentRecord[i].esd.Consumable_count__c
- );
- }
- }
- }
+ }
- //閲囪喘鏁伴噺澶辩劍
- conCountBlur(event) {
- var conCount = event.detail.data.value;
- var allnumber = event.detail.data.allnumber;
- var upperLimit = event.detail.data.upperLimit;
- var lowerLimit = event.detail.data.lowerLimit;
- console.log(
- "limit:" +
- conCount +
- "---" +
- allnumber +
- "---" +
- lowerLimit +
- "---" +
- allnumber
- );
- if (
- upperLimit != null &&
- lowerLimit != null &&
- conCount != null &&
- allnumber != null
- ) {
- if (parseInt(allnumber) + parseInt(conCount) > upperLimit) {
- // window.alert("璇ヤ骇鍝佽璐暟閲忚秴鍑哄簱瀛樹笂闄愶紒");
- this.showMyToast("璇ヤ骇鍝佽璐暟閲忚秴鍑哄簱瀛樹笂闄愶紒", "", "error");
- }
- if (parseInt(allnumber) + parseInt(conCount) < lowerLimit) {
- // window.alert("璇ヤ骇鍝佽璐暟閲忎綆浜庡簱瀛樹笅闄愶紒");
- this.showMyToast("璇ヤ骇鍝佽璐暟閲忎綆浜庡簱瀛樹笅闄愶紒", "", "error");
- }
- }
- }
-
- @wire(CurrentPageReference)
- getStateParameters(currentPageReference) {
- console.log("CurrentPageReference");
- if (currentPageReference) {
- this.pageType = currentPageReference.state?.type;
- this.esetId = currentPageReference.state?.ESetid;
- this.keyWords = currentPageReference.state?.KeyWords;
- console.log("type:" + this.pageType);
- console.log("esetId:" + this.esetId);
- console.log("keyWords:" + this.keyWords);
- }
- }
-
- renderedCallback() {
- if (!this.stylesLoaded) {
- Promise.all([loadStyle(this, WrappedHeaderTable)])
- .then(() => {
- console.log("Custom styles loaded");
- this.stylesLoaded = true;
- })
- .catch((error) => {
- console.error("Error loading custom styles");
- });
- }
- }
-
- //椤甸潰鍒濆鍖�
- connectedCallback() {
- this.showSpinner = true;
- initPage({
- type: this.pageType,
- esetId: this.esetId,
- keywordStr: this.keyWords
- })
- .then((result) => {
- this.isNoteStay = result.isNoteStay;
- if (result.result == "Success") {
- this.editAble = result.editAble;
- this.edoffersPrice = result.edoffersPrice;
- this.cansee = result.cansee;
- this.editDelCommitBtnDisabled = result.editDelCommitBtnDisabled;
- this.category3Option = result.category3Option;
- this.category4Option = result.category4Option;
- this.category5Option = result.category5Option;
- this.agencyProType = result.agencyProType;
- this.agencyProType1 = result.agencyProType1;
- this.OSHFLG = result.OSHFLG;
- this.hospitalName = result.hospitalName;
- this.contractName = result.contractName;
- this.contractLabel = "缁忛攢鍟嗘湁鏁堝悎鍚�";
- this.consumableorderdetailsRecordsview =
- result.consumableorderdetailsRecordsview;
- this.currentPage = 1;
- this.showCurrentReocrd();
- this.getAllChecked();
- this.attachmentRecoeds = result.attachmentRecoeds;
- console.log("attSize:" + this.attachmentRecoeds.length);
- for (var i in this.attachmentRecoeds) {
- this.attachmentRecoeds[i]["recordId"] =
- this.attachmentRecoeds[i].Concc.Id;
- this.attachmentRecoeds[i]["documentId"] =
- this.attachmentRecoeds[i].Concc.ContentDocumentId;
- this.attachmentRecoeds[i]["fileFullName"] =
- this.attachmentRecoeds[i].Concc.Title;
- var contractionName = this.attachmentRecoeds[i].Concc.Title;
- // var contractionName = '闀挎枃浠堕暱鏂囦欢闀挎枃浠堕暱鏂囦欢';
- if (contractionName.length > 25) {
- contractionName = contractionName.substr(0, 21) + "...";
+ //鍕鹃�夋搷浣�
+ checkRows(event){
+ this.selectRows = [];
+ const selectedRows = event.detail.selectedRows;
+ for(var i in this.consumableorderdetailsRecordsview){
+ var count = 0;
+ for(var j in selectedRows){
+ if(this.consumableorderdetailsRecordsview[i].recordId == selectedRows[j].recordId){
+ count++
+ console.log("checkId:"+selectedRows[j].recordId+'---'+this.consumableorderdetailsRecordsview[i].prodName);
}
- this.attachmentRecoeds[i]["fileName"] = contractionName;
- this.attachmentRecoeds[i]["ownerName"] =
- this.attachmentRecoeds[i].Concc.Owner.Name;
- this.attachmentRecoeds[i]["downloadUrl"] =
- "/sfc/servlet.shepherd/document/download/" +
- this.attachmentRecoeds[i].Concc.ContentDocumentId +
- "?operationContext=S1";
- // var date = this.attachmentRecoeds[i].Concc.CreatedDate;
- // var year = date.getFullYear();
- // var month = date.getMonth();
- // var day = date.getDay();
- // console.log(year+'-'+month+'-'+day);
- this.attachmentRecoeds[i]["updateDate"] = new Date(
- Date.parse(this.attachmentRecoeds[i].Concc.CreatedDate)
- ).toLocaleString();
- this.attachmentRecoeds[i]["attUrl"] =
- "/" + this.attachmentRecoeds[i].Concc.Id;
- this.attachmentRecoeds[i]["ownerUrl"] =
- "/" + this.attachmentRecoeds[i].Concc.OwnerId;
- }
- this.errorMsgs = result.errorMsgList;
- this.warningMsgs = result.warningMsgList;
- this.userWorkLocation = result.userWorkLocation;
- this.accountName = result.accountName;
- this.accountid = result.accountid;
- this.hospitalId = result.hospitalId;
- this.contractId = result.contractId;
- this.category_Goods = result.category_Goods;
- this.specialCampaign = result.specialCampaign;
- this.dealerProductId = result.dealerProductId;
- this.contactDealer = result.contactDealer;
- this.pageType = result.methodType;
- this.proLimitAndDate = result.proLimitAndDate;
- console.log(
- "proLimitAndDate:" + JSON.stringify(this.proLimitAndDate)
- );
- this.coc = result.coc;
- this.cocId = this.coc.Id;
- if (this.pageType == "hospitalorder" && this.agencyProType != "ET") {
- this.showHospital = true;
- }
- if (
- this.coc.Order_status__c == "宸叉彁浜�" ||
- this.coc.Order_status__c == "鎵瑰噯"
- ) {
- this.showOrderDate = true;
- }
- if (this.coc.Consumable_pdf_insert_day__c != null) {
- this.showAttUploadDate = true;
- }
- if (!(this.editAble || this.edoffersPrice)) {
- this.showEditBtn = true;
- this.showOfferPriceInputBtn = true;
- }
- if (
- this.coc.Order_status__c == "宸叉彁浜�" ||
- this.coc.Order_status__c == "鎵瑰噯" ||
- this.coc.Order_status__c == "椹冲洖"
- ) {
- this.disabledEditBtn = true;
- this.disabledUploadSheetBtn = true;
- this.disabledSubOrderbtn = true;
- this.disabledDeleteBtn = true;
- this.disabledOfferPriceInputBtn = true;
- }
- if (
- !(
- this.editDelCommitBtnDisabled ||
- this.editAble ||
- this.edoffersPrice
- )
- ) {
- this.showPrintSheetBtn = true;
- this.showUploadSheetBtn = true;
- this.showSubOrderbtn = true;
- this.showDeleteBtn = true;
- }
- if (
- (this.editDelCommitBtnDisabled ||
- this.editAble ||
- this.edoffersPrice) &&
- this.coc.Order_status__c != "椹冲洖"
- ) {
- this.showSaveOrderbtn1 = true;
- }
- if (this.coc.Order_status__c == "椹冲洖" && this.editAble) {
- this.showSaveOrderbtn2 = true;
- }
- if (this.coc.Order_status__c == "椹冲洖" && !this.editAble) {
- this.showReapplyBtn = true;
- }
- this.showSpinner = false;
- this.showPage = true;
- } else {
- this.showSpinner = false;
- console.log("Error:" + result.errorMsg);
- this.showMyToast("鍒濆鍖栭〉闈㈠け璐�", result.errorMsg, "error");
- }
- })
- .catch((error) => {
- this.showSpinner = false;
- console.log("error:" + error);
- this.showMyToast("鍒濆鍖栭〉闈㈠け璐�", error, "error");
- });
- }
-
- //鎺掑簭
- onHandleSort(event) {
- //灏嗗凡缁忛�夊ソ浜嗙殑鏀惧埌鍓嶉潰锛屼笉杩涜鎺掑簭
- console.log("sort");
- if (this.editAble) {
- const { fieldName: sortedBy, sortDirection } = event.detail;
- const cloneData = [...this.currentRecord];
- cloneData.sort(this.sortBy(sortedBy, sortDirection === "asc" ? 1 : -1));
- let index = 0;
- let selectedRows = this.template
- .querySelector("c-lex-custom-lightning-datatable")
- .getSelectedRows();
- let selectedRowsIds = [];
- for (var i in selectedRows) {
- selectedRowsIds.push(selectedRows[i].recordId);
+ }
+ if(count == 0){
+ this.consumableorderdetailsRecordsview[i].check = false;
+ }else{
+ this.consumableorderdetailsRecordsview[i].check = true;
+ this.selectRows.push(this.consumableorderdetailsRecordsview[i].recordId);
+ }
}
- console.log("selectedRowsIds = " + JSON.stringify(selectedRowsIds));
- for (var i = 0; i < cloneData.length; i++) {
- if (selectedRowsIds.indexOf(cloneData[i].recordId) != -1) {
- if (i != 0) {
- let temp = cloneData[index];
- cloneData[index] = cloneData[i];
- cloneData[i] = temp;
- }
- index++;
- }
- }
- this.currentRecord = cloneData;
- this.sortDirection = sortDirection;
- this.sortedBy = sortedBy;
- } else {
- const { fieldName: sortedBy, sortDirection } = event.detail;
- const cloneData = [...this.currentRecord];
- cloneData.sort(this.sortBy(sortedBy, sortDirection === "asc" ? 1 : -1));
- this.currentRecord = cloneData;
- this.sortDirection = sortDirection;
- this.sortedBy = sortedBy;
- }
- }
-
- sortBy(field, reverse, primer) {
- const key = primer
- ? function (x) {
- return primer(x[field]);
- }
- : function (x) {
- return x[field];
- };
-
- return function (a, b) {
- a = key(a);
- b = key(b);
- return reverse * ((a > b) - (b > a));
- };
- }
-
- //鏄惁鏈夎鍛�
- get hasWarning() {
- if (this.warningMsgs == null || this.warningMsgs.length == 0) {
- return false;
- }
- if (this.warningMsgs.length > 0) {
- return true;
- }
- }
-
- //鏄惁鏈夐敊璇�
- get hasError() {
- if (this.errorMsgs == null || this.errorMsgs.length == 0) {
- return false;
- }
- if (this.errorMsgs.length > 0) {
- return true;
- }
- }
-
- //鐗逛环change浜嬩欢
- offerPriceChange(event) {
- this.coc.Offers_Price__c = event.detail.value;
- }
-
- //娑堣�楀搧鍚嶇Оchange浜嬩欢
- category1Change(event) {
- this.category1 = event.detail.value;
- }
-
- //绗笁鍒嗙被change浜嬩欢
- category3Change(event) {
- this.showSpinner = true;
- this.category3 = event.detail.value;
- this.category4 = "";
- this.category5 = "";
- categoryAllload({
- agencyProTypeStr: this.agencyProType,
- category3Str: this.category3
- }).then((result) => {
- if (result.result == "Success") {
- this.category4Option = result.category4Option;
- this.category5Option = result.category5Option;
- this.showSpinner = false;
- } else {
- this.showSpinner = false;
- console.log("Error:" + result.errorMsg);
- this.showMyToast("鍔犺浇鍒嗙被澶辫触", result.errorMsg, "error");
- }
- });
- }
-
- //绗洓鍒嗙被change浜嬩欢
- category4Change(event) {
- this.showSpinner = true;
- this.category4 = event.detail.value;
- this.category5 = "";
- categoryload({
- agencyProTypeStr: this.agencyProType,
- category3Str: this.category3,
- category4Str: this.category4
- }).then((result) => {
- if (result.result == "Success") {
- this.category4Option = result.category4Option;
- this.category5Option = result.category5Option;
- this.showSpinner = false;
- } else {
- this.showSpinner = false;
- console.log("Error:" + result.errorMsg);
- this.showMyToast("鍔犺浇鍒嗙被澶辫触", result.errorMsg, "error");
- }
- });
- }
-
- //绗簲鍒嗙被change浜嬩欢
- category5Change(event) {
- this.category5 = event.detail.value;
- }
-
- //鎼滅储浜у搧
- searchProduct(event) {
- this.showSpinner = true;
- searchConsumableorderdetails({
- userWorkLocationStr: this.userWorkLocation,
- agencyProTypeStr: this.agencyProType,
- accountNameStr: this.accountName,
- accountIdStr: this.accountid,
- contractIdStr: this.contractId,
- hospitalIdStr: this.hospitalId,
- category1Str: this.category1,
- category3Str: this.category3,
- category4Str: this.category4,
- category5Str: this.category5,
- category_GoodStr: this.category_Goods,
- specialCampaignStr: this.specialCampaign,
- dealerProductIdStr: JSON.stringify(this.dealerProductId),
- methodTypeStr: this.pageType,
- editAbleStr: this.editAble,
- consumableorderdetailsRecordsviewStr: JSON.stringify(
- this.consumableorderdetailsRecordsview
- ),
- proLimitAndDateList: this.proLimitAndDate
- })
- .then((result) => {
- if (result.result == "Success") {
- this.consumableorderdetailsRecordsview =
- result.consumableorderdetailsRecordsview;
- this.currentPage = 1;
- this.currentRecord = [];
- this.showCurrentReocrd();
- this.getAllChecked();
- this.showSpinner = false;
- this.errorMsgs = result.errorMsgList;
- this.warningMsgs = result.warningMsgList;
- // this.hasError = result.hasError;
- // this.hasWarning = result.hasWarning;
- this.showMyToast("鎼滅储鎴愬姛", result.errorMsg, "success");
- } else {
- this.showSpinner = false;
- console.log("Error:" + result.errorMsg);
- if (result.errorMsg == "娌℃湁鎼滅储鍒扮浉鍏虫暟鎹�") {
- this.showMyToast(result.errorMsg, "", "error");
- } else {
- this.showMyToast("鎼滅储澶辫触", result.errorMsg, "error");
- }
- }
- })
- .catch((error) => {
- console.log("Error:" + error);
- });
- }
-
- //娓呴櫎鎼滅储鏍�
- clear(event) {
- this.category1 = "";
- this.category3 = "";
- this.category4 = "";
- this.category5 = "";
- this.showSpinner = true;
- searchConsumableorderdetails({
- userWorkLocationStr: this.userWorkLocation,
- agencyProTypeStr: this.agencyProType,
- accountNameStr: this.accountName,
- accountIdStr: this.accountid,
- contractIdStr: this.contractId,
- hospitalIdStr: this.hospitalId,
- category1Str: this.category1,
- category3Str: this.category3,
- category4Str: this.category4,
- category5Str: this.category5,
- category_GoodStr: this.category_Goods,
- specialCampaignStr: this.specialCampaign,
- dealerProductIdStr: JSON.stringify(this.dealerProductId),
- methodTypeStr: this.pageType,
- editAbleStr: this.editAble,
- consumableorderdetailsRecordsviewStr: JSON.stringify(
- this.consumableorderdetailsRecordsview
- ),
- proLimitAndDateList: this.proLimitAndDate
- }).then((result) => {
- if (result.result == "Success") {
- this.consumableorderdetailsRecordsview =
- result.consumableorderdetailsRecordsview;
- this.currentPage = 1;
- this.currentRecord = [];
- this.showCurrentReocrd();
- this.getAllChecked();
- this.showSpinner = false;
- this.showMyToast("鎼滅储鎴愬姛", result.errorMsg, "success");
- } else {
- this.showSpinner = false;
- console.log("Error:" + result.errorMsg);
- if (result.errorMsg == "娌℃湁鎼滅储鍒扮浉鍏虫暟鎹�") {
- this.showMyToast(result.errorMsg, "", "error");
- } else {
- this.showMyToast("鎼滅储澶辫触", result.errorMsg, "error");
- }
- }
- });
- }
-
- //閫夋嫨鎵�鏈�
- checkAll(event) {
- for (
- let i = 0, len = this.consumableorderdetailsRecordsview.length;
- i < len;
- i++
- ) {
- this.consumableorderdetailsRecordsview[i].check = event.target.checked;
- }
- }
-
- //閫夋嫨
- check(event) {
- let index = event.target.getAttribute("data-index");
- this.consumableorderdetailsRecordsview[index].check = event.target.checked;
- }
-
- //閲囪喘鏁伴噺change浜嬩欢
- // consumableCountChange(event){
- // let index = event.target.getAttribute("data-index");
- // var value = event.target.value;
- // this.consumableorderdetailsRecordsview[index].esd.Consumable_count__c = value;
- // if(isNaN(value)){
- // value=0.00;
- // }
- // if(value != null && value !=0 && value!=''){
- // this.consumableorderdetailsRecordsview[index].check = true;
- // }else{
- // this.consumableorderdetailsRecordsview[index].check = false;
- // }
- // }
-
- //淇濆瓨璁㈠崟
- saveOrder(event) {
- this.showSpinner = true;
- console.log("start save");
- save({
- contractNameStr: this.contractName,
- cocStr: JSON.stringify(this.coc),
- agencyProTypeStr: this.agencyProType,
- accountidStr: this.accountid,
- consumableorderdetailsRecordsviewStr: JSON.stringify(
- this.consumableorderdetailsRecordsview
- ),
- contactDealerStr: JSON.stringify(this.contactDealer),
- methodTypeStr: this.pageType,
- eSetIdStr: this.esetId,
- hospitalIdStr: this.hospitalId,
- contractIdStr: this.contractId,
- agencyProType1Str: this.agencyProType1,
- OSHFLGStr: this.OSHFLG
- }).then((result) => {
- this.showSpinner = false;
- if (result.result == "Success") {
- this.esetId = result.eSetId;
- const config = {
- type: "standard__webPage",
- attributes: {
- url:
- "/lexconsumable?ESetid=" + this.esetId + "&type=" + this.pageType
- }
- };
- this[NavigationMixin.Navigate](config);
- } else {
- this.showSpinner = false;
- console.log("Error:" + result.errorMsg);
- this.showMyToast("淇濆瓨澶辫触", result.errorMsg, "error");
- }
- });
- }
-
- //淇濆瓨璁㈠崟锛堥┏鍥烇級
- orderCopy(event) {
- this.showSpinner = true;
- ordrCopy({
- contractNameStr: this.contractName,
- cocStr: JSON.stringify(this.coc),
- agencyProTypeStr: this.agencyProType,
- accountidStr: this.accountid,
- consumableorderdetailsRecordsviewStr: JSON.stringify(
- this.consumableorderdetailsRecordsview
- ),
- contactDealerStr: JSON.stringify(this.contactDealer),
- methodTypeStr: this.pageType,
- hospitalIdStr: this.hospitalId,
- contractIdStr: this.contractId,
- agencyProType1Str: this.agencyProType1,
- OSHFLGStr: this.OSHFLG
- }).then((result) => {
- this.showSpinner = false;
- if (result.result == "Success") {
- this.esetId = result.eSetId;
- const config = {
- type: "standard__webPage",
- attributes: {
- url:
- "/lexconsumable?ESetid=" + this.esetId + "&type=" + this.pageType
- }
- };
- this[NavigationMixin.Navigate](config);
- } else {
- this.showSpinner = false;
- console.log("Error:" + result.errorMsg);
- this.showMyToast("淇濆瓨澶辫触", result.errorMsg, "error");
- }
- });
- }
-
- //缂栬緫
- editOrder(event) {
- setEditAble({ eSetidStr: this.esetId }).then((result) => {
- if (result.result == "Success") {
- const config = {
- type: "standard__webPage",
- attributes: {
- url: result.url
- }
- };
- this[NavigationMixin.Navigate](config);
- } else {
- this.showSpinner = false;
- console.log("Error:" + result.errorMsg);
- this.showMyToast("缂栬緫澶辫触", result.errorMsg, "error");
- }
- });
- }
-
- //鎵撳嵃閰嶇疆鍗�
- printOrder(event) {
- var site = window.location.origin;
- const config = {
- type: "standard__webPage",
- attributes: {
- url: site + "/consumable/PrintConsumblePDF?ESetid=" + this.esetId
- }
- };
- this[NavigationMixin.Navigate](config);
- }
-
- //涓婁紶閰嶇疆鍗�
- uploadOrder(event) {
- this.showAttPop = true;
- }
-
- //鎻愪氦璁㈠崟
- submitOrder(event) {
- sorder({ eSetidStr: this.esetId, accountidStr: this.accountid })
- .then((result) => {
- if (result.result == "Success") {
- const config = {
- type: "standard__webPage",
- attributes: {
- url: result.url
+ for(var i in this.selectRows){
+ console.log("checkId1:"+this.selectRows[i]);
+ for(var i in this.currentRecord){
+ if(this.currentRecord[i].recordId == this.selectRows[i]){
+ console.log("currentRecord:"+this.selectRows[i]);
}
- };
- this[NavigationMixin.Navigate](config);
- } else {
- this.showSpinner = false;
- this.errorMsgs = result.errorMsgList;
- this.warningMsgs = result.warningMsgList;
- console.log("Error:" + result.errorMsg);
- if (result.errorMsg.indexOf("璇蜂笂浼犺璐ч厤缃崟闄勪欢") != -1) {
- result.errorMsg = "璇蜂笂浼犺璐ч厤缃崟闄勪欢";
- }
- this.showMyToast("鎻愪氦澶辫触", result.errorMsg, "error");
- }
- })
- .catch((error) => {
- console.log("Error:" + error);
- });
- }
-
- //鍒犻櫎璁㈠崟
- deleteOrder(event) {
- if (!window.confirm("鍒犻櫎鏄笉鍙仮澶嶇殑锛屼綘纭瑕佸垹闄ゅ悧锛�")) {
- return;
- }
- delConsumable({ eSetidStr: this.esetId }).then((result) => {
- if (result.result == "Success") {
- const config = {
- type: "standard__webPage",
- attributes: {
- url: result.url
- }
- };
- this[NavigationMixin.Navigate](config);
- } else {
- this.showSpinner = false;
- console.log("Error:" + result.errorMsg);
- this.showMyToast("鍒犻櫎澶辫触", result.errorMsg, "error");
+ }
}
- });
- }
+ }
- //鐗逛环閲戦褰曞叆
- inputOfferPrice(event) {
- this.edoffersPrice = true;
- if (!(this.editAble || this.edoffersPrice)) {
- this.showEditBtn = true;
- this.showOfferPriceInputBtn = true;
- } else {
- this.showEditBtn = false;
- this.showOfferPriceInputBtn = false;
- }
- if (
- !(this.editDelCommitBtnDisabled || this.editAble || this.edoffersPrice)
- ) {
- this.showPrintSheetBtn = true;
- this.showUploadSheetBtn = true;
- this.showSubOrderbtn = true;
- this.showDeleteBtn = true;
- } else {
- this.showPrintSheetBtn = false;
- this.showUploadSheetBtn = false;
- this.showSubOrderbtn = false;
- this.showDeleteBtn = false;
- }
- if (
- (this.editDelCommitBtnDisabled || this.editAble || this.edoffersPrice) &&
- this.coc.Order_status__c != "椹冲洖"
- ) {
- this.showSaveOrderbtn1 = true;
- } else {
- this.showSaveOrderbtn1 = false;
- }
- }
-
- //鍐嶇敵璇�
- reapplyOrder(event) {
- backOrder({ eSetidStr: this.esetId }).then((result) => {
- if (result.result == "Success") {
- const config = {
- type: "standard__webPage",
- attributes: {
- url: result.url
- }
- };
- this[NavigationMixin.Navigate](config);
- } else {
- this.showSpinner = false;
- console.log("Error:" + result.errorMsg);
- this.showMyToast("鍐嶇敵璇峰け璐�", result.errorMsg, "error");
+ //閲囪喘鏁伴噺鑾峰彇
+ conCountChange(event){
+ var recordId = event.detail.data.recordId;
+ var conCount = event.detail.data.value;
+ console.log('countChange:'+recordId+'---'+conCount);
+ for(var i in this.consumableorderdetailsRecordsview){
+ if(this.consumableorderdetailsRecordsview[i].recordId == recordId){
+ this.consumableorderdetailsRecordsview[i].esd.Consumable_count__c = conCount;
+ this.consumableorderdetailsRecordsview[i].consumableCount = conCount;
+ if(conCount != null && conCount !=0 && conCount!=''){
+ this.consumableorderdetailsRecordsview[i].check = true;
+ }else{
+ this.consumableorderdetailsRecordsview[i].check = false;
+ this.consumableorderdetailsRecordsview[i].esd.Consumable_count__c = null;
+ this.consumableorderdetailsRecordsview[i].consumableCount = null;
+ }
+ }
}
- });
- }
-
- //闄勪欢change浜嬩欢
- attChange(event) {
- if (event.target.files.length > 0) {
- this.filesUploaded = event.target.files;
- this.fileName = event.target.files[0].name;
- console.log("this.fileName:" + this.fileName);
- }
- }
-
- //鏄惁鏄剧ず闄勪欢绉婚櫎
- get attDelBtn() {
- if (
- this.fileName != "" &&
- this.fileName != null &&
- this.fileName != "璇烽�夋嫨涓�涓枃浠朵笂浼�"
- ) {
- return true;
- } else {
- return false;
- }
- }
-
- //鍏抽棴闄勪欢寮圭獥
- closePop() {
- this.showAttPop = false;
- this.filesUploaded = [];
- this.fileName = null;
- }
-
- //绉婚櫎闄勪欢
- removeAtt() {
- this.filesUploaded = [];
- this.fileName = "";
- }
-
- //涓婁紶闄勪欢
- uploadAtt(event) {
- if (this.filesUploaded.length > 0) {
- this.file = this.filesUploaded[0];
- if (this.file.size > this.MAX_FILE_SIZE) {
- window.console.log("鏂囦欢杩囧ぇ");
- return;
+ this.getAllChecked();
+ for(var i in this.currentRecord){
+ if(this.currentRecord[i].recordId == recordId){
+ console.log("currentRecord1:"+this.currentRecord[i].esd.Consumable_count__c);
+ }
}
- this.fileReader = new FileReader();
+ }
- this.fileReader.onloadend = () => {
- this.fileContents = this.fileReader.result;
- let base64 = "base64,";
- this.content = this.fileContents.indexOf(base64) + base64.length;
- this.fileContents = this.fileContents.substring(this.content);
- this.saveToFile();
+ //閲囪喘鏁伴噺澶辩劍
+ conCountBlur(event){
+ var conCount = event.detail.data.value;
+ var allnumber = event.detail.data.allnumber;
+ var upperLimit = event.detail.data.upperLimit;
+ var lowerLimit = event.detail.data.lowerLimit;
+ console.log('limit:'+conCount+'---'+ allnumber+'---'+lowerLimit+'---'+allnumber);
+ if(upperLimit != null && lowerLimit != null && conCount != null && allnumber != null){
+ if(parseInt(allnumber) + parseInt(conCount) > upperLimit){
+ // window.alert("璇ヤ骇鍝佽璐暟閲忚秴鍑哄簱瀛樹笂闄愶紒");
+ this.showMyToast('璇ヤ骇鍝佽璐暟閲忚秴鍑哄簱瀛樹笂闄愶紒','','error');
+ }
+ if(parseInt(allnumber) + parseInt(conCount) < lowerLimit){
+ // window.alert("璇ヤ骇鍝佽璐暟閲忎綆浜庡簱瀛樹笅闄愶紒");
+ this.showMyToast('璇ヤ骇鍝佽璐暟閲忎綆浜庡簱瀛樹笅闄愶紒','','error');
+ }
+ }
+ }
+
+ @wire(CurrentPageReference)
+ getStateParameters(currentPageReference) {
+ console.log('CurrentPageReference');
+ if (currentPageReference) {
+ this.pageType = currentPageReference.state?.type;
+ this.esetId = currentPageReference.state?.ESetid;
+ this.keyWords = currentPageReference.state?.KeyWords;
+ console.log('type:'+this.pageType);
+ console.log('esetId:'+this.esetId);
+ console.log('keyWords:'+this.keyWords);
+ }
+ }
+
+ renderedCallback(){
+ if (!this.stylesLoaded) {
+ Promise.all([loadStyle(this, WrappedHeaderTable)])
+ .then(() => {
+ console.log("Custom styles loaded");
+ this.stylesLoaded = true;
+ })
+ .catch((error) => {
+ console.error("Error loading custom styles");
+ });
+ }
+ }
+
+ //椤甸潰鍒濆鍖�
+ connectedCallback(){
+ this.showSpinner = true;
+ initPage({type:this.pageType, esetId:this.esetId, keywordStr:this.keyWords})
+ .then(result=>{
+ this.isNoteStay = result.isNoteStay;
+ if(result.result == 'Success'){
+ this.editAble = result.editAble;
+ this.edoffersPrice = result.edoffersPrice;
+ this.cansee = result.cansee;
+ this.editDelCommitBtnDisabled = result.editDelCommitBtnDisabled;
+ this.category3Option = result.category3Option;
+ this.category4Option = result.category4Option;
+ this.category5Option = result.category5Option;
+ this.agencyProType = result.agencyProType;
+ this.agencyProType1 = result.agencyProType1;
+ this.OSHFLG = result.OSHFLG;
+ this.hospitalName = result.hospitalName;
+ this.contractName = result.contractName;
+ this.contractLabel = '缁忛攢鍟嗘湁鏁堝悎鍚�';
+ this.consumableorderdetailsRecordsview = result.consumableorderdetailsRecordsview;
+ this.currentPage = 1;
+ this.showCurrentReocrd();
+ this.getAllChecked();
+ this.attachmentRecoeds = result.attachmentRecoeds;
+ console.log("attSize:"+this.attachmentRecoeds.length);
+ for(var i in this.attachmentRecoeds){
+ this.attachmentRecoeds[i]['recordId'] = this.attachmentRecoeds[i].Concc.Id;
+ this.attachmentRecoeds[i]['documentId'] = this.attachmentRecoeds[i].Concc.ContentDocumentId;
+ this.attachmentRecoeds[i]['fileFullName'] = this.attachmentRecoeds[i].Concc.Title;
+ var contractionName = this.attachmentRecoeds[i].Concc.Title;
+ // var contractionName = '闀挎枃浠堕暱鏂囦欢闀挎枃浠堕暱鏂囦欢';
+ if(contractionName.length > 25){
+ contractionName = contractionName.substr(0,21) + "...";
+ }
+ this.attachmentRecoeds[i]['fileName'] = contractionName;
+ this.attachmentRecoeds[i]['ownerName'] = this.attachmentRecoeds[i].Concc.Owner.Name;
+ this.attachmentRecoeds[i]['downloadUrl'] = '/sfc/servlet.shepherd/document/download/'+this.attachmentRecoeds[i].Concc.ContentDocumentId+'?operationContext=S1';
+ // var date = this.attachmentRecoeds[i].Concc.CreatedDate;
+ // var year = date.getFullYear();
+ // var month = date.getMonth();
+ // var day = date.getDay();
+ // console.log(year+'-'+month+'-'+day);
+ this.attachmentRecoeds[i]['updateDate'] = new Date(Date.parse(this.attachmentRecoeds[i].Concc.CreatedDate)).toLocaleString();
+ this.attachmentRecoeds[i]['attUrl'] = '/'+this.attachmentRecoeds[i].Concc.Id;
+ this.attachmentRecoeds[i]['ownerUrl'] = '/'+this.attachmentRecoeds[i].Concc.OwnerId;
+ }
+ this.errorMsgs = result.errorMsgList;
+ this.warningMsgs = result.warningMsgList;
+ this.userWorkLocation = result.userWorkLocation;
+ this.accountName = result.accountName;
+ this.accountid = result.accountid;
+ this.hospitalId = result.hospitalId;
+ this.contractId = result.contractId;
+ this.category_Goods = result.category_Goods;
+ this.specialCampaign = result.specialCampaign;
+ this.dealerProductId = result.dealerProductId;
+ this.contactDealer = result.contactDealer;
+ this.pageType = result.methodType;
+ this.proLimitAndDate = result.proLimitAndDate;
+ console.log("proLimitAndDate:"+JSON.stringify(this.proLimitAndDate));
+ this.coc = result.coc;
+ this.cocId = this.coc.Id;
+ if(this.pageType == 'hospitalorder' && this.agencyProType != 'ET'){
+ this.showHospital = true;
+ }
+ if(this.coc.Order_status__c == "宸叉彁浜�" || this.coc.Order_status__c == "鎵瑰噯"){
+ this.showOrderDate = true;
+ }
+ if(this.coc.Consumable_pdf_insert_day__c != null){
+ this.showAttUploadDate = true;
+ }
+ if(!(this.editAble || this.edoffersPrice)){
+ this.showEditBtn = true;
+ this.showOfferPriceInputBtn = true;
+ }
+ if(this.coc.Order_status__c == "宸叉彁浜�" || this.coc.Order_status__c == "鎵瑰噯" || this.coc.Order_status__c == "椹冲洖"){
+ this.disabledEditBtn = true;
+ this.disabledUploadSheetBtn = true;
+ this.disabledSubOrderbtn = true;
+ this.disabledDeleteBtn = true;
+ this.disabledOfferPriceInputBtn = true;
+ }
+ if(!(this.editDelCommitBtnDisabled || this.editAble || this.edoffersPrice)){
+ this.showPrintSheetBtn = true;
+ this.showUploadSheetBtn = true;
+ this.showSubOrderbtn = true;
+ this.showDeleteBtn = true;
+ }
+ if((this.editDelCommitBtnDisabled || this.editAble || this.edoffersPrice) && this.coc.Order_status__c != "椹冲洖"){
+ this.showSaveOrderbtn1 = true;
+ }
+ if(this.coc.Order_status__c == "椹冲洖" && this.editAble){
+ this.showSaveOrderbtn2 = true;
+ }
+ if(this.coc.Order_status__c == "椹冲洖" && !this.editAble){
+ this.showReapplyBtn = true;
+ }
+ this.showSpinner = false;
+ this.showPage = true;
+ }else{
+ this.showSpinner = false;
+ console.log("Error:"+result.errorMsg);
+ this.showMyToast('鍒濆鍖栭〉闈㈠け璐�',result.errorMsg,'error');
+ }
+ })
+ .catch(error=>{
+ this.showSpinner = false;
+ console.log("error:"+error);
+ this.showMyToast('鍒濆鍖栭〉闈㈠け璐�',error,'error');
+ })
+ }
+
+ //鎺掑簭
+ onHandleSort(event){
+ //灏嗗凡缁忛�夊ソ浜嗙殑鏀惧埌鍓嶉潰锛屼笉杩涜鎺掑簭
+ console.log('sort');
+ if(this.editAble){
+ const { fieldName: sortedBy, sortDirection } = event.detail;
+ const cloneData = [...this.currentRecord];
+ cloneData.sort(this.sortBy(sortedBy, sortDirection === 'asc' ? 1 : -1));
+ let index = 0;
+ let selectedRows = this.template.querySelector('c-lex-custom-lightning-datatable').getSelectedRows();
+ let selectedRowsIds = [];
+ for(var i in selectedRows){
+ selectedRowsIds.push(selectedRows[i].recordId);
+ }
+ console.log('selectedRowsIds = ' + JSON.stringify(selectedRowsIds));
+ for(var i = 0;i < cloneData.length ; i++){
+ if(selectedRowsIds.indexOf(cloneData[i].recordId) != -1){
+ if(i != 0){
+ let temp = cloneData[index];
+ cloneData[index] = cloneData[i];
+ cloneData[i] = temp;
+ }
+ index++;
+ }
+ }
+ this.currentRecord = cloneData;
+ this.sortDirection = sortDirection;
+ this.sortedBy = sortedBy;
+ }else{
+ const { fieldName: sortedBy, sortDirection } = event.detail;
+ const cloneData = [...this.currentRecord];
+ cloneData.sort(this.sortBy(sortedBy, sortDirection === 'asc' ? 1 : -1));
+ this.currentRecord = cloneData;
+ this.sortDirection = sortDirection;
+ this.sortedBy = sortedBy;
+ }
+ }
+
+ sortBy(field, reverse, primer) {
+ const key = primer
+ ? function (x) {
+ return primer(x[field]);
+ }
+ : function (x) {
+ return x[field];
+ };
+
+ return function (a, b) {
+ a = key(a);
+ b = key(b);
+ return reverse * ((a > b) - (b > a));
};
- this.fileReader.readAsDataURL(this.file);
- } else {
- this.fileName = "璇烽�夋嫨涓�涓枃浠朵笂浼�";
- }
- }
-
- //璋冪敤涓婁紶闄勪欢鍚庡彴鏂规硶
- saveToFile() {
- this.showPopSpinner = true;
- filesUpload({
- pId: this.esetId,
- fileName: this.file.name,
- base64Data: encodeURIComponent(this.fileContents)
- })
- .then((result) => {
- this.showPopSpinner = false;
- if (result.result == "Success") {
- this.closePop();
- window.location.reload();
- } else {
- console.log("Error:" + result.errorMsg);
- this.showMyToast("涓婁紶澶辫触", result.errorMsg, "error");
- }
- })
- .catch((error) => {
- this.showPopSpinner = false;
- this.showMyToast("涓婁紶澶辫触", error, "error");
- });
- }
-
- //鍒犻櫎闄勪欢
- deleteAtt(event) {
- this.showSpinner = true;
- var recordId = event.target.getAttribute("data-fileid");
- console.log("attid:" + recordId);
- deleteAtt({ contentVersionId: recordId })
- .then((result) => {
- this.showSpinner = false;
- if (result.result == "Success") {
- window.location.reload();
- } else {
- console.log("Error:" + result.errorMsg);
- this.showMyToast("鍒犻櫎澶辫触", result.errorMsg, "error");
- }
- })
- .catch((error) => {
- this.showSpinner = false;
- console.log("Error:" + error);
- this.showMyToast("鍒犻櫎澶辫触", JSON.stringify(error), "error");
- });
- }
-
- //棰勮闄勪欢
- previweAtt(event) {
- var recordId = event.target.getAttribute("data-fileid");
- console.log(recordId);
- this[NavigationMixin.Navigate]({
- type: "standard__namedPage",
- attributes: {
- pageName: "filePreview"
- },
- state: {
- recordIds: recordId,
- selectedRecordId: recordId
+ }
+
+ //鏄惁鏈夎鍛�
+ get hasWarning(){
+ if(this.warningMsgs == null || this.warningMsgs.length == 0){
+ return false;
}
- });
- }
+ if(this.warningMsgs.length > 0){
+ return true;
+ }
+ }
- //鎵撳紑鎼滅储寮圭獥锛屽苟鍒濆鍖栧脊绐�
- showSearchHos(event) {
- initHospital()
- .then((result) => {
- if (result.result == "Success") {
- this.showAttHosPop = true;
- this.hospitalList = result.attList;
- for (var i in this.hospitalList) {
- if (this.hospitalList[i].State_Master__c) {
- this.hospitalList[i]["StateMaster"] =
- this.hospitalList[i].State_Master__r.Name;
+ //鏄惁鏈夐敊璇�
+ get hasError(){
+ if(this.errorMsgs == null || this.errorMsgs.length == 0){
+ return false;
+ }
+ if(this.errorMsgs.length > 0){
+ return true;
+ }
+ }
+
+ //鐗逛环change浜嬩欢
+ offerPriceChange(event){
+ this.coc.Offers_Price__c = event.detail.value;
+ }
+
+ //娑堣�楀搧鍚嶇Оchange浜嬩欢
+ category1Change(event){
+ this.category1 = event.detail.value;
+ }
+
+ //绗笁鍒嗙被change浜嬩欢
+ category3Change(event){
+ this.showSpinner = true;
+ this.category3 = event.detail.value;
+ this.category4 = '';
+ this.category5 = '';
+ categoryAllload({agencyProTypeStr:this.agencyProType, category3Str:this.category3})
+ .then(result=>{
+ if(result.result == 'Success'){
+ this.category4Option = result.category4Option;
+ this.category5Option = result.category5Option;
+ this.showSpinner = false;
+ }else{
+ this.showSpinner = false;
+ console.log("Error:"+result.errorMsg);
+ this.showMyToast('鍔犺浇鍒嗙被澶辫触',result.errorMsg,'error');
}
- }
- } else {
- console.log("Error:" + result.errorMsg);
- this.showMyToast("鍒濆鍖栨绱㈠尰闄㈤〉闈㈠け璐�", result.errorMsg, "error");
- }
+ })
+ }
+
+ //绗洓鍒嗙被change浜嬩欢
+ category4Change(event){
+ this.showSpinner = true;
+ this.category4 = event.detail.value;
+ this.category5 = '';
+ categoryload({agencyProTypeStr:this.agencyProType, category3Str:this.category3, category4Str:this.category4})
+ .then(result=>{
+ if(result.result == 'Success'){
+ this.category4Option = result.category4Option;
+ this.category5Option = result.category5Option;
+ this.showSpinner = false;
+ }else{
+ this.showSpinner = false;
+ console.log("Error:"+result.errorMsg);
+ this.showMyToast('鍔犺浇鍒嗙被澶辫触',result.errorMsg,'error');
+ }
+ })
+ }
+
+ //绗簲鍒嗙被change浜嬩欢
+ category5Change(event){
+ this.category5 = event.detail.value;
+ }
+
+ //鎼滅储浜у搧
+ searchProduct(event){
+ this.showSpinner = true;
+ searchConsumableorderdetails({userWorkLocationStr:this.userWorkLocation,
+ agencyProTypeStr:this.agencyProType,
+ accountNameStr:this.accountName,
+ accountIdStr:this.accountid,
+ contractIdStr:this.contractId,
+ hospitalIdStr:this.hospitalId,
+ category1Str:this.category1,
+ category3Str:this.category3,
+ category4Str:this.category4,
+ category5Str:this.category5,
+ category_GoodStr:this.category_Goods,
+ specialCampaignStr:this.specialCampaign,
+ dealerProductIdStr:JSON.stringify(this.dealerProductId),
+ methodTypeStr:this.pageType,
+ editAbleStr:this.editAble,
+ consumableorderdetailsRecordsviewStr:JSON.stringify(this.consumableorderdetailsRecordsview),
+ proLimitAndDateList : this.proLimitAndDate
})
- .catch((error) => {
- console.log("Error:" + error);
- this.showMyToast("鍒濆鍖栨绱㈠尰闄㈤〉闈㈠け璐�", error, "error");
- });
- }
+ .then(result=>{
+ if(result.result == 'Success'){
+ this.consumableorderdetailsRecordsview = result.consumableorderdetailsRecordsview;
+ this.currentPage = 1;
+ this.currentRecord = [];
+ this.showCurrentReocrd();
+ this.getAllChecked();
+ this.showSpinner = false;
+ this.errorMsgs = result.errorMsgList;
+ this.warningMsgs = result.warningMsgList;
+ // this.hasError = result.hasError;
+ // this.hasWarning = result.hasWarning;
+ this.showMyToast('鎼滅储鎴愬姛',result.errorMsg,'success');
+ }else{
+ this.showSpinner = false;
+ console.log("Error:"+result.errorMsg);
+ if(result.errorMsg == '娌℃湁鎼滅储鍒扮浉鍏虫暟鎹�'){
+ this.showMyToast(result.errorMsg,'','error');
+ }else{
+ this.showMyToast('鎼滅储澶辫触',result.errorMsg,'error');
+ }
+ }
+ })
+ .catch(error=>{
+ console.log("Error:"+error);
+ })
+ }
- //妫�绱㈠尰闄�
- searchHos(event) {
- searchHospital({
- searchName: this.searchNameHos,
- accountId: this.accountid
- })
- .then((result) => {
- if (result.result == "Success") {
- this.hospitalList = result.attList;
- for (var i in this.hospitalList) {
- if (this.hospitalList[i].State_Master__c) {
- this.hospitalList[i]["StateMaster"] =
- this.hospitalList[i].State_Master__r.Name;
+ //娓呴櫎鎼滅储鏍�
+ clear(event){
+ this.category1 = '';
+ this.category3 = '';
+ this.category4 = '';
+ this.category5 = '';
+ this.showSpinner = true;
+ searchConsumableorderdetails({
+ userWorkLocationStr:this.userWorkLocation,
+ agencyProTypeStr:this.agencyProType,
+ accountNameStr:this.accountName,
+ accountIdStr:this.accountid,
+ contractIdStr:this.contractId,
+ hospitalIdStr:this.hospitalId,
+ category1Str:this.category1,
+ category3Str:this.category3,
+ category4Str:this.category4,
+ category5Str:this.category5,
+ category_GoodStr:this.category_Goods,
+ specialCampaignStr:this.specialCampaign,
+ dealerProductIdStr:JSON.stringify(this.dealerProductId),
+ methodTypeStr:this.pageType,
+ editAbleStr:this.editAble,
+ consumableorderdetailsRecordsviewStr:JSON.stringify(this.consumableorderdetailsRecordsview),
+ proLimitAndDateList : this.proLimitAndDate
+ }).then(result=>{
+ if(result.result == 'Success'){
+ this.consumableorderdetailsRecordsview = result.consumableorderdetailsRecordsview;
+ this.currentPage = 1;
+ this.currentRecord = [];
+ this.showCurrentReocrd();
+ this.getAllChecked();
+ this.showSpinner = false;
+ this.showMyToast('鎼滅储鎴愬姛',result.errorMsg,'success');
+ }else{
+ this.showSpinner = false;
+ console.log("Error:"+result.errorMsg);
+ if(result.errorMsg == '娌℃湁鎼滅储鍒扮浉鍏虫暟鎹�'){
+ this.showMyToast(result.errorMsg,'','error');
+ }else{
+ this.showMyToast('鎼滅储澶辫触',result.errorMsg,'error');
+ }
}
- }
- } else {
- console.log("Error:" + result.errorMsg);
- this.showMyToast("鎼滅储澶辫触", result.errorMsg, "error");
- }
+ })
+ }
+
+ //閫夋嫨鎵�鏈�
+ checkAll(event){
+ for(let i=0, len=this.consumableorderdetailsRecordsview.length; i < len ;i++){
+ this.consumableorderdetailsRecordsview[i].check = event.target.checked;
+ }
+ }
+
+ //閫夋嫨
+ check(event){
+ let index = event.target.getAttribute("data-index");
+ this.consumableorderdetailsRecordsview[index].check = event.target.checked;
+ }
+
+ //閲囪喘鏁伴噺change浜嬩欢
+ // consumableCountChange(event){
+ // let index = event.target.getAttribute("data-index");
+ // var value = event.target.value;
+ // this.consumableorderdetailsRecordsview[index].esd.Consumable_count__c = value;
+ // if(isNaN(value)){
+ // value=0.00;
+ // }
+ // if(value != null && value !=0 && value!=''){
+ // this.consumableorderdetailsRecordsview[index].check = true;
+ // }else{
+ // this.consumableorderdetailsRecordsview[index].check = false;
+ // }
+ // }
+
+ //淇濆瓨璁㈠崟
+ saveOrder(event){
+ this.showSpinner = true;
+ console.log('start save');
+ save({
+ contractNameStr:this.contractName,
+ cocStr:JSON.stringify(this.coc),
+ agencyProTypeStr:this.agencyProType,
+ accountidStr:this.accountid,
+ consumableorderdetailsRecordsviewStr:JSON.stringify(this.consumableorderdetailsRecordsview),
+ contactDealerStr:JSON.stringify(this.contactDealer),
+ methodTypeStr:this.pageType,
+ eSetIdStr:this.esetId,
+ hospitalIdStr : this.hospitalId,
+ contractIdStr : this.contractId,
+ agencyProType1Str : this.agencyProType1,
+ OSHFLGStr : this.OSHFLG
+ }).then(result=>{
+ this.showSpinner = false;
+ if(result.result == 'Success'){
+ this.esetId = result.eSetId;
+ const config = {
+ type: 'standard__webPage',
+ attributes: {
+ url: '/lexconsumable?ESetid=' + this.esetId + '&type=' + this.pageType
+ }
+ };
+ this[NavigationMixin.Navigate](config);
+ }else{
+ this.showSpinner = false;
+ console.log("Error:"+result.errorMsg);
+ this.showMyToast('淇濆瓨澶辫触',result.errorMsg,'error');
+ }
})
- .catch((error) => {
- console.log("Error:" + error);
- this.showMyToast("鎼滅储澶辫触", error, "error");
- });
- }
+ }
- //鍖婚櫌鍚嶇Оchange
- searchNameHosChange(event) {
- this.searchNameHos = event.detail.value;
- }
-
- //鍏抽棴寮圭獥
- closeHospitalPop() {
- this.showAttHosPop = false;
- this.chooseHospital = "";
- this.chooseHospitalId = "";
- }
-
- // //閫夋嫨鍖婚櫌
- // chooseHos(event){
- // var hosName = event.target.getAttribute("data-name");
- // var hosid = event.target.getAttribute("data-hosid");
- // console.log('hos:'+hosName+'---'+hosid);
- // this.chooseHospital = hosName;
- // this.chooseHospitalId = hosid;
- // }
-
- changeHos(event) {
- this.hospitalName = event.detail.value;
- }
-
- changeCon(event) {
- this.contractName = event.detail.value;
- }
-
- chooseHos(event) {
- const row = event.detail.row;
- this.chooseHospitalId = row.Id;
- this.chooseHospital = row.Name;
- console.log("row.Id:" + row.Id);
- console.log("row.Name:" + row.Name);
- this.confirmHospital();
- }
-
- //纭閫夋嫨鍖婚櫌
- confirmHospital() {
- if (this.chooseHospital != "" && this.chooseHospital != null) {
- this.hospitalId = this.chooseHospitalId;
- this.tempidHp = this.chooseHospitalId;
- this.hospitalName = this.chooseHospital;
- this.closeHospitalPop();
- //娑堥櫎璀﹀憡
- var arr = [];
- for (var i in this.warningMsgs) {
- if (this.warningMsgs[i] != "璇烽�夋嫨鍖婚櫌") {
- arr.push(this.warningMsgs[i]);
- }
- }
- this.warningMsgs = arr;
- if (this.tempidHp != "tempId" && this.tempidHp != "") {
- searchorderdetails({
- methodTypeStr: this.pageType,
- accountIdStr: this.accountid,
- hospitalIdStr: this.hospitalId,
- contractIdStr: this.contractId,
- userWorkLocationStr: this.userWorkLocation,
- accountNameStr: this.accountName,
- proLimitAndDateList: this.proLimitAndDate,
- editAbleStr: this.editAble
- })
- .then((result) => {
- if (result.result == "Success") {
- this.consumableorderdetailsRecordsview =
- result.consumableorderdetailsRecordsview;
- this.currentPage = 1;
- this.currentRecord = [];
- this.showCurrentReocrd();
- this.getAllChecked();
- this.showMyToast("鎼滅储鎴愬姛", result.errorMsg, "success");
- } else {
- console.log("Error:" + result.errorMsg);
- if (result.errorMsg == "娌℃湁鎼滅储鍒扮浉鍏虫暟鎹�") {
- this.showMyToast(result.errorMsg, "", "error");
- } else {
- this.showMyToast("鎼滅储浜у搧澶辫触", result.errorMsg, "error");
- }
- }
- })
- .catch((error) => {
- console.log("Error:" + error);
- this.showMyToast("鎼滅储浜у搧澶辫触", error, "error");
- });
- this.tempidHp = "tempId";
- }
- } else {
- this.showMyToast("璇烽�夋嫨鍖婚櫌", "", "error");
- }
- }
-
- //鎵撳紑鍚堝悓妫�绱㈠脊绐楀苟鍒濆鍖�
- showSearchCon() {
- initContract({ ctype: this.agencyProType1 })
- .then((result) => {
- if (result.result == "Success") {
- this.showConPop = true;
- this.contractList = result.attList;
- for (var i in this.contractList) {
- if (this.contractList[i].State_Master__c) {
- this.contractList[i]["StateMaster"] =
- this.contractList[i].State_Master__r.Name;
- }
- }
- } else {
- console.log("Error:" + result.errorMsg);
- this.showMyToast("鍒濆鍖栨绱㈠悎鍚岄〉闈㈠け璐�", result.errorMsg, "error");
- }
+ //淇濆瓨璁㈠崟锛堥┏鍥烇級
+ orderCopy(event){
+ this.showSpinner = true;
+ ordrCopy({
+ contractNameStr:this.contractName,
+ cocStr:JSON.stringify(this.coc),
+ agencyProTypeStr:this.agencyProType,
+ accountidStr:this.accountid,
+ consumableorderdetailsRecordsviewStr:JSON.stringify(this.consumableorderdetailsRecordsview),
+ contactDealerStr:JSON.stringify(this.contactDealer),
+ methodTypeStr:this.pageType,
+ hospitalIdStr:this.hospitalId,
+ contractIdStr : this.contractId,
+ agencyProType1Str : this.agencyProType1,
+ OSHFLGStr : this.OSHFLG
+ }).then(result=>{
+ this.showSpinner = false;
+ if(result.result == 'Success'){
+ this.esetId = result.eSetId;
+ const config = {
+ type: 'standard__webPage',
+ attributes: {
+ url: '/lexconsumable?ESetid=' + this.esetId + '&type=' + this.pageType
+ }
+ };
+ this[NavigationMixin.Navigate](config);
+ }else{
+ this.showSpinner = false;
+ console.log("Error:"+result.errorMsg);
+ this.showMyToast('淇濆瓨澶辫触',result.errorMsg,'error');
+ }
})
- .catch((error) => {
- console.log("Error:" + error);
- this.showMyToast("鍒濆鍖栨绱㈠悎鍚岄〉闈㈠け璐�", error, "error");
- });
- }
+ }
- //妫�绱㈠悎鍚�
- searchCon() {
- searchContract({
- searchName: this.searchNameCon,
- accountId: this.accountid,
- ctype: this.agencyProType1,
- OSHFLGStr: this.OSHFLG
- })
- .then((result) => {
- if (result.result == "Success") {
- this.contractList = result.attList;
- for (var i in this.contractList) {
- if (this.contractList[i].State_Master__c) {
- this.contractList[i]["StateMaster"] =
- this.contractList[i].State_Master__r.Name;
+ //缂栬緫
+ editOrder(event){
+ setEditAble({eSetidStr:this.esetId})
+ .then(result=>{
+ if(result.result == 'Success'){
+ const config = {
+ type: 'standard__webPage',
+ attributes: {
+ url: result.url
+ }
+ };
+ this[NavigationMixin.Navigate](config);
+ }else{
+ this.showSpinner = false;
+ console.log("Error:"+result.errorMsg);
+ this.showMyToast('缂栬緫澶辫触',result.errorMsg,'error');
}
- }
- } else {
- console.log("Error:" + result.errorMsg);
- this.showMyToast("鎼滅储澶辫触", result.errorMsg, "error");
- }
+ })
+ }
+
+ //鎵撳嵃閰嶇疆鍗�
+ printOrder(event){
+ var site = window.location.origin;
+ const config = {
+ type: 'standard__webPage',
+ attributes: {
+ url: site+'/consumable/PrintConsumblePDF?ESetid='+this.esetId
+ }
+ };
+ this[NavigationMixin.Navigate](config);
+ }
+
+ //涓婁紶閰嶇疆鍗�
+ uploadOrder(event){
+ this.showAttPop = true;
+ }
+
+ //鎻愪氦璁㈠崟
+ submitOrder(event){
+ sorder({eSetidStr:this.esetId,accountidStr:this.accountid})
+ .then(result=>{
+ if(result.result == 'Success'){
+ const config = {
+ type: 'standard__webPage',
+ attributes: {
+ url: result.url
+ }
+ };
+ this[NavigationMixin.Navigate](config);
+ }else{
+ this.showSpinner = false;
+ this.errorMsgs = result.errorMsgList;
+ this.warningMsgs = result.warningMsgList;
+ console.log("Error:"+result.errorMsg);
+ if(result.errorMsg.indexOf("璇蜂笂浼犺璐ч厤缃崟闄勪欢") != -1){
+ result.errorMsg = '璇蜂笂浼犺璐ч厤缃崟闄勪欢';
+ }
+ this.showMyToast('鎻愪氦澶辫触',result.errorMsg,'error');
+ }
+ })
+ .catch(error=>{
+ console.log("Error:"+error);
+ })
+ }
+
+ //鍒犻櫎璁㈠崟
+ deleteOrder(event){
+ if(!window.confirm('鍒犻櫎鏄笉鍙仮澶嶇殑锛屼綘纭瑕佸垹闄ゅ悧锛�')){
+ return;
+ }
+ delConsumable({eSetidStr:this.esetId})
+ .then(result=>{
+ if(result.result == 'Success'){
+ const config = {
+ type: 'standard__webPage',
+ attributes: {
+ url: result.url
+ }
+ };
+ this[NavigationMixin.Navigate](config);
+ }else{
+ this.showSpinner = false;
+ console.log("Error:"+result.errorMsg);
+ this.showMyToast('鍒犻櫎澶辫触',result.errorMsg,'error');
+ }
+ })
+ }
+
+ //鐗逛环閲戦褰曞叆
+ inputOfferPrice(event){
+ this.edoffersPrice = true;
+ if(!(this.editAble || this.edoffersPrice)){
+ this.showEditBtn = true;
+ this.showOfferPriceInputBtn = true;
+ }else{
+ this.showEditBtn = false;
+ this.showOfferPriceInputBtn = false;
+ }
+ if(!(this.editDelCommitBtnDisabled || this.editAble || this.edoffersPrice)){
+ this.showPrintSheetBtn = true;
+ this.showUploadSheetBtn = true;
+ this.showSubOrderbtn = true;
+ this.showDeleteBtn = true;
+ }else{
+ this.showPrintSheetBtn = false;
+ this.showUploadSheetBtn = false;
+ this.showSubOrderbtn = false;
+ this.showDeleteBtn = false;
+ }
+ if((this.editDelCommitBtnDisabled || this.editAble || this.edoffersPrice) && this.coc.Order_status__c != "椹冲洖"){
+ this.showSaveOrderbtn1 = true;
+ }else{
+ this.showSaveOrderbtn1 = false;
+ }
+ }
+
+ //鍐嶇敵璇�
+ reapplyOrder(event){
+ backOrder({eSetidStr:this.esetId})
+ .then(result=>{
+ if(result.result == 'Success'){
+ const config = {
+ type: 'standard__webPage',
+ attributes: {
+ url: result.url
+ }
+ };
+ this[NavigationMixin.Navigate](config);
+ }else{
+ this.showSpinner = false;
+ console.log("Error:"+result.errorMsg);
+ this.showMyToast('鍐嶇敵璇峰け璐�',result.errorMsg,'error');
+ }
+ })
+ }
+
+ //闄勪欢change浜嬩欢
+ attChange(event){
+ if(event.target.files.length > 0) {
+ this.filesUploaded = event.target.files;
+ this.fileName = event.target.files[0].name;
+ console.log('this.fileName:'+this.fileName);
+ }
+ }
+
+ //鏄惁鏄剧ず闄勪欢绉婚櫎
+ get attDelBtn(){
+ if(this.fileName != '' && this.fileName != null && this.fileName != '璇烽�夋嫨涓�涓枃浠朵笂浼�'){
+ return true;
+ }else{
+ return false;
+ }
+ }
+
+ //鍏抽棴闄勪欢寮圭獥
+ closePop(){
+ this.showAttPop = false;
+ this.filesUploaded = [];
+ this.fileName = null;
+ }
+
+ //绉婚櫎闄勪欢
+ removeAtt(){
+ this.filesUploaded = [];
+ this.fileName = '';
+ }
+
+ //涓婁紶闄勪欢
+ uploadAtt(event){
+ if(this.filesUploaded.length > 0) {
+ this.file = this.filesUploaded[0];
+ if (this.file.size > this.MAX_FILE_SIZE) {
+ window.console.log('鏂囦欢杩囧ぇ');
+ return ;
+ }
+ this.fileReader= new FileReader();
+
+ this.fileReader.onloadend = (() => {
+ this.fileContents = this.fileReader.result;
+ let base64 = 'base64,';
+ this.content = this.fileContents.indexOf(base64) + base64.length;
+ this.fileContents = this.fileContents.substring(this.content);
+ this.saveToFile();
+ });
+ this.fileReader.readAsDataURL(this.file);
+ }
+ else {
+ this.fileName = '璇烽�夋嫨涓�涓枃浠朵笂浼�';
+ }
+ }
+
+ //璋冪敤涓婁紶闄勪欢鍚庡彴鏂规硶
+ saveToFile() {
+ this.showPopSpinner = true;
+ filesUpload({pId:this.esetId, fileName: this.file.name, base64Data: encodeURIComponent(this.fileContents)})
+ .then(result => {
+ this.showPopSpinner = false;
+ if(result.result == 'Success'){
+ this.closePop();
+ window.location.reload();
+ }else{
+ console.log("Error:"+result.errorMsg);
+ this.showMyToast('涓婁紶澶辫触',result.errorMsg,'error');
+ }
+ })
+ .catch(error => {
+ this.showPopSpinner = false;
+ this.showMyToast('涓婁紶澶辫触',error,'error');
+ });
+ }
+
+ //鍒犻櫎闄勪欢
+ deleteAtt(event){
+ this.showSpinner = true;
+ var recordId = event.target.getAttribute("data-fileid");
+ console.log('attid:'+recordId);
+ deleteAtt({contentVersionId : recordId, cocId : this.esetId})
+ .then(result=>{
+ this.showSpinner = false;
+ if(result.result == 'Success'){
+ window.location.reload();
+ }else{
+ console.log("Error:"+result.errorMsg);
+ this.showMyToast('鍒犻櫎澶辫触',result.errorMsg,'error');
+ }
})
- .catch((error) => {
- console.log("Error:" + error);
- this.showMyToast("鎼滅储澶辫触", error, "error");
+ .catch(error=>{
+ this.showSpinner = false;
+ console.log("Error:"+error);
+ this.showMyToast('鍒犻櫎澶辫触',JSON.stringify(error),'error');
+ })
+ }
+
+ //棰勮闄勪欢
+ previweAtt(event){
+ var recordId = event.target.getAttribute("data-fileid");
+ console.log(recordId);
+ this[NavigationMixin.Navigate]({
+ type:'standard__namedPage',
+ attributes:{
+ pageName:'filePreview'
+ },
+ state:{
+ recordIds: recordId,
+ selectedRecordId: recordId
+ }
});
- }
+ }
- searchNameConChange(event) {
- this.searchNameCon = event.detail.value;
- }
-
- //鍏抽棴寮圭獥
- closeContractPop() {
- this.showConPop = false;
- this.chooseContract = "";
- this.chooseContractId = "";
- }
-
- //閫夋嫨鍚堝悓
- // chooseCon(event){
- // var conName = event.target.getAttribute("data-name");
- // var conid = event.target.getAttribute("data-hosid");
- // console.log('hos:'+conName+'---'+conid);
- // this.chooseContract = conName;
- // this.chooseContractId = conid;
- // }
-
- chooseCon(event) {
- const row = event.detail.row;
- this.chooseContractId = row.Id;
- this.chooseContract = row.Name;
- console.log("row.Id:" + row.Id);
- console.log("row.Name:" + row.Name);
- this.confirmContract();
- }
-
- //纭閫夋嫨鍚堝悓
- confirmContract() {
- if (this.chooseContract != "" && this.chooseContract != null) {
- this.contractId = this.chooseContractId;
- this.tempidPp = this.chooseContractId;
- this.contractName = this.chooseContract;
- this.closeContractPop();
- if (
- this.tempidPp != "tempId" &&
- this.tempidPp != "" &&
- this.contractId != "" &&
- this.pageType == "promotionorder"
- ) {
- searchorderdetails({
- methodTypeStr: this.pageType,
- accountIdStr: this.accountid,
- hospitalIdStr: this.hospitalId,
- contractIdStr: this.contractId,
- userWorkLocationStr: this.userWorkLocation,
- accountNameStr: this.accountName,
- proLimitAndDateList: this.proLimitAndDate,
- editAbleStr: this.editAble
- })
- .then((result) => {
- if (result.result == "Success") {
- this.consumableorderdetailsRecordsview =
- result.consumableorderdetailsRecordsview;
- this.currentPage = 1;
- this.currentRecord = [];
- this.showCurrentReocrd();
- this.getAllChecked();
- this.showMyToast("鎼滅储鎴愬姛", result.errorMsg, "success");
- } else {
- console.log("Error:" + result.errorMsg);
- if (result.errorMsg == "娌℃湁鎼滅储鍒扮浉鍏虫暟鎹�") {
- this.showMyToast(result.errorMsg, "", "error");
- } else {
- this.showMyToast("鎼滅储浜у搧澶辫触", result.errorMsg, "error");
- }
+ //鎵撳紑鎼滅储寮圭獥锛屽苟鍒濆鍖栧脊绐�
+ showSearchHos(event){
+ initHospital()
+ .then(result=>{
+ if(result.result == 'Success'){
+ this.showAttHosPop = true;
+ this.hospitalList = result.attList;
+ for(var i in this.hospitalList){
+ if(this.hospitalList[i].State_Master__c){
+ this.hospitalList[i]['StateMaster'] = this.hospitalList[i].State_Master__r.Name;
+ }
+ }
+ }else{
+ console.log("Error:"+result.errorMsg);
+ this.showMyToast('鍒濆鍖栨绱㈠尰闄㈤〉闈㈠け璐�',result.errorMsg,'error');
}
- })
- .catch((error) => {
- console.log("Error:" + error);
- this.showMyToast("鎼滅储浜у搧澶辫触", error, "error");
- });
- this.tempidPp = "tempId";
- }
- } else {
- this.showMyToast("璇烽�夋嫨鍚堝悓", "", "error");
- }
- }
+ })
+ .catch(error=>{
+ console.log("Error:"+error);
+ this.showMyToast('鍒濆鍖栨绱㈠尰闄㈤〉闈㈠け璐�',error,'error');
+ })
+ }
- showMyToast(title, message, variant) {
- console.log("show custom message");
- var iconName = "";
- var content = "";
- if (variant == "success") {
- iconName = "utility:check";
- } else {
- iconName = "utility:error";
- }
- if (message != "") {
- content =
- "<h2><strong>" + title + "<strong/></h2><h5>" + message + "</h5>";
- } else {
- content = "<h2><strong>" + title + "<strong/></h2>";
- }
- this.template
- .querySelector("c-common-toast")
- .showToast(variant, content, iconName, 10000);
- // var mode;
- // if(this.isNoteStay){
- // mode ='sticky';
- // }else{
- // mode = 'dismissable';
- // }
- // const evt = new ShowToastEvent({
- // title: title,
- // message: message,
- // variant: variant,
- // mode: mode
- // });
- // this.dispatchEvent(evt);
- }
+ //妫�绱㈠尰闄�
+ searchHos(event){
+ searchHospital({searchName:this.searchNameHos, accountId:this.accountid})
+ .then(result=>{
+ if(result.result == 'Success'){
+ this.hospitalList = result.attList;
+ for(var i in this.hospitalList){
+ if(this.hospitalList[i].State_Master__c){
+ this.hospitalList[i]['StateMaster'] = this.hospitalList[i].State_Master__r.Name;
+ }
+ }
+ }else{
+ console.log("Error:"+result.errorMsg);
+ this.showMyToast('鎼滅储澶辫触',result.errorMsg,'error');
+ }
+ })
+ .catch(error=>{
+ console.log("Error:"+error);
+ this.showMyToast('鎼滅储澶辫触',error,'error');
+ })
+ }
- //鍒嗛〉
- showCurrentReocrd() {
- var startIndex = 0;
- var endIndex = 0;
- console.log("len:" + this.consumableorderdetailsRecordsview.length);
- if (
- this.consumableorderdetailsRecordsview != null &&
- this.consumableorderdetailsRecordsview.length > 0
- ) {
- var currentRecord = [];
- var currentCount = 0;
- var mu = this.consumableorderdetailsRecordsview.length % this.pageSize;
- if (this.currentPage == this.totalPage) {
- if (mu != 0) {
- currentCount = mu;
- } else {
- currentCount = this.pageSize;
- }
- } else {
- currentCount = this.pageSize;
+ //鍖婚櫌鍚嶇Оchange
+ searchNameHosChange(event){
+ this.searchNameHos = event.detail.value;
+ }
+
+ //鍏抽棴寮圭獥
+ closeHospitalPop(){
+ this.showAttHosPop = false;
+ this.chooseHospital = '';
+ this.chooseHospitalId = '';
+ }
+
+ // //閫夋嫨鍖婚櫌
+ // chooseHos(event){
+ // var hosName = event.target.getAttribute("data-name");
+ // var hosid = event.target.getAttribute("data-hosid");
+ // console.log('hos:'+hosName+'---'+hosid);
+ // this.chooseHospital = hosName;
+ // this.chooseHospitalId = hosid;
+ // }
+
+ changeHos(event){
+ this.hospitalName = event.detail.value;
+ }
+
+ changeCon(event){
+ this.contractName = event.detail.value;
+ }
+
+ chooseHos(event){
+ const row = event.detail.row;
+ this.chooseHospitalId = row.Id;
+ this.chooseHospital = row.Name;
+ console.log('row.Id:'+row.Id);
+ console.log('row.Name:'+row.Name);
+ this.confirmHospital();
+ }
+
+ //纭閫夋嫨鍖婚櫌
+ confirmHospital(){
+ if(this.chooseHospital != '' && this.chooseHospital != null){
+ this.hospitalId = this.chooseHospitalId;
+ this.tempidHp = this.chooseHospitalId;
+ this.hospitalName = this.chooseHospital;
+ this.closeHospitalPop();
+ //娑堥櫎璀﹀憡
+ var arr = [];
+ for(var i in this.warningMsgs){
+ if(this.warningMsgs[i] != '璇烽�夋嫨鍖婚櫌'){
+ arr.push(this.warningMsgs[i]);
+ }
+ }
+ this.warningMsgs = arr;
+ if(this.tempidHp != 'tempId' && this.tempidHp != ''){
+ searchorderdetails({
+ methodTypeStr : this.pageType,
+ accountIdStr : this.accountid,
+ hospitalIdStr : this.hospitalId,
+ contractIdStr : this.contractId,
+ userWorkLocationStr : this.userWorkLocation,
+ accountNameStr : this.accountName,
+ proLimitAndDateList : this.proLimitAndDate,
+ editAbleStr : this.editAble
+ }).then(result=>{
+ if(result.result == 'Success'){
+ this.consumableorderdetailsRecordsview = result.consumableorderdetailsRecordsview;
+ this.currentPage = 1;
+ this.currentRecord = [];
+ this.showCurrentReocrd();
+ this.getAllChecked();
+ this.showMyToast('鎼滅储鎴愬姛',result.errorMsg,'success');
+ }else{
+ console.log("Error:"+result.errorMsg);
+ if(result.errorMsg == '娌℃湁鎼滅储鍒扮浉鍏虫暟鎹�'){
+ this.showMyToast(result.errorMsg,'','error');
+ }else{
+ this.showMyToast('鎼滅储浜у搧澶辫触',result.errorMsg,'error');
+ }
+ }
+ })
+ .catch(error=>{
+ console.log("Error:"+error);
+ this.showMyToast('鎼滅储浜у搧澶辫触',error,'error');
+ })
+ this.tempidHp = 'tempId';
+ }
+ }else{
+ this.showMyToast('璇烽�夋嫨鍖婚櫌','','error');
}
- console.log("this.totalPage:" + this.totalPage);
- console.log("this.pageSize:" + this.pageSize);
- console.log("mu:" + mu);
- console.log("currentCount:" + currentCount);
- startIndex = (this.currentPage - 1) * this.pageSize;
- endIndex = parseInt(startIndex) + parseInt(currentCount) - 1;
- console.log("startIndex:" + startIndex);
- console.log("endIndex:" + endIndex);
- if (this.editAble) {
- for (var i in this.currentRecord) {
- if (this.currentRecord[i].check) {
- currentRecord.push(this.currentRecord[i]);
- }
- }
+ }
+
+ //鎵撳紑鍚堝悓妫�绱㈠脊绐楀苟鍒濆鍖�
+ showSearchCon(){
+ initContract({ctype:this.agencyProType1})
+ .then(result=>{
+ if(result.result == 'Success'){
+ this.showConPop = true;
+ this.contractList = result.attList;
+ for(var i in this.contractList){
+ if(this.contractList[i].State_Master__c){
+ this.contractList[i]['StateMaster'] = this.contractList[i].State_Master__r.Name;
+ }
+ }
+ }else{
+ console.log("Error:"+result.errorMsg);
+ this.showMyToast('鍒濆鍖栨绱㈠悎鍚岄〉闈㈠け璐�',result.errorMsg,'error');
+ }
+ })
+ .catch(error=>{
+ console.log("Error:"+error);
+ this.showMyToast('鍒濆鍖栨绱㈠悎鍚岄〉闈㈠け璐�',error,'error');
+ })
+ }
+
+ //妫�绱㈠悎鍚�
+ searchCon(){
+ searchContract({searchName:this.searchNameCon, accountId:this.accountid, ctype:this.agencyProType1,OSHFLGStr : this.OSHFLG})
+ .then(result=>{
+ if(result.result == 'Success'){
+ this.contractList = result.attList;
+ for(var i in this.contractList){
+ if(this.contractList[i].State_Master__c){
+ this.contractList[i]['StateMaster'] = this.contractList[i].State_Master__r.Name;
+ }
+ }
+ }else{
+ console.log("Error:"+result.errorMsg);
+ this.showMyToast('鎼滅储澶辫触',result.errorMsg,'error');
+ }
+ })
+ .catch(error=>{
+ console.log("Error:"+error);
+ this.showMyToast('鎼滅储澶辫触',error,'error');
+ })
+ }
+
+ searchNameConChange(event){
+ this.searchNameCon = event.detail.value;
+ }
+
+ //鍏抽棴寮圭獥
+ closeContractPop(){
+ this.showConPop = false;
+ this.chooseContract = '';
+ this.chooseContractId = '';
+ }
+
+ //閫夋嫨鍚堝悓
+ // chooseCon(event){
+ // var conName = event.target.getAttribute("data-name");
+ // var conid = event.target.getAttribute("data-hosid");
+ // console.log('hos:'+conName+'---'+conid);
+ // this.chooseContract = conName;
+ // this.chooseContractId = conid;
+ // }
+
+ chooseCon(event){
+ const row = event.detail.row;
+ this.chooseContractId = row.Id;
+ this.chooseContract = row.Name;
+ console.log('row.Id:'+row.Id);
+ console.log('row.Name:'+row.Name);
+ this.confirmContract();
+ }
+
+ //纭閫夋嫨鍚堝悓
+ confirmContract(){
+ if(this.chooseContract != '' && this.chooseContract != null){
+ this.contractId = this.chooseContractId;
+ this.tempidPp = this.chooseContractId;
+ this.contractName = this.chooseContract;
+ this.closeContractPop();
+ if(this.tempidPp != 'tempId' && this.tempidPp != '' && this.contractId != '' && this.pageType == 'promotionorder'){
+ searchorderdetails({
+ methodTypeStr : this.pageType,
+ accountIdStr : this.accountid,
+ hospitalIdStr : this.hospitalId,
+ contractIdStr : this.contractId,
+ userWorkLocationStr : this.userWorkLocation,
+ accountNameStr : this.accountName,
+ proLimitAndDateList : this.proLimitAndDate,
+ editAbleStr : this.editAble
+ }).then(result=>{
+ if(result.result == 'Success'){
+ this.consumableorderdetailsRecordsview = result.consumableorderdetailsRecordsview;
+ this.currentPage = 1;
+ this.currentRecord = [];
+ this.showCurrentReocrd();
+ this.getAllChecked();
+ this.showMyToast('鎼滅储鎴愬姛',result.errorMsg,'success');
+ }else{
+ console.log("Error:"+result.errorMsg);
+ if(result.errorMsg == '娌℃湁鎼滅储鍒扮浉鍏虫暟鎹�'){
+ this.showMyToast(result.errorMsg,'','error');
+ }else{
+ this.showMyToast('鎼滅储浜у搧澶辫触',result.errorMsg,'error');
+ }
+ }
+ })
+ .catch(error=>{
+ console.log("Error:"+error);
+ this.showMyToast('鎼滅储浜у搧澶辫触',error,'error');
+ })
+ this.tempidPp = 'tempId';
+ }
+ }else{
+ this.showMyToast('璇烽�夋嫨鍚堝悓','','error');
}
- for (var i = startIndex; i <= endIndex; i++) {
- var count = 0;
- for (var j in this.currentRecord) {
- if (
- this.consumableorderdetailsRecordsview[i].recordId ==
- this.currentRecord[j].recordId
- ) {
- count++;
- }
- }
- if (count == 0) {
- currentRecord.push(this.consumableorderdetailsRecordsview[i]);
- }
+ }
+
+ showMyToast(title, message, variant) {
+ console.log('show custom message');
+ var iconName = '';
+ var content = '';
+ if(variant == 'success'){
+ iconName = 'utility:check';
+ }else{
+ iconName = 'utility:error';
}
- this.recordStart = startIndex + 1;
- this.recordEnd = endIndex + 1;
- this.currentRecord = currentRecord;
- } else {
- this.currentPage = 0;
+ if(message != ''){
+ content = '<h2><strong>'+title+'<strong/></h2><h5>'+message+'</h5>';
+ }else{
+ content = '<h2><strong>'+title+'<strong/></h2>';
+ }
+ this.template.querySelector('c-common-toast').
+ showToast(variant,content,iconName,10000);
+ // var mode;
+ // if(this.isNoteStay){
+ // mode ='sticky';
+ // }else{
+ // mode = 'dismissable';
+ // }
+ // const evt = new ShowToastEvent({
+ // title: title,
+ // message: message,
+ // variant: variant,
+ // mode: mode
+ // });
+ // this.dispatchEvent(evt);
+ }
+
+ //鍒嗛〉
+ showCurrentReocrd(){
+ var startIndex = 0;
+ var endIndex = 0;
+ console.log('len:'+this.consumableorderdetailsRecordsview.length);
+ if(this.consumableorderdetailsRecordsview != null && this.consumableorderdetailsRecordsview.length > 0){
+ var currentRecord = [];
+ var currentCount = 0;
+ var mu = this.consumableorderdetailsRecordsview.length % this.pageSize;
+ if(this.currentPage == this.totalPage){
+ if(mu != 0){
+ currentCount = mu;
+ }else{
+ currentCount = this.pageSize;
+ }
+ }else{
+ currentCount = this.pageSize;
+ }
+ console.log('this.totalPage:'+this.totalPage);
+ console.log('this.pageSize:'+this.pageSize);
+ console.log('mu:'+mu);
+ console.log('currentCount:'+currentCount);
+ startIndex = (this.currentPage - 1) * this.pageSize;
+ endIndex = parseInt(startIndex) + parseInt(currentCount) - 1;
+ console.log('startIndex:'+startIndex);
+ console.log('endIndex:'+endIndex);
+ if(this.editAble){
+ for(var i in this.currentRecord){
+ if(this.currentRecord[i].check){
+ currentRecord.push(this.currentRecord[i]);
+ }
+ }
+ }
+ for(var i = startIndex; i <= endIndex; i++){
+ var count = 0;
+ for(var j in this.currentRecord){
+ if(this.consumableorderdetailsRecordsview[i].recordId == this.currentRecord[j].recordId){
+ count++;
+ }
+ }
+ if(count == 0){
+ currentRecord.push(this.consumableorderdetailsRecordsview[i]);
+ }
+ }
+ this.recordStart = startIndex + 1;
+ this.recordEnd = endIndex + 1;
+ this.currentRecord = currentRecord;
+ }else{
+ this.currentPage = 0;
+ this.currentRecord = [];
+ }
+ }
+
+ get prePage(){
+ return this.currentPage - 1;
+ }
+
+ get nextPage(){
+ return this.currentPage + 1;
+ }
+
+ get totalPage(){
+ if(this.consumableorderdetailsRecordsview.length % this.pageSize == 0){
+ return Math.trunc(this.consumableorderdetailsRecordsview.length / this.pageSize);
+ }else{
+ return Math.trunc(this.consumableorderdetailsRecordsview.length / this.pageSize) + 1;
+ }
+ }
+
+ get totalRecords(){
+ return this.consumableorderdetailsRecordsview.length;
+ }
+
+ //绗竴椤�
+ goFirstPage(){
+ this.currentPage = 1;
+ this.showCurrentReocrd();
+ }
+
+ //鏈�鍚庝竴椤�
+ goLastPage(){
+ this.currentPage = this.totalPage;
+ this.showCurrentReocrd();
+ }
+
+ //涓婁竴椤�
+ prePageClick(){
+ this.currentPage = this.currentPage - 1;
+ this.showCurrentReocrd();
+ }
+
+ //涓嬩竴椤�
+ nextPageClick(){
+ this.currentPage = this.currentPage + 1;
+ this.showCurrentReocrd();
+ }
+
+ //page size change
+ pageSizeChange(event){
+ console.log('pagesize:'+event.detail);
+ this.pageSize = event.detail;
+ this.currentPage = 1;
this.currentRecord = [];
- }
- }
+ this.showCurrentReocrd();
+ }
+
+ //涓婁竴椤垫寜閽槸鍚isable
+ get previousButtonDisabled() {
+ return this.currentPage == 1 || this.currentPage == 0;
+ }
- get prePage() {
- return this.currentPage - 1;
- }
-
- get nextPage() {
- return this.currentPage + 1;
- }
-
- get totalPage() {
- if (this.consumableorderdetailsRecordsview.length % this.pageSize == 0) {
- return Math.trunc(
- this.consumableorderdetailsRecordsview.length / this.pageSize
- );
- } else {
- return (
- Math.trunc(
- this.consumableorderdetailsRecordsview.length / this.pageSize
- ) + 1
- );
- }
- }
-
- get totalRecords() {
- return this.consumableorderdetailsRecordsview.length;
- }
-
- //绗竴椤�
- goFirstPage() {
- this.currentPage = 1;
- this.showCurrentReocrd();
- }
-
- //鏈�鍚庝竴椤�
- goLastPage() {
- this.currentPage = this.totalPage;
- this.showCurrentReocrd();
- }
-
- //涓婁竴椤�
- prePageClick() {
- this.currentPage = this.currentPage - 1;
- this.showCurrentReocrd();
- }
-
- //涓嬩竴椤�
- nextPageClick() {
- this.currentPage = this.currentPage + 1;
- this.showCurrentReocrd();
- }
-
- //page size change
- pageSizeChange(event) {
- console.log("pagesize:" + event.detail);
- this.pageSize = event.detail;
- this.currentPage = 1;
- this.currentRecord = [];
- this.showCurrentReocrd();
- }
-
- //涓婁竴椤垫寜閽槸鍚isable
- get previousButtonDisabled() {
- return this.currentPage == 1 || this.currentPage == 0;
- }
-
- //涓嬩竴椤垫寜閽槸鍚isable
- get nextButtonDisabled() {
- return this.currentPage == this.totalPage;
- }
-}
+ //涓嬩竴椤垫寜閽槸鍚isable
+ get nextButtonDisabled() {
+ return this.currentPage == this.totalPage;
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexConsumableAccount/lexConsumableAccount.html b/force-app/main/default/lwc/lexConsumableAccount/lexConsumableAccount.html
index d0db616..f657066 100644
--- a/force-app/main/default/lwc/lexConsumableAccount/lexConsumableAccount.html
+++ b/force-app/main/default/lwc/lexConsumableAccount/lexConsumableAccount.html
@@ -1,11 +1,10 @@
<!-- sldsValidatorIgnore -->
<!-- sldsValidatorIgnore -->
<template>
- <c-common-toast></c-common-toast>
<template if:true={isShowSpinner}>
- <lightning-spinner alternative-text="Loading" size="large"></lightning-spinner>
+ <lightning-spinner size="medium" variant="brand"></lightning-spinner>
</template>
-
+ <c-common-toast></c-common-toast>
<template if:false={isShowAccountInfo}>
<div class="outerBorderCss">
<div style="padding: 5px">
@@ -34,7 +33,7 @@
</div>
<div style="padding: 7px">
<!-- <lightning-datatable key-field="id" data={topAccountData} columns={topColumns} hide-checkbox-column
- class="wrapped-header-datatable">
+ class="wrapped-header-datatable">
</lightning-datatable> -->
<c-lex-custom-lightning-datatable key-field="Id" data={topAccountData} columns={topColumns}
@@ -95,7 +94,7 @@
<lightning-datatable key-field="id" data={pageRecords} columns={columns}
hide-checkbox-column default-sort-direction={defaultSortDirection}
sorted-direction={sortDirection} sorted-by={sortedBy} onsort={onHandleSort}
- class="wrapped-header-datatable">
+ class="wrapped-header-datatable grayBackground">
</lightning-datatable>
<c-paginator onprevious={handlePrevious} onnext={handleNext}
onpageschange={handlePageschange} onfirst={handleFirst} onlast={handleLast}
@@ -233,10 +232,10 @@
<lightning-layout-item size="1">
</lightning-layout-item>
<lightning-layout-item size="4">
- <lightning-input type="text" label="OCSM鍒嗙被(鍖婚櫌)"
+ <!-- <lightning-input type="text" label="OCSM鍒嗙被(鍖婚櫌)"
value={accountDataInfo.oCMCategory} variant="label-inline" read-only style="
border-bottom: 1px solid #dde4e9;
- "></lightning-input>
+ "></lightning-input> -->
</lightning-layout-item>
<lightning-layout-item size="1">
</lightning-layout-item>
@@ -381,4 +380,5 @@
</div>
</div>
</template>
+
</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexConsumableAccount/lexConsumableAccount.js b/force-app/main/default/lwc/lexConsumableAccount/lexConsumableAccount.js
index 8687cd2..2b81ce8 100644
--- a/force-app/main/default/lwc/lexConsumableAccount/lexConsumableAccount.js
+++ b/force-app/main/default/lwc/lexConsumableAccount/lexConsumableAccount.js
@@ -14,34 +14,40 @@
fieldName: "NameUrl",
hideDefaultActions: true,
wrapText: true,
- initialWidth: 345,
+ initialWidth: 200,
sortable: true,
type: "url",
typeAttributes: {
label: {
fieldName: "Name",
},
+ target:"_blank"
},
},
+ // {
+ // label: "鐪�",
+ // fieldName: "StateMasterUrl",
+ // hideDefaultActions: true,
+ // wrapText: true,
+ // sortable: true,
+ // type: "url",
+ // typeAttributes: {
+ // label: {
+ // fieldName: "StateMasterName",
+ // },
+ // target: "_blank",
+ // },
+ // },
{
label: "鐪�",
- fieldName: "StateMasterUrl",
+ fieldName: "StateMasterName",
hideDefaultActions: true,
- initialWidth: 80,
wrapText: true,
sortable: true,
- type: "url",
- typeAttributes: {
- label: {
- fieldName: "StateMasterName",
- },
- target: "_blank",
- },
},
{
label: "閿�鍞湰閮ㄥ尰闄�",
fieldName: "Salesdepartment_HP__c",
- initialWidth: 115,
hideDefaultActions: true,
sortable: true,
wrapText: true,
@@ -59,7 +65,6 @@
month: "numeric",
year: "numeric",
},
- initialWidth: 100,
},
{
label: "鏈夋晥/鏃犳晥",
@@ -67,45 +72,49 @@
hideDefaultActions: true,
sortable: true,
wrapText: true,
- initialWidth: 91,
},
- {
- label: "瀹㈡埛璁板綍绫诲瀷",
- fieldName: "RecordTypeName",
- hideDefaultActions: true,
- sortable: true,
- wrapText: true,
- initialWidth: 130,
- },
+ // {
+ // label: "瀹㈡埛璁板綍绫诲瀷",
+ // fieldName: "RecordTypeName",
+ // hideDefaultActions: true,
+ // sortable: true,
+ // wrapText: true,
+ // initialWidth: 130,
+ // },
{
label: "鏀垮簻绛夌骇",
fieldName: "Grade__c",
hideDefaultActions: true,
sortable: true,
wrapText: true,
- initialWidth: 86,
},
- {
- label: "OCSM鍒嗙被(鍖婚櫌)",
- fieldName: "OCM_Category__c",
- hideDefaultActions: true,
- sortable: true,
- wrapText: true,
- initialWidth: 150,
- },
+ // {
+ // label: "OCSM鍒嗙被(鍖婚櫌)",
+ // fieldName: "OCM_Category__c",
+ // hideDefaultActions: true,
+ // sortable: true,
+ // wrapText: true,
+ // },
+ // {
+ // label: "甯�",
+ // fieldName: "CityMasterNameUrl",
+ // hideDefaultActions: true,
+ // sortable: true,
+ // wrapText: true,
+ // type: "url",
+ // typeAttributes: {
+ // label: {
+ // fieldName: "CityMasterName",
+ // },
+ // target: "_blank",
+ // },
+ // },
{
label: "甯�",
- fieldName: "CityMasterNameUrl",
+ fieldName: "CityMasterName",
hideDefaultActions: true,
sortable: true,
wrapText: true,
- type: "url",
- typeAttributes: {
- label: {
- fieldName: "CityMasterName",
- },
- target: "_blank",
- },
},
{
label: "鍘�/鍖�",
@@ -126,28 +135,33 @@
const topColumns = [
{
label: "瀹㈡埛鍚�",
- fieldName: "NameUrl",
hideDefaultActions: true,
+ fieldName : "accountName",
wrapText: true,
- type: "url",
+ type: "customShowAccountUrl",
typeAttributes: {
- label: {
- fieldName: "Name",
- },
+ accountName: { fieldName: "accountName" },
+ accountUrl: { fieldName: "accountUrl" },
+ isDisable: { fieldName: "isDisable" },
},
},
+ // {
+ // label: "甯�",
+ // fieldName: "CityMasterName",
+ // hideDefaultActions: true,
+ // wrapText: true,
+ // type: "customShowAccountUrl",
+ // typeAttributes: {
+ // accountName: { fieldName: "CityMasterName" },
+ // accountUrl: { fieldName: "CityMasterNameUrl" },
+ // isDisable: { fieldName: "isDisable" },
+ // },
+ // },
{
label: "甯�",
- fieldName: "CityMasterNameUrl",
+ fieldName: "CityMasterName",
hideDefaultActions: true,
wrapText: true,
- type: "url",
- typeAttributes: {
- label: {
- fieldName: "CityMasterName",
- },
- target: "_blank",
- },
},
{
label: "鍘�/鍖�",
@@ -179,7 +193,7 @@
export default class LexConsumableAccount extends LightningElement {
columns = columns;
topColumns = topColumns;
- @track isShowSpinner = true;
+ @track isShowSpinner = false;
@track pageRecords = [];
@track accountId = "";
@track agencyProType = "";
@@ -189,14 +203,14 @@
label: "01. 鍖婚櫌_Hospital",
value: "01. 鍖婚櫌_Hospital",
},
- {
- label: "61. 鍖婚櫌_Hospital鑽夋涓殑鍖婚櫌",
- value: "61. 鍖婚櫌_Hospital鑽夋涓殑鍖婚櫌",
- },
- {
- label: "62. 鍖婚櫌_Hospital鐢宠涓殑鍖婚櫌",
- value: "62. 鍖婚櫌_Hospital鐢宠涓殑鍖婚櫌",
- },
+ // {
+ // label: "61. 鍖婚櫌_Hospital鑽夋涓殑鍖婚櫌",
+ // value: "61. 鍖婚櫌_Hospital鑽夋涓殑鍖婚櫌",
+ // },
+ // {
+ // label: "62. 鍖婚櫌_Hospital鐢宠涓殑鍖婚櫌",
+ // value: "62. 鍖婚櫌_Hospital鐢宠涓殑鍖婚櫌",
+ // },
{
label: "63. 鍖婚櫌_Hospital涓婂懆鍒涘缓鐨勫尰闄�",
value: "63. 鍖婚櫌_Hospital涓婂懆鍒涘缓鐨勫尰闄�",
@@ -291,6 +305,7 @@
}
connectedCallback() {
+ this.isShowSpinner = true;
this.AccId = this.getQueryString("AccId");
this.AccId = this.AccId == null ? "" : this.AccId;
if (this.AccId != "") {
@@ -301,41 +316,29 @@
r = JSON.parse(JSON.stringify(r));
console.log("r = " + JSON.stringify(r));
if (r.status == "Success") {
+ console.log('r.entity.obj = ' + JSON.stringify(r.entity.obj))
this.accountDataInfo.name = r.entity.obj.Name;
- this.accountDataInfo.ownerName =
- r.entity.obj.Owner == null ? "" : r.entity.obj.Owner.Name;
+ this.accountDataInfo.ownerName = r.entity.obj.Owner == null ? "" : r.entity.obj.Owner.Name;
this.accountDataInfo.site = r.entity.obj.site;
this.accountDataInfo.isActive = r.entity.obj.Is_Active__c;
this.accountDataInfo.aliasName2 = r.entity.obj.Alias_Name2__c;
- this.accountDataInfo.banOnUseReason =
- r.entity.obj.Ban_On_Use_Reason__c;
+ this.accountDataInfo.banOnUseReason = r.entity.obj.Ban_On_Use_Reason__c;
this.accountDataInfo.grade = r.entity.obj.Grade__c;
this.accountDataInfo.attributeType = r.entity.obj.Attribute_Type__c;
this.accountDataInfo.oCMCategory = r.entity.obj.OCM_Category__c;
- this.accountDataInfo.specialityType =
- r.entity.obj.Speciality_Type__c;
- this.accountDataInfo.stateMasterName =
- r.entity.obj.State_Master__r == null
- ? ""
- : r.entity.obj.State_Master__r.Name;
+ this.accountDataInfo.specialityType = r.entity.obj.Speciality_Type__c;
+ this.accountDataInfo.stateMasterName = r.entity.obj.State_Master__r == null ? "" : r.entity.obj.State_Master__r.Name;
this.accountDataInfo.phone = r.entity.obj.Phone;
- this.accountDataInfo.cityMasterName =
- r.entity.obj.City_Master__r == null
- ? ""
- : r.entity.obj.City_Master__r.Name;
+ this.accountDataInfo.cityMasterName = r.entity.obj.City_Master__r == null ? "" : r.entity.obj.City_Master__r.Name;
this.accountDataInfo.phoneCall = r.entity.obj.PhoneCall__c;
this.accountDataInfo.town = r.entity.obj.Town__c;
this.accountDataInfo.fax = r.entity.obj.Fax;
this.accountDataInfo.street = r.entity.obj.Street__c;
this.accountDataInfo.postalCode = r.entity.obj.Postal_Code__c;
this.accountDataInfo.address = r.entity.obj.Address__c;
- this.accountDataInfo.parentName =
- r.entity.obj.Parent == null ? "" : r.entity.obj.Parent.Name;
- console.log(
- "this.accountDataInfo = " + JSON.stringify(this.accountDataInfo)
- );
- this.printUrl =
- "/lexconsumableaccountinfoprint?AccId=" + this.AccId;
+ this.accountDataInfo.parentName = r.entity.obj.Parent == null ? "" : r.entity.obj.Parent.Name;
+ console.log('this.accountDataInfo = ' + JSON.stringify(this.accountDataInfo))
+ this.printUrl = "/lexconsumableaccountinfoprint?AccId=" + this.AccId;
this.isShowAccountInfo = true;
this.isShowSpinner = false;
} else {
@@ -372,7 +375,8 @@
this.agencyProTypestr = r.entity.agencyProTypestr;
console.log("this.agencyProTypestr = " + this.agencyProTypestr);
for (var i in this.pageRecords) {
- this.pageRecords[i]["NameUrl"] = "/lexconsumableaccount?AccId=" + this.pageRecords[i].Id;
+ this.pageRecords[i]["Is_Active__c"] = this.pageRecords[i].Is_Active__c.replace('鍔�','鏁�');
+ this.pageRecords[i]["NameUrl"] = "/s/lexconsumableaccount?AccId=" + this.pageRecords[i].Id;
this.pageRecords[i]["StateMasterName"] = this.pageRecords[i].State_Master__r.Name;
this.pageRecords[i]["StateMasterUrl"] = "/" + this.pageRecords[i].State_Master__c;
this.pageRecords[i]["CityMasterName"] = this.pageRecords[i].City_Master__r.Name;
@@ -393,40 +397,50 @@
);
console.log('9/3 = ' + this.keepTwoDecimalStr(this.amend(9, 3, '/').toFixed(2)));
let total = 100;
- for (var i in this.topAccountData) {
- console.log('i = ' + i);
- this.topAccountData[i]["NameUrl"] = "/lexconsumableaccount?AccId=" + this.topAccountData[i].Id;
- this.topAccountData[i]["StateMasterName"] = this.topAccountData[i].State_Master__r.Name;
- this.topAccountData[i]["StateMasterUrl"] = "/" + this.topAccountData[i].State_Master__c;
- this.topAccountData[i]["CityMasterName"] = this.topAccountData[i].City_Master__r.Name;
- this.topAccountData[i]["CityMasterNameUrl"] = "/" + this.topAccountData[i].City_Master__c;
- this.topAccountData[i]["RecordTypeName"] = this.topAccountData[i].RecordType.Name;
- this.topAccountData[i]["isShowButton"] = true;
- let number = this.keepTwoDecimalStr((this.amend(this.topInfo.deList[i], this.topInfo.saleAmount, '/') * 100).toFixed(2));
- total -= number;
- this.topAccountData[i]["proportion"] = number + '%';
+ try {
+ for (var i in this.topAccountData) {
+ console.log('i = ' + i);
+ this.topAccountData[i]["accountName"] = this.topAccountData[i].Name;
+ this.topAccountData[i]["accountUrl"] = "/s/lexconsumableaccount?AccId=" + this.topAccountData[i].Id;
+ this.topAccountData[i]["isDisable"] = false;
+ this.topAccountData[i]["StateMasterName"] = this.topAccountData[i].State_Master__r.Name;
+ this.topAccountData[i]["StateMasterUrl"] = "/" + this.topAccountData[i].State_Master__c;
+ this.topAccountData[i]["CityMasterName"] = this.topAccountData[i].City_Master__r.Name;
+ this.topAccountData[i]["CityMasterNameUrl"] = "/" + this.topAccountData[i].City_Master__c;
+ this.topAccountData[i]["RecordTypeName"] = this.topAccountData[i].RecordType.Name;
+ this.topAccountData[i]["isShowButton"] = true;
+ let number = this.keepTwoDecimalStr((this.amend(this.topInfo.deList[i], this.topInfo.saleAmount, '/') * 100).toFixed(2));
+ total -= number;
+ this.topAccountData[i]["proportion"] = number + '%';
+ }
+
+ console.log('this.topAccountData = ' + JSON.stringify(this.topAccountData));
+
+ //鍏朵粬
+ if (total != 100) {
+ this.topAccountData.push({
+ accountName: '...',
+ accountUrl: '/s/lexconsumableaccount',
+ isDisable: true,
+ proportion: total.toFixed(2) + '%',
+ CityMasterName: '...',
+ CityMasterNameUrl: '/lexconsumableaccount',
+ Town__c: '...',
+ isShowButton: false
+ })
+ } else {
+ let title = '';
+ for (var key in this.fiscalYearOptions) {
+ if (this.fiscalYearOption == this.fiscalYearOptions[key].value)
+ title = this.fiscalYearOptions[key].label;
+ }
+ this.showMyToast(title, '鏃犳暟鎹�', 'Error');
+ }
+ this.isShowSpinner = false;
+ } catch (error) {
+ console.log('error = ' + error.message)
}
- // //鍏朵粬
- if (total != 100) {
- this.topAccountData.push({
- Name: '...',
- NameUrl: '/lexconsumableaccount',
- proportion: total.toFixed(2) + '%',
- CityMasterName: '...',
- CityMasterNameUrl: '/lexconsumableaccount',
- Town__c: '...',
- isShowButton: false
- })
- } else {
- let title = '';
- for (var key in this.fiscalYearOptions) {
- if (this.fiscalYearOption == this.fiscalYearOptions[key].value)
- title = this.fiscalYearOptions[key].label;
- }
- this.showMyToast(title, '鏃犳暟鎹�', 'Error');
- }
- this.isShowSpinner = false;
} else {
console.log("r = " + JSON.stringify(r));
this.showMyToast('Error', r.msg, 'Error');
@@ -525,7 +539,9 @@
let total = 100;
for (var i in this.topAccountData) {
console.log('i = ' + i);
- this.topAccountData[i]["NameUrl"] = "/lexconsumableaccount?AccId=" + this.topAccountData[i].Id;
+ this.topAccountData[i]["accountName"] = this.topAccountData[i].Name;
+ this.topAccountData[i]["accountUrl"] = "/s/lexconsumableaccount?AccId=" + this.topAccountData[i].Id;
+ this.topAccountData[i]["isDisable"] = false;
this.topAccountData[i]["StateMasterName"] = this.topAccountData[i].State_Master__r.Name;
this.topAccountData[i]["StateMasterUrl"] = "/" + this.topAccountData[i].State_Master__c;
this.topAccountData[i]["CityMasterName"] = this.topAccountData[i].City_Master__r.Name;
@@ -540,8 +556,9 @@
// //鍏朵粬
if (total != 100) {
this.topAccountData.push({
- Name: '...',
- NameUrl: '/lexconsumableaccount',
+ accountName: '...',
+ accountUrl: '/s/lexconsumableaccount',
+ isDisable: true,
proportion: total.toFixed(2) + '%',
CityMasterName: '...',
CityMasterNameUrl: '/lexconsumableaccount',
@@ -597,18 +614,13 @@
this.pageRecords = r.entity.pageRecords;
console.log("this.pageRecords = " + JSON.stringify(this.pageRecords));
for (var i in this.pageRecords) {
- this.pageRecords[i]["NameUrl"] =
- "/lexconsumableaccount?AccId=" + this.pageRecords[i].Id;
- this.pageRecords[i]["StateMasterName"] =
- this.pageRecords[i].State_Master__r.Name;
- this.pageRecords[i]["StateMasterUrl"] =
- "/" + this.pageRecords[i].State_Master__c;
- this.pageRecords[i]["CityMasterName"] =
- this.pageRecords[i].City_Master__r.Name;
- this.pageRecords[i]["CityMasterNameUrl"] =
- "/" + this.pageRecords[i].City_Master__c;
- this.pageRecords[i]["RecordTypeName"] =
- this.pageRecords[i].RecordType.Name;
+ this.pageRecords[i]["Is_Active__c"] = this.pageRecords[i].Is_Active__c.replace('鍔�','鏁�');
+ this.pageRecords[i]["NameUrl"] = "/s/lexconsumableaccount?AccId=" + this.pageRecords[i].Id;
+ this.pageRecords[i]["StateMasterName"] = this.pageRecords[i].State_Master__r.Name;
+ this.pageRecords[i]["StateMasterUrl"] = "/" + this.pageRecords[i].State_Master__c;
+ this.pageRecords[i]["CityMasterName"] = this.pageRecords[i].City_Master__r.Name;
+ this.pageRecords[i]["CityMasterNameUrl"] = "/" + this.pageRecords[i].City_Master__c;
+ this.pageRecords[i]["RecordTypeName"] = this.pageRecords[i].RecordType.Name;
}
this.isShowSpinner = false;
} else {
diff --git a/force-app/main/default/lwc/lexConsumableOrderManage/lexConsumableOrderManage.html b/force-app/main/default/lwc/lexConsumableOrderManage/lexConsumableOrderManage.html
index 2f7e121..7e0cb72 100644
--- a/force-app/main/default/lwc/lexConsumableOrderManage/lexConsumableOrderManage.html
+++ b/force-app/main/default/lwc/lexConsumableOrderManage/lexConsumableOrderManage.html
@@ -38,29 +38,34 @@
<td style="width:122px;">
<div style="color:#696969;font-size:16px;">娑堣�楀搧璁㈠崟鍚嶇О</div>
</td>
- <td style="width: 200px;">
+ <td >
<lightning-input class="inputFont" type="text" label="娑堣�楀搧璁㈠崟鍚嶇О" value={category1} variant="label-hidden" onchange={category1Change}></lightning-input>
</td>
<td style="width:30px;"></td>
<td style="width: 74px;">
<div style="color:#696969;font-size:16px;">璁㈠崟鏃ユ湡</div>
</td>
- <td style="width: 200px;">
+ <td >
<lightning-input class="inputFont" type="date" name="orderDate" value={orderDate} label="璁㈠崟鏃ユ湡" variant="label-hidden" onchange={orderDateChange}></lightning-input>
</td>
<td style="width:30px;"></td>
<td style="width: 74px;">
<div style="color:#696969;font-size:16px;">璁㈠崟鐘舵��</div>
</td>
- <td style="width: 200px;">
+ <td style="width: 250px;">
<lightning-combobox class="inputFont" name="orderStatus" label="璁㈠崟鐘舵��" value={orderStatus} placeholder="璇烽�夋嫨..." options={provinceOpts} variant="label-hidden" onchange={orderStatusChange}></lightning-combobox>
</td>
- <td style="width: 30px;"></td>
- <td style="width: 400;">
- <!-- <lightning-button style="margin: 5px;" label="鎼滅储" onclick={searchProduct}></lightning-button>
- <lightning-button style="margin: 5px;" label="娓呯┖" onclick={clear}></lightning-button> -->
- <button class="slds-button slds-button_neutral slds-button_stretch lexsearchStyle" style="margin-right: 30px;height:32px;" onclick={searchProduct}>鎼滅储</button>
- <button class="slds-button slds-button_neutral slds-button_stretch lexclearStyle" style="height:32px;" onclick={clear}>娓呯┖</button>
+ </tr>
+ </tbody>
+ </table>
+ <p style="height:10px;"></p>
+ <table>
+ <tbody>
+ <tr>
+ <td></td>
+ <td style="width:325px;">
+ <button class="slds-button slds-button_neutral slds-button_stretch lexsearchStyle" style="margin-right: 20px;height:32px;width: 150px;" onclick={searchProduct}>鎼滅储</button>
+ <button class="slds-button slds-button_neutral slds-button_stretch lexclearStyle" style="height:32px;width: 150px;" onclick={clear}>娓呯┖</button>
</td>
</tr>
</tbody>
diff --git a/force-app/main/default/lwc/lexCustomDiffReasonComp/lexCustomDiffReasonComp.html b/force-app/main/default/lwc/lexCustomDiffReasonComp/lexCustomDiffReasonComp.html
index dbe7731..bed3e16 100644
--- a/force-app/main/default/lwc/lexCustomDiffReasonComp/lexCustomDiffReasonComp.html
+++ b/force-app/main/default/lwc/lexCustomDiffReasonComp/lexCustomDiffReasonComp.html
@@ -1,5 +1,6 @@
<template>
<lightning-input
+ style="width:90%;"
variant="label-hidden"
type='text'
value = {DiffReason}
diff --git a/force-app/main/default/lwc/lexCustomLightningDatatable/customMyDrCheckBox.html b/force-app/main/default/lwc/lexCustomLightningDatatable/customMyDrCheckBox.html
new file mode 100644
index 0000000..3a93338
--- /dev/null
+++ b/force-app/main/default/lwc/lexCustomLightningDatatable/customMyDrCheckBox.html
@@ -0,0 +1,10 @@
+<!-- sldsValidatorIgnore -->
+<!-- sldsValidatorIgnore -->
+<template>
+ <c-custom-mydr-comp
+ record-id={typeAttributes.recordId}
+ is-checked-my-dr={typeAttributes.isCheckedMyDr}
+ onunitchange={handleDataChange}
+ >
+ </c-custom-mydr-comp>
+</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexCustomLightningDatatable/customShipmentNumber.html b/force-app/main/default/lwc/lexCustomLightningDatatable/customShipmentNumber.html
index 9213e1e..af207b0 100644
--- a/force-app/main/default/lwc/lexCustomLightningDatatable/customShipmentNumber.html
+++ b/force-app/main/default/lwc/lexCustomLightningDatatable/customShipmentNumber.html
@@ -3,6 +3,8 @@
style="border-color: red;"
record-id={typeAttributes.recordId}
shipment-number={typeAttributes.shipmentNumber}
+ is-coninvoice={typeAttributes.isConinvoice}
+ esd-invoice-pro-not-count={typeAttributes.esdInvoiceProNotCount}
>
</c-custom-shipment-number-comp>
diff --git a/force-app/main/default/lwc/lexCustomLightningDatatable/customaccountUrl.html b/force-app/main/default/lwc/lexCustomLightningDatatable/customaccountUrl.html
new file mode 100644
index 0000000..be4620f
--- /dev/null
+++ b/force-app/main/default/lwc/lexCustomLightningDatatable/customaccountUrl.html
@@ -0,0 +1,10 @@
+<!-- sldsValidatorIgnore -->
+<!-- sldsValidatorIgnore -->
+<template>
+ <c-custom-account-url-comp
+ account-name={typeAttributes.accountName}
+ account-url={typeAttributes.accountUrl}
+ is-disable={typeAttributes.isDisable}
+ >
+ </c-custom-account-url-comp>
+</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexCustomLightningDatatable/customdeleteReason.html b/force-app/main/default/lwc/lexCustomLightningDatatable/customdeleteReason.html
new file mode 100644
index 0000000..667aeb4
--- /dev/null
+++ b/force-app/main/default/lwc/lexCustomLightningDatatable/customdeleteReason.html
@@ -0,0 +1,8 @@
+<!-- sldsValidatorIgnore -->
+<!-- sldsValidatorIgnore -->
+<template>
+ <c-custom-delete-reason-comp
+ record-id={typeAttributes.recordId}
+ >
+ </c-custom-delete-reason-comp>
+</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexCustomLightningDatatable/lexCustomLightningDatatable.js b/force-app/main/default/lwc/lexCustomLightningDatatable/lexCustomLightningDatatable.js
index e82595a..1f46c88 100644
--- a/force-app/main/default/lwc/lexCustomLightningDatatable/lexCustomLightningDatatable.js
+++ b/force-app/main/default/lwc/lexCustomLightningDatatable/lexCustomLightningDatatable.js
@@ -13,6 +13,9 @@
import customOutboundCountTemplate from './customOutboundCount.html';
import customWeeklyReportTemplate from './customWeeklyReport.html';
import customAgencyOppInputTemplate from './customAgencyOppInput.html';
+import customMyDrCheckBoxTemplate from './customMyDrCheckBox.html';
+import customdeleteReasonTemplate from './customdeleteReason.html';
+import customAccountUrlTemplate from './customaccountUrl.html';
import { loadStyle} from 'lightning/platformResourceLoader';
import LexCustomDataTable from '@salesforce/resourceUrl/LexCustomDataTable';
@@ -24,7 +27,7 @@
},
customShipment: {
template: customShipmentNumberTemplate,
- typeAttributes: ['shipmentNumber','recordId'],
+ typeAttributes: ['shipmentNumber','recordId','isConinvoice','esdInvoiceProNotCount'],
},
customShipmentUnitPrice: {
template: customShippingUnitPriceTemplate,
@@ -73,6 +76,18 @@
agencyOppInput:{
template: customAgencyOppInputTemplate,
typeAttributes:['inputValue','recordId','fieldName','showType'],
+ },
+ MyDrCheckBox:{
+ template: customMyDrCheckBoxTemplate,
+ typeAttributes:['recordId','isCheckedMyDr'],
+ },
+ deleteReason:{
+ template: customdeleteReasonTemplate,
+ typeAttributes:['recordId'],
+ },
+ customShowAccountUrl:{
+ template: customAccountUrlTemplate,
+ typeAttributes:['accountName','accountUrl','isDisable'],
}
};
constructor() {
diff --git a/force-app/main/default/lwc/lexInventory/lexInventory.html b/force-app/main/default/lwc/lexInventory/lexInventory.html
index 8e8f0d4..356372e 100644
--- a/force-app/main/default/lwc/lexInventory/lexInventory.html
+++ b/force-app/main/default/lwc/lexInventory/lexInventory.html
@@ -108,7 +108,7 @@
<!-- <template if:true={showTable}> -->
<div style="padding:10px;">
<lightning-datatable key-field="id" data={pageCodeRecords} columns={column}
- hide-checkbox-column={hidecheckbox} class="wrapped-header-datatable">
+ hide-checkbox-column={hidecheckbox} class="wrapped-header-datatable" style="word-wrap:break-word; word-break:break-all; ">
</lightning-datatable>
<c-paginator onprevious={handlePrevious} onnext={handleNext} onpageschange={handlePageschange}
onfirst={handleFirst} onlast={handleLast} page-size-options={pageSizeOptions}
diff --git a/force-app/main/default/lwc/lexInventory/lexInventory.js b/force-app/main/default/lwc/lexInventory/lexInventory.js
index 43d0f99..e53eb3a 100644
--- a/force-app/main/default/lwc/lexInventory/lexInventory.js
+++ b/force-app/main/default/lwc/lexInventory/lexInventory.js
@@ -112,6 +112,7 @@
fieldName: "Name__c",
wrapText: true,
hideDefaultActions: true,
+ // initialWidth: 550
},
{
label: "鍗曚綅",
@@ -125,13 +126,14 @@
fieldName: "Bar_Code__c",
hideDefaultActions: true,
wrapText: true,
- initialWidth: 500,
+ // initialWidth: 300,
},
{
label: "璋冩暣鍘熷洜",
fieldName: "DiffReason",
hideDefaultActions: true,
wrapText: true,
+ // initialWidth:
},
];
@@ -272,7 +274,7 @@
@track isSummonsFlag;
//灞曞紑鏍�
activeSections = ["dataExpand"];
- columnHeader = ["娑堣�楀搧鍚嶇О", "鍗曚綅", "barCode", "璋冩暣鍘熷洜"];
+ columnHeader = ["娑堣�楀搧鍚嶇О", "鍗曚綅", "BarCode", "璋冩暣鍘熷洜"];
//纭涓�瑙�
@track eSetId = "";
@track EditAble = false;
@@ -521,41 +523,43 @@
getSelectedRows(event) {
let selectedRowsEvent = event.detail.selectedRows;
this.selectedRows = [];
- for (var i in selectedRowsEvent) {
- this.selectedRows.push(selectedRowsEvent[i].ProdId+this.data[i]["boxPiece"]);
- }
- const selectedRows = event.detail.selectedRows;
- console.log("this.selectedRows = " + JSON.stringify(selectedRows));
- for (var i in selectedRows) {
- this.selectedRows.push(selectedRows[i].ProdId+this.data[i]["boxPiece"]);
- }
-
+ for (var i in this.data) {
+ for (var j in selectedRowsEvent) {
+ if (this.data[i].ProdId+this.data[i]["boxPiece"] == selectedRowsEvent[j].ProdId+ selectedRowsEvent[j]["boxPiece"]) {
+ this.selectedRows.push(selectedRowsEvent[j].ProdId+this.data[i]["boxPiece"])
+ }
+ }
+ // for (var i in selectedRowsEvent) {
+ // this.selectedRows.push(selectedRowsEvent[i].ProdId+this.data[i]["boxPiece"]);
+ // }
+ }
}
-
//瀵煎嚭涓篶sv
exportData() {
// Prepare a html table
let doc = '<table>';
// Add styles for the table
doc += '<style>';
- doc += 'table, th, td {';
- doc += ' border: 1px solid black;';
+ doc += 'table,th,td{';
+ doc += ' border: 1px solid;';
doc += ' border-collapse: collapse;';
+ doc += ' font-weight: normal;';
+ doc += ' text-align: left;';
doc += '}';
doc += '</style>';
// Add all the Table Headers
doc += '<tr>';
this.columnHeader.forEach(element => {
- doc += '<th>' + element + '</th>'
+ doc += '<th style="font-weight: bold";>' + element + '</th>'
});
doc += '</tr>';
// Add the data rows
this.codPageRecords.forEach(record => {
doc += '<tr>';
- doc += '<th>' + record.Name__c + '</th>';
- doc += '<th>' + record.Box_Piece__c + '</th>';
- doc += '<th>' + record.Bar_Code__c + '</th>';
- doc += '<th>' + record.DiffReason + '</th>';
+ doc += '<td>' + record.Name__c + '</td>';
+ doc += '<td>' + record.Box_Piece__c + '</td>';
+ doc += '<td>' + record.Bar_Code__c + '</td>';
+ doc += '<td>' + record.DiffReason + '</td>';
doc += '</tr>';
});
doc += '</table>';
diff --git a/force-app/main/default/lwc/lexLookup/lexLookup.html b/force-app/main/default/lwc/lexLookup/lexLookup.html
index 36864a9..0a059dd 100644
--- a/force-app/main/default/lwc/lexLookup/lexLookup.html
+++ b/force-app/main/default/lwc/lexLookup/lexLookup.html
@@ -64,12 +64,12 @@
disable-linkify>
</lightning-formatted-rich-text>
</span>
- <span lwc:if={item.result.subtitleFormatted}
+ <!-- <span lwc:if={item.result.subtitleFormatted}
class="slds-listbox__option-meta slds-listbox__option-meta_entity">
<lightning-formatted-rich-text value={item.result.subtitleFormatted}
disable-linkify>
</lightning-formatted-rich-text>
- </span>
+ </span> -->
</span>
</div>
</li>
diff --git a/force-app/main/default/lwc/lexNewAndEditContactPIPL/lexNewAndEditContactPIPL.css b/force-app/main/default/lwc/lexNewAndEditContactPIPL/lexNewAndEditContactPIPL.css
new file mode 100644
index 0000000..2e0a8ae
--- /dev/null
+++ b/force-app/main/default/lwc/lexNewAndEditContactPIPL/lexNewAndEditContactPIPL.css
@@ -0,0 +1,3 @@
+.This{
+
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexNewAndEditContactPIPL/lexNewAndEditContactPIPL.html b/force-app/main/default/lwc/lexNewAndEditContactPIPL/lexNewAndEditContactPIPL.html
new file mode 100644
index 0000000..1f5c839
--- /dev/null
+++ b/force-app/main/default/lwc/lexNewAndEditContactPIPL/lexNewAndEditContactPIPL.html
@@ -0,0 +1,84 @@
+<!-- sldsValidatorIgnore -->
+<!-- sldsValidatorIgnore -->
+<template>
+ <template if:true={isDoctor}>
+ <!-- 灞曠ず -->
+ <section role="dialog" tabindex="-1" aria-modal="true" aria-labelledby="modal-heading-01"
+ class="slds-modal slds-fade-in-open slds-modal_medium">
+ <div class="slds-modal__container">
+ <div class="slds-scrollable">
+ <button class="slds-button slds-button_icon slds-modal__close slds-button_icon-inverse">
+ <svg class="slds-button__icon slds-button__icon_large" aria-hidden="true">
+ <use xlink:href="/assets/icons/utility-sprite/svg/symbols.svg#close"></use>
+ </svg>
+ <span class="slds-assistive-text">Cancel and close</span>
+ </button>
+ <div class="slds-modal__header">
+ <h1 id="modal-heading-01" class="slds-modal__title slds-hyphenate">鏂板缓瀹㈡埛浜哄憳</h1>
+ </div>
+ <div class="slds-modal__content" id="modal-content-id-1">
+ <lightning-card class="slds-text-align_center">
+ <template if:true={isShowSpinner}>
+ <lightning-spinner size="large" alternative-text="Loading"
+ style="height: 100%;"></lightning-spinner>
+ </template>
+ <lightning-record-edit-form object-api-name={sobjectType} record-type-id={recordTypeId}
+ record-id={recordId} onsubmit={handleSubmit} onsuccess={handleSuccess}
+ onerror={handleError}>
+ <template for:each={layout} for:item="layoutSection">
+ <lightning-accordion lwc:if={layoutSection.editHeading} class="greyyyy"
+ active-section-name={sectionName} allow-multiple-sections-open
+ key={layoutSection.name}>
+ <lightning-accordion-section name={layoutSection.label}
+ label={layoutSection.label}>
+ <lightning-layout multiple-rows="true">
+ <template for:each={layoutSection.layoutColumns}
+ for:item="layoutColumns">
+ <lightning-layout-item class="hehe-layoutItem" size="6"
+ key={layoutColumns.index}>
+ <template for:each={layoutColumns.layoutItems}
+ for:item="layoutField">
+ <template if:false={layoutField.isDisable}>
+ <template if:false={layoutField.isModify}>
+ <lightning-input-field
+ field-name={layoutField.field}
+ value={layoutField.value}
+ required={layoutField.isRequired}
+ data-field={layoutField.field}
+ key={layoutField.field}>
+ </lightning-input-field>
+ </template>
+ <template if:true={layoutField.isModify}>
+ <lightning-input label={layoutField.fieldLabel}
+ value={layoutField.value}
+ required={layoutField.isRequired}
+ data-field={layoutField.field}
+ variant="label-inline" onchange={dataChange}
+ key={layoutField.field}>
+ </lightning-input>
+ </template>
+ </template>
+ </template>
+ </lightning-layout-item>
+ </template>
+ </lightning-layout>
+ </lightning-accordion-section>
+
+ </lightning-accordion>
+ </template>
+ </lightning-record-edit-form>
+ </lightning-card>
+ </div>
+ </div>
+ <div class="slds-modal__footer">
+ <div class="slds-text-align_center">
+ <lightning-button label="淇濆瓨" type="submit" onsubmit={handleSubmit}
+ class="slds-m-right_x-small"></lightning-button>
+ <lightning-button label="鍙栨秷" onclick={cancel} class="slds-m-right_x-small"></lightning-button>
+ </div>
+ </div>
+ </div>
+ </section>
+ </template>
+ <div class="slds-backdrop slds-backdrop_open"></div>
+</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexNewAndEditContactPIPL/lexNewAndEditContactPIPL.js b/force-app/main/default/lwc/lexNewAndEditContactPIPL/lexNewAndEditContactPIPL.js
new file mode 100644
index 0000000..a0a9ff6
--- /dev/null
+++ b/force-app/main/default/lwc/lexNewAndEditContactPIPL/lexNewAndEditContactPIPL.js
@@ -0,0 +1,425 @@
+import { LightningElement, api, track, wire } from 'lwc';
+import { CurrentPageReference } from 'lightning/navigation';
+import initData from '@salesforce/apex/LexNewAndEditContactPIPLController.initData';
+import { NavigationMixin } from 'lightning/navigation';
+import { AWSService } from 'c/piUtils';
+import { ShowToastEvent } from 'lightning/platformShowToastEvent';
+
+export default class LexNewAndEditContactPIPL extends NavigationMixin(LightningElement) {
+ sobjectType = 'Contact';
+
+ @api recordId;
+ @track recordTypeId = '';
+ @wire(CurrentPageReference) pageRef;
+ @track recordData = {};
+ @track title = '';
+ @track isShowSpinner = true;
+ @track layout = [];
+ @track isDoctor = true;
+
+
+ @track staticResource;
+ @track staticResourceContact;
+ @track piFieldsMap;
+ @track abstractData = '';
+ @track data = {};
+ @track piplData = {};
+ @track isNewMode = false;
+ @track isCloneMode = false;
+ @track isEditMode = false;
+ @track sectionName = [];
+ @track AWSToSobjectMap = {};
+ @track AWSDataId = '';
+ @track txId = '';
+ @track isShowSearchAccount = false;
+ @track hospitalId = '';
+ @track contactId = '';
+ AWSService;
+
+ @track modifyObj = {};
+ modifyArray = ['LastName'];
+
+ connectedCallback() {
+ console.log('enter connectedCallback');
+ this.AWSService = new AWSService();
+ if (!this.recordId || this.isCloneMode) {
+ this.title = '鏂板缓瀹㈡埛浜哄憳';
+ this.isNewMode = true;
+ }
+ if (this.recordId) {
+ this.title = '缂栬緫瀹㈡埛浜哄憳';
+ this.isEditMode = true;
+ }
+ if (this.pageRef && this.pageRef.state) {
+ this.recordTypeId = this.pageRef.state.recordTypeId;
+ console.log('this.recordTypeId = ' + this.recordTypeId);
+ }
+ console.log('recordId = ' + this.recordId + ' recordTypeId = ' + this.recordTypeId + ' sobjectType = ' + this.sobjectType);
+ initData({
+ rid: this.recordId,
+ recordTypeId: this.recordTypeId,
+ sobjectType: this.sobjectType
+ }).then((r) => {
+ r = JSON.parse(JSON.stringify(r));
+ if (r.status == 'Success') {
+ this.isDoctor = r.entity.isDoctor;
+ console.log('this.isDoctor = ' + this.isDoctor);
+ if(this.isEditMode){
+ this.recordTypeId = r.entity.recordTypeId;
+ }
+ console.log('this.recordTypeId = ' + this.recordTypeId);
+ debugger
+ //濡傛灉涓嶆槸鍖婚櫌绫诲瀷锛屼娇鐢ㄦ爣鍑嗛〉闈�
+ if (!this.isDoctor) {
+ if(this.isNewMode)
+ this.RedirectStandardNewPage();
+ if(this.isEditMode)
+ this.RedirectStandardEditPage();
+ return
+ }
+ this.AWSDataId = r.entity.AWSDataId;
+ let layout = JSON.parse(r.entity.layout);
+ console.log('layout = ' + JSON.stringify(layout));
+ console.log('layout = ' + typeof layout);
+
+ let index = 1;
+ this.sectionName = layout.map(s => s.label);
+ for (let s of layout) {
+ for (let c of s.layoutColumns) {
+ c['index'] = index++;
+ if (c.layoutItems) {
+ for (let item of c.layoutItems) {
+ item['isDisable'] = item.behavior == 'Readonly' ? true : false;
+ item['isRequired'] = item.behavior == 'Required' ? true : false;
+ item['isModify'] = false;
+ if (item['field'] == 'Name') {
+ item.field = 'LastName';
+ item.fieldLabel = '濮撳悕'
+ item['isModify'] = true;
+ if (this.isEditMode) {
+ item['value'] = this.recordData.LastName
+ }
+ }
+ }
+ }
+ }
+ }
+ this.layout = layout;
+ console.log('this.layout = ' + JSON.stringify(this.layout));
+ this.AWSToSobjectMap = JSON.parse(JSON.stringify(r.entity.AWSToSobjectNonEncryptedMap));
+ this.staticResource = JSON.parse(r.entity.staticResource);
+
+
+ //缂栬緫
+ if (this.isEditMode) {
+ //瑙ｅ瘑瀹㈡埛鐨勫姞瀵嗗瓧娈�
+ this.querySobjectFromAWS();
+ }
+ this.isShowSpinner = false;
+ } else {
+ this.showToast('Error', r.msg);
+ }
+ })
+ }
+
+ querySobjectFromAWS() {
+ debugger
+ var that = this;
+ this.AWSService.query(this.staticResource.queryUrl, this.AWSDataId, function (data) {
+ console.log('queryLeadFromAWSIFS data = ' + JSON.stringify(data));
+ if (data.object) {
+ for (let s of that.layout) {
+ for (let lc of s.layoutColumns) {
+ if(lc.layoutItems){
+ for (let c of lc.layoutItems) {
+ for (let f in that.AWSToSobjectMap) {
+ if (data.object.hasOwnProperty(f) && c['field'] == that.AWSToSobjectMap[f]) {
+ c['value'] = data.object[f] == null ? '' : data.object[f];
+ if (c['field'] == 'LastName') {
+ that.modifyObj['LastName'] = data.object[f] == null ? '' : data.object[f];
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ // for (var s of that.layout) {
+ // for (var c of s.layoutFields) {
+ // for (let f in that.AWSToSobjectMap) {
+ // if (data.object.hasOwnProperty(f) && c['fieldAPI'] == that.AWSToSobjectMap[f]) {
+ // c['value'] = data.object[f] == null ? '' : data.object[f];
+ // if (c['fieldAPI'] == 'LastName') {
+ // that.modifyObj['LastName'] = data.object[f] == null ? '' : data.object[f];
+ // }
+ // }
+ // }
+ // }
+ // }
+ }
+ }, this.staticResource.token)
+ }
+
+
+ dataChange(event) {
+ let fieldName = event.target.getAttribute("data-field");
+ let value = event.detail.value;
+ console.log("fieldName = " + fieldName + " value = " + event.detail.value);
+ switch (fieldName) {
+ case "LastName":
+ this.modifyObj[fieldName] = value;
+ break;
+ }
+ }
+
+ handleSubmit(event) {
+ this.isShowSpinner = true;
+ //1. Get Sobject Information from Form
+ console.log('handleSubmit');
+ event.preventDefault();
+ const fields = event.detail.fields;
+ console.log('this.modifyObj = ' + JSON.stringify(this.modifyObj));
+ Object.assign(fields, this.modifyObj);
+ console.log('fields = ' + JSON.stringify(fields));
+
+ debugger
+ //2. select cannot actively select redaction option
+ let validationResultMessage = this.validateFieldValueFormate(fields);
+ console.log(validationResultMessage);
+ if (validationResultMessage) {
+ this.showToast('Error', validationResultMessage);
+ return
+ }
+
+ //3. Check Required Field
+ let checkRequiredFieldMsgResult = this.checkRequiredFieldMsg(fields);
+ console.log('checkRequiredFieldMsgResult = ' + checkRequiredFieldMsgResult);
+ if (checkRequiredFieldMsgResult != '') {
+ this.showToast('Error', checkRequiredFieldMsgResult + '闇�瑕佽繘琛屽～鍐�');
+ return
+ }
+
+ //4. Prepare the payload for New PI API To AWS - To Do
+ let payloadForNewPI = this.getPIPayload(fields);
+ console.log('payloadForNewPI = ' + payloadForNewPI);
+
+ //5. PI To AWS
+ //鏂板缓
+ if (this.isNewMode) {
+ this.NewPIToAWS(payloadForNewPI, fields);
+ }
+ //缂栬緫
+ if (this.isEditMode) {
+ this.UpdatePIToAWS(payloadForNewPI, fields);
+ }
+ }
+
+ //楠岃瘉瀛楁
+ validateFieldValueFormate(fields) {
+ let error_msg = '';
+ let b = false;
+ for (var key in fields) {
+ if (fields[key] == "*****")
+ b = true;
+ }
+ if (b)
+ error_msg = '涓嬫媺妗嗕笉鑳戒富鍔ㄩ�夋嫨瀵嗘枃閫夐」';
+ return error_msg;
+ }
+
+ //楠岃瘉required瀛楁闇�瑕佽繘琛屽～鍐�
+ checkRequiredFieldMsg(fields) {
+ let msg = '';
+ try {
+ for (let s of this.layout) {
+ for (let lc of s.layoutColumns) {
+ if (lc.layoutItems) {
+ for (let c of lc.layoutItems) {
+ if (!c.isDisable && c.isRequired && (fields[c.field] == null || fields[c.field] == '')) {
+ msg += ';' + c.fieldLabel;
+ }
+ }
+ }
+ }
+ }
+ } catch (err) {
+ this.showToast('Error',err.message);
+ }
+ msg = msg.substring(1);
+ return msg;
+ }
+
+ //鑾峰彇PI瀛楁
+ getPIPayload(sobjJsonLwc) {
+ console.log()
+ let leadPayloadList = [];
+ let leadPIData = {};
+
+ for (let f in this.AWSToSobjectMap) {
+ if (sobjJsonLwc.hasOwnProperty(this.AWSToSobjectMap[f])) {
+ leadPIData[f] = sobjJsonLwc[this.AWSToSobjectMap[f]]
+ }
+ else {
+ console.log(this.AWSToSobjectMap[f] + 'is not in sobjJsonLwc');
+ }
+ }
+
+ leadPIData.medicalStaffFullName = leadPIData.lastName;
+ leadPIData.sfRecordId = '';
+ console.log('Sobject PI Data x :' + leadPIData);
+ leadPayloadList.push(leadPIData);
+ console.log('leadPayloadList = ' + JSON.stringify(leadPayloadList));
+ return JSON.stringify(leadPayloadList);
+ }
+
+ //鏂板缓淇濆瓨ToAWS
+ NewPIToAWS(payloadForNewPI, fields) {
+ this.AWSService.post(this.staticResource.newUrl, payloadForNewPI, (result) => {
+ if (result && result.object) {
+ console.log('result = ' + JSON.stringify(result));
+ for (let f in this.AWSToSobjectMap) {
+ if (result.object[0].hasOwnProperty(f)) {
+ fields[this.AWSToSobjectMap[f]] = result.object[0][f];
+ console.log('this.AWSToSobjectMap[f] = ' + this.AWSToSobjectMap[f]);
+ console.log('fields[this.AWSToSobjectMap[f]] = ' + fields[this.AWSToSobjectMap[f]]);
+ }
+ else {
+ console.log(f + 'is not in result.object[0]');
+ }
+ }
+ fields['AWS_Data_Id__c'] = result.object[0].dataId;
+ this.txId = result.txId;
+ //淇濆瓨鍒板悗绔�
+ this.template.querySelector('lightning-record-edit-form').submit(fields);
+ } else {
+ console.log('result = ' + JSON.stringify(result));
+ }
+ }, this.staticResource.token);
+ }
+
+ //缂栬緫淇濆瓨ToAWS
+ UpdatePIToAWS(payloadForNewPI, fields) {
+ let obj = JSON.parse(payloadForNewPI);
+ obj[0].dataId = this.AWSDataId;
+ let payloadForNewPIJson = JSON.stringify(obj);
+ this.AWSService.post(this.staticResource.updateUrl, payloadForNewPIJson, (result) => {
+ if (result && result.object) {
+ console.log('result = ' + JSON.stringify(result));
+ for (let f in this.AWSToSobjectMap) {
+ if (result.object[0].hasOwnProperty(f)) {
+ fields[this.AWSToSobjectMap[f]] = result.object[0][f];
+ console.log('this.AWSToSobjectMap[f] = ' + this.AWSToSobjectMap[f]);
+ console.log('fields[this.AWSToSobjectMap[f]] = ' + fields[this.AWSToSobjectMap[f]]);
+ }
+ else {
+ console.log(f + 'is not in result.object[0]');
+ }
+ }
+ fields['AWS_Data_Id__c'] = this.AWSDataId;
+ this.txId = result.txId;
+ console.log('this.txId = ' + this.txId);
+ console.log('PI After fields = ' + JSON.stringify(fields));
+ if (fields.RecordTypeId) {
+ fields['RecordTypeId'] = fields.RecordTypeId.substring(1, fields.RecordTypeId.length - 1);
+ }
+ //淇濆瓨鍒板悗绔�
+ console.log('update submit = ' + JSON.stringify(fields));
+ this.template.querySelector('lightning-record-edit-form').submit(fields);
+ } else {
+ console.log('result = ' + JSON.stringify(result));
+ }
+ }, this.staticResource.token);
+ }
+
+ //鎻愪氦淇濆瓨鎴愬姛
+ handleSuccess(event) {
+ let updatedRecord = event.detail.id;
+ console.log('onsuccess: ', updatedRecord);
+ console.log('confirmTrans');
+ let that = this;
+ this.AWSService.confirm(true, updatedRecord, this.txId, this.staticResource.token, this.staticResource.transactionUrl, function (result) {
+ console.log('result = ' + JSON.stringify(result))
+ that.showToast('Success', '淇濆瓨鎴愬姛');
+ console.log('updatedRecord = ' + updatedRecord)
+ that[NavigationMixin.Navigate]({
+ type: 'standard__recordPage',
+ attributes: {
+ actionName: "view",
+ recordId: updatedRecord,
+ objectApiName: that.sobjectType
+ }
+ });
+ });
+ }
+
+ //鎻愪氦淇濆瓨澶辫触
+ handleError(event) {
+ event.preventDefault();
+ event.stopImmediatePropagation();
+ this.showToast("Error", event.detail.detail);
+ this.AWSService.confirm(false, '', this.txId, this.staticResource.token, this.staticResource.transactionUrl, function (result) {
+ console.log('result = ' + JSON.stringify(result))
+ });
+ }
+
+ //change浜嬩欢
+ dataChange(event) {
+ let fieldName = event.target.getAttribute("data-field");
+ let value = event.detail.value;
+ console.log("fieldName = " + fieldName + " value = " + event.detail.value);
+ if (this.modifyArray.indexOf(fieldName) != -1) {
+ switch (fieldName) {
+ case "LastName":
+ this.modifyObj[fieldName] = value;
+ break;
+ }
+ }
+ }
+
+ //鍙栨秷
+ cancel() {
+ console.log('cancel');
+ window.history.back();
+ }
+
+ //鏍囧噯鏂板缓椤甸潰璺宠浆
+ RedirectStandardNewPage() {
+ this[NavigationMixin.Navigate]({
+ type: 'standard__objectPage',
+ attributes: {
+ objectApiName: 'Contact',
+ actionName: 'new'
+ },
+ state: {
+ nooverride: '1',
+ recordTypeId: this.recordTypeId
+ }
+ });
+ }
+
+ //鏍囧噯缂栬緫椤甸潰璺宠浆
+ RedirectStandardEditPage() {
+ this[NavigationMixin.Navigate]({
+ type: 'standard__recordPage',
+ attributes: {
+ objectApiName: 'Contact',
+ recordId: this.recordId,
+ actionName: 'edit',
+ },
+ state: {
+ nooverride: '1',
+ }
+ });
+ }
+
+ //鏄剧ず淇℃伅
+ showToast(type, msg) {
+ this.isShowSpinner = false;
+ const event = new ShowToastEvent({
+ title: type,
+ variant: type,
+ message: msg
+ });
+ this.dispatchEvent(event);
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexNewAndEditContactPIPL/lexNewAndEditContactPIPL.js-meta.xml b/force-app/main/default/lwc/lexNewAndEditContactPIPL/lexNewAndEditContactPIPL.js-meta.xml
new file mode 100644
index 0000000..3fe0e73
--- /dev/null
+++ b/force-app/main/default/lwc/lexNewAndEditContactPIPL/lexNewAndEditContactPIPL.js-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>57.0</apiVersion>
+ <isExposed>false</isExposed>
+</LightningComponentBundle>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexOutboundorderImport/lexOutboundorderImport.js b/force-app/main/default/lwc/lexOutboundorderImport/lexOutboundorderImport.js
index db4e6a3..0200238 100644
--- a/force-app/main/default/lwc/lexOutboundorderImport/lexOutboundorderImport.js
+++ b/force-app/main/default/lwc/lexOutboundorderImport/lexOutboundorderImport.js
@@ -12,38 +12,45 @@
label: "鍑哄簱鍗曞悕绉�",
fieldName: "orderName",
hideDefaultActions: true,
- initialWidth: 200
+ initialWidth: 200,
+ wrapText: true,
},
{
label: "鐩殑",
fieldName: "orderSummonsForDirction",
hideDefaultActions: true,
+ wrapText: true,
},
{
label: "鍖婚櫌缂栫爜",
fieldName: "hospitalCode",
hideDefaultActions: true,
+ wrapText: true,
},
{
label: "鍖婚櫌鍚嶇О",
fieldName: "hospitalName",
hideDefaultActions: true,
+ wrapText: true,
initialWidth: 300
},
{
label: "绉戝",
fieldName: "orderOrderForCustomerText",
hideDefaultActions: true,
+ wrapText: true,
},
{
label: "浜岀骇缁忛攢鍟�",
fieldName: "agencyName",
hideDefaultActions: true,
+ wrapText: true,
},
{
label: "鍑哄簱/閿�鍞棩鏈�",
fieldName: "orderOutboundDate",
hideDefaultActions: true,
+ wrapText: true,
},
];
export default class LexOutboundorderImport extends LightningElement {
@@ -159,6 +166,7 @@
console.log('this.sqlagencyProType = ' + this.sqlagencyProType);
console.log('this.userWorkLocation = ' + this.userWorkLocation);
console.log('this.accountName = ' + this.accountName);
+ console.log('encodeURIComponent(this.fileContents) = ' + encodeURIComponent(this.fileContents));
importCSVFile({
base64DataLwc: encodeURIComponent(this.fileContents),
sqlagencyProTypeLwc: this.sqlagencyProType,
diff --git a/force-app/main/default/lwc/lexOverdueStock/lexOverdueStock.html b/force-app/main/default/lwc/lexOverdueStock/lexOverdueStock.html
index 84a3ed8..719cc89 100644
--- a/force-app/main/default/lwc/lexOverdueStock/lexOverdueStock.html
+++ b/force-app/main/default/lwc/lexOverdueStock/lexOverdueStock.html
@@ -75,7 +75,7 @@
<!-- <div style="height: 300px;"> -->
<template if:true={showTable}>
- <c-lex-custom-lightning-datatable key-field="prodid" data={data} columns={columns}
+ <c-lex-custom-lightning-datatable key-field="key" data={data} columns={columns}
onrowselection={getSelectedRows}
selected-rows={selectedRows} class="wrapped-header-datatable">
</c-lex-custom-lightning-datatable>
@@ -114,7 +114,7 @@
<lightning-datatable
key-field="id" data={overduePageRecords} columns={column}
onrowselection={getSelectedRows} hide-checkbox-column="true"
- selected-rows={selectedRows} class="wrapped-header-datatable">
+ selected-rows={selectedRows} class="wrapped-header-datatable" style="word-wrap:break-word; word-break:break-all; ">
</lightning-datatable>
</div>
diff --git a/force-app/main/default/lwc/lexOverdueStock/lexOverdueStock.js b/force-app/main/default/lwc/lexOverdueStock/lexOverdueStock.js
index d81b24d..d25d299 100644
--- a/force-app/main/default/lwc/lexOverdueStock/lexOverdueStock.js
+++ b/force-app/main/default/lwc/lexOverdueStock/lexOverdueStock.js
@@ -11,268 +11,337 @@
//杩囨湡搴撳瓨涓�瑙�
const columns = [
- {
- label: '鏄惁閿�瀛�',
- fieldName: 'iscount',
- type: 'checkbox',
- hideDefaultActions: true,
- initialWidth: 80,
- },
- {
- label: '娑堣�楀搧鍚嶇О',
- fieldName: 'prodname',
- type: 'prodname',
- wrapText: true,
- initialWidth: 350,
-
- hideDefaultActions: true
+ {
+ label: '鏄惁閿�瀛�',
+ fieldName: 'iscount',
+ type: 'checkbox',
+ hideDefaultActions: true,
+ initialWidth: 80,
+ },
+ {
+ label: '娑堣�楀搧鍚嶇О',
+ fieldName: 'prodname',
+ type: 'prodname',
+ wrapText: true,
+ initialWidth: 350,
- },
- {
- label: '鍗曚綅',
- fieldName: 'boxPiece',
- hideDefaultActions: true,
- // initialWidth: 250,
-
- },
- {
- label: '杩囨湡鏁伴噺',
- fieldName: 'overlimitCount',
- hideDefaultActions: true,
- cellAttributes: { alignment: 'right' }
-
- // initialWidth: 250,
-
- },
- {
- label: '閿�瀛樻暟閲�',
- fieldName: 'pandian',
- hideDefaultActions: true,
- cellAttributes: { alignment: 'right' }
- // initialWidth: 250,
+ hideDefaultActions: true
+
+ },
+ {
+ label: '鍗曚綅',
+ fieldName: 'boxPiece',
+ hideDefaultActions: true,
+ // initialWidth: 250,
+
+ },
+ {
+ label: '杩囨湡鏁伴噺',
+ fieldName: 'overlimitCount',
+ hideDefaultActions: true,
+ cellAttributes: { alignment: 'right' }
+
+ // initialWidth: 250,
+
+ },
+ {
+ label: '閿�瀛樻暟閲�',
+ fieldName: 'pandian',
+ hideDefaultActions: true,
+ cellAttributes: { alignment: 'right' }
+ // initialWidth: 250,
// cellAttributes: { alignment: 'center' }
- }
- ];
- //閿�瀛樻槑缁�
+ }
+];
+//閿�瀛樻槑缁�
const column = [
-
- {
- label: '娑堣�楀搧鍚嶇О',
- fieldName: 'Name__c',
- type: 'Name',
- // initialWidth : 300,
- hideDefaultActions: true,
- cellAttributes: { alignment: 'left' }
- },
- {
- label: '鍗曚綅',
- fieldName: 'Box_Piece__c',
- initialWidth : 80,
- hideDefaultActions: true
- },
- {
- label: 'BarCode',
- fieldName: 'Bar_Code__c',
- wrapText: true,
- hideDefaultActions: true,
- initialWidth : 500,
- },
- {
- label: '浣跨敤鏈熼檺',
- fieldName: 'Sterilization_limit__c',
- hideDefaultActions: true,
- // initialWidth : 250
+
+ {
+ label: '娑堣�楀搧鍚嶇О',
+ fieldName: 'Name__c',
+ type: 'Name',
+ wrapText: true,
+ // initialWidth : 300,
+ hideDefaultActions: true,
+ cellAttributes: { alignment: 'left' }
+ },
+ {
+ label: '鍗曚綅',
+ fieldName: 'Box_Piece__c',
+ initialWidth: 80,
+ hideDefaultActions: true
+ },
+ {
+ label: 'BarCode',
+ fieldName: 'Bar_Code__c',
+ wrapText: true,
+ hideDefaultActions: true,
+ // initialWidth: 500,
+ },
+ {
+ label: '浣跨敤鏈熼檺',
+ fieldName: 'Sterilization_limit__c',
+ hideDefaultActions: true,
+ // initialWidth : 250
+ }
+ ,
+ {
+ label: '閿�瀛樺師鍥�',
+ fieldName: 'diffReason',
+ hideDefaultActions: true,
+ wrapText: true,
+ initialWidth: 160
+ }
+];
+
+
+export default class LexOverdueStock extends NavigationMixin(LightningElement) {
+ columns = columns
+ column = column
+ @track data = [];
+ @track overduePageRecords = [];
+ @track iSinventory = false
+
+
+ //鍔犺浇妗�
+ // @track casesSpinner = true;
+ @track showSpinner = true;
+ //鏄剧ず鍙�
+ @track showbutton = false
+ @track showTable = false;
+ @track showTables = false;
+ //閿�瀛樹竴瑙堟暟鎹�
+ @track accountName;
+ @track agencyProType;
+ @track userWorkLocation;
+ @track barcode = ''
+ @track orderDetZaiku
+ @track selectedRows = [];
+ @track codPageRecordsLWC;
+ @track Id;
+ @track overdueList = [];
+
+
+ renderedCallback() {
+ if (!this.stylesLoaded) {
+ Promise.all([loadStyle(this, WrappedHeaderTable)])
+ .then(() => {
+ console.log("Custom styles loaded");
+ this.stylesLoaded = true;
+ })
+ .catch((error) => {
+ console.error("Error loading custom styles");
+ });
}
- ,
- {
- label: '閿�瀛樺師鍥�',
- fieldName: 'diffReason',
- hideDefaultActions: true,
- initialWidth: 160
- }
- ];
-
-
-export default class LexOverdueStock extends NavigationMixin (LightningElement ){
- columns = columns
- column = column
- @track data =[];
- @track overduePageRecords = [];
- @track iSinventory = false
-
-
- //鍔犺浇妗�
- // @track casesSpinner = true;
- @track showSpinner =true;
- //鏄剧ず鍙�
- @track showbutton = false
- @track showTable = false;
- @track showTables = false;
- //閿�瀛樹竴瑙堟暟鎹�
- @track accountName;
- @track agencyProType;
- @track userWorkLocation;
- @track barcode = ''
- @track orderDetZaiku
- @track selectedRows = [];
- @track codPageRecordsLWC;
- @track Id;
- @track overdueList = [];
-
-
- renderedCallback() {
- if (!this.stylesLoaded) {
- Promise.all([loadStyle(this, WrappedHeaderTable)])
- .then(() => {
- console.log("Custom styles loaded");
- this.stylesLoaded = true;
- })
- .catch((error) => {
- console.error("Error loading custom styles");
- });
- }
}
- //鍒濆鍖�
- connectedCallback() {
- console.log('鍒濆鍖�');
- this.showSpinner = true;
+ //鍒濆鍖�
+ connectedCallback() {
+ console.log('鍒濆鍖�');
+ this.showSpinner = true;
- init().then((result) => {
- result = JSON.parse(JSON.stringify(result));
- console.log('result ='+JSON.stringify(result));
- console.log('result 1='+result.entity.codPageRecords);
- if(result.status = 'Success'){
- this.data = JSON.parse(result.entity.codPageRecords);
- this.codPageRecordsLWC = result.entity.codPageRecords;
- console.log('this.data'+this.data);
- this.accountName = result.entity.accountName;
- this.agencyProType = result.entity.agencyProType;
- this.userWorkLocation = result.entity.userWorkLocation;
- this.showTable = true;
- // this.casesSpinner = false;
- this.showSpinner = false;
- }else {
- this.showMyToast('鍒濆鍖栧け璐�',result.msg,'error');
- this.showSpinner = false;
- }
- }).catch((error) => {
- console.log('error = ' + JSON.stringify(error));
- });
- }
- //barcode褰曞叆
- barcodeEntrys(){
- this.showSpinner = true;
- this.showTable = false;
- console.log('code'+this.barcode);
- console.log(' this.accountName'+ this.accountName);
- console.log(' this.barcode'+ this.barcode);
-
- if(this.barcode == ''||this.barcode==null){
- this.showMyToast('鑾峰彇澶辫触','璇疯緭鍏arCode鍙�','error');
- this.showSpinner = false;
+ init().then((result) => {
+ result = JSON.parse(JSON.stringify(result));
+ console.log('result =' + JSON.stringify(result));
+ console.log('result 1=' + result.entity.codPageRecords);
+ if (result.status = 'Success') {
+ this.data = JSON.parse(result.entity.codPageRecords);
+ this.codPageRecordsLWC = result.entity.codPageRecords;
+ console.log('this.data' + this.data);
+ this.accountName = result.entity.accountName;
+ this.agencyProType = result.entity.agencyProType;
+ this.userWorkLocation = result.entity.userWorkLocation;
+ for (var i in this.data) {
+ this.data[i]["key"] = this.data[i]["prodid"] + this.data[i]["boxPiece"];
}
- barcodeEntry({
- accountNameLWC: this.accountName,
- agencyProTypeLWC: this.agencyProType,
- userWorkLocationLWC:this.userWorkLocation,
- barcodeLWC:this.barcode,
- codPageRecordsLWC:this.codPageRecordsLWC
- }).then((result)=>{
- result = JSON.parse(JSON.stringify(result));
- if (result.status == 'Success') {
- this.overduePageRecords = JSON.parse(result.entity.overduePageRecords);
- this.overdueList = result.entity.overdueList;
- this.iSinventory = result.entity.iSinventory;
- console.log('result褰曞叆'+JSON.stringify( result));
- console.log('overdueList==>'+JSON.stringify( this.overdueList));
- for(let i in this.overduePageRecords){
- if(this.overduePageRecords[i].Prod!=null){
- this.overduePageRecords[i]['Name__c'] = this.overduePageRecords[i].Prod.Name__c;
+ this.showTable = true;
+ // this.casesSpinner = false;
+ this.showSpinner = false;
+ } else {
+ this.showMyToast('鍒濆鍖栧け璐�', result.msg, 'error');
+ this.showSpinner = false;
+ }
+ }).catch((error) => {
+ console.log('error = ' + JSON.stringify(error));
+ });
+ }
+ //barcode褰曞叆
+ barcodeEntrys() {
+ this.showSpinner = true;
+ this.showTable = false;
+ console.log('code' + this.barcode);
+ console.log(' this.accountName' + this.accountName);
+ console.log(' this.barcode' + this.barcode);
+ const selectedRows = this.template.querySelector('c-lex-custom-lightning-datatable').getSelectedRows();
+ console.log('selectedRows========> ' + JSON.stringify(selectedRows));
+ for (var i in this.data) {
+ this.data[i]["check"] = false;
+ }
+ for (var i in this.data) {
+ for (var j in selectedRows) {
+ if (this.data[i].prodid + this.data[i]["boxPiece"] == selectedRows[j].prodid + selectedRows[j]["boxPiece"]) {
+ this.data[i]["check"] = true;
+ }
+ // console.log('this.data[i].ProdId+this.data[i]["boxPiece"]'+this.data[i].ProdId+this.data[i]["boxPiece"]);
+ console.log('selectedRows[j].prodid+this.data[i]["boxPiece"]' + selectedRows[j].prodid + selectedRows[j]["boxPiece"]);
- }
- this.overduePageRecords[i]['Bar_Code__c'] = this.overduePageRecords[i].orderdetails2.Bar_Code__c;
- this.overduePageRecords[i]['Box_Piece__c'] = this.overduePageRecords[i].orderdetails2.Box_Piece__c;
- this.overduePageRecords[i]['Sterilization_limit__c'] = this.overduePageRecords[i].orderdetails2.Sterilization_limit__c;
+ }
+ console.log('data===>'+ JSON.stringify(this.data));
+ }
+ // this.selectedRows = [];
+
+ // if(this.barcode == ''||this.barcode==null){
+ // this.showMyToast('鑾峰彇澶辫触','璇疯緭鍏arCode鍙�','error');
+ // this.showSpinner = false;
+ // }
+ barcodeEntry({
+ accountNameLWC: this.accountName,
+ agencyProTypeLWC: this.agencyProType,
+ userWorkLocationLWC: this.userWorkLocation,
+ barcodeLWC: this.barcode,
+ codPageRecordsLWC: JSON.stringify(this.data)
+ }).then((result) => {
+ result = JSON.parse(JSON.stringify(result));
+ if (result.status == 'Success') {
+ this.overduePageRecords = JSON.parse(result.entity.overduePageRecords);
+ this.overdueList = result.entity.overdueList;
+ this.iSinventory = result.entity.iSinventory;
+ console.log('result褰曞叆' + JSON.stringify(result));
+ console.log('overdueList==>' + JSON.stringify(this.overdueList));
+ for (let i in this.overduePageRecords) {
+ if (this.overduePageRecords[i].Prod != null) {
+ this.overduePageRecords[i]['Name__c'] = this.overduePageRecords[i].Prod.Name__c;
+
+ }
+ this.overduePageRecords[i]['Bar_Code__c'] = this.overduePageRecords[i].orderdetails2.Bar_Code__c;
+ this.overduePageRecords[i]['Box_Piece__c'] = this.overduePageRecords[i].orderdetails2.Box_Piece__c;
+ this.overduePageRecords[i]['Sterilization_limit__c'] = this.overduePageRecords[i].orderdetails2.Sterilization_limit__c;
+ }
+ this.data = JSON.parse(result.entity.codPageRecords);
+ console.log(' this.data' + JSON.stringify(this.data));
+ for (var i in this.data) {
+ this.data[i]["key"] = this.data[i]["prodid"] + this.data[i]["boxPiece"];
+ }
+ for (var i in this.data) {
+ if (this.data[i]['check']) {
+ this.selectedRows.push(this.data[i].prodid + this.data[i]["boxPiece"]);
+ console.log("selectedRows:" + this.selectedRows);
+ }
+ }
+ this.showSpinner = false;
+ // this.showTables = true;
+ this.showTable = true;
+ } else {
+ if (result.status == 'Success1') {
+ this.overduePageRecords = JSON.parse(result.entity.overduePageRecords);
+ this.overdueList = result.entity.overdueList;
+ this.iSinventory = result.entity.iSinventory;
+ console.log('result褰曞叆' + JSON.stringify(result));
+ console.log('overdueList==>' + JSON.stringify(this.overdueList));
+ for (let i in this.overduePageRecords) {
+ if (this.overduePageRecords[i].Prod != null) {
+ this.overduePageRecords[i]['Name__c'] = this.overduePageRecords[i].Prod.Name__c;
+
}
- this.data = JSON.parse(result.entity.codPageRecords);
- console.log(' this.data'+ JSON.stringify(this.data));
- for (var i in this.data) {
+ this.overduePageRecords[i]['Bar_Code__c'] = this.overduePageRecords[i].orderdetails2.Bar_Code__c;
+ this.overduePageRecords[i]['Box_Piece__c'] = this.overduePageRecords[i].orderdetails2.Box_Piece__c;
+ this.overduePageRecords[i]['Sterilization_limit__c'] = this.overduePageRecords[i].orderdetails2.Sterilization_limit__c;
+ }
+ this.data = JSON.parse(result.entity.codPageRecords);
+ console.log(' this.data' + JSON.stringify(this.data));
+ for (var i in this.data) {
+ this.data[i]["key"] = this.data[i]["prodid"] + this.data[i]["boxPiece"];
+ }
+ for (var i in this.data) {
if (this.data[i]['check']) {
- this.selectedRows.push(this.data[i].prodid);
- console.log('selectedRows:' + this.selectedRows);
+ this.selectedRows.push(this.data[i].prodid + this.data[i]["boxPiece"]);
+ console.log("selectedRows:" + this.selectedRows);
}
}
this.showSpinner = false;
// this.showTables = true;
this.showTable = true;
- }else{
- this.showMyToast('鑾峰彇澶辫触',result.msg,'error');
+ }else {
+ console.log('Error:' + result.msg);
+ this.showMyToast(result.msg,'','error');
this.showSpinner = false;
+ this.showTable = true;
}
- }).catch((error) => {
- console.log('error = ' + JSON.stringify(error));
- });
-
- }
- //鑾峰彇褰撳墠杈撳叆鍊�
+ // this.showMyToast('鑾峰彇澶辫触', result.msg, 'error');
+ // this.showSpinner = false;
+ }
+
+ }).catch((error) => {
+ console.log('error = ' + JSON.stringify(error));
+ });
+
+ }
+ //鑾峰彇褰撳墠杈撳叆鍊�
handleChange(event) {
let value = event.detail.value;
console.log('value' + value);
this.barcode = value;
- console.log('this.barcode'+this.barcode);
+ console.log('this.barcode' + this.barcode);
}
getSelectedRows(event) {
- console.log('鎵撳嬀');
- const selectedRows = event.detail.selectedRows;
- console.log('this.selectedRows = ' + this.selectedRows);
- for (var i in this.data) {
- this.data[i]['check'] = false;
- }
- for (var i in this.data) {
- for (var j in selectedRows) {
- console.log('this.selectedRows111 = ' + selectedRows[j].prodid);
- console.log('this.selectedRows1112 = ' + this.data[i].prodid );
- if (this.data[i].prodid == selectedRows[j].prodid) {
- this.data[i]['check'] = true;
- }
- }
- }
+ let selectedRowsEvent = event.detail.selectedRows;
+ this.selectedRows = [];
+ for (var i in selectedRowsEvent) {
+ this.selectedRows.push(selectedRowsEvent[i].prodid+this.data[i]["boxPiece"]);
+ }
+ console.log('this.selectedRows==>'+this.selectedRows);
+
}
//淇濆瓨
saveConfirm() {
console.log('杩涘叆閿�瀛樼‘璁�');
this.showSpinner = true;
- var el = this.template.querySelector('c-lex-custom-lightning-datatable');
- var selected = el.getSelectedRows();
- this.selectedData = selected;
- console.log('閫変腑鏁版嵁' + JSON.stringify(this.selectedData));
- console.log('this.overdueList'+this.overdueList);
+ //鏌ヨ鏈夊摢浜涢�夋嫨浜嗙殑鐒跺悗check
+ const selectedRows = this.template.querySelector('c-lex-custom-lightning-datatable').getSelectedRows();
+ console.log('selectedRows========> ' + JSON.stringify(selectedRows));
+ for (var i in this.data) {
+ this.data[i]["check"] = false;
+ }
+ for (var i in this.data) {
+ for (var j in selectedRows) {
+ if (this.data[i].prodid+this.data[i]["boxPiece"] == selectedRows[j].prodid+ selectedRows[j]["boxPiece"]) {
+ this.data[i]["check"] = true;
+ }
+ // console.log('this.data[i].ProdId+this.data[i]["boxPiece"]'+this.data[i].ProdId+this.data[i]["boxPiece"]);
+ console.log('selectedRows[j].prodid+this.data[i]["boxPiece"]'+selectedRows[j].prodid+selectedRows[j]["boxPiece"]);
+
+ }
+ }
+ // var el = this.template.querySelector('c-lex-custom-lightning-datatable');
+ // var selected = el.getSelectedRows();
+ // this.selectedData = selected;
+ // console.log('閫変腑鏁版嵁' + JSON.stringify(this.selectedData));
+ // console.log('this.overdueList' + this.overdueList);
save({
iSinventory: this.iSinventory,
- saveCodPageRecords: JSON.stringify(this.selectedData),
+ saveCodPageRecords: JSON.stringify(this.data),
// saveoverdueList:JSON.stringify(this.overdueList)
- saveoverdueList:this.overdueList
+ saveoverdueList: this.overdueList
}).then((result) => {
- result = JSON.parse(JSON.stringify(result));
- console.log('result淇濆瓨 = ' + JSON.stringify(result));
- if (result.status == 'Success') {
- this[NavigationMixin.Navigate]({
- type: 'standard__recordPage',
- attributes: {
- recordId:result.entity.Id,
- objectApiName: 'Consumable_order__c',
- actionName: 'view'
- }
- });
- this.showSpinner = false;
- } else {
- this.showMyToast('閿�瀛樺け璐�',result.msg,'error');
- this.showSpinner = false;
- }
- })
+ result = JSON.parse(JSON.stringify(result));
+ console.log('result淇濆瓨 = ' + JSON.stringify(result));
+ if (result.status == 'Success') {
+ this[NavigationMixin.Navigate]({
+ type: 'standard__recordPage',
+ attributes: {
+ recordId: result.entity.Id,
+ objectApiName: 'Consumable_order__c',
+ actionName: 'view'
+ }
+ });
+ this.showSpinner = false;
+ } else {
+ this.showMyToast('閿�瀛樺け璐�', result.msg, 'error');
+ this.showSpinner = false;
+ }
+ })
.catch((error) => {
console.log('error = ' + JSON.stringify(error));
this.showSpinner = false;
@@ -283,17 +352,17 @@
console.log('show custom message');
var iconName = '';
var content = '';
- if(variant == 'success'){
- iconName = 'utility:check';
- }else{
- iconName = 'utility:error';
+ if (variant == 'success') {
+ iconName = 'utility:check';
+ } else {
+ iconName = 'utility:error';
}
- if(message != ''){
- content = '<h2><strong>'+title+'<strong/></h2><h5>'+message+'</h5>';
- }else{
- content = '<h2><strong>'+title+'<strong/></h2>';
+ if (message != '') {
+ content = '<h2><strong>' + title + '<strong/></h2><h5>' + message + '</h5>';
+ } else {
+ content = '<h2><strong>' + title + '<strong/></h2>';
}
- this.template.querySelector('c-common-toast').showToast(variant,content,iconName,10000);
- }
+ this.template.querySelector('c-common-toast').showToast(variant, content, iconName, 10000);
+ }
- }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexProductLimitEdit/lexProductLimitEdit.js b/force-app/main/default/lwc/lexProductLimitEdit/lexProductLimitEdit.js
index c6976a3..025f40b 100644
--- a/force-app/main/default/lwc/lexProductLimitEdit/lexProductLimitEdit.js
+++ b/force-app/main/default/lwc/lexProductLimitEdit/lexProductLimitEdit.js
@@ -3,71 +3,71 @@
import save from "@salesforce/apex/LexUpAccountProLimit.upAccount";
import { ShowToastEvent } from 'lightning/platformShowToastEvent';
import { NavigationMixin } from "lightning/navigation";
-export default class InventoryEditingLWC extends NavigationMixin(LightningElement){
+export default class LexProductLimitEdit extends NavigationMixin(LightningElement) {
@track invRecords = [];
@track accountid;
@track upstring = '';
@track userPro_Type;
@track showSpinner = true;
//鑾峰彇閾炬帴鍙傛暟
- getQueryString(name) {
- console.log("getQueryString name " + name);
- let reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
- let r = window.location.search.substr(1).match(reg);
- if (r != null) {
- return decodeURIComponent(r[2]);
- }
- return null;
- }
+ getQueryString(name) {
+ console.log("getQueryString name " + name);
+ let reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+ let r = window.location.search.substr(1).match(reg);
+ if (r != null) {
+ return decodeURIComponent(r[2]);
+ }
+ return null;
+ }
- connectedCallback(){
+ connectedCallback() {
this.showSpinner = true;
console.log(' === connectedCallback === ');
//鑾峰彇accountid userPro_Type
- this.accountid = this.getQueryString("accountid");
+ this.accountid = this.getQueryString("accountid");
this.accountid = this.accountid == null ? "" : this.accountid;
this.userPro_Type = this.getQueryString("userPro_Type");
- this.userPro_Type = this.userPro_Type == null ? "" : this.userPro_Type;
- //鑾峰彇鏁版嵁
- oninit({
- accountid:this.accountid,
- userPro_Type:this.userPro_Type
+ this.userPro_Type = this.userPro_Type == null ? "" : this.userPro_Type;
+ //鑾峰彇鏁版嵁
+ oninit({
+ accountid: this.accountid,
+ userPro_Type: this.userPro_Type
- }).then((result) => {
- result = JSON.parse(JSON.stringify(result));
- console.log('result'+JSON.stringify(result));
- if(result.status == 'Success'){
- console.log('11===>'+result.entity.product_Limit);
- console.log('11===>'+typeof(result.entity.product_Limit));
- let str = result.entity.product_Limit;
- var arr = str.split(',');
- console.log('arr==>'+ arr);
- console.log('arr==>'+ arr.length);
- console.log('arr==>'+ typeof(arr));
- for(var i in arr){
- var arry = arr[i].split('|');
- this.invRecords.push({
- productNumber: arry[0],
- inventory1:arry[1],
- inventory2:arry[2]
- });
- }
- this.showSpinner = false;
- console.log('this.invRecords'+JSON.stringify(this.invRecords));
- }else{
- this.showSpinner = false;
- console.log("error = " + JSON.stringify(error));
-
+ }).then((result) => {
+ result = JSON.parse(JSON.stringify(result));
+ console.log('result' + JSON.stringify(result));
+ if (result.status == 'Success') {
+ console.log('11===>' + result.entity.product_Limit);
+ console.log('11===>' + typeof (result.entity.product_Limit));
+ let str = result.entity.product_Limit;
+ var arr = str.split(',');
+ console.log('arr==>' + arr);
+ console.log('arr==>' + arr.length);
+ console.log('arr==>' + typeof (arr));
+ for (var i in arr) {
+ var arry = arr[i].split('|');
+ this.invRecords.push({
+ productNumber: arry[0],
+ inventory1: arry[1],
+ inventory2: arry[2]
+ });
}
- }).catch((error) => {
this.showSpinner = false;
- console.log("error = " + JSON.stringify(error));
- });
+ console.log('this.invRecords' + JSON.stringify(this.invRecords));
+ } else {
+ this.showSpinner = false;
+ console.log("error = " + JSON.stringify(error));
+
+ }
+ }).catch((error) => {
+ this.showSpinner = false;
+ console.log("error = " + JSON.stringify(error));
+ });
// this.inventoryTempRecords();
}
- addRow(){
+ addRow() {
let objRow = {
productNumber: '',
inventory1: '',
@@ -76,118 +76,118 @@
}
this.invRecords = [...this.invRecords, Object.create(objRow)];
}
- removeRow(event){
+ removeRow(event) {
const indexPos = event.currentTarget.name;
let remList = [];
remList = this.invRecords;
- remList.splice(indexPos,1);
+ remList.splice(indexPos, 1);
this.invRecords = remList;
}
- handleClick(){
+ handleClick() {
this.showSpinner = true;
console.log('淇濆瓨');
- console.log('this.invRecords'+JSON.stringify(this.invRecords));
- for(var i in this.invRecords){
- console.log('inven'+this.invRecords[i]["inventory1"]);
- console.log('鏁板瓧'+this.isNum(this.invRecords[i]["inventory1"]));
+ console.log('this.invRecords' + JSON.stringify(this.invRecords));
+ for (var i in this.invRecords) {
+ console.log('inven1' + this.invRecords[i]["inventory1"]);
+ console.log('鏁板瓧1' + this.isNum(this.invRecords[i]["inventory1"]));
+ console.log('inven2' + this.invRecords[i]["inventory2"]);
+ console.log('鏁板瓧2' + this.isNum(this.invRecords[i]["inventory2"]));
+ if (this.invRecords[i]["inventory1"] == '' || this.invRecords[i]["inventory1"] == null || this.invRecords[i]["inventory2"] == null || this.invRecords[i]["inventory2"] == '') {
+ this.showMyToast('淇濆瓨澶辫触', '杈撳叆鏍煎紡涓嶆纭�,璇疯緭鍏ユ暟瀛�', 'error');
+ this.showSpinner = false;
+ return;
+ }
+ if( this.isNum(this.invRecords[i]["inventory1"]) == false || this.isNum(this.invRecords[i]["inventory2"]) == false){
+ this.showMyToast('淇濆瓨澶辫触', '杈撳叆鏍煎紡涓嶆纭�,璇疯緭鍏ユ暟瀛�', 'error');
+ this.showSpinner = false;
+ return;
- if(this.isNum(this.invRecords[i]["inventory1"]) == false || this.isNum(this.invRecords[i]["inventory2"]==false)){
- // alert("杈撳叆鏍煎紡涓嶆纭�,璇疯緭鍏ユ暟瀛�!");
- this.showMyToast('淇濆瓨澶辫触','杈撳叆鏍煎紡涓嶆纭�,璇疯緭鍏ユ暟瀛�','error');
- this.showSpinner = false;
- return;
}
- if(this.invRecords[i]["inventory1"] == ''||this.invRecords[i]["inventory1"] == null ||this.invRecords[i]["inventory2"] == null ||
- this.invRecords[i]["inventory2"] == ''){
- // alert('璇疯緭鍏�' +this.invRecords[i]["productNumber"] + '搴撳瓨涓婁笅闄愪俊鎭紒');
- this.showMyToast('淇濆瓨澶辫触','璇疯緭鍏�' +this.invRecords[i]["productNumber"] + '搴撳瓨涓婁笅闄愪俊鎭�','error');
- this.showSpinner = false;
- return;
- }
- if(Number(this.invRecords[i]["inventory1"])>Number(this.invRecords[i]["inventory2"])){
- // alert( this.invRecords[i]["productNumber"] + '搴撳瓨涓嬮檺澶т簬涓婇檺锛�');
- this.showMyToast('淇濆瓨澶辫触',this.invRecords[i]["productNumber"] + '搴撳瓨涓嬮檺澶т簬涓婇檺','error');
+ if (Number(this.invRecords[i]["inventory1"]) > Number(this.invRecords[i]["inventory2"])) {
+ this.showMyToast('淇濆瓨澶辫触', this.invRecords[i]["productNumber"] + '搴撳瓨涓嬮檺澶т簬涓婇檺', 'error');
this.showSpinner = false;
return;
}
}
- let dataStr = ''
- for(var i in this.invRecords){
- dataStr = dataStr+this.invRecords[i]["productNumber"] +'|'+this.invRecords[i]["inventory1"]+'|'+this.invRecords[i]["inventory2"]+',';
- }
- console.log('dataStr==>'+dataStr);
- this.upstring = dataStr.substring(0, dataStr.lastIndexOf(','));
- console.log('upstring'+ this.upstring);
- save({
- accountId: this.accountid,
- productLimit: this.upstring,
- userPro_Type:this.userPro_Type
- }).then((result) => {
- result = JSON.parse(JSON.stringify(result));
- console.log('result===>'+JSON.stringify(result));
- if(result.status == 'Success'){
- this.showMyToast('淇濆瓨鎴愬姛','','success');
- this.showSpinner = false;
- // setTimeout(this.toLexToppage(),5000 );
- setTimeout(() => {
- this.toLexToppage();
- }, 500);
-
- }else{
- this.showMyToast('淇濆瓨澶辫触',result.msg,'error');
- this.showSpinner = false;
-
- }
- }).catch((error) => {
- console.log("error = " + JSON.stringify(error));
+ let dataStr = ''
+ for (var i in this.invRecords) {
+ dataStr = dataStr + this.invRecords[i]["productNumber"] + '|' + this.invRecords[i]["inventory1"] + '|' + this.invRecords[i]["inventory2"] + ',';
+ }
+ console.log('dataStr==>' + dataStr);
+ this.upstring = dataStr.substring(0, dataStr.lastIndexOf(','));
+ console.log('upstring' + this.upstring);
+ save({
+ accountId: this.accountid,
+ productLimit: this.upstring,
+ userPro_Type: this.userPro_Type
+ }).then((result) => {
+ result = JSON.parse(JSON.stringify(result));
+ console.log('result===>' + JSON.stringify(result));
+ if (result.status == 'Success') {
+ this.showMyToast('淇濆瓨鎴愬姛', '', 'success');
this.showSpinner = false;
- });
-
+ // setTimeout(this.toLexToppage(),5000 );
+ setTimeout(() => {
+ this.toLexToppage();
+ }, 500);
+
+ } else {
+ this.showMyToast('淇濆瓨澶辫触', result.msg, 'error');
+ this.showSpinner = false;
+
+ }
+ }).catch((error) => {
+ console.log("error = " + JSON.stringify(error));
+ this.showSpinner = false;
+ });
+
this.inventoryTempRecords();
- console.log( 'Save ==> ' + JSON.stringify(toSaveList));
+ console.log('Save ==> ' + JSON.stringify(toSaveList));
}
- handleProductChange(event){
+ handleProductChange(event) {
if (event.target.name == 'productNumber') {
this.invRecords[event.currentTarget.dataset.index].productNumber = event.target.value;
- console.log('===>invrecords'+JSON.stringify(this.invRecords));
+ console.log('===>invrecords' + JSON.stringify(this.invRecords));
}
else if (event.target.name == 'inventory1') {
this.invRecords[event.currentTarget.dataset.index].inventory1 = event.target.value;
+ console.log('===>invrecords' + JSON.stringify(this.invRecords));
}
else if (event.target.name == 'inventory2') {
this.invRecords[event.currentTarget.dataset.index].inventory2 = event.target.value;
+ console.log('===>invrecords' + JSON.stringify(this.invRecords));
}
}
-
-//鏁板瓧楠岃瘉
-isNum(num){
- var reNum =/^[0-9]+$/;
- return (reNum.test(num));
+
+ //鏁板瓧楠岃瘉
+ isNum(num) {
+ var reNum = /^[0-9]+$/;
+ return (reNum.test(num));
}
showMyToast(title, message, variant) {
console.log('show custom message');
var iconName = '';
var content = '';
- if(variant == 'success'){
- iconName = 'utility:check';
- }else{
- iconName = 'utility:error';
+ if (variant == 'success') {
+ iconName = 'utility:check';
+ } else {
+ iconName = 'utility:error';
}
- if(message != ''){
- content = '<h2><strong>'+title+'<strong/></h2><h5>'+message+'</h5>';
- }else{
- content = '<h2><strong>'+title+'<strong/></h2>';
+ if (message != '') {
+ content = '<h2><strong>' + title + '<strong/></h2><h5>' + message + '</h5>';
+ } else {
+ content = '<h2><strong>' + title + '<strong/></h2>';
}
- this.template.querySelector('c-common-toast').showToast(variant,content,iconName,10000);
- }
- toLexToppage(){
- this[NavigationMixin.Navigate]({
- type: 'standard__webPage',
- attributes: {
- url: '/lextoppage'
- }
- });
- }
+ this.template.querySelector('c-common-toast').showToast(variant, content, iconName, 10000);
+ }
+ toLexToppage() {
+ this[NavigationMixin.Navigate]({
+ type: 'standard__webPage',
+ attributes: {
+ url: '/lextoppage'
+ }
+ });
+ }
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexRemoveBox/lexRemoveBox.html b/force-app/main/default/lwc/lexRemoveBox/lexRemoveBox.html
index 0b65e31..ce3bcf7 100644
--- a/force-app/main/default/lwc/lexRemoveBox/lexRemoveBox.html
+++ b/force-app/main/default/lwc/lexRemoveBox/lexRemoveBox.html
@@ -220,4 +220,4 @@
</div>
</div>
</div>
-</template>
+</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexRemoveBox/lexRemoveBox.js b/force-app/main/default/lwc/lexRemoveBox/lexRemoveBox.js
index cd935a9..3db9fa1 100644
--- a/force-app/main/default/lwc/lexRemoveBox/lexRemoveBox.js
+++ b/force-app/main/default/lwc/lexRemoveBox/lexRemoveBox.js
@@ -246,4 +246,4 @@
.querySelector("c-common-toast")
.showToast(variant, content, iconName, 10000);
}
-}
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexSaleAndDelivery/lexSaleAndDelivery.html b/force-app/main/default/lwc/lexSaleAndDelivery/lexSaleAndDelivery.html
index 509cd8c..670097d 100644
--- a/force-app/main/default/lwc/lexSaleAndDelivery/lexSaleAndDelivery.html
+++ b/force-app/main/default/lwc/lexSaleAndDelivery/lexSaleAndDelivery.html
@@ -71,33 +71,31 @@
<lightning-layout multiple-rows>
<lightning-layout-item size="6">
<div class="slds-text-align_center">
- <div class="slds-grid slds-grid_vertical-align-center">
- <div class="slds-form-element__label searchName">
- 鍑哄簱鏃�　浠�
- </div>
- <lightning-input type="date" variant="label-hidden" label="鍑哄簱鏃� 浠�"
- onchange={dataChange} data-field="deliveryFromDate" value={deliveryFromDate}
- style="min-width: 200px" class="inputFont"></lightning-input>
- <div class="slds-form-element__label searchName">
- 　鍒�
- </div>
- <lightning-input type="date" variant="label-hidden" label="鍒�"
- onchange={dataChange} data-field="deliveryToDate" value={deliveryToDate}
- style="min-width: 200px" class="inputFont"></lightning-input>
- </div>
- </div>
- </lightning-layout-item>
+ <lightning-layout multiple-rows>
+ <lightning-layout-item size="6">
+ <div class="slds-grid slds-grid_vertical-align-center">
+ <div class="slds-form-element__label searchName">
+ 鍑哄簱鏃�　浠�
+ </div>
+ <lightning-input type="date" variant="label-hidden" label="鍑哄簱鏃� 浠�"
+ onchange={dataChange} data-field="deliveryFromDate"
+ value={deliveryFromDate} class="inputFont"
+ style="max-width: 150px;"></lightning-input>
+ </div>
+ </lightning-layout-item>
- <lightning-layout-item size="3" style="margin-left: -80px;">
- <div class="slds-text-align_center">
- <div class="slds-grid slds-grid_vertical-align-center">
- <div class="slds-form-element__label searchName">
- 鍑哄簱鍗曞彿
- </div>
- <lightning-input variant="label-hidden" label="鍑哄簱鍗曞彿" onchange={dataChange}
- data-field="deliveryOrderNo" value={deliveryOrderNo}
- style="min-width: 215px" class="inputFont"></lightning-input>
- </div>
+ <lightning-layout-item size="6">
+ <div class="slds-grid slds-grid_vertical-align-center">
+ <div class="slds-form-element__label searchName">
+ 鍒�
+ </div>
+ <lightning-input type="date" variant="label-hidden" label="鍒�"
+ onchange={dataChange} data-field="deliveryToDate"
+ value={deliveryToDate} class="inputFont"
+ style="max-width: 150px;"></lightning-input>
+ </div>
+ </lightning-layout-item>
+ </lightning-layout>
</div>
</lightning-layout-item>
@@ -105,11 +103,24 @@
<div class="slds-text-align_center">
<div class="slds-grid slds-grid_vertical-align-center">
<div class="slds-form-element__label searchName">
+ 鍑哄簱鍗曞彿
+ </div>
+ <lightning-input variant="label-hidden" label="鍑哄簱鍗曞彿" onchange={dataChange}
+ data-field="deliveryOrderNo" value={deliveryOrderNo} class="inputFont"
+ style="max-width: 150px;"></lightning-input>
+ </div>
+ </div>
+ </lightning-layout-item>
+
+ <lightning-layout-item>
+ <div class="slds-text-align_center">
+ <div class="slds-grid slds-grid_vertical-align-center">
+ <div class="slds-form-element__label searchName">
瀹㈡埛鍚�
</div>
<lightning-input variant="label-hidden" label="瀹㈡埛鍚�" onchange={dataChange}
- data-field="contactName" value={contactName} style="min-width: 215px"
- class="inputFont"></lightning-input>
+ data-field="contactName" value={contactName} class="inputFont"
+ style="max-width: 150px;"></lightning-input>
</div>
</div>
</lightning-layout-item>
@@ -117,119 +128,38 @@
<lightning-layout multiple-rows style="margin-top: 20px">
<lightning-layout-item size="6">
- <div class="slds-text-align_center">
- <div class="slds-grid slds-grid_vertical-align-center">
- <!-- <div class="slds-form-element__label searchName" style="visibility: hidden;">
- 鍑哄簱鏃�　浠�</div> -->
+ <lightning-layout multiple-rows>
+ <lightning-layout-item size="6">
<button
class="slds-button slds-button_neutral slds-button_stretch lexsearchStyle"
- onclick={searchConsumableorderdetailsJs} style="width: 200px;">
+ onclick={searchConsumableorderdetailsJs} style="min-width: 180px;">
杩樻病鍑哄簱鐨勫嚭搴撳崟
</button>
+ </lightning-layout-item>
- <div class="slds-form-element__label searchName" style="visibility: hidden">
- 鍑哄簱鏃�　浠�
- </div>
- <div class="slds-form-element__label searchName" style="visibility: hidden">
- 　鍒�
- </div>
+ <lightning-layout-item size="6">
<button
class="slds-button slds-button_neutral slds-button_stretch lexsearchStyle"
- onclick={searchOrderInstatusJs} style="width: 215px;margin-left: 4px;">
+ onclick={searchOrderInstatusJs} style="min-width: 215px;">
宸插嚭搴撴湭寮�绁ㄧ殑鍑哄簱鍗�
</button>
- </div>
- </div>
- </lightning-layout-item>
-
- <lightning-layout-item size="3" style="margin-left: -80px;">
- <div class="slds-text-align_center">
- <div class="slds-grid slds-grid_vertical-align-center">
- <div class="slds-form-element__label searchName" style="visibility: hidden">
- 鍑哄簱鍗曞彿
- </div>
- <button
- class="slds-button slds-button_neutral slds-button_stretch lexsearchStyle"
- onclick={searchConsumableorFinishJs} style="width: 215px">
- 宸插嚭搴撳凡寮�绁ㄧ殑鍑哄簱鍗�
- </button>
- </div>
- </div>
+ </lightning-layout-item>
+ </lightning-layout>
</lightning-layout-item>
<lightning-layout-item size="3">
- <div class="slds-text-align_center">
- <div class="slds-grid slds-grid_vertical-align-center">
- <div class="slds-form-element__label searchName" style="visibility: hidden">
- 瀹㈡埛鍚�
- </div>
- <button
- class="slds-button slds-button_neutral slds-button_stretch lexclearStyle"
- onclick={clearJs} style="width: 215px">
- 娓呯┖
- </button>
- </div>
- </div>
+ <button class="slds-button slds-button_neutral slds-button_stretch lexsearchStyle"
+ onclick={searchConsumableorFinishJs} style="min-width: 225px">
+ 宸插嚭搴撳凡寮�绁ㄧ殑鍑哄簱鍗�
+ </button>
</lightning-layout-item>
- <!-- <lightning-layout-item size="5">
- <div class="slds-text-align_center">
- <div class="slds-grid slds-grid_vertical-align-center">
- <div class="slds-form-element__label searchName" style="visibility: hidden;">
- 鍑哄簱鏃�　浠�</div>
- <lightning-input type="date" variant="label-hidden" label="鍑哄簱鏃� 浠�"
- onchange={dataChange} data-field="deliveryFromDate" value={deliveryFromDate}
- style="min-width: 200px;visibility: hidden;"></lightning-input>
-
- <div class="slds-form-element__label searchName" style="visibility: hidden;">
- 　鍒�
- </div>
- <button
- class="slds-button slds-button_neutral slds-button_stretch lexBorderWidth"
- onclick={searchConsumableorderdetailsJs}>杩樻病鍑哄簱鐨勫嚭搴撳崟</button>
- </div>
- </div>
+ <lightning-layout-item>
+ <button class="slds-button slds-button_neutral slds-button_stretch lexclearStyle"
+ onclick={clearJs} style="width: 206px;">
+ 娓呯┖
+ </button>
</lightning-layout-item>
- <lightning-layout-item size="3">
- <div class="slds-text-align_center">
- <div class="slds-grid slds-grid_vertical-align-center">
- <div class="slds-form-element__label searchName" style="visibility: hidden;">
- 鍑哄簱鍗曞彿</div>
- <button
- class="slds-button slds-button_neutral slds-button_stretch lexBorderWidth"
- onclick={searchOrderInstatusJs} style="width: 215px;">宸插嚭搴撴湭寮�绁ㄧ殑鍑哄簱鍗�</button>
- </div>
- </div>
- </lightning-layout-item>
- <lightning-layout-item size="3">
- <div class="slds-text-align_center">
- <div class="slds-grid slds-grid_vertical-align-center">
- <div class="slds-form-element__label searchName" style="visibility: hidden;">瀹㈡埛鍚�
- </div>
- <button
- class="slds-button slds-button_neutral slds-button_stretch lexBorderWidth"
- onclick={searchConsumableorFinishJs}
- style="width: 215px;">宸插嚭搴撳凡寮�绁ㄧ殑鍑哄簱鍗�</button>
- </div>
- </div>
- </lightning-layout-item>
- <lightning-layout-item size="1">
- <div class="slds-grid slds-grid_vertical-align-center">
- <button class="slds-button slds-button_neutral slds-button_stretch lexBorderWidth"
- onclick={clearJs} style="width: 80px;">娓呯┖</button>
- </div>
- </lightning-layout-item> -->
-
- <!-- <div class="slds-m-top_small slds-m-bottom_medium">
- <button class="slds-button slds-button_neutral slds-button_stretch lexBorderWidth lexBorder"
- onclick={searchConsumableorderdetailsJs}>杩樻病鍑哄簱鐨勫嚭搴撳崟</button>
- 聽 <button class="slds-button slds-button_neutral slds-button_stretch lexBorderWidth lexBorder buttonMarginLeft"
- onclick={searchOrderInstatusJs} style="width: 215px;">宸插嚭搴撴湭寮�绁ㄧ殑鍑哄簱鍗�</button>
- <button class="slds-button slds-button_neutral slds-button_stretch lexBorderWidth lexBorder buttonMarginLeft"
- onclick={searchConsumableorFinishJs} style="width: 215px;">宸插嚭搴撳凡寮�绁ㄧ殑鍑哄簱鍗�</button>
- <button class="slds-button slds-button_neutral slds-button_stretch lexBorderWidth lexBorder buttonMarginLeft"
- onclick={clearJs} >娓呯┖</button>
- </div> -->
</lightning-layout>
</div>
</div>
@@ -250,9 +180,10 @@
</div>
<template if:true={showTable}>
<div style="padding: 7px; height: 500px">
- <lightning-datatable key-field="id" data={data} columns={columns} hide-checkbox-column
- default-sort-direction={defaultSortDirection} sorted-direction={sortDirection}
- sorted-by={sortedBy} onsort={onHandleSort} class="wrapped-header-datatable">
+ <lightning-datatable key-field="id" data={data} columns={columns}
+ hide-checkbox-column default-sort-direction={defaultSortDirection}
+ sorted-direction={sortDirection} sorted-by={sortedBy} onsort={onHandleSort}
+ class="wrapped-header-datatable">
</lightning-datatable>
</div>
</template>
diff --git a/force-app/main/default/lwc/lexSaleAndDelivery/lexSaleAndDelivery.js b/force-app/main/default/lwc/lexSaleAndDelivery/lexSaleAndDelivery.js
index 0d98bf7..17153ab 100644
--- a/force-app/main/default/lwc/lexSaleAndDelivery/lexSaleAndDelivery.js
+++ b/force-app/main/default/lwc/lexSaleAndDelivery/lexSaleAndDelivery.js
@@ -15,15 +15,14 @@
label: '鍑哄簱鏃�',
fieldName: 'Outbound_Date__c',
type: 'date',
- initialWidth: 130,
hideDefaultActions: true,
- sortable: true
+ sortable: true,
+ wrapText: true,
},
{
label: '鍑哄簱鍗曞彿',
fieldName: 'url',
type: 'url',
- initialWidth: 175,
typeAttributes: {
label: {
fieldName: 'Name'
@@ -31,8 +30,8 @@
target: '_blank'
},
hideDefaultActions: true,
- initialWidth: 225,
- sortable: true
+ sortable: true,
+ wrapText: true,
},
{
label: '瀹㈡埛鍚�',
@@ -45,21 +44,21 @@
label: '绉戝',
fieldName: 'Order_ForCustomerText__c',
hideDefaultActions: true,
- initialWidth: 120
+ wrapText: true,
},
{
label: '鍑哄簱鍗曠姸鎬�',
fieldName: 'SummonsStatus_c__c',
hideDefaultActions: true,
sortable: true,
- initialWidth: 100
+ wrapText: true,
},
{
label: '寮�绁ㄧ姸鎬�',
fieldName: 'Billed_Status__c',
hideDefaultActions: true,
sortable: true,
- initialWidth: 100
+ wrapText: true,
},
{
label: '鏈彂绁ㄩ噾棰�(鍏�)',
@@ -69,13 +68,14 @@
typeAttributes: {
minimumFractionDigits: 2,
},
- initialWidth: 150
+ wrapText: true,
},
{
label: '鍒涘缓鏃ユ湡',
fieldName: 'CreatedDate',
hideDefaultActions: true,
sortable: true,
+ wrapText: true,
type: "date",
typeAttributes: {
timeZone: "Asia/Shanghai",
@@ -85,7 +85,6 @@
hour: "2-digit",
minute: "2-digit"
},
- initialWidth: 200
}
];
export default class LexSaleAndDelivery extends NavigationMixin(LightningElement) {
diff --git a/force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.css b/force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.css
index 3e12bf1..7e7956b 100644
--- a/force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.css
+++ b/force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.css
@@ -31,4 +31,9 @@
:host {
--lwc-inputStaticFontSize: 16px;
--lwc-formLabelFontSize: 16px;
+}
+
+.fileUpload {
+ font-size: 16px;
+ --lwc-formLabelFontSize:16px;
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.html b/force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.html
index 8e43278..01126e3 100644
--- a/force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.html
+++ b/force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.html
@@ -3,58 +3,68 @@
<template>
<c-common-toast></c-common-toast>
<template if:true={isShowSpinner}>
- <lightning-spinner alternative-text="Loading" size="large"></lightning-spinner>
+ <lightning-spinner size="medium" variant="brand"></lightning-spinner>
</template>
<!-- 鎼滅储瀹㈡埛鍚� -->
<template if:true={isModalOpen}>
- <!-- Modal/Popup Box LWC starts here -->
<section role="dialog" tabindex="-1" aria-labelledby="modal-heading-01" aria-modal="true"
- aria-describedby="modal-content-id-1" class="slds-modal slds-fade-in-open">
+ aria-describedby="modal-content-id-1" class="slds-modal slds-fade-in-open slds-modal_medium"
+ style="border: 1px solid #D4D4D4;">
<div class="slds-modal__container">
- <!-- Modal/Popup Box LWC header here -->
- <header class="slds-modal__header">
- <button class="slds-button slds-button_icon slds-modal__close slds-button_icon-inverse"
+ <header class="slds-modal__header" style="background-color: #F3F3F3;">
+ <button style="" class="slds-button slds-button_icon slds-modal__close slds-button_icon-inverse"
title="Close" onclick={closeModal}>
<lightning-icon icon-name="utility:close" alternative-text="close" variant="inverse"
size="small"></lightning-icon>
<span class="slds-assistive-text">Close</span>
</button>
- <h2 id="modal-heading-01" class="slds-text-heading_medium slds-hyphenate">
- 缁忛攢鍟嗗尰闄㈡绱�
- </h2>
+ <h2 id="modal-heading-01" class="slds-text-heading_medium slds-hyphenate">缁忛攢鍟嗗尰闄㈡绱�</h2>
</header>
- <!-- Modal/Popup Box LWC body starts here -->
- <div class="slds-modal__content slds-p-around_medium" id="modal-content-id-1">
- <lightning-layout>
- <lightning-layout-item flexibility="auto" padding="around-small">
- <lightning-input type="text" label="鍖婚櫌鍚嶇О" onchange={dataChange}
- data-field="searchHospitalName" value={searchHospitalName} variant="label-inline"
- class="inputFont"></lightning-input>
- </lightning-layout-item>
- <lightning-layout-item flexibility="auto" padding="around-small" style="padding-top: 16px;">
- <!-- <lightning-button label="妫�绱�" onclick={searchHospital}></lightning-button> -->
- <button class="slds-button slds-button_neutral" onclick={searchHospital}
- title="searchHospital" style="font-size: 16px;">
- 妫�绱�
- </button>
- </lightning-layout-item>
- </lightning-layout>
-
- <div class="tableColumn">
- <lightning-layout class="datatable" style="height: 250px;">
+ <div class="slds-modal__content slds-p-around_medium" id="modal-content-id-1"
+ style="border: 1px solid #F3F3F3;">
+ <table style="width: 100%;">
+ <tbody>
+ <tr>
+ <td style="width: 74px;">
+ <div style="color:#696969;font-size:16px;text-align: left;">鍖婚櫌鍚嶇О</div>
+ </td>
+ <td style="width: 60%;"><lightning-input class="inputFont" label="鍖婚櫌鍚嶇О"
+ variant="label-hidden" placeholder="璇疯緭鍏ュ尰闄㈠悕绉�" value={searchHospitalName}
+ data-field="searchHospitalName" onchange={dataChange}></lightning-input></td>
+ <td style="width: 10px;"></td>
+ <td><button class="slds-button slds-button_neutral slds-button_stretch lexsearchStyle"
+ style="height: 32px;" label="鎼滅储" onclick={searchHospital}>鎼滅储</button></td>
+ </tr>
+ </tbody>
+ </table>
+ <p style="height: 20px;"></p>
+ <!-- <p>宸查�夋嫨鍖婚櫌锛歿chooseHospital}</p> -->
+ <div
+ style="border: 1px solid #D4D4D4;border-top: 3px solid #51606E;border-radius:5px;margin-bottom:7px;">
+ <div style="border-bottom: 1px solid #D4D4D4;padding:3px;">
+ <lightning-layout>
+ <lightning-layout-item padding="around-small">
+ <p style="font-size: 18px">
+ <strong>鎼滅储缁撴灉</strong>
+ </p>
+ </lightning-layout-item>
+ </lightning-layout>
+ <!-- <p style="font-size: 16px;"><strong>鎼滅储缁撴灉</strong></p> -->
+ </div>
+ <div class="myTable" style="padding:10px;">
+ <!-- <lightning-datatable class="wrapped-header-datatable" key-field="id"
+ hide-checkbox-column="true" data={hospitalList} columns={hosCols}
+ onrowaction={chooseHos}></lightning-datatable> -->
<lightning-datatable class="datatabel slds-border_top wrapped-header-datatable"
key-field="id" data={hospitalList} columns={hospitalColumns} hide-checkbox-column="true"
onrowaction={searchHandleRowAction}>
</lightning-datatable>
- </lightning-layout>
+ </div>
</div>
</div>
- <!-- Modal/Popup Box LWC footer starts here -->
<footer class="slds-modal__footer">
- <button class="slds-button slds-button_neutral" onclick={closeModal} title="Cancel"
- style="font-size: 16px;">
- 鍏抽棴
- </button>
+ <button class="slds-button slds-button_neutral slds-button_stretch lexclearStyle" label="鍙栨秷"
+ onclick={closeModal}>鍙栨秷</button>
</footer>
</div>
</section>
@@ -83,11 +93,11 @@
style="border: 1px solid #F3F3F3;">
<div class="slds-m-top_medium slds-m-bottom_x-large">
<div class="slds-p-around_medium lgc-bg">
- <lightning-input type="file" label="闄勪欢涓婁紶"
+ <lightning-input class="fileUpload" type="file" label="闄勪欢涓婁紶"
accept=".xlsx, .xls, .csv, .png, .doc, .docx, .pdf"
onchange={attChange}></lightning-input>
</div>
- <p>宸查�夋嫨鏂囦欢锛歿fileName}
+ <p style="font-size: 16px;">宸查�夋嫨鏂囦欢锛歿fileName}
<template if:true={attDelBtn}>
<a onclick={removeAtt}>绉婚櫎</a>
</template>
@@ -95,10 +105,14 @@
</div>
</div>
<footer class="slds-modal__footer">
- <lightning-button style="margin-left: 10px;" variant="neutral" label="鍙栨秷"
+ <!-- <lightning-button style="margin-left: 10px;" variant="neutral" label="鍙栨秷"
onclick={closePop}></lightning-button>
<lightning-button style="margin-left: 10px;" variant="neutral" label="涓婁紶"
- onclick={handleSave}></lightning-button>
+ onclick={handleSave}></lightning-button> -->
+ <button class="slds-button slds-button_neutral slds-button_stretch lexclearStyle" style="margin-left: 10px;" label="鍙栨秷"
+ onclick={closePop}>鍙栨秷</button>
+ <button class="slds-button slds-button_neutral slds-button_stretch lexsearchStyle" style="margin-left: 10px;" label="涓婁紶"
+ onclick={handleSave}>涓婁紶</button>
</footer>
</div>
</section>
@@ -251,17 +265,20 @@
<template if:true={isSummonsFlag}>
<lightning-layout-item size="1"></lightning-layout-item>
- <lightning-layout-item size="4">
+ <lightning-layout-item size="5">
<lightning-output-field field-name="Name"
class="hehe-layoutItem"></lightning-output-field>
</lightning-layout-item>
- <lightning-layout-item size="1"></lightning-layout-item>
-
- <lightning-layout-item class="hehe-layoutItem" size="4">
+ <lightning-layout-item class="hehe-layoutItem" size="5"
+ style="padding-left: 100px;">
<lightning-output-field
field-name="SummonsStatus_c__c"></lightning-output-field>
</lightning-layout-item>
+
+ <lightning-layout-item size="1"></lightning-layout-item>
+
+
</template>
</lightning-layout>
@@ -269,28 +286,34 @@
<lightning-layout multiple-rows="true">
<lightning-layout-item size="1"></lightning-layout-item>
- <lightning-layout-item class="hehe-layoutItem" size="4">
+ <lightning-layout-item class="hehe-layoutItem" size="5">
<lightning-output-field field-name="SummonsForDirction__c"
+ class="searchName"></lightning-output-field>
+ </lightning-layout-item>
+
+ <lightning-layout-item class="hehe-layoutItem" size="5"
+ style="padding-left: 100px;">
+ <lightning-output-field field-name="Billed_Status__c"
class="searchName"></lightning-output-field>
</lightning-layout-item>
<lightning-layout-item size="1"></lightning-layout-item>
- <lightning-layout-item class="hehe-layoutItem" size="4">
- <lightning-output-field field-name="Billed_Status__c"
- class="searchName"></lightning-output-field>
- </lightning-layout-item>
+
</lightning-layout>
<!-- 浜岀骇缁忛攢鍟� -->
<template if:true={isSummonsForDirctionTwoShow}>
<lightning-layout multiple-rows="true">
+
<lightning-layout-item size="1"></lightning-layout-item>
- <lightning-layout-item class="hehe-layoutItem" size="4">
+ <lightning-layout-item class="hehe-layoutItem" size="5">
<lightning-output-field
field-name="Order_Dealer_Info__c"></lightning-output-field>
</lightning-layout-item>
+
+
</lightning-layout>
</template>
@@ -298,45 +321,55 @@
<lightning-layout multiple-rows="true">
<lightning-layout-item size="1"></lightning-layout-item>
- <lightning-layout-item class="hehe-layoutItem" size="4">
+ <lightning-layout-item class="hehe-layoutItem" size="5">
<lightning-output-field class="hideHelpText"
field-name="ShipmentAccount__c"></lightning-output-field>
</lightning-layout-item>
- <lightning-layout-item size="1"></lightning-layout-item>
-
- <lightning-layout-item class="hehe-layoutItem" size="4">
+ <lightning-layout-item class="hehe-layoutItem" size="5"
+ style="padding-left: 100px;">
<lightning-input-field data-field={ConInvoice_Code__c}
onchange={invoiceChange} field-name="ConInvoice_Code__c"
class="inputFont"></lightning-input-field>
</lightning-layout-item>
+
+ <lightning-layout-item size="1"></lightning-layout-item>
+
+
</lightning-layout>
<!-- 绉戝 鍑哄簱閲戦 -->
<lightning-layout multiple-rows="true">
<lightning-layout-item size="1"></lightning-layout-item>
- <lightning-layout-item class="hehe-layoutItem" size="4">
+ <lightning-layout-item class="hehe-layoutItem" size="5">
<lightning-output-field
field-name="Order_ForCustomerText__c"></lightning-output-field>
</lightning-layout-item>
- <lightning-layout-item size="1"></lightning-layout-item>
-
- <lightning-layout-item class="hehe-layoutItem" size="4">
+ <lightning-layout-item class="hehe-layoutItem" size="5"
+ style="padding-left: 100px;">
<lightning-output-field
field-name="Shipment_total_amount__c"></lightning-output-field>
</lightning-layout-item>
+
+ <lightning-layout-item size="1"></lightning-layout-item>
+
+
</lightning-layout>
<!-- 娌℃湁纭畾浠锋牸 -->
<lightning-layout multiple-rows="true">
+
+
<lightning-layout-item size="1"></lightning-layout-item>
- <lightning-layout-item class="hehe-layoutItem" size="4">
+ <lightning-layout-item class="hehe-layoutItem" size="5">
<lightning-output-field
field-name="NoConfirmedPrice__c"></lightning-output-field>
</lightning-layout-item>
+
+
</lightning-layout>
</lightning-record-edit-form>
</template>
@@ -350,16 +383,17 @@
<template if:true={isSummonsFlag}>
<lightning-layout-item size="1"></lightning-layout-item>
- <lightning-layout-item class="hehe-layoutItem" size="4">
+ <lightning-layout-item class="hehe-layoutItem" size="5">
<lightning-output-field field-name="Name"></lightning-output-field>
</lightning-layout-item>
- <lightning-layout-item size="1"></lightning-layout-item>
-
- <lightning-layout-item class="hehe-layoutItem" size="4">
+ <lightning-layout-item class="hehe-layoutItem" size="5"
+ style="padding-left: 100px;">
<lightning-output-field
field-name="SummonsStatus_c__c"></lightning-output-field>
</lightning-layout-item>
+
+ <lightning-layout-item size="1"></lightning-layout-item>
</template>
</lightning-layout>
@@ -367,16 +401,15 @@
<lightning-layout multiple-rows="true">
<lightning-layout-item size="1"></lightning-layout-item>
- <lightning-layout-item class="hehe-layoutItem" size="4">
+ <lightning-layout-item class="hehe-layoutItem" size="5">
<lightning-input-field data-field="summonsForDirction"
value={summonsForDirction} field-name="SummonsForDirction__c"
required="true" onchange={ChangeDirction}
class="inputFont"></lightning-input-field>
</lightning-layout-item>
- <lightning-layout-item size="1"></lightning-layout-item>
-
- <lightning-layout-item class="hehe-layoutItem" size="4">
+ <lightning-layout-item class="hehe-layoutItem" size="5"
+ style="padding-left: 100px;">
<lightning-combobox data-field="secondaryDistributor"
name="secondaryDistributor" label="浜岀骇缁忛攢鍟�"
value={secondaryDistributor} placeholder="璇烽�夋嫨..."
@@ -384,13 +417,17 @@
onchange={dataChange} disabled={isDisabledSecondaryDistributor}
class="inputFont"></lightning-combobox>
</lightning-layout-item>
+
+ <lightning-layout-item size="1"></lightning-layout-item>
+
+
</lightning-layout>
<!-- 瀹㈡埛鍚� 缁忛攢鍟嗗綍鍏� -->
<lightning-layout multiple-rows="true">
<lightning-layout-item size="1"></lightning-layout-item>
- <lightning-layout-item class="hehe-layoutItem" size="4">
+ <lightning-layout-item class="hehe-layoutItem" size="5">
<div
class="slds-form-element__control slds-input-has-icon slds-input-has-icon_right">
<lightning-icon size="x-small"
@@ -404,9 +441,8 @@
</div>
</lightning-layout-item>
- <lightning-layout-item size="1"></lightning-layout-item>
-
- <lightning-layout-item class="hehe-layoutItem" size="4">
+ <lightning-layout-item class="hehe-layoutItem" size="5"
+ style="padding-left: 100px;">
<template if:true={isMutualTransferGoods}>
<c-lex-lookup onsearch={handleSearch}
onselectionchange={handleSelectionChange} label="缁忛攢鍟�(褰曞叆)"
@@ -425,13 +461,17 @@
</lightning-input>
</template>
</lightning-layout-item>
+
+ <lightning-layout-item size="1"></lightning-layout-item>
+
+
</lightning-layout>
<!-- 绉戝 鎬婚噾棰� -->
<lightning-layout multiple-rows="true">
<lightning-layout-item size="1"></lightning-layout-item>
- <lightning-layout-item class="hehe-layoutItem" size="4">
+ <lightning-layout-item class="hehe-layoutItem" size="5">
<lightning-input-field onchange={dataChange}
data-field="ForCustomerText" value={ForCustomerText}
field-name="Order_ForCustomerText__c"
@@ -439,24 +479,31 @@
class="inputFont"></lightning-input-field>
</lightning-layout-item>
- <lightning-layout-item size="1"></lightning-layout-item>
- <lightning-layout-item class="hehe-layoutItem" size="4">
+
+ <lightning-layout-item class="hehe-layoutItem" size="5"
+ style="padding-left: 100px;">
<lightning-input type="text" name="sumPrice" label="鎬婚噾棰�"
value={sumPrice} variant="label-inline" onchange={dataChange}
data-field="sumPrice" readonly></lightning-input>
</lightning-layout-item>
+
+ <lightning-layout-item size="1"></lightning-layout-item>
</lightning-layout>
<!-- 娌℃湁纭畾浠锋牸 -->
<lightning-layout multiple-rows="true">
+
<lightning-layout-item size="1"></lightning-layout-item>
- <lightning-layout-item class="hehe-layoutItem" size="4">
+ <lightning-layout-item class="hehe-layoutItem" size="5">
<lightning-input-field value={NoConfirmedPrice}
field-name="NoConfirmedPrice__c" data-field="NoConfirmedPrice"
onchange={dataChange}></lightning-input-field>
</lightning-layout-item>
+
+
+
</lightning-layout>
</lightning-record-edit-form>
</template>
@@ -487,17 +534,19 @@
<template if:true={isSummonsFlag}>
<lightning-layout-item size="1"></lightning-layout-item>
- <lightning-layout-item size="4">
+ <lightning-layout-item size="5">
<lightning-output-field field-name="Name"
class="hehe-layoutItem"></lightning-output-field>
</lightning-layout-item>
- <lightning-layout-item size="1"></lightning-layout-item>
- <lightning-layout-item size="4">
+
+ <lightning-layout-item size="5" style="padding-left: 100px;">
<lightning-output-field field-name="SummonsStatus_c__c"
class="hehe-layoutItem"></lightning-output-field>
</lightning-layout-item>
+
+ <lightning-layout-item size="1"></lightning-layout-item>
</template>
</lightning-layout>
@@ -505,17 +554,19 @@
<lightning-layout multiple-rows="true">
<lightning-layout-item size="1"></lightning-layout-item>
- <lightning-layout-item size="4">
+ <lightning-layout-item size="5">
<lightning-output-field field-name="SummonsForDirction__c"
+ class="hehe-layoutItem"></lightning-output-field>
+ </lightning-layout-item>
+
+ <lightning-layout-item size="5" style="padding-left: 100px;">
+ <lightning-output-field field-name="Billed_Status__c"
class="hehe-layoutItem"></lightning-output-field>
</lightning-layout-item>
<lightning-layout-item size="1"></lightning-layout-item>
- <lightning-layout-item size="4">
- <lightning-output-field field-name="Billed_Status__c"
- class="hehe-layoutItem"></lightning-output-field>
- </lightning-layout-item>
+
</lightning-layout>
<!-- 浜岀骇缁忛攢鍟� -->
@@ -523,7 +574,7 @@
<lightning-layout multiple-rows="true">
<lightning-layout-item size="1"></lightning-layout-item>
- <lightning-layout-item size="4">
+ <lightning-layout-item size="5">
<lightning-output-field field-name="Order_Dealer_Info__c"
class="hehe-layoutItem"></lightning-output-field>
</lightning-layout-item>
@@ -534,44 +585,49 @@
<lightning-layout multiple-rows="true">
<lightning-layout-item size="1"></lightning-layout-item>
- <lightning-layout-item size="4" class="hehe-layoutItem">
+ <lightning-layout-item size="5" class="hehe-layoutItem">
<lightning-output-field class="hideHelpText"
field-name="ShipmentAccount__c"></lightning-output-field>
</lightning-layout-item>
- <lightning-layout-item size="1"></lightning-layout-item>
-
<template if:true={isConInvoiceShow}>
- <lightning-layout-item size="4">
+ <lightning-layout-item size="5" style="padding-left: 100px;">
<lightning-input-field data-field={ConInvoice_Code__c}
onchange={invoiceChange} field-name="ConInvoice_Code__c"
class="hehe-layoutItem inputFont"></lightning-input-field>
</lightning-layout-item>
</template>
+
+ <lightning-layout-item size="1"></lightning-layout-item>
+
+
</lightning-layout>
<!-- 绉戝 鍑哄簱閲戦 -->
<lightning-layout multiple-rows="true">
<lightning-layout-item size="1"></lightning-layout-item>
- <lightning-layout-item size="4">
+ <lightning-layout-item size="5">
<lightning-output-field field-name="Order_ForCustomerText__c"
class="hehe-layoutItem"></lightning-output-field>
</lightning-layout-item>
- <lightning-layout-item size="1"></lightning-layout-item>
-
- <lightning-layout-item size="4">
+ <lightning-layout-item size="5" style="padding-left: 100px;">
<lightning-output-field field-name="Shipment_total_amount__c"
class="hehe-layoutItem"></lightning-output-field>
</lightning-layout-item>
+
+ <lightning-layout-item size="1"></lightning-layout-item>
+
+
</lightning-layout>
<!-- 娌℃湁纭畾浠锋牸 -->
<lightning-layout multiple-rows="true">
+
<lightning-layout-item size="1"></lightning-layout-item>
- <lightning-layout-item size="4">
+ <lightning-layout-item size="5">
<lightning-output-field field-name="NoConfirmedPrice__c"
class="hehe-layoutItem"></lightning-output-field>
</lightning-layout-item>
@@ -582,7 +638,7 @@
<lightning-layout multiple-rows="true">
<lightning-layout-item size="1">
</lightning-layout-item>
- <lightning-layout-item size="11">
+ <lightning-layout-item size="10">
<lightning-card class="attListTitle" variant="Narrow" title="闄勪欢鍒楄〃"
icon-name="utility:attach">
@@ -590,14 +646,14 @@
<template for:each={fileData} for:item="item" for:index="index">
<lightning-layout-item padding="around-none" size="2"
key={item.recordId}
- style="text-align: left;padding:5px">
+ style="text-align: left;padding:5px;word-wrap:break-word; word-break:break-all;">
<lightning-icon title={item.Title}
style="margin-left: 20px;" icon-name="doctype:gform"
alternative-text={item.Title}
size="large"></lightning-icon><br />
- <span title={item.Title}>
- {item.fileName}
- </span>
+ <div title={item.Title} style="width: 100px;text-overflow: ellipsis;overflow: hidden;white-space: nowrap;">
+ {item.Title}
+ </div>
<p>
<!-- <a data-fileid ={item.documentId} onclick={previweAtt}> -->
<a href={item.attUrl} target="_blank">
@@ -606,7 +662,7 @@
<a href={item.downloadUrl}>
涓嬭浇
</a> 路
- <a data-fileid={item.recordId} onclick={deleteAtt}>
+ <a data-fileid={item.Id} onclick={deleteAtt}>
鍒犻櫎
</a>
</p>
@@ -628,72 +684,127 @@
<!-- 妫�绱� -->
<template if:true={isSearchShow}>
<div class="borderCss">
- <div style="padding: 3px;height:110px;">
+ <div style="padding: 3px;">
<div lwc:dom="manual" class="resultDiv"></div>
<div draggable="false">
- <lightning-layout multiple-rows>
- <lightning-layout-item style="padding: 10px;" flexibility="auto">
+ <lightning-layout multiple-rows style="margin-top: 10px;">
+ <lightning-layout-item style="padding-left: 10px;" flexibility="auto">
<div class="slds-grid slds-grid_vertical-align-center">
<div class="slds-form-element__label">娑堣�楀搧鍚嶇О</div>
<lightning-input type="text" name="consumableName" label="娑堣�楀搧鍚嶇О"
value={consumableName} variant="label-hidden" onchange={dataChange}
- data-field="consumableName" class="inputFont"></lightning-input>
+ data-field="consumableName" class="inputFont"
+ style="width:150px"></lightning-input>
</div>
-
</lightning-layout-item>
- <lightning-layout-item style="padding: 10px;" flexibility="auto">
+ <lightning-layout-item flexibility="auto">
<div class="slds-grid slds-grid_vertical-align-center">
<div class="slds-form-element__label" style="width:80px">绗�3鍒嗙被</div>
<lightning-combobox name="progress" label="绗�3鍒嗙被" value={Category3}
variant="label-hidden" options={category3Options} onchange={dataChange}
- data-field="Category3" style="min-width: 160px;"
+ data-field="Category3" style="min-width: 120px;"
class="inputFont"></lightning-combobox>
</div>
</lightning-layout-item>
- <lightning-layout-item style="padding: 10px;" flexibility="auto">
+ <lightning-layout-item flexibility="auto">
<div class="slds-grid slds-grid_vertical-align-center">
<div class="slds-form-element__label" style="width:80px">绗�4鍒嗙被</div>
<lightning-combobox name="progress" label="绗�4鍒嗙被" value={Category4}
variant="label-hidden" options={category4Options} onchange={dataChange}
- data-field="Category4" style="min-width: 160px;"
+ data-field="Category4" style="min-width: 120px;"
class="inputFont"></lightning-combobox>
</div>
</lightning-layout-item>
- <lightning-layout-item style="padding: 10px;" flexibility="auto">
+ <lightning-layout-item flexibility="auto">
<div class="slds-grid slds-grid_vertical-align-center">
<div class="slds-form-element__label" style="width:80px">绗�5鍒嗙被</div>
<lightning-combobox name="progress" label="绗�5鍒嗙被" value={Category5}
variant="label-hidden" onchange={dataChange} data-field="Category5"
- options={category5Options} style="min-width: 160px;"
+ options={category5Options} style="min-width: 120px;"
class="inputFont"></lightning-combobox>
</div>
</lightning-layout-item>
<template if:true={hasHosPro}>
- <lightning-layout-item style="padding: 10px;" flexibility="auto">
+ <lightning-layout-item flexibility="auto">
<div class="slds-grid slds-grid_vertical-align-center">
<div class="slds-form-element__label">鍖婚櫌鐗逛环</div>
<lightning-combobox name="progress" label="鍖婚櫌鐗逛环" value={outOutPattern}
variant="label-hidden" options={outOutPatternOptionList}
onchange={dataChange} data-field="outOutPattern"
- style="min-width: 140px;" class="inputFont"></lightning-combobox>
+ style="min-width: 120px;" class="inputFont"></lightning-combobox>
</div>
</lightning-layout-item>
</template>
</lightning-layout>
- <div style="float:right;margin-right:50px;">
- <!-- <lightning-button label="妫�绱�" onclick={searchProductJs}></lightning-button> -->
- <button class="slds-button slds-button_neutral slds-button_stretch lexBorder lexsearchStyle"
- onclick={searchProductJs}>妫�绱�</button>
+ <lightning-layout multiple-rows style="margin-top: 10px;">
+ <lightning-layout-item style="padding-left: 10px;visibility:hidden;"
+ flexibility="auto">
+ <div class="slds-grid slds-grid_vertical-align-center">
+ <div class="slds-form-element__label">娑堣�楀搧鍚嶇О</div>
+ <lightning-input type="text" name="consumableName" label="娑堣�楀搧鍚嶇О"
+ value={consumableName} variant="label-hidden" onchange={dataChange}
+ data-field="consumableName" class="inputFont"
+ style="width:150px"></lightning-input>
+ </div>
+ </lightning-layout-item>
+ <lightning-layout-item flexibility="auto" style="visibility:hidden;">
+ <div class="slds-grid slds-grid_vertical-align-center">
+ <div class="slds-form-element__label" style="width:80px">绗�3鍒嗙被</div>
+ <lightning-combobox name="progress" label="绗�3鍒嗙被" value={Category3}
+ variant="label-hidden" options={category3Options} onchange={dataChange}
+ data-field="Category3" style="min-width: 120px;"
+ class="inputFont"></lightning-combobox>
+ </div>
+ </lightning-layout-item>
+ <lightning-layout-item flexibility="auto" style="visibility:hidden;">
+ <div class="slds-grid slds-grid_vertical-align-center">
+ <div class="slds-form-element__label" style="width:80px">绗�4鍒嗙被</div>
+ <lightning-combobox name="progress" label="绗�4鍒嗙被" value={Category4}
+ variant="label-hidden" options={category4Options} onchange={dataChange}
+ data-field="Category4" style="min-width: 120px;"
+ class="inputFont"></lightning-combobox>
+ </div>
- <!-- <lightning-button label="娓呯┖" onclick={ClearJs}></lightning-button> -->
- <button style="margin-left:10px;"
- class="slds-button slds-button_neutral slds-button_stretch lexBorder lexclearStyle"
- onclick={ClearJs}>娓呯┖</button>
- </div>
-
+ </lightning-layout-item>
+ <template if:false={hasHosPro}>
+ <lightning-layout-item flexibility="auto">
+ <div class="slds-grid slds-grid_vertical-align-center">
+ <button
+ class="slds-button slds-button_neutral slds-button_stretch lexBorder lexsearchStyle"
+ onclick={searchProductJs}
+ style="min-width: 80px;max-width: 100px;">妫�绱�</button>
+ <button style="margin-left:10px;min-width: 80px;max-width: 100px;"
+ class="slds-button slds-button_neutral slds-button_stretch lexBorder lexclearStyle"
+ onclick={ClearJs}>娓呯┖</button>
+ </div>
+ </lightning-layout-item>
+ </template>
+ <template if:true={hasHosPro}>
+ <lightning-layout-item flexibility="auto" style="visibility:hidden;">
+ <div class="slds-grid slds-grid_vertical-align-center">
+ <div class="slds-form-element__label" style="width:80px">绗�5鍒嗙被</div>
+ <lightning-combobox name="progress" label="绗�5鍒嗙被" value={Category5}
+ variant="label-hidden" onchange={dataChange} data-field="Category5"
+ options={category5Options} style="min-width: 120px;"
+ class="inputFont"></lightning-combobox>
+ </div>
+ </lightning-layout-item>
+ <lightning-layout-item flexibility="auto">
+ <div class="slds-grid slds-grid_vertical-align-center">
+ <button
+ class="slds-button slds-button_neutral slds-button_stretch lexBorder lexsearchStyle"
+ onclick={searchProductJs}
+ style="min-width: 80px;max-width: 110px;">妫�绱�</button>
+ <button style="margin-left:10px;min-width: 80px;max-width: 110px;"
+ class="slds-button slds-button_neutral slds-button_stretch lexBorder lexclearStyle"
+ onclick={ClearJs}>娓呯┖</button>
+ </div>
+ </lightning-layout-item>
+ </template>
+ </lightning-layout>
</div>
</div>
</div>
@@ -714,12 +825,13 @@
<template if:true={EditAble}>
<template if:true={showTable}>
<c-lex-custom-lightning-datatable key-field="Id" data={data} columns={columns}
- onunitchange={handleUnitChange} onshipmentnumber={handleShipmentNumber}
+ hide-checkbox-column={hideCheckboxColumn} onunitchange={handleUnitChange}
+ onshipmentnumber={handleShipmentNumber}
onshipmentunitprice={handleShipmentUnitPrice} onrowselection={getSelectedRows}
selected-rows={selectedRows} default-sort-direction={defaultSortDirection}
sorted-direction={sortDirection} sorted-by={sortedBy} onsort={onHandleSort}
style="word-wrap:break-word; word-break:break-all; "
- class="wrapped-header-datatable">
+ class="wrapped-header-datatable" min-column-width="110">
</c-lex-custom-lightning-datatable>
</template>
<c-paginator onprevious={handlePrevious} onnext={handleNext}
@@ -738,7 +850,7 @@
selected-rows={selectedRows} default-sort-direction={defaultSortDirection}
sorted-direction={sortDirection} sorted-by={sortedBy} onsort={onHandleSort}
style="word-wrap:break-word; word-break:break-all; "
- class="wrapped-header-datatable">
+ class="wrapped-header-datatable" min-column-width="110">
</c-lex-custom-lightning-datatable>
<c-paginator onprevious={editHandlePrevious} onnext={editHandleNext}
onpageschange={editHandlePageschange} onfirst={editHandleFirst}
@@ -988,7 +1100,7 @@
columns={salesColumns} onoutboundcount={handleOutboundCount}
hide-checkbox-column
style="word-wrap:break-word; word-break:break-all; "
- class="wrapped-header-datatable">
+ class="wrapped-header-datatable" min-column-width="120">
</c-lex-custom-lightning-datatable>
</div>
</div>
@@ -1008,7 +1120,7 @@
<div lwc:dom="manual" class="resultDiv"></div>
<div draggable="false">
<lightning-datatable key-field="id" data={salesErrorData}
- columns={salesErrorColumns} hide-checkbox-column
+ columns={salesErrorColumns} hide-checkbox-column min-column-width="120"
style="word-wrap:break-word; word-break:break-all; "
class="wrapped-header-datatable">
</lightning-datatable>
diff --git a/force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.js b/force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.js
index 74a0853..728b39d 100644
--- a/force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.js
+++ b/force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.js
@@ -19,7 +19,7 @@
import { getObjectInfo } from "lightning/uiObjectInfoApi";
import hospitalInit from "@salesforce/apex/lexSearchAgencyHospitalController.init";
import serContact from "@salesforce/apex/lexSearchAgencyHospitalController.serContact";
-import deleteAtt from '@salesforce/apex/LexConsumableController.deleteAtt';
+import deleteAtt from '@salesforce/apex/LexSummonsCreatController.deleteAtt';
import { NavigationMixin } from "lightning/navigation";
//table css
import { loadStyle } from "lightning/platformResourceLoader";
@@ -87,7 +87,7 @@
label: "娉ㄥ唽璇佺紪鐮佸彿",
fieldName: "approbation_No",
wrapText: true,
- initialWidth: 115,
+ initialWidth: 130,
hideDefaultActions: true,
},
{
@@ -130,7 +130,7 @@
unitValue: { fieldName: "unitValue" },
unitOptions: { fieldName: "unitOptions" },
recordId: { fieldName: "Id" },
- },
+ }
},
{
label: "鍑鸿揣鏁伴噺",
@@ -207,6 +207,7 @@
label: "娉ㄥ唽璇佺紪鐮佸彿",
fieldName: "approbation_No",
hideDefaultActions: true,
+ initialWidth: 130,
wrapText: true,
},
{
@@ -270,9 +271,20 @@
@track hospitalList = [];
@track hospitalColumns = [
{
+ label: "",
+ fieldName: "Id1",
+ type: "button",
+ hideDefaultActions: true,
+ initialWidth: 90,
+ typeAttributes: {
+ label: "閫夋嫨",
+ name: "Id2",
+ size: 1,
+ },
+ },
+ {
label: "鍖婚櫌鍚嶇О",
fieldName: "Name",
- initialWidth: 400,
hideDefaultActions: true,
wrapText: true,
},
@@ -280,18 +292,7 @@
label: "鐪佷唤",
fieldName: "stateMasterName",
hideDefaultActions: true,
- },
- {
- label: "閫夋嫨",
- fieldName: "Id1",
- type: "button",
- hideDefaultActions: true,
- typeAttributes: {
- label: "閫夋嫨",
- name: "Id2",
- size: 1,
- },
- },
+ }
];
@track accountid = "";
@@ -312,6 +313,7 @@
label: "娑堣�楀搧鍚嶇О",
fieldName: "ProdName",
hideDefaultActions: true,
+ wrapText: true,
},
{
label: "鎵规鍙�",
@@ -337,6 +339,7 @@
label: "娑堣�楀搧璁㈠崟",
fieldName: "ConsumableorderminorUrl",
hideDefaultActions: true,
+ initialWidth: 210,
type: "url",
typeAttributes: {
label: { fieldName: "Consumable_order_minor__c" },
@@ -404,6 +407,7 @@
fieldName: "ConsumableorderminorUrl",
hideDefaultActions: true,
type: "url",
+ initialWidth: 210,
typeAttributes: {
label: { fieldName: "Consumable_order_minor__c" },
target: "_blank",
@@ -434,6 +438,7 @@
label: "BarCode",
fieldName: "Bar_Code__c",
hideDefaultActions: true,
+ wrapText: true,
initialWidth: 400
},
{
@@ -607,6 +612,7 @@
@track recordEnd = 0;
//end
@track SearchDone = '';
+ @track hideCheckboxColumn = false;
stylesLoaded = false;
renderedCallback() {
@@ -652,8 +658,12 @@
//statusEdit
this.statusEdit = this.getQueryString("KeyWords");
this.statusEdit = this.statusEdit == null ? "" : this.statusEdit;
+ //arriveorder
+ this.arriveorder = this.getQueryString("arriveorder");
+ this.arriveorder = this.arriveorder == null ? "" : this.arriveorder;
console.log("this.ESetid = " + this.ESetid);
console.log("this.statusEdit = " + this.statusEdit);
+ console.log("this.arriveorder = " + this.arriveorder);
if (this.ESetid == "") {
this.isShowInformation = false;
}
@@ -662,7 +672,8 @@
ESetidJs: this.ESetid,
statusEdit: this.statusEdit,
pageSizeLWC: this.pageSize,
- pageTokenLWC: this.currentPageToken
+ pageTokenLWC: this.currentPageToken,
+ arriveorderLWC: this.arriveorder
}).then((r) => {
r = JSON.parse(JSON.stringify(r));
console.log("r = " + JSON.stringify(r));
@@ -830,7 +841,7 @@
this.Existarrive = r.entity.Existarrive;
console.log("this.EditAble = " + this.EditAble);
-
+
//disable
if (Object.values(r.entity.coc).length > 0) {
@@ -870,7 +881,7 @@
) {
this.isPraseToPDFDisabled = false;
}
- if ((coc.Billed_Status__c != "杩樻病寮�绁�" || coc.SummonsStatus_c__c == "宸插畬鎴�") && this.agencyProType != 'ET') {
+ if ((coc.Billed_Status__c != "杩樻病寮�绁�" || coc.SummonsStatus_c__c == "宸插畬鎴�")) {
this.isOpenReportDisabled = false;
}
if (
@@ -986,6 +997,7 @@
this.secondaryDistributor = "";
this.ForDealerText = "";
this.accountValue = "";
+ this.cocLwc['Order_ForDealerText__c'] = '';
this.isDisabledForDealerText = true;
this.isDisabledSecondaryDistributor = true;
break;
@@ -1055,6 +1067,28 @@
);
this.HospitalName = r.entity.HospitalName;
this.sumPrice = r.entity.sumPrice.toFixed(2) + "鍏�";
+ debugger
+ console.log('this.Existarrive = ' + this.Existarrive);
+ console.log('this.EditAble = ' + this.EditAble);
+ console.log('r.entity.coc.SummonsStatus_c__c = ' + r.entity.coc.SummonsStatus_c__c);
+ if (!this.Existarrive && this.EditAble && r.entity.coc.SummonsStatus_c__c != '浠锋牸鏈畾') {
+ this.hideCheckboxColumn = false;
+ } else {
+ this.hideCheckboxColumn = true;
+ }
+ if (!(this.arriveorder == '' && this.Existarrive == false && this.EditAble && this.cocLwc.SummonsStatus_c__c != '浠锋牸鏈畾')) {
+ //璁╁崟浣嶏紝鍑鸿揣鏁伴噺 鍙樹负涓嶅彲閫夌殑text绫诲瀷
+ for (var i in this.columns) {
+ if (this.columns[i].label == '鍗曚綅') {
+ this.columns[i].type = 'text';
+ this.columns[i].fieldName = 'unitValue';
+ }
+ if (this.columns[i].label == '鍑鸿揣鏁伴噺') {
+ this.columns[i].type = 'text';
+ this.columns[i].fieldName = 'shipmentNumber';
+ }
+ }
+ }
this.isShowSpinner = false;
this.showTable = true;
console.log("ESetid = " + this.ESetid);
@@ -1079,6 +1113,7 @@
this.isDisabledForCustomerText = false;
this.secondaryDistributor = "";
this.ForDealerText = "";
+ this.cocLwc['Order_ForDealerText__c'] = '';
this.isDisabledForDealerText = true;
this.isDisabledSecondaryDistributor = true;
this.isMutualTransferGoods = false;
@@ -1296,7 +1331,7 @@
}
}
- let cloneData = this.data;
+ let cloneData = this.deepClone(this.data);
for (var i in cloneData) {
cloneData[i]["Name"] = cloneData[i].Name__c;
cloneData[i]["Category3"] = cloneData[i].Category3__c;
@@ -1340,6 +1375,8 @@
this.totalPages = Math.ceil(r.entity.paginatedAccounts.totalRecords / this.pageSize);
console.log('this.totalPages = ' + this.totalPages);
+ this.hasHosPro = r.entity.hasHosPro;
+ console.log("this.hasHosPro = " + this.hasHosPro);
this.SearchDone = r.entity.SearchDone;
let tempData = [];
@@ -1371,13 +1408,17 @@
tempData[i]["shipmentNumber"] = tempData[i].orderdetails1["Shipment_Count__c"];
tempData[i]["shippingUnitPrice"] = tempData[i].orderdetails1["Delivery_List_RMB__c"];
+ tempData[i]["Id"] = tempData[i].Prod.Id;
console.log('tempData[i]["hospitalSpecialOffer"] = ' + tempData[i]["hospitalSpecialOffer"])
- if (tempData[i]["hospitalSpecialOffer"]) {
- tempData[i]["Id"] = tempData[i].Prod.Id + 'ishos';
- } else {
- tempData[i]["Id"] = tempData[i].Prod.Id + 'nothos';
+ if (this.hasHosPro) {
+ if (tempData[i]["hospitalSpecialOffer"]) {
+ tempData[i]["Id"] = tempData[i].Prod.Id + 'ishos';
+ } else {
+ tempData[i]["Id"] = tempData[i].Prod.Id + 'nothos';
+ }
}
+
tempData[i]["recordId"] = tempData[i]["Id"];
tempData[i]["Name__c"] = tempData[i].Prod.Name__c;
tempData[i]["SFDA_Status__c"] = tempData[i].Prod.SFDA_Status__c;
@@ -1402,6 +1443,23 @@
}
this.data = tempData;
+
+ //濡傛灉hasHosPro = true 鍖婚櫌鐗逛环
+ console.log('this.hasHosPro = ' + this.hasHosPro);
+ if (this.hasHosPro) {
+ let object1 = {
+ label: "鍖婚櫌鐗逛环",
+ fieldName: "hospitalSpecialOffer",
+ type: 'boolean',
+ initialWidth: 100,
+ hideDefaultActions: true,
+ };
+ this.columns.push(object1);
+ this.editColumns.push(object1);
+ }
+ this.columns = [...this.columns];
+ this.editColumns = [...this.editColumns];
+ console.log("this.columns = " + JSON.stringify(this.columns));
console.log("this.data = " + JSON.stringify(this.data));
console.log(" this.selectedRows = " + JSON.stringify(this.selectedRows));
//this.showTable = true;
@@ -1517,9 +1575,7 @@
if (this.data[i].Id == numberDetail.data.recordId) {
index = i;
this.data[i].shipmentNumber = Number(numberDetail.data.shipmentnumber);
- this.data[i].orderdetails1["Shipment_Count__c"] = Number(
- numberDetail.data.shipmentnumber
- );
+ this.data[i].orderdetails1["Shipment_Count__c"] = Number(numberDetail.data.shipmentnumber);
console.log('this.data[i].orderdetails1["Shipment_Count__c"] = ' + this.data[i].orderdetails1["Shipment_Count__c"]);
console.log('this.selectedRows.indexOf(this.data[i].Id) = ' + this.selectedRows.indexOf(this.data[i].Id));
if (this.data[i].orderdetails1["Shipment_Count__c"] != '') {
@@ -1537,6 +1593,7 @@
console.log('this.selectedRows = ' + JSON.stringify(this.selectedRows));
}
}
+ this.data = [...this.data];
this.ComputePrice(
index,
this.data[index].shipmentNumber,
@@ -1681,6 +1738,10 @@
}
}
+ deepClone(obj) {
+ return JSON.parse(JSON.stringify(obj));
+ }
+
saveConfirm() {
this.isShowSpinner = true;
@@ -1698,13 +1759,14 @@
}
}
- let cloneData = this.data;
+ let cloneData = this.deepClone(this.data);
for (var i in cloneData) {
cloneData[i]["Name"] = cloneData[i].Name__c;
cloneData[i]["Category3"] = cloneData[i].Category3__c;
cloneData[i]["Category4"] = cloneData[i].Category4__c;
cloneData[i]["Category5"] = cloneData[i].Category5__c;
cloneData[i]["BoxPiece"] = cloneData[i].Box_Piece__c;
+ //cloneData[i]["shippingUnitPrice"] = cloneData[i]["shippingUnitPrice"] == '' ? 0 : cloneData[i]["shippingUnitPrice"];
delete cloneData[i].Name__c;
delete cloneData[i].Category3__c;
delete cloneData[i].Category4__c;
@@ -1779,17 +1841,20 @@
console.log("openReportJs");
var reportId = this.ESetid;
reportId = reportId.substring(0, 15);
+ console.log("reportId = " + reportId);
let reportFilters = '[{"operator":"equals","value":"' + reportId + '","column":"FK_CUSTENT_ID"}]';
let reportUrl = this.label.ConsumableOutboundReportId;
console.log("reportUrl = " + reportUrl);
- let url = "/report/" + reportUrl + "?reportFilters=" + encodeURIComponent(reportFilters);
+ let url = "/s/report/" + reportUrl + "?reportFilters=" + encodeURIComponent(reportFilters);
console.log("url = " + url);
- this[NavigationMixin.Navigate]({
- type: "standard__webPage",
- attributes: {
- url: url,
- },
- });
+ window.open(url);
+ // this[NavigationMixin.Navigate]({
+ // type: "standard__webPage",
+ // attributes: {
+ // url: url,
+ // target: '_blank'
+ // },
+ // });
}
vpClear2Delay(event) {
@@ -1872,17 +1937,17 @@
fileName: this.fileName,
base64Data: encodeURIComponent(this.fileContents),
}).then((r) => {
- this.showPopSpinner = false;
- r = JSON.parse(JSON.stringify(r));
- console.log("r = " + JSON.stringify(r));
- this.closePop();
- this.showMyToast('鎴愬姛', '涓婁紶鎴愬姛', 'Success');
- this.getFiles();
- }).catch((error) => {
- this.showPopSpinner = false;
- console.log("error = " + error.message);
- this.showMyToast('澶辫触', '涓婁紶澶辫触', 'Error');
- });
+ this.showPopSpinner = false;
+ r = JSON.parse(JSON.stringify(r));
+ console.log("r = " + JSON.stringify(r));
+ this.closePop();
+ this.showMyToast('涓婁紶鎴愬姛', '', 'Success');
+ this.getFiles();
+ }).catch((error) => {
+ this.showPopSpinner = false;
+ console.log("error = " + error.message);
+ this.showMyToast('澶辫触', '涓婁紶澶辫触', 'Error');
+ });
}
getFiles() {
@@ -1891,24 +1956,24 @@
getFiles({
recordId: this.ESetid,
}).then((r) => {
- r = JSON.parse(JSON.stringify(r));
- console.log("r = " + JSON.stringify(r));
- this.fileData = r.entity.cvList;
- console.log("this.fileData = " + JSON.stringify(this.fileData));
- for (var i in this.fileData) {
- this.fileData[i]["Id"] = this.fileData[i].Id;
- this.fileData[i]["recordId"] = this.fileData[i].Id;
- this.fileData[i]["url"] = "/" + this.fileData[i].Id;
- this.fileData[i]["Title"] = this.fileData[i].Title;
- this.fileData[i]["attUrl"] = '/' + this.fileData[i].Id;
- this.fileData[i]['downloadUrl'] = '/sfc/servlet.shepherd/document/download/' + this.fileData[i].ContentDocumentId + '?operationContext=S1';
- }
- console.log("this.fileData = " + this.fileData);
- this.showLoadingSpinner = false;
- }).catch((error) => {
- console.log("error = " + error.message);
- this.showMyToast('澶辫触', '鑾峰彇闄勪欢澶辫触', 'Error');
- });
+ r = JSON.parse(JSON.stringify(r));
+ console.log("r = " + JSON.stringify(r));
+ this.fileData = r.entity.cvList;
+ console.log("this.fileData = " + JSON.stringify(this.fileData));
+ for (var i in this.fileData) {
+ this.fileData[i]["Id"] = this.fileData[i].Id;
+ this.fileData[i]["recordId"] = this.fileData[i].Id;
+ this.fileData[i]["url"] = "/" + this.fileData[i].Id;
+ this.fileData[i]["Title"] = this.fileData[i].Title;
+ this.fileData[i]["attUrl"] = '/' + this.fileData[i].Id;
+ this.fileData[i]['downloadUrl'] = '/sfc/servlet.shepherd/document/download/' + this.fileData[i].ContentDocumentId + '?operationContext=S1';
+ }
+ console.log("this.fileData = " + this.fileData);
+ this.showLoadingSpinner = false;
+ }).catch((error) => {
+ console.log("error = " + error.message);
+ this.showMyToast('澶辫触', '鑾峰彇闄勪欢澶辫触', 'Error');
+ });
}
GoodsDeliveryJs() {
@@ -1928,7 +1993,7 @@
}
}
- let cloneData = this.data;
+ let cloneData = this.deepClone(this.data);
for (var i in cloneData) {
cloneData[i]["Name"] = cloneData[i].Name__c;
cloneData[i]["Category3"] = cloneData[i].Category3__c;
@@ -1971,29 +2036,29 @@
GoodsDeliveryInit({
ESetId: this.ESetid,
}).then((r) => {
- r = JSON.parse(JSON.stringify(r));
- console.log("r = " + JSON.stringify(r));
- if (r.status == "Success") {
- this.salesCoc = r.entity.coc;
- this.salesAccountName = r.entity.accountName;
- this.salesUserWorkLocation = r.entity.userWorkLocation;
- this.salesAccountid = r.entity.accountid;
- this.salesOrderdetails = r.entity.orderdetails;
- console.log('this.salesOrderdetails = ' + JSON.stringify(this.salesOrderdetails))
- this.salesData = r.entity.consumableorderdetailsRecords;
- this.salesErrorData = r.entity.consumableorderdetailsRecordserror;
- this.salesOrderpieceorboxMap = r.entity.orderpieceorboxMap;
- this.salesOrderpriceMap = r.entity.orderpriceMap;
- this.salesOrderagencypriceMap = r.entity.orderagencypriceMap;
- this.isShowSpinner = false;
- } else {
- console.log("r.msg = " + r.msg);
- this.showMyToast('鍒濆鍖栧け璐�', r.msg, 'Error');
- }
- }).catch((error) => {
- console.log("error = " + error.message);
- this.showMyToast('閿欒', '鍒濆鍖栧け璐�', 'Error');
- });
+ r = JSON.parse(JSON.stringify(r));
+ console.log("r = " + JSON.stringify(r));
+ if (r.status == "Success") {
+ this.salesCoc = r.entity.coc;
+ this.salesAccountName = r.entity.accountName;
+ this.salesUserWorkLocation = r.entity.userWorkLocation;
+ this.salesAccountid = r.entity.accountid;
+ this.salesOrderdetails = r.entity.orderdetails;
+ console.log('this.salesOrderdetails = ' + JSON.stringify(this.salesOrderdetails))
+ this.salesData = r.entity.consumableorderdetailsRecords;
+ this.salesErrorData = r.entity.consumableorderdetailsRecordserror;
+ this.salesOrderpieceorboxMap = r.entity.orderpieceorboxMap;
+ this.salesOrderpriceMap = r.entity.orderpriceMap;
+ this.salesOrderagencypriceMap = r.entity.orderagencypriceMap;
+ this.isShowSpinner = false;
+ } else {
+ console.log("r.msg = " + r.msg);
+ this.showMyToast('鍒濆鍖栧け璐�', r.msg, 'Error');
+ }
+ }).catch((error) => {
+ console.log("error = " + error.message);
+ this.showMyToast('閿欒', '鍒濆鍖栧け璐�', 'Error');
+ });
}
SalesearchProductJs() {
@@ -2178,16 +2243,18 @@
let url = '';
console.log('this.invoiceId = ' + this.invoiceId);
if (this.invoiceId.length > 0 && this.invoiceId != '000000000000000') {
- url = "/lexconinvoiceview?deliveryId=" + this.ESetid + "&invoiceId=" + this.invoiceId + "&KeyWords=Redirect";
+ url = "/s/lexconinvoiceview?deliveryId=" + this.ESetid + "&invoiceId=" + this.invoiceId + "&KeyWords=Redirect";
} else {
- url = "/lexconinvoiceview?deliveryId=" + this.ESetid + "&KeyWords=Redirect";
+ url = "/s/lexconinvoiceview?deliveryId=" + this.ESetid + "&KeyWords=Redirect";
}
- this[NavigationMixin.Navigate]({
- type: "standard__webPage",
- attributes: {
- url: url,
- },
- });
+ window.open(url);
+ // this[NavigationMixin.Navigate]({
+ // type: "standard__webPage",
+ // attributes: {
+ // url: url,
+ // target:'_blank'
+ // },
+ // });
}
//鍒犻櫎
@@ -2468,23 +2535,22 @@
//鍒犻櫎闄勪欢
deleteAtt(event) {
- this.showLoadingSpinner = true;
+ this.isShowSpinner = true;
//var recordId = event.detail.data.recordId;
var recordId = event.target.getAttribute("data-fileid");
console.log('attid:' + recordId);
- deleteAtt(
- {
- contentVersionId: recordId
- }
- ).then(result => {
- if (result.result == 'Success') {
- this.showMyToast('鎴愬姛', '鍒犻櫎鎴愬姛', 'Success');
+ deleteAtt({
+ contentVersionId: recordId
+ }).then(r => {
+ r = JSON.parse(JSON.stringify(r));
+ if (r.status == "Success") {
+ this.showMyToast('鍒犻櫎鎴愬姛', '', 'Success');
this.getFiles();
} else {
- this.showMyToast('鍒犻櫎澶辫触', result.errorMsg, 'Error');
+ this.showMyToast('鍒犻櫎澶辫触', r.msg, 'Error');
}
}).catch(error => {
- this.showMyToast('閿欒', '鍒犻櫎澶辫触', 'Error');
+ this.showMyToast('閿欒', error.message, 'Error');
})
}
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexTopPage/lexTopPage.js b/force-app/main/default/lwc/lexTopPage/lexTopPage.js
index cb6582a..c2d88d1 100644
--- a/force-app/main/default/lwc/lexTopPage/lexTopPage.js
+++ b/force-app/main/default/lwc/lexTopPage/lexTopPage.js
@@ -84,7 +84,7 @@
},
hideDefaultActions: true,initialWidth: 200
},
- { label: 'SAP鍚堝悓鍙�', fieldName: 'ContractNo__c', hideDefaultActions: true},
+ { label: 'SAP鍚堝悓鍙�', fieldName: 'ContractNo__c', hideDefaultActions: true,initialWidth:180},
{
label: '璁㈠崟鎬绘暟',
type: "customOutputGood",
@@ -141,7 +141,7 @@
@track colms2 = [
{ label: '浜у搧鍨嬪彿', fieldName: 'prodModel', hideDefaultActions: true },
- { label: '鏁伴噺', fieldName: 'recordCount', hideDefaultActions: true ,initialWidth: 100}
+ { label: '鏁伴噺', fieldName: 'recordCount', hideDefaultActions: true ,initialWidth: 60,cellAttributes: { alignment: "center" }}
];
//浣跨敤鏈熼檺灏忎簬涓�骞寸殑浜у搧col
@@ -329,6 +329,7 @@
this.hasHos = result.hasHos;
this.product_Limit = result.product_Limit;
console.log('result==>' + JSON.stringify(result));
+
for (var i in this.pageRecords) {
this.pageRecords[i]["Name__c"] = this.pageRecords[i].Prod.Name__c;
this.pageRecords[i]["Category3__c"] = this.pageRecords[i].Prod.Category3__c;
diff --git a/force-app/main/default/lwc/lexinventoryViewLWC/lexinventoryViewLWC.css b/force-app/main/default/lwc/lexinventoryViewLWC/lexinventoryViewLWC.css
index d8ad0bb..c1f9846 100644
--- a/force-app/main/default/lwc/lexinventoryViewLWC/lexinventoryViewLWC.css
+++ b/force-app/main/default/lwc/lexinventoryViewLWC/lexinventoryViewLWC.css
@@ -13,4 +13,4 @@
background: #ffffff;
box-sizing: border-box;
border: 1px solid #0a81df;
-}
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexinventoryViewLWC/lexinventoryViewLWC.html b/force-app/main/default/lwc/lexinventoryViewLWC/lexinventoryViewLWC.html
index fb2aa16..b8da408 100644
--- a/force-app/main/default/lwc/lexinventoryViewLWC/lexinventoryViewLWC.html
+++ b/force-app/main/default/lwc/lexinventoryViewLWC/lexinventoryViewLWC.html
@@ -1,281 +1,129 @@
<template>
<template if:true={showSpinner}>
- <lightning-spinner size="medium" variant="brand"></lightning-spinner>
+ <lightning-spinner size="medium" variant="brand"></lightning-spinner>
</template>
<c-common-toast></c-common-toast>
- <div style="border: 1px solid #d4d4d4; border-radius: 5px">
- <div
- style="
- border-top: 3px solid #51606e;
- border-bottom: 1px solid #d4d4d4;
- padding: 3px;
- "
- >
- <!-- <p style="font-size: 18px;"><strong>搴撳瓨绠＄悊</strong></p> -->
- <lightning-layout>
- <lightning-layout-item padding="around-small">
- <p style="font-size: 18px">
- <strong>搴撳瓨绠＄悊</strong>
- </p>
- </lightning-layout-item>
- </lightning-layout>
- </div>
- <div style="padding: 10px">
- <div
- style="
- border: 1px solid #d4d4d4;
- border-radius: 5px;
- margin-bottom: 7px;
- "
- >
- <div
- style="
- border-top: 3px solid #51606e;
- border-bottom: 1px solid #d4d4d4;
- padding: 10px;
- "
- >
- <!-- <lightning-button variant="brand" class = 'lexstyle' style="margin:12px;" label="搴撳瓨鐩樼偣" title="搴撳瓨鐩樼偣"
- onclick={inventoryCount}></lightning-button>
- <lightning-button variant="brand" class = 'lexstyle' style="margin: 12px;" label="杩囨湡搴撳瓨閿�瀛�" title="杩囨湡搴撳瓨閿�瀛�"
- onclick={handleExpired}></lightning-button>
- <lightning-button variant="brand" class = 'lexstyle' style="margin: 12px;" label="鎷嗙洅" title="鎷嗙洅" onclick={removeBox}></lightning-button>
- <lightning-button variant="brand" class = 'lexstyle' style="margin: 12px;" label="鍙栨秷鎷嗙洅" title="鍙栨秷鎷嗙洅"
- onclick={cancelremoveBox}></lightning-button> -->
- <button
- style="margin-left: 5px"
- class="slds-button slds-button_neutral slds-button_stretch lexBorder"
- label="搴撳瓨鐩樼偣"
- onclick={inventoryCount}
- >
- 搴撳瓨鐩樼偣
- </button>
- <button
- class="slds-button slds-button_neutral slds-button_stretch lexButtoun"
- label="杩囨湡搴撳瓨閿�瀛�"
- style="margin-left: 60px"
- onclick={handleExpired}
- >
- 杩囨湡搴撳瓨閿�瀛�
- </button>
- <button
- class="slds-button slds-button_neutral slds-button_stretch lexButtoun"
- label="鎷嗙洅"
- style="margin-left: 60px"
- onclick={removeBox}
- >
- 鎷嗙洅
- </button>
- <button
- class="slds-button slds-button_neutral slds-button_stretch lexButtoun"
- label="鍙栨秷鎷嗙洅"
- style="margin-left: 60px"
- onclick={cancelremoveBox}
- >
- 鍙栨秷鎷嗙洅
- </button>
- </div>
+ <div style="border: 1px solid #D4D4D4;border-radius:5px;">
+ <div style="border-top: 3px solid #51606E;;border-bottom: 1px solid #D4D4D4;padding:3px;">
+ <!-- <p style="font-size: 18px;"><strong>搴撳瓨绠＄悊</strong></p> -->
+ <lightning-layout>
+ <lightning-layout-item padding="around-small">
+ <p style="font-size: 18px">
+ <strong>搴撳瓨绠＄悊</strong>
+ </p>
+ </lightning-layout-item>
+ </lightning-layout>
+ </div>
+ <div style="padding:10px;">
+ <div style="border: 1px solid #D4D4D4;border-radius:5px;margin-bottom:7px;">
+ <div style="border-top: 3px solid #51606E;border-bottom: 1px solid #D4D4D4;padding:10px;">
+ <!-- <lightning-button variant="brand" class = 'lexstyle' style="margin:12px;" label="搴撳瓨鐩樼偣" title="搴撳瓨鐩樼偣"
+ onclick={inventoryCount}></lightning-button>
+ <lightning-button variant="brand" class = 'lexstyle' style="margin: 12px;" label="杩囨湡搴撳瓨閿�瀛�" title="杩囨湡搴撳瓨閿�瀛�"
+ onclick={handleExpired}></lightning-button>
+ <lightning-button variant="brand" class = 'lexstyle' style="margin: 12px;" label="鎷嗙洅" title="鎷嗙洅" onclick={removeBox}></lightning-button>
+ <lightning-button variant="brand" class = 'lexstyle' style="margin: 12px;" label="鍙栨秷鎷嗙洅" title="鍙栨秷鎷嗙洅"
+ onclick={cancelremoveBox}></lightning-button> -->
+ <button style ="margin-left:5px" class="slds-button slds-button_neutral slds-button_stretch lexBorder" label="搴撳瓨鐩樼偣" onclick={inventoryCount}>搴撳瓨鐩樼偣</button>
+ <button class="slds-button slds-button_neutral slds-button_stretch lexButtoun" label="杩囨湡搴撳瓨閿�瀛�" style = "margin-left:60px;" onclick={handleExpired}>杩囨湡搴撳瓨閿�瀛�</button>
+ <button class="slds-button slds-button_neutral slds-button_stretch lexButtoun" label="鎷嗙洅" style = "margin-left:60px;" onclick={removeBox}>鎷嗙洅</button>
+ <button class="slds-button slds-button_neutral slds-button_stretch lexButtoun" label="鍙栨秷鎷嗙洅" style = "margin-left:60px;" onclick={cancelremoveBox}>鍙栨秷鎷嗙洅</button>
+ </div>
+ </div>
+
+ <div style="border: 1px solid #D4D4D4;border-radius:5px;margin-bottom:7px;margin-top:30px;">
+ <div style="border-top: 3px solid #51606E;border-bottom: 1px solid #D4D4D4;padding:3px;height:115px">
+ <table style="margin-top:10px;">
+ <colgroup>
+ <col width="160px" />
+ <col width="100px" />
+ <col width="10px" />
+ <col width="70px" />
+ <col width="100px" />
+ <col width="10px" />
+ <col width="70px" />
+ <col width="100px" />
+ <col width="10px" />
+ <col width="90px" />
+ <col width="100px" />
+ <col width="85px" />
+ <col width="100px" />
+ <col width="10px" />
+ <col width="70px" />
+ <col width="100px" />
+ </colgroup>
+ <tbody>
+ <tr>
+ <td style="width:10px;"></td>
+ <td style="width:250px">
+ <div style="width:90px;margin-left:12px;" class="searchName">娑堣�楀搧鍚嶇О</div>
+ </td>
+ <td style="width: 21%;">
+ <lightning-input class="searchName" type="text" name="Name" label="娑堣�楀搧鍚嶇О" value={Name}
+ variant="label-hidden" onchange={dataChange}
+ data-field="Name"></lightning-input>
+ </td>
+ <td style="width:150px">
+ <div style="width:90px;text-align:center;" class="searchName">绗�3鍒嗙被</div>
+ </td>
+ <td style="width: 21%;">
+ <lightning-combobox class="inputFont" style="margin-left:5px;" name="CategoryThree" label="绗�3鍒嗙被" value={value}
+ placeholder="璇烽�夋嫨..." options={category3Options} variant="label-hidden"
+ data-field="CategoryThree" onchange={dataChange}></lightning-combobox>
+ </td>
+ <td style="width:150px">
+ <div style="width:90px;text-align:center;" class="searchName">绗�4鍒嗙被</div>
+ </td>
+ <td style="width: 21%;">
+ <lightning-combobox class="inputFont" name="CategoryFour" label="绗�4鍒嗙被" value={value}
+ placeholder="璇烽�夋嫨..." options={category4Options} variant="label-hidden"
+ data-field="CategoryFour" onchange={dataChange}></lightning-combobox>
+ </td>
+ <td style="width:150px">
+ <div style="width:90px;text-align:center;" class="searchName">绗�5鍒嗙被</div>
+ </td>
+ <td style="width: 21%;">
+ <lightning-combobox class="inputFont" name="CategoryFive" label="绗�5鍒嗙被" value={value}
+ placeholder="璇烽�夋嫨..." options={category5Options} variant="label-hidden"
+ data-field="CategoryFive" onchange={dataChange}></lightning-combobox>
+ </td>
+ <td style="width: 1%;"></td>
+ </tr>
+ </tbody>
+ </table>
+ <br/>
+ <div style="float:right;margin-right:10px;"> <button class="slds-button slds-button_neutral slds-button_stretch lexsearchStyle" label="娑堣�楀搧鎼滅储" onclick={searchOrderDetail}>娑堣�楀搧鎼滅储</button>
+ <button style="margin-left:10px;" class="slds-button slds-button_neutral slds-button_stretch lexclearStyle" label="娓呯┖" onclick={clearAll}>娓呯┖</button></div>
+
+ </div>
+ </div>
+ <div style="border: 1px solid #D4D4D4;border-radius:5px;margin-bottom:7px;">
+ <div style="border-top: 3px solid #51606E;border-bottom: 1px solid #D4D4D4;padding:3px;">
+ <!-- <p style="font-size: 16px;"><strong>搴撳瓨璇︽儏</strong></p> -->
+ <lightning-layout>
+ <lightning-layout-item padding="around-small">
+ <p style="font-size: 18px">
+ <strong>搴撳瓨璇︽儏</strong>
+ </p>
+ </lightning-layout-item>
+ </lightning-layout>
+ </div>
+ <div style="padding:10px;">
+ <template if:true={showTable}>
+ <c-lex-custom-lightning-datatable key-field="id" data={data} columns={columns}
+ default-sort-direction={defaultSortDirection} sorted-direction={sortDirection}
+ sorted-by={sortedBy} onsort={onHandleSort} hide-checkbox-column={hidecheckboxcolumn}
+ class="wrapped-header-datatable">
+ </c-lex-custom-lightning-datatable>
+ </template>
+ <c-paginator onprevious={handlePrevious} onnext={handleNext} onpageschange={handlePageschange}
+ onfirst={handleFirst} onlast={handleLast} page-size-options={pageSizeOptions}
+ previous-button-disabled={previousButtonDisabled} next-button-disabled={nextButtonDisabled}
+ record-start={recordStart} record-end={recordEnd} total-records={totalRecords}></c-paginator>
+ </div>
+ </div>
</div>
- <div
- style="
- border: 1px solid #d4d4d4;
- border-radius: 5px;
- margin-bottom: 7px;
- margin-top: 30px;
- "
- >
- <div
- style="
- border-top: 3px solid #51606e;
- border-bottom: 1px solid #d4d4d4;
- padding: 3px;
- height: 115px;
- "
- >
- <table style="margin-top: 10px">
- <colgroup>
- <col width="160px" />
- <col width="100px" />
- <col width="10px" />
- <col width="70px" />
- <col width="100px" />
- <col width="10px" />
- <col width="70px" />
- <col width="100px" />
- <col width="10px" />
- <col width="90px" />
- <col width="100px" />
- <col width="85px" />
- <col width="100px" />
- <col width="10px" />
- <col width="70px" />
- <col width="100px" />
- </colgroup>
- <tbody>
- <tr>
- <td style="width: 10px"></td>
- <td style="width: 250px">
- <div
- style="width: 90px; margin-left: 12px"
- class="searchName"
- >
- 娑堣�楀搧鍚嶇О
- </div>
- </td>
- <td style="width: 21%">
- <lightning-input
- class="searchName"
- type="text"
- name="Name"
- label="娑堣�楀搧鍚嶇О"
- value={Name}
- variant="label-hidden"
- onchange={dataChange}
- data-field="Name"
- ></lightning-input>
- </td>
- <td style="width: 150px">
- <div
- style="width: 90px; text-align: center"
- class="searchName"
- >
- 绗�3鍒嗙被
- </div>
- </td>
- <td style="width: 21%">
- <lightning-combobox
- class="inputFont"
- style="margin-left: 5px"
- name="CategoryThree"
- label="绗�3鍒嗙被"
- value={value}
- placeholder="璇烽�夋嫨..."
- options={category3Options}
- variant="label-hidden"
- data-field="CategoryThree"
- onchange={dataChange}
- ></lightning-combobox>
- </td>
- <td style="width: 150px">
- <div
- style="width: 90px; text-align: center"
- class="searchName"
- >
- 绗�4鍒嗙被
- </div>
- </td>
- <td style="width: 21%">
- <lightning-combobox
- class="inputFont"
- name="CategoryFour"
- label="绗�4鍒嗙被"
- value={value}
- placeholder="璇烽�夋嫨..."
- options={category4Options}
- variant="label-hidden"
- data-field="CategoryFour"
- onchange={dataChange}
- ></lightning-combobox>
- </td>
- <td style="width: 150px">
- <div
- style="width: 90px; text-align: center"
- class="searchName"
- >
- 绗�5鍒嗙被
- </div>
- </td>
- <td style="width: 21%">
- <lightning-combobox
- class="inputFont"
- name="CategoryFive"
- label="绗�5鍒嗙被"
- value={value}
- placeholder="璇烽�夋嫨..."
- options={category5Options}
- variant="label-hidden"
- data-field="CategoryFive"
- onchange={dataChange}
- ></lightning-combobox>
- </td>
- <td style="width: 1%"></td>
- </tr>
- </tbody>
- </table>
- <br />
- <div style="float: right; margin-right: 10px">
- <button
- class="slds-button slds-button_neutral slds-button_stretch lexsearchStyle"
- label="娑堣�楀搧鎼滅储"
- onclick={searchOrderDetail}
- >
- 娑堣�楀搧鎼滅储
- </button>
- <button
- style="margin-left: 10px"
- class="slds-button slds-button_neutral slds-button_stretch lexclearStyle"
- label="娓呯┖"
- onclick={clearAll}
- >
- 娓呯┖
- </button>
- </div>
- </div>
- </div>
- <div
- style="
- border: 1px solid #d4d4d4;
- border-radius: 5px;
- margin-bottom: 7px;
- "
- >
- <div
- style="
- border-top: 3px solid #51606e;
- border-bottom: 1px solid #d4d4d4;
- padding: 3px;
- "
- >
- <!-- <p style="font-size: 16px;"><strong>搴撳瓨璇︽儏</strong></p> -->
- <lightning-layout>
- <lightning-layout-item padding="around-small">
- <p style="font-size: 18px">
- <strong>搴撳瓨璇︽儏</strong>
- </p>
- </lightning-layout-item>
- </lightning-layout>
- </div>
- <div style="padding: 10px">
- <template if:true={showTable}>
- <c-lex-custom-lightning-datatable
- key-field="id"
- data={data}
- columns={columns}
- default-sort-direction={defaultSortDirection}
- sorted-direction={sortDirection}
- sorted-by={sortedBy}
- onsort={onHandleSort}
- hide-checkbox-column={hidecheckboxcolumn}
- class="wrapped-header-datatable"
- >
- </c-lex-custom-lightning-datatable>
- </template>
- <c-paginator
- onprevious={handlePrevious}
- onnext={handleNext}
- onpageschange={handlePageschange}
- onfirst={handleFirst}
- onlast={handleLast}
- page-size-options={pageSizeOptions}
- previous-button-disabled={previousButtonDisabled}
- next-button-disabled={nextButtonDisabled}
- record-start={recordStart}
- record-end={recordEnd}
- total-records={totalRecords}
- ></c-paginator>
- </div>
- </div>
- </div>
+
</div>
-</template>
+</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexinventoryViewLWC/lexinventoryViewLWC.js b/force-app/main/default/lwc/lexinventoryViewLWC/lexinventoryViewLWC.js
index 3b4fb28..08547a6 100644
--- a/force-app/main/default/lwc/lexinventoryViewLWC/lexinventoryViewLWC.js
+++ b/force-app/main/default/lwc/lexinventoryViewLWC/lexinventoryViewLWC.js
@@ -1,688 +1,655 @@
-import { LightningElement, wire, api, track } from "lwc";
+import { LightningElement, wire, api, track } from 'lwc';
import oninit from "@salesforce/apex/LexInventoryViewController.init";
import { ShowToastEvent } from "lightning/platformShowToastEvent";
import searchOrder from "@salesforce/apex/LexInventoryViewController.searchConsumableorderdetails";
import categoryAllload from "@salesforce/apex/LexInventoryViewController.categoryAllload";
import { NavigationMixin } from "lightning/navigation";
-//table css
+//table css
import { loadStyle } from "lightning/platformResourceLoader";
import WrappedHeaderTable from "@salesforce/resourceUrl/lexdatatable";
-export default class LexinventoryViewLWC extends NavigationMixin(
- LightningElement
-) {
- //鍒嗛〉start
- @track sortBy = "";
- //@track sortDirection = "asc";
- @track pageSize = 10;
- error;
- records;
- currentPageToken = 0;
- nextPageToken = this.pageSize;
- @track totalRecords = 0;
- @track loader = false;
- @track pageNumber = 1;
- @track paginationVisibility = false;
- @track totalPages = 1;
- pageSizeOptions = [10, 25, 50, 100];
- @track recordStart = 0;
- @track recordEnd = 0;
- //end
- @track data = [];
- @track message = "";
- @track Name;
- @track CategoryThree;
+export default class LexinventoryViewLWC extends NavigationMixin(LightningElement) {
+ //鍒嗛〉start
+ @track sortBy = "";
+ //@track sortDirection = "asc";
+ @track pageSize = 10;
+ error;
+ records;
+ currentPageToken = 0;
+ nextPageToken = this.pageSize;
+ @track totalRecords = 0;
+ @track loader = false;
+ @track pageNumber = 1;
+ @track paginationVisibility = false;
+ @track totalPages = 1;
+ pageSizeOptions = [10,25,50,100];
+ @track recordStart = 0;
+ @track recordEnd = 0;
+ //end
- @track category3Options = [];
- @track CategoryFour;
- @track category4Options = [];
- @track CategoryFive;
- @track category5Options = [];
- @track orderDetZaikuList = [];
- @track accountName;
- @track agencyProType;
- @track userWorkLocation;
- @track value = "";
- @track showTable = false;
- @track hidecheckboxcolumn = true;
- @track check = false;
- //鍔犺浇
- @track showSpinner = false;
- @track showSpinners = false;
- //鍖婚櫌鐗逛环
- @track hasHos = false;
- //琛ㄥご鏍峰紡
- stylesLoaded = false;
+ @track data = [];
+ @track message = "";
+ @track Name;
+ @track CategoryThree;
- @track columns = [
- {
- label: "娑堣�楀搧鍚嶇О",
- fieldName: "Name__c",
- type: "Name",
- sortable: true,
- hideDefaultActions: true,
- initialWidth: 300,
- wrapText: true,
- cellAttributes: { alignment: "left" }
- },
- {
- label: "绗笁鍒嗙被",
- fieldName: "Category3__c",
- initialWidth: 90,
- cellAttributes: { alignment: "left" },
- hideDefaultActions: true,
- sortable: true,
- wrapText: true
- },
- {
- label: "绗洓鍒嗙被",
- fieldName: "Category4__c",
- cellAttributes: { alignment: "left" },
- initialWidth: 90,
- hideDefaultActions: true,
- wrapText: true,
- sortable: true
- },
- {
- label: "绗簲鍒嗙被",
- fieldName: "Category5__c",
- cellAttributes: { alignment: "left" },
- initialWidth: 90,
- hideDefaultActions: true,
- wrapText: true,
- sortable: true
- },
+ @track category3Options = [];
+ @track CategoryFour;
+ @track category4Options = [];
+ @track CategoryFive;
+ @track category5Options = [];
+ @track orderDetZaikuList = [];
+ @track accountName;
+ @track agencyProType;
+ @track userWorkLocation;
+ @track value = "";
+ @track showTable = false;
+ @track hidecheckboxcolumn = true;
+ @track check = false;
+ @track productkucun;
+ //鍔犺浇
+ @track showSpinner = false;
+ @track showSpinners = false;
+ //鍖婚櫌鐗逛环
+ @track hasHos = false;
+ //琛ㄥご鏍峰紡
+ stylesLoaded = false;
- {
- label: "瑙勬牸",
- fieldName: "packing_list",
- cellAttributes: { alignment: "right" },
- initialWidth: 55,
- wrapText: true,
- hideDefaultActions: true
- },
- {
- label: "鍗曚綅",
- fieldName: "BoxPiece",
- cellAttributes: { alignment: "left" },
- initialWidth: 55,
- wrapText: true,
- hideDefaultActions: true
- },
- {
- label: "娉ㄥ唽璇佺紪鐮佸彿",
- fieldName: "approbation_No",
- cellAttributes: { alignment: "left" },
- wrapText: true,
- initialWidth: 155,
- hideDefaultActions: true
- },
- {
- label: "娉ㄥ唽鏈夋晥鏈�",
- fieldName: "expiration_Date",
- cellAttributes: { alignment: "left" },
- wrapText: true,
- hideDefaultActions: true,
- initialWidth: 100
- },
- {
- label: "CFDA鐘舵��",
- fieldName: "SFDA_Status__c",
- cellAttributes: { alignment: "left" },
- initialWidth: 95,
- wrapText: true,
- hideDefaultActions: true
- },
- {
- label: "浣跨敤鏈熼檺",
- fieldName: "guaranteeperiod",
- cellAttributes: { alignment: "left" },
- hideDefaultActions: true,
- initialWidth: 105
- },
- {
- label: "鏈夋晥鏈熷唴搴撳瓨",
- type: "customInventoryColor",
- // sortable: true,
- cellAttributes: { alignment: "right" },
- typeAttributes: {
- value: { fieldName: "limitCount" },
- upperlimit: { fieldName: "upperlimit" },
- lowerlimit: { fieldName: "lowerlimit" },
- boxPrice: { fieldName: "BoxPiece" }
- },
- hideDefaultActions: true,
- initialWidth: 150
- },
- {
- label: "杩囨湡搴撳瓨",
- fieldName: "overlimitCount",
- hideDefaultActions: true,
- cellAttributes: { alignment: "right" },
- initialWidth: 80
+ @track columns = [
+ {
+ label: "娑堣�楀搧鍚嶇О",
+ fieldName: "Name__c",
+ type: "Name",
+ sortable: true,
+ hideDefaultActions: true,
+ initialWidth: 300,
+ wrapText: true,
+ cellAttributes: { alignment: "left" }
+ },
+ {
+ label: "绗笁鍒嗙被",
+ fieldName: "Category3__c",
+ initialWidth: 120,
+ cellAttributes: { alignment: "left" },
+ hideDefaultActions: true,
+ sortable: true,
+ wrapText: true,
+ },
+ {
+ label: "绗洓鍒嗙被",
+ fieldName: "Category4__c",
+ cellAttributes: { alignment: "left" },
+ initialWidth: 120,
+ hideDefaultActions: true,
+ wrapText: true,
+ sortable: true,
+
+ },
+ {
+ label: "绗簲鍒嗙被",
+ fieldName: "Category5__c",
+ cellAttributes: { alignment: "left" },
+ initialWidth: 120,
+ hideDefaultActions: true,
+ wrapText: true,
+ sortable: true,
+
+ },
+
+ {
+ label: "瑙勬牸",
+ fieldName: "packing_list",
+ cellAttributes: { alignment: "right" },
+ initialWidth: 55,
+ wrapText: true,
+ hideDefaultActions: true,
+ },
+ {
+ label: "鍗曚綅",
+ fieldName: "BoxPiece",
+ cellAttributes: { alignment: "left" },
+ initialWidth: 55,
+ wrapText: true,
+ hideDefaultActions: true,
+ },
+ {
+ label: "娉ㄥ唽璇佺紪鐮佸彿",
+ fieldName: "approbation_No",
+ cellAttributes: { alignment: "left" },
+ wrapText: true,
+ initialWidth: 200,
+ hideDefaultActions: true,
+ },
+ {
+ label: "娉ㄥ唽鏈夋晥鏈�",
+ fieldName: "expiration_Date",
+ cellAttributes: { alignment: "left" },
+ wrapText: true,
+ hideDefaultActions: true,
+ initialWidth: 110
+ },
+ {
+ label: "CFDA鐘舵��",
+ fieldName: "SFDA_Status__c",
+ cellAttributes: { alignment: "left" },
+ initialWidth: 95,
+ wrapText: true,
+ hideDefaultActions: true,
+ },
+ {
+ label: "浣跨敤鏈熼檺",
+ fieldName: "guaranteeperiod",
+ cellAttributes: { alignment: "left" },
+ hideDefaultActions: true,
+ initialWidth: 105
+ },
+ {
+ label:'鏈夋晥鏈熷唴搴撳瓨',
+ type: "customInventoryColor",
+ fieldName: "limitCount",
+ sortable: true,
+ cellAttributes: {alignment: "right" },
+ typeAttributes: {
+ value: { fieldName:"limitCount"},
+ upperlimit: { fieldName: "upperlimit" },
+ lowerlimit: { fieldName: "lowerlimit" },
+ boxPrice:{ fieldName: "BoxPiece" },
+ },
+ hideDefaultActions: true,
+ initialWidth:150
+ },
+
+ {
+ label: "杩囨湡搴撳瓨",
+ fieldName: "overlimitCount",
+ hideDefaultActions: true,
+ cellAttributes: { alignment: "right" },
+ initialWidth:80
+ }
+ ];
+ defaultSortDirection = "asc";
+ sortDirection = "asc";
+ sortedBy;
+
+
+
+ renderedCallback() {
+ if (!this.stylesLoaded) {
+ Promise.all([loadStyle(this, WrappedHeaderTable)])
+ .then(() => {
+ console.log("Custom styles loaded");
+ this.stylesLoaded = true;
+ })
+ .catch((error) => {
+ console.error("Error loading custom styles");
+ });
+ }
}
- ];
- defaultSortDirection = "asc";
- sortDirection = "asc";
- sortedBy;
- renderedCallback() {
- if (!this.stylesLoaded) {
- Promise.all([loadStyle(this, WrappedHeaderTable)])
- .then(() => {
- console.log("Custom styles loaded");
- this.stylesLoaded = true;
- })
- .catch((error) => {
- console.error("Error loading custom styles");
+
+ connectedCallback() {
+ this.loader = true;
+ this.init();
+ }
+
+ init() {
+ this.showSpinner = true;
+ oninit({
+ pageSizeLWC: this.pageSize,
+ pageTokenLWC: this.currentPageToken,
+ sortFieldLWC: this.sortBy,
+ sortOrderLWC: this.sortDirection
+ }).then((result) => {
+ result = JSON.parse(JSON.stringify(result));
+ console.log("result.pageRecords = " + JSON.stringify(result.entity.pageRecords));
+ console.log("result.consumableorderdetailsRecords = " + JSON.stringify(result.entity.consumableorderdetailsRecords));
+ console.log("result.status = " + result.status);
+ console.log("result = " + JSON.stringify(result));
+ console.log("result 1= " + JSON.stringify(result.entity));
+ console.log("result 2= " + JSON.stringify(result.entity.pageRecords));
+ if (result.status == "Success") {
+ console.log('result.entity.paginatedAccounts = ' + JSON.stringify(result.entity.paginatedAccounts));
+ this.nextPageToken = result.entity.paginatedAccounts.nextPageToken;
+ this.totalRecords = result.entity.paginatedAccounts.totalRecords;
+ this.recordStart = result.entity.paginatedAccounts.recordStart;
+ this.recordEnd = result.entity.paginatedAccounts.recordEnd;
+ this.totalPages = Math.ceil(result.entity.paginatedAccounts.totalRecords / this.pageSize);
+ console.log('this.totalPages = ' + this.totalPages);
+ this.paginationVisibility = this.totalPages > 1 ? true : false;
+
+ this.loader = false;
+ this.data = result.entity.pageRecords;
+ this.productkucun = result.entity.productkucun;
+
+ for (var i in this.data) {
+ this.data[i]["Name__c"] = this.data[i].Prod.Name__c;
+ this.data[i]["Category3__c"] = this.data[i].Prod.Category3__c;
+ this.data[i]["Category4__c"] = this.data[i].Prod.Category4__c;
+ this.data[i]["Category5__c"] = this.data[i].Prod.Category5__c;
+ this.data[i]["SFDA_Status__c"] = this.data[i].Prod.SFDA_Status__c;
+ }
+ this.showTable = true;
+ this.orderDetZaikuList = result.entity.orderDetZaikuList;
+ this.accountName = result.entity.accountName;
+ this.agencyProType = result.entity.agencyProType;
+ this.userWorkLocation = result.entity.userWorkLocation;
+ let option1ValueTemp = [];
+ for (var key in result.entity.categoryOptionMap) {
+ let object = {};
+ object['label'] = result.entity.categoryOptionMap[key];
+ object['value'] = key;
+ option1ValueTemp.push(object);
+ }
+ this.category3Options = option1ValueTemp;
+ console.log(' this.optionscatone===>' + JSON.stringify(this.optionscatone));
+ let option2ValueTemp = [];
+ for (var key in result.entity.category4OptionMap) {
+ let object = {};
+ object["label"] = result.entity.category4OptionMap[key];
+ object["value"] = key;
+ option2ValueTemp.push(object);
+ }
+ this.category4Options = option2ValueTemp;
+ let option3ValueTemp = [];
+ for (var key in result.entity.category5OptionMap) {
+ let object = {};
+ object["label"] = result.entity.category5OptionMap[key];
+ object["value"] = key;
+ option3ValueTemp.push(object);
+ }
+ this.category5Options = option3ValueTemp;
+ this.hasHos = result.entity.hasHos;
+ console.log('this.hasHos'+this.hasHos);
+ //棰滆壊鏍囪
+
+ //hasHos = true 鍖婚櫌鐗逛环
+ if (this.hasHos) {
+ let object1 = {
+ label: "鍖婚櫌鐗逛环",
+ fieldName: "hospitalSpecialOffer__c",
+ hideDefaultActions: true,
+ type:'boolean',
+ cellAttributes: { alignment: "left" },
+ initialWidth:80
+
+ };
+ this.columns.push(object1);
+ console.log(' this.columns'+ this.columns);
+ for (var j in this.data) {
+ this.data[j]["Name__c"] = this.data[j].Prod.Name__c;
+ this.data[j]["Category3__c"] = this.data[j].Prod.Category3__c;
+ this.data[j]["Category4__c"] = this.data[j].Prod.Category4__c;
+ this.data[j]["Category5__c"] = this.data[j].Prod.Category5__c;
+ this.data[j]["SFDA_Status__c"] = this.data[j].Prod.SFDA_Status__c;
+ this.data[j]["hospitalSpecialOffer__c"] = this.data[j].hospitalSpecialOffer;
+ console.log('this.data[j].hospitalSpecialOffer__c'+this.data[j].hospitalSpecialOffer);
+ }
+ }
+ this.showSpinner = false;
+ } else {
+ // this.showToast("Error",'Error', result.msg);
+ this.showMyToast('鍒濆鍖栧け璐�',result.msg,'error');
+ }
+ }).catch((error) => {
+ this.loader = false;
+ this.showSpinner = false;
+ console.log("error = " + JSON.stringify(error));
+ });
+ }
+
+ handleChange(event) {
+ let fieldName = event.target.getAttribute("data-field");
+ let value = event.detail.value;
+ console.log("======>fieldName" + fieldName);
+ console.log("======>value" + value);
+ switch (fieldName) {
+ case "Name":
+ this.Name = value;
+ break;
+ case "CategoryThree":
+ this.CategoryThree = value;
+ break;
+ case "CategoryFour":
+ this.CategoryFour = value;
+ break;
+ case "CategoryFive":
+ this.CategoryFive = value;
+ break;
+ default:
+ console.log("no data");
+ }
+ }
+ dataChange(event) {
+ let fieldName = event.target.getAttribute("data-field");
+ let value = event.detail.value;
+ console.log("fieldName = " + fieldName + " value = " + value);
+ switch (fieldName) {
+ case "Name":
+ this.Name = value;
+ break;
+ case "CategoryThree":
+ this.CategoryThree = value;
+ //璋冪敤鍚庡彴鏄剧ず绗洓浜斿垎绫�
+ this.showAllCate();
+ if (this.CategoryThree == '') {
+ this.CategoryFour = '';
+ this.CategoryFive = '';
+ }
+ break;
+ case "CategoryFour":
+ this.CategoryFour = value;
+ //璋冪敤鍚庡彴鏄剧ず绗簲鍒嗙被
+ this.showCate();
+ if (this.CategoryFour == '') {
+ this.CategoryFive = '';
+ }
+ break;
+ case "CategoryFive":
+ this.CategoryFive = value;
+ break;
+ }
+ }
+
+
+ showAllCate() {
+ categoryAllload({
+ category3LWC: this.CategoryThree,
+ agencyProTypeLWC:this.agencyProType
+ }).then((result) => {
+ result = JSON.parse(JSON.stringify(result));
+ console.log("result = " + JSON.stringify(result));
+ if (result.status == "Success") {
+ this.category4Options = [];
+ this.category5Options = [];
+ //绗�4鍒嗙被
+ for (var key in result.entity.category4OptionMap) {
+ let object = {};
+ object["label"] = result.entity.category4OptionMap[key];
+ object["value"] = key;
+ this.category4Options.push(object);
+ }
+ console.log("this.category4Options = " + JSON.stringify(this.category4Options));
+ //绗�5鍒嗙被
+ for (var key in result.entity.category5OptionMap) {
+ let object = {};
+ object["label"] = result.entity.category5OptionMap[key];
+ object["value"] = key;
+ this.category5Options.push(object);
+ }
+ } else {
+ console.log("result = " + JSON.stringify(result));
+ this.showMyToast(result.msg,'','error');
+ }
+ }).catch((error) => {
+ console.log("error" + JSON.stringify(error));
});
}
- }
- connectedCallback() {
- this.loader = true;
- this.init();
- }
+ searchOrderDetail() {
+ this.showTable = false;
+ this.showSpinner = true;
+ searchOrder({
+ category1: this.Name,
+ Category3: this.CategoryThree,
+ Category4: this.CategoryFour,
+ Category5: this.CategoryFive,
+ orderDetZaikuListLWC: JSON.stringify(this.orderDetZaikuList),
+ accountName: this.accountName,
+ agencyProType: this.agencyProType,
+ userWorkLocation: this.userWorkLocation,
+ pageSizeLWC: this.pageSize,
+ pageTokenLWC: this.currentPageToken,
+ productkucunLWC: this.productkucun
+
+ // sortFieldLWC: this.sortBy,
+ // sortOrderLWC: this.sortDirection
+ })
+ .then((result) => {
+ result = JSON.parse(JSON.stringify(result));
+ if (result.status == "Success") {
+ this.nextPageToken = result.entity.paginatedAccounts.nextPageToken;
+ this.totalRecords = result.entity.paginatedAccounts.totalRecords;
+ this.recordStart = result.entity.paginatedAccounts.recordStart;
+ this.recordEnd = result.entity.paginatedAccounts.recordEnd;
+ this.totalPages = Math.ceil(result.entity.paginatedAccounts.totalRecords / this.pageSize);
+ console.log('result.entity.paginatedAccounts = ' + JSON.stringify(result.entity.paginatedAccounts));
+ console.log('this.totalPages = ' + this.totalPages);
+ this.paginationVisibility = this.totalPages > 1 ? true : false;
+ console.log('this.sortDirection = ' + this.sortDirection);
+ // this.showToast("Success",'鎼滅储鎴愬姛', result.msg);
+ // this.showMyToast('鎼滅储鎴愬姛',result.msg,'success');
+ this.data = result.entity.pageRecords;
+ console.log('鎼滅储Data==>'+JSON.stringify(this.data));
+ for (var i in this.data) {
+ this.data[i]["Name__c"] = this.data[i].Prod.Name__c;
+ this.data[i]["Category3__c"] = this.data[i].Prod.Category3__c;
+ this.data[i]["Category4__c"] = this.data[i].Prod.Category4__c;
+ this.data[i]["Category5__c"] = this.data[i].Prod.Category5__c;
+ this.data[i]["SFDA_Status__c"] = this.data[i].Prod.SFDA_Status__c;
+ this.data[i]["hospitalSpecialOffer__c"] = this.data[i].hospitalSpecialOffer;
+ this.data[i]["guaranteeperiod"] = this.data[i].guaranteeperiod;
+ }
+ this.data = [...this.data];
+ console.log('this.data = ' + JSON.stringify(this.data));
+ this.showTable = true;
+ this.showSpinner = false;
+ } else {
+ this.nextPageToken = this.pageSize;
+ this.totalRecords = 0;
+ this.recordStart = 0;
+ this.recordEnd = 0;
+ this.totalPages =0;
- init() {
- this.showSpinner = true;
- oninit({
- pageSizeLWC: this.pageSize,
- pageTokenLWC: this.currentPageToken,
- sortFieldLWC: this.sortBy,
- sortOrderLWC: this.sortDirection
- })
- .then((result) => {
- result = JSON.parse(JSON.stringify(result));
- console.log(
- "result.pageRecords = " + JSON.stringify(result.entity.pageRecords)
- );
- console.log(
- "result.consumableorderdetailsRecords = " +
- JSON.stringify(result.entity.consumableorderdetailsRecords)
- );
- console.log("result.status = " + result.status);
- console.log("result = " + JSON.stringify(result));
- console.log("result 1= " + JSON.stringify(result.entity));
- console.log("result 2= " + JSON.stringify(result.entity.pageRecords));
- console.log(
- "result.entity.categoryOptionMap 2= " +
- JSON.stringify(result.entity.categoryOptionMap)
- );
- console.log(
- "result.entity.categoryOptionMap 2= " +
- JSON.stringify(result.entity.category4OptionMap)
- );
- console.log(
- "result.entity.categoryOptionMap 2= " +
- JSON.stringify(result.entity.category5OptionMap)
- );
- if (result.status == "Success") {
- console.log(
- "result.entity.paginatedAccounts = " +
- JSON.stringify(result.entity.paginatedAccounts)
- );
- this.nextPageToken = result.entity.paginatedAccounts.nextPageToken;
- this.totalRecords = result.entity.paginatedAccounts.totalRecords;
- this.recordStart = result.entity.paginatedAccounts.recordStart;
- this.recordEnd = result.entity.paginatedAccounts.recordEnd;
- this.totalPages = Math.ceil(
- result.entity.paginatedAccounts.totalRecords / this.pageSize
- );
- console.log("this.totalPages = " + this.totalPages);
- this.paginationVisibility = this.totalPages > 1 ? true : false;
+ // this.showToast("Error",'Error', result.msg);
+ // this.showMyToast('鎼滅储澶辫触',result.msg,'error');
+ this.showSpinner = false;
+ }
+ })
+ .catch((error) => {
+ console.log("error = " + JSON.stringify(error));
+ this.showSpinner = false;
+ });
+ }
+ inventoryCount() {
+ this[NavigationMixin.Navigate]({
+ type: 'standard__webPage',
+ attributes: {
+ url: '/lexinventory'
+ }
+ });
+ }
- this.loader = false;
- this.data = result.entity.pageRecords;
+ handleExpired() {
+ console.log('杩囨湡搴撳瓨鍛㈤攢瀛�');
+ this[NavigationMixin.Navigate]({
+ type: 'standard__webPage',
+ attributes: {
+ url: '/lexoverduestock'
+ }
+ });
- for (var i in this.data) {
- this.data[i]["Name__c"] = this.data[i].Prod.Name__c;
- this.data[i]["Category3__c"] = this.data[i].Prod.Category3__c;
- this.data[i]["Category4__c"] = this.data[i].Prod.Category3__c;
- this.data[i]["Category5__c"] = this.data[i].Prod.Category3__c;
- this.data[i]["SFDA_Status__c"] = this.data[i].Prod.SFDA_Status__c;
- }
- this.showTable = true;
- this.orderDetZaikuList = result.entity.orderDetZaikuList;
- this.accountName = result.entity.accountName;
- this.agencyProType = result.entity.agencyProType;
- this.userWorkLocation = result.entity.userWorkLocation;
- let option1ValueTemp = [];
- for (var key in result.entity.categoryOptionMap) {
- let object = {};
- object["label"] = result.entity.categoryOptionMap[key];
- object["value"] = key;
- option1ValueTemp.push(object);
- }
- this.category3Options = option1ValueTemp;
- console.log(
- " this.optionscatone===>" + JSON.stringify(this.optionscatone)
- );
- let option2ValueTemp = [];
- for (var key in result.entity.category4OptionMap) {
- let object = {};
- object["label"] = result.entity.category4OptionMap[key];
- object["value"] = key;
- option2ValueTemp.push(object);
- }
- this.category4Options = option2ValueTemp;
- let option3ValueTemp = [];
- for (var key in result.entity.category5OptionMap) {
- let object = {};
- object["label"] = result.entity.category5OptionMap[key];
- object["value"] = key;
- option3ValueTemp.push(object);
- }
- this.category5Options = option3ValueTemp;
- this.hasHos = result.entity.hasHos;
- console.log("this.hasHos" + this.hasHos);
- //棰滆壊鏍囪
+ }
+ removeBox() {
+ this[NavigationMixin.Navigate]({
+ type: 'standard__webPage',
+ attributes: {
+ url: '/lexremovebox'
+ }
+ });
- //hasHos = true 鍖婚櫌鐗逛环
- if (this.hasHos) {
- let object1 = {
- label: "鍖婚櫌鐗逛环",
- fieldName: "hospitalSpecialOffer__c",
- hideDefaultActions: true,
- type: "boolean",
- cellAttributes: { alignment: "left" },
- initialWidth: 80
- };
- this.columns.push(object1);
- console.log(" this.columns" + this.columns);
- for (var j in this.data) {
- this.data[j]["Name__c"] = this.data[j].Prod.Name__c;
- this.data[j]["Category3__c"] = this.data[j].Prod.Category3__c;
- this.data[j]["Category4__c"] = this.data[j].Prod.Category3__c;
- this.data[j]["Category5__c"] = this.data[j].Prod.Category3__c;
- this.data[j]["SFDA_Status__c"] = this.data[j].Prod.SFDA_Status__c;
- this.data[j]["hospitalSpecialOffer__c"] =
- this.data[j].hospitalSpecialOffer;
- console.log(
- "this.data[j].hospitalSpecialOffer__c" +
- this.data[j].hospitalSpecialOffer
- );
- }
- }
- this.showSpinner = false;
- } else {
- // this.showToast("Error",'Error', result.msg);
- this.showMyToast("鍒濆鍖栧け璐�", result.msg, "error");
- }
- })
- .catch((error) => {
- this.loader = false;
- this.showSpinner = false;
- console.log("error = " + JSON.stringify(error));
- });
- }
+ }
+ cancelremoveBox() {
+ this[NavigationMixin.Navigate]({
+ type: 'standard__webPage',
+ attributes: {
+ url: '/lexcancelremovebox'
+ }
+ });
- handleChange(event) {
- let fieldName = event.target.getAttribute("data-field");
- let value = event.detail.value;
- console.log("======>fieldName" + fieldName);
- console.log("======>value" + value);
- switch (fieldName) {
- case "Name":
- this.Name = value;
- break;
- case "CategoryThree":
- this.CategoryThree = value;
- break;
- case "CategoryFour":
- this.CategoryFour = value;
- break;
- case "CategoryFive":
- this.CategoryFive = value;
- break;
- default:
- console.log("no data");
- }
- }
- dataChange(event) {
- let fieldName = event.target.getAttribute("data-field");
- let value = event.detail.value;
- console.log("fieldName = " + fieldName + " value = " + value);
- switch (fieldName) {
- case "Name":
- this.Name = value;
- break;
- case "CategoryThree":
- this.CategoryThree = value;
- //璋冪敤鍚庡彴鏄剧ず绗洓浜斿垎绫�
- this.showAllCate();
- if (this.CategoryThree == "") {
- this.CategoryFour = "";
- this.CategoryFive = "";
- }
- break;
- case "CategoryFour":
- this.Category4 = value;
- //璋冪敤鍚庡彴鏄剧ず绗簲鍒嗙被
- this.showCate();
- if (this.CategoryFour == "") {
- this.CategoryFive = "";
- }
- break;
- case "CategoryFive":
- this.CategoryFive = value;
- break;
- }
- }
+ }
- showAllCate() {
- categoryAllload({
- category3LWC: this.CategoryThree,
- agencyProTypeLWC: this.agencyProType
- })
- .then((result) => {
- result = JSON.parse(JSON.stringify(result));
- console.log("result = " + JSON.stringify(result));
- if (result.status == "Success") {
- this.category4Options = [];
- this.category5Options = [];
- //绗�4鍒嗙被
- for (var key in result.entity.category4OptionMap) {
- let object = {};
- object["label"] = result.entity.category4OptionMap[key];
- object["value"] = key;
- this.category4Options.push(object);
- }
- console.log(
- "this.category4Options = " + JSON.stringify(this.category4Options)
- );
- //绗�5鍒嗙被
- for (var key in result.entity.category5OptionMap) {
- let object = {};
- object["label"] = result.entity.category5OptionMap[key];
- object["value"] = key;
- this.category5Options.push(object);
- }
- } else {
- console.log("result = " + JSON.stringify(result));
- this.showMyToast(result.msg, "", "error");
- }
- })
- .catch((error) => {
- console.log("error" + JSON.stringify(error));
- });
- }
+ clearAll() {
+ this.showSpinner = true;
+ this.showTable = false;
+ this.Name = '';
+ this.CategoryThree = '';
+ this.CategoryFour = '';
+ this.CategoryFive = '';
+ this.template.querySelectorAll("lightning-combobox").forEach((each) => {
+ each.value = null;
+ });
+ console.log(' this.CategoryThree' + this.CategoryThree);
+ console.log('鏁版嵁鍒楄〃' + this.data);
+ searchOrder({
+ category1: this.Name,
+ Category3: this.CategoryThree,
+ Category4: this.CategoryFour,
+ Category5: this.CategoryFive,
+ orderDetZaikuListLWC: JSON.stringify(this.orderDetZaikuList),
+ accountName: this.accountName,
+ agencyProType: this.agencyProType,
+ userWorkLocation: this.userWorkLocation,
+ pageSizeLWC: this.pageSize,
+ pageTokenLWC: this.currentPageToken,
+ })
+ .then((result) => {
+ console.log("result鎼滅储 = " + JSON.stringify(result));
+ result = JSON.parse(JSON.stringify(result));
+ if (result.status == "Success") {
+
+ this.nextPageToken = result.entity.paginatedAccounts.nextPageToken;
+ this.totalRecords = result.entity.paginatedAccounts.totalRecords;
+ this.recordStart = result.entity.paginatedAccounts.recordStart;
+ this.recordEnd = result.entity.paginatedAccounts.recordEnd;
+ this.totalPages = Math.ceil(result.entity.paginatedAccounts.totalRecords / this.pageSize);
+ console.log('this.totalPages = ' + this.totalPages);
+ this.paginationVisibility = this.totalPages > 1 ? true : false;
+ console.log('this.sortDirection = ' + this.sortDirection);
+ this.data = result.entity.pageRecords;
- searchOrderDetail() {
- this.showTable = false;
- searchOrder({
- category1: this.Name,
- Category3: this.CategoryThree,
- Category4: this.CategoryFour,
- Category5: this.CategoryFive,
- orderDetZaikuListLWC: JSON.stringify(this.orderDetZaikuList),
- accountName: this.accountName,
- agencyProType: this.agencyProType,
- userWorkLocation: this.userWorkLocation,
- pageSizeLWC: this.pageSize,
- pageTokenLWC: this.currentPageToken
- // sortFieldLWC: this.sortBy,
- // sortOrderLWC: this.sortDirection
- })
- .then((result) => {
- result = JSON.parse(JSON.stringify(result));
- if (result.status == "Success") {
- this.nextPageToken = result.entity.paginatedAccounts.nextPageToken;
- this.totalRecords = result.entity.paginatedAccounts.totalRecords;
- this.recordStart = result.entity.paginatedAccounts.recordStart;
- this.recordEnd = result.entity.paginatedAccounts.recordEnd;
- this.totalPages = Math.ceil(
- result.entity.paginatedAccounts.totalRecords / this.pageSize
- );
- console.log("this.totalPages = " + this.totalPages);
- this.paginationVisibility = this.totalPages > 1 ? true : false;
- console.log("this.sortDirection = " + this.sortDirection);
- // this.showToast("Success",'鎼滅储鎴愬姛', result.msg);
- this.showMyToast("鎼滅储鎴愬姛", result.msg, "success");
- this.data = result.entity.pageRecords;
- console.log("鎼滅储Data==>" + JSON.stringify(this.data));
- for (var i in this.data) {
- this.data[i]["Name__c"] = this.data[i].Prod.Name__c;
- this.data[i]["Category3__c"] = this.data[i].Prod.Category3__c;
- this.data[i]["Category4__c"] = this.data[i].Prod.Category3__c;
- this.data[i]["Category5__c"] = this.data[i].Prod.Category3__c;
- this.data[i]["SFDA_Status__c"] = this.data[i].Prod.SFDA_Status__c;
- this.data[i]["hospitalSpecialOffer__c"] =
- this.data[i].hospitalSpecialOffer;
- }
- this.data = [...this.data];
- console.log("this.data = " + JSON.stringify(this.data));
- this.showTable = true;
- } else {
- // this.showToast("Error",'Error', result.msg);
- this.showMyToast("鎼滅储澶辫触", result.msg, "error");
- }
- })
- .catch((error) => {
- console.log("error = " + JSON.stringify(error));
- });
- }
- inventoryCount() {
- this[NavigationMixin.Navigate]({
- type: "standard__webPage",
- attributes: {
- url: "/lexinventory"
- }
- });
- }
+ for (var i in this.data) {
+ this.data[i]["Name__c"] = this.data[i].Prod.Name__c;
+ this.data[i]["Category3__c"] = this.data[i].Prod.Category3__c;
+ this.data[i]["Category4__c"] = this.data[i].Prod.Category4__c;
+ this.data[i]["Category5__c"] = this.data[i].Prod.Category5__c;
+ this.data[i]["SFDA_Status__c"] = this.data[i].Prod.SFDA_Status__c;
+ this.data[i]["guaranteeperiod"] = this.data[i].guaranteeperiod;
+ }
+ this.showSpinner = false;
+ this.showTable = true;
+ // this.showMyToast('鎼滅储鎴愬姛',result.msg,'success');
+ // this.showToast("Success",'鎼滅储鎴愬姛', result.msg);
+ } else {
+ // this.showToast("Error", 'Error',result.msg);
+ // this.showMyToast('鎼滅储澶辫触',result.msg,'error');
+ this.showSpinner = false;
+
+ }
+ })
+ .catch((error) => {
+ console.log("error = " + JSON.stringify(error));
+ this.showSpinner = false;
+ });
+ }
- handleExpired() {
- console.log("杩囨湡搴撳瓨鍛㈤攢瀛�");
- this[NavigationMixin.Navigate]({
- type: "standard__webPage",
- attributes: {
- url: "/lexoverduestock"
- }
- });
- }
- removeBox() {
- this[NavigationMixin.Navigate]({
- type: "standard__webPage",
- attributes: {
- url: "/lexremovebox"
- }
- });
- }
- cancelremoveBox() {
- this[NavigationMixin.Navigate]({
- type: "standard__webPage",
- attributes: {
- url: "/lexcancelremovebox"
- }
- });
- }
+ sortByMethod(field, reverse, primer) {
+ const key = primer
+ ? function (x) {
+ return primer(x[field]);
+ }
+ : function (x) {
+ return x[field];
+ };
- clearAll() {
- this.showSpinner = true;
- this.showTable = false;
- this.Name = "";
- this.CategoryThree = "";
- this.CategoryFour = "";
- this.CategoryFive = "";
- this.template.querySelectorAll("lightning-combobox").forEach((each) => {
- each.value = null;
- });
- console.log(" this.CategoryThree" + this.CategoryThree);
- console.log("鏁版嵁鍒楄〃" + this.data);
- searchOrder({
- category1: this.Name,
- Category3: this.CategoryThree,
- Category4: this.CategoryFour,
- Category5: this.CategoryFive,
- orderDetZaikuListLWC: JSON.stringify(this.orderDetZaikuList),
- accountName: this.accountName,
- agencyProType: this.agencyProType,
- userWorkLocation: this.userWorkLocation,
- pageSizeLWC: this.pageSize,
- pageTokenLWC: this.currentPageToken
- })
- .then((result) => {
- console.log("result鎼滅储 = " + JSON.stringify(result));
- result = JSON.parse(JSON.stringify(result));
- if (result.status == "Success") {
- this.nextPageToken = result.entity.paginatedAccounts.nextPageToken;
- this.totalRecords = result.entity.paginatedAccounts.totalRecords;
- this.recordStart = result.entity.paginatedAccounts.recordStart;
- this.recordEnd = result.entity.paginatedAccounts.recordEnd;
- this.totalPages = Math.ceil(
- result.entity.paginatedAccounts.totalRecords / this.pageSize
- );
- console.log("this.totalPages = " + this.totalPages);
- this.paginationVisibility = this.totalPages > 1 ? true : false;
- console.log("this.sortDirection = " + this.sortDirection);
- this.data = result.entity.pageRecords;
-
- for (var i in this.data) {
- this.data[i]["Name__c"] = this.data[i].Prod.Name__c;
- this.data[i]["Category3__c"] = this.data[i].Prod.Category3__c;
- this.data[i]["Category4__c"] = this.data[i].Prod.Category3__c;
- this.data[i]["Category5__c"] = this.data[i].Prod.Category3__c;
- this.data[i]["SFDA_Status__c"] = this.data[i].Prod.SFDA_Status__c;
- }
- this.showSpinner = false;
- this.showTable = true;
- this.showMyToast("鎼滅储鎴愬姛", result.msg, "success");
- // this.showToast("Success",'鎼滅储鎴愬姛', result.msg);
- this.showSpinner = false;
- } else {
- // this.showToast("Error", 'Error',result.msg);
- this.showMyToast("鎼滅储澶辫触", result.msg, "error");
- }
- })
- .catch((error) => {
- console.log("error = " + JSON.stringify(error));
- });
- }
-
- sortByMethod(field, reverse, primer) {
- const key = primer
- ? function (x) {
- return primer(x[field]);
- }
- : function (x) {
- return x[field];
+ return function (a, b) {
+ a = key(a);
+ b = key(b);
+ return reverse * ((a > b) - (b > a));
};
-
- return function (a, b) {
- a = key(a);
- b = key(b);
- return reverse * ((a > b) - (b > a));
- };
- }
-
- onHandleSort(event) {
- console.log("Sort");
- this.sortBy = event.detail.fieldName;
- this.sortDirection = event.detail.sortDirection;
- this.currentPageToken = 0;
- console.log("this.sortBy = " + this.sortBy);
- console.log("this.sortDirection = " + this.sortDirection);
- // if('limitCount' != this.sortBy)
- // this.searchOrderDetail();
- // else{
- // const { fieldName: sortedBy, sortDirection } = event.detail;
- // const cloneData = [...this.data];
- // cloneData.sort(this.sortByMethod(sortedBy, sortDirection === 'asc' ? 1 : -1));
- // this.data = cloneData;
- // this.sortDirection = sortDirection;
- // this.sortedBy = sortedBy;
- // }
- const { fieldName: sortedBy, sortDirection } = event.detail;
- const cloneData = [...this.data];
- cloneData.sort(
- this.sortByMethod(sortedBy, sortDirection === "asc" ? 1 : -1)
- );
- this.data = cloneData;
- this.sortDirection = sortDirection;
- this.sortedBy = sortedBy;
- }
- handlePaginatorChange(event) {
- this.recordsToDisplay = event.detail.recordsToDisplay;
- this.preSelected = event.detail.preSelected;
- if (this.recordsToDisplay && this.recordsToDisplay > 0) {
- this.rowNumberOffset = this.recordsToDisplay[0].rowNumber - 1;
- } else {
- this.rowNumberOffset = 0;
}
- }
- handlePrevious() {
- this.currentPageToken =
- Number(this.currentPageToken) - Number(this.pageSize);
- this.searchOrderDetail();
- }
+ onHandleSort(event) {
+ console.log("Sort");
+ this.sortBy = event.detail.fieldName;
+ this.sortDirection = event.detail.sortDirection;
+ this.currentPageToken = 0;
+ console.log('this.sortBy = ' + this.sortBy)
+ console.log('this.sortDirection = ' + this.sortDirection)
+ // if('limitCount' != this.sortBy)
+ // this.searchOrderDetail();
+ // else{
+ // const { fieldName: sortedBy, sortDirection } = event.detail;
+ // const cloneData = [...this.data];
+ // cloneData.sort(this.sortByMethod(sortedBy, sortDirection === 'asc' ? 1 : -1));
+ // this.data = cloneData;
+ // this.sortDirection = sortDirection;
+ // this.sortedBy = sortedBy;
+ // }
+ const { fieldName: sortedBy, sortDirection } = event.detail;
+ const cloneData = [...this.data];
+ cloneData.sort(this.sortByMethod(sortedBy, sortDirection === 'asc' ? 1 : -1));
+ this.data = cloneData;
+ this.sortDirection = sortDirection;
+ this.sortedBy = sortedBy;
+ }
+ handlePaginatorChange(event) {
+ this.recordsToDisplay = event.detail.recordsToDisplay;
+ this.preSelected = event.detail.preSelected;
+ if (this.recordsToDisplay && this.recordsToDisplay > 0) {
+ this.rowNumberOffset = this.recordsToDisplay[0].rowNumber - 1;
+ } else {
+ this.rowNumberOffset = 0;
+ }
+ }
- handleNext() {
- this.currentPageToken =
- Number(this.currentPageToken) + Number(this.pageSize);
- this.searchOrderDetail();
- }
- handleFirst() {
- this.currentPageToken = 0;
- this.searchOrderDetail();
- }
+ handlePrevious() {
+ this.currentPageToken = Number(this.currentPageToken) - Number(this.pageSize);
+ this.searchOrderDetail();
+ }
- handleLast() {
- this.currentPageToken =
- this.totalPages > 1 ? (this.totalPages - 1) * this.pageSize : 0;
- this.searchOrderDetail();
- }
+ handleNext() {
+ this.currentPageToken = Number(this.currentPageToken) + Number(this.pageSize);
+ this.searchOrderDetail();
+ }
+ handleFirst() {
+ this.currentPageToken = 0;
+ this.searchOrderDetail();
+ }
- handlePageschange(event) {
- console.log(event.detail);
- this.pageSize = event.detail;
- this.currentPageToken = 0;
- this.searchOrderDetail();
- }
- get previousButtonDisabled() {
- return this.currentPageToken === 0;
- }
+ handleLast() {
+ this.currentPageToken = this.totalPages > 1 ? (this.totalPages - 1) * this.pageSize : 0;
+ this.searchOrderDetail();
+ }
- get nextButtonDisabled() {
- return this.nextPageToken === undefined;
- }
- showMyToast(title, message, variant) {
- console.log("show custom message");
- var iconName = "";
- var content = "";
- if (variant == "success") {
- iconName = "utility:check";
- } else {
- iconName = "utility:error";
- }
- if (message != "") {
- content =
- "<h2><strong>" + title + "<strong/></h2><h5>" + message + "</h5>";
- } else {
- content = "<h2><strong>" + title + "<strong/></h2>";
- }
- this.template
- .querySelector("c-common-toast")
- .showToast(variant, content, iconName, 10000);
+ handlePageschange(event) {
+ console.log(event.detail);
+ this.pageSize = event.detail;
+ this.currentPageToken = 0;
+ this.searchOrderDetail();
+ }
+ get previousButtonDisabled() {
+ return this.currentPageToken === 0;
+ }
- // showToast(type,title,msg) {
- // this.showSpinner = false;
- // let mode = '';
- // if (type.toLowerCase() != 'success') {
- // mode = 'sticky';
- // } else {
- // mode = 'dismissable';
- // }
- // const event = new ShowToastEvent({
- // title: title,
- // variant: type,
- // message: msg,
- // mode: mode
- // });
- // this.dispatchEvent(event);
- // }
- }
-}
+ get nextButtonDisabled() {
+ return this.nextPageToken === undefined;
+ }
+ showMyToast(title, message, variant) {
+ console.log('show custom message');
+ var iconName = '';
+ var content = '';
+ if(variant == 'success'){
+ iconName = 'utility:check';
+ }else{
+ iconName = 'utility:error';
+ }
+ if(message != ''){
+ content = '<h2><strong>'+title+'<strong/></h2><h5>'+message+'</h5>';
+ }else{
+ content = '<h2><strong>'+title+'<strong/></h2>';
+ }
+ this.template.querySelector('c-common-toast').showToast(variant,content,iconName,10000);
+ }
+}
\ No newline at end of file
diff --git "a/force-app/main/default/networks/Consumable\347\263\273\347\273\237.network-meta.xml" "b/force-app/main/default/networks/Consumable\347\263\273\347\273\237.network-meta.xml"
index 0193e26..950fbcc 100644
--- "a/force-app/main/default/networks/Consumable\347\263\273\347\273\237.network-meta.xml"
+++ "b/force-app/main/default/networks/Consumable\347\263\273\347\273\237.network-meta.xml"
@@ -1,14 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
<Network xmlns="http://soap.sforce.com/2006/04/metadata">
- <allowInternalUserLogin>true</allowInternalUserLogin>
+ <allowInternalUserLogin>false</allowInternalUserLogin>
<allowMembersToFlag>false</allowMembersToFlag>
- <changePasswordTemplate
- >unfiled$public/CommunityChangePasswordEmailTemplate</changePasswordTemplate>
- <communityRoles />
- <disableReputationRecordConversations
- >false</disableReputationRecordConversations>
- <emailSenderAddress>linktan@deloitte.com.cn</emailSenderAddress>
- <emailSenderName>娑堣�楀搧绠＄悊绯荤粺</emailSenderName>
+ <changePasswordTemplate>unfiled$public/CommunityChangePasswordEmailTemplate</changePasswordTemplate>
+ <communityRoles/>
+ <disableReputationRecordConversations>false</disableReputationRecordConversations>
+ <emailSenderAddress>buli@deloitte.com.cn</emailSenderAddress>
+ <emailSenderName>Consumable绯荤粺</emailSenderName>
<enableCustomVFErrorPageOverrides>false</enableCustomVFErrorPageOverrides>
<enableDirectMessages>true</enableDirectMessages>
<enableGuestChatter>false</enableGuestChatter>
@@ -16,8 +14,8 @@
<enableGuestMemberVisibility>false</enableGuestMemberVisibility>
<enableInvitation>false</enableInvitation>
<enableKnowledgeable>false</enableKnowledgeable>
- <enableMemberVisibility>false</enableMemberVisibility>
- <enableNicknameDisplay>true</enableNicknameDisplay>
+ <enableMemberVisibility>true</enableMemberVisibility>
+ <enableNicknameDisplay>false</enableNicknameDisplay>
<enablePrivateMessages>false</enablePrivateMessages>
<enableReputation>false</enableReputation>
<enableShowAllNetworkSettings>false</enableShowAllNetworkSettings>
@@ -26,26 +24,18 @@
<enableTopicAssignmentRules>true</enableTopicAssignmentRules>
<enableTopicSuggestions>false</enableTopicSuggestions>
<enableUpDownVote>false</enableUpDownVote>
- <forgotPasswordTemplate
- >unfiled$public/CommunityForgotPasswordEmailTemplate</forgotPasswordTemplate>
+ <forgotPasswordTemplate>unfiled$public/CommunityForgotPasswordEmailTemplate</forgotPasswordTemplate>
<gatherCustomerSentimentData>false</gatherCustomerSentimentData>
<networkMemberGroups>
+ <permissionSet>Community_LEX_PS</permissionSet>
<profile>admin</profile>
- <profile>901_缁忛攢鍟嗙ぞ鍖烘櫘閫氭潈闄恄2閲嶉獙璇�(et email)</profile>
- <profile>901_缁忛攢鍟嗙ぞ鍖烘櫘閫氭潈闄恄2閲嶉獙璇�(鑳介噺)</profile>
- <profile>901_缁忛攢鍟嗙ぞ鍖烘櫘閫氭潈闄恄2閲嶉獙璇�(鑳介噺email)</profile>
- <profile>901_缁忛攢鍟嗙ぞ鍖烘櫘閫氭潈闄�</profile>
- <profile>901_缁忛攢鍟嗙ぞ鍖烘櫘閫氭潈闄恄2閲嶉獙璇�(et)</profile>
</networkMemberGroups>
<networkPageOverrides>
- <changePasswordPageOverrideSetting
- >Standard</changePasswordPageOverrideSetting>
- <forgotPasswordPageOverrideSetting
- >Designer</forgotPasswordPageOverrideSetting>
+ <changePasswordPageOverrideSetting>Standard</changePasswordPageOverrideSetting>
+ <forgotPasswordPageOverrideSetting>Designer</forgotPasswordPageOverrideSetting>
<homePageOverrideSetting>Designer</homePageOverrideSetting>
<loginPageOverrideSetting>Designer</loginPageOverrideSetting>
- <selfRegProfilePageOverrideSetting
- >Designer</selfRegProfilePageOverrideSetting>
+ <selfRegProfilePageOverrideSetting>Designer</selfRegProfilePageOverrideSetting>
</networkPageOverrides>
<picassoSite>Consumable1</picassoSite>
<selfRegistration>false</selfRegistration>
@@ -57,6 +47,5 @@
<standardTab>Chatter</standardTab>
</tabs>
<urlPathPrefix>consumable</urlPathPrefix>
- <welcomeTemplate
- >unfiled$public/CommunityWelcomeEmailTemplate</welcomeTemplate>
+ <welcomeTemplate>unfiled$public/CommunityWelcomeEmailTemplate</welcomeTemplate>
</Network>
diff --git a/force-app/main/default/networks/Partner Sales.network-meta.xml b/force-app/main/default/networks/Partner Sales.network-meta.xml
index 08d1a2b..d5087b3 100644
--- a/force-app/main/default/networks/Partner Sales.network-meta.xml
+++ b/force-app/main/default/networks/Partner Sales.network-meta.xml
@@ -1,12 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
<Network xmlns="http://soap.sforce.com/2006/04/metadata">
<allowInternalUserLogin>true</allowInternalUserLogin>
<allowMembersToFlag>false</allowMembersToFlag>
- <changePasswordTemplate
- >unfiled$public/CommunityChangePasswordEmailTemplate</changePasswordTemplate>
- <communityRoles />
- <disableReputationRecordConversations
- >false</disableReputationRecordConversations>
+ <changePasswordTemplate>unfiled$public/CommunityChangePasswordEmailTemplate</changePasswordTemplate>
+ <communityRoles/>
+ <disableReputationRecordConversations>false</disableReputationRecordConversations>
<emailSenderAddress>olympussupport@sunbridge.com</emailSenderAddress>
<emailSenderName>Partner Sales</emailSenderName>
<enableCustomVFErrorPageOverrides>false</enableCustomVFErrorPageOverrides>
@@ -17,7 +15,7 @@
<enableInvitation>false</enableInvitation>
<enableKnowledgeable>false</enableKnowledgeable>
<enableMemberVisibility>true</enableMemberVisibility>
- <enableNicknameDisplay>true</enableNicknameDisplay>
+ <enableNicknameDisplay>false</enableNicknameDisplay>
<enablePrivateMessages>false</enablePrivateMessages>
<enableReputation>false</enableReputation>
<enableShowAllNetworkSettings>true</enableShowAllNetworkSettings>
@@ -26,8 +24,7 @@
<enableTopicAssignmentRules>false</enableTopicAssignmentRules>
<enableTopicSuggestions>true</enableTopicSuggestions>
<enableUpDownVote>false</enableUpDownVote>
- <forgotPasswordTemplate
- >unfiled$public/CommunityForgotPasswordEmailTemplate</forgotPasswordTemplate>
+ <forgotPasswordTemplate>unfiled$public/CommunityForgotPasswordEmailTemplate</forgotPasswordTemplate>
<gatherCustomerSentimentData>false</gatherCustomerSentimentData>
<networkMemberGroups>
<permissionSet>P002_Partner</permissionSet>
@@ -36,14 +33,11 @@
<profile>901_缁忛攢鍟嗘椿鍔ㄧ郴缁�</profile>
</networkMemberGroups>
<networkPageOverrides>
- <changePasswordPageOverrideSetting
- >Standard</changePasswordPageOverrideSetting>
- <forgotPasswordPageOverrideSetting
- >Standard</forgotPasswordPageOverrideSetting>
+ <changePasswordPageOverrideSetting>Standard</changePasswordPageOverrideSetting>
+ <forgotPasswordPageOverrideSetting>Standard</forgotPasswordPageOverrideSetting>
<homePageOverrideSetting>Designer</homePageOverrideSetting>
<loginPageOverrideSetting>Designer</loginPageOverrideSetting>
- <selfRegProfilePageOverrideSetting
- >Designer</selfRegProfilePageOverrideSetting>
+ <selfRegProfilePageOverrideSetting>Designer</selfRegProfilePageOverrideSetting>
</networkPageOverrides>
<picassoSite>Partner_Sales1</picassoSite>
<selfRegistration>false</selfRegistration>
@@ -55,6 +49,5 @@
<standardTab>Chatter</standardTab>
</tabs>
<urlPathPrefix>partner</urlPathPrefix>
- <welcomeTemplate
- >unfiled$public/CommunityWelcomeEmailTemplate</welcomeTemplate>
+ <welcomeTemplate>unfiled$public/CommunityWelcomeEmailTemplate</welcomeTemplate>
</Network>
diff --git "a/force-app/main/default/networks/\346\266\210\350\200\227\345\223\201\347\256\241\347\220\206\347\263\273\347\273\237.network-meta.xml" "b/force-app/main/default/networks/\346\266\210\350\200\227\345\223\201\347\256\241\347\220\206\347\263\273\347\273\237.network-meta.xml"
index 6dd1b5e..8bfe456 100644
--- "a/force-app/main/default/networks/\346\266\210\350\200\227\345\223\201\347\256\241\347\220\206\347\263\273\347\273\237.network-meta.xml"
+++ "b/force-app/main/default/networks/\346\266\210\350\200\227\345\223\201\347\256\241\347\220\206\347\263\273\347\273\237.network-meta.xml"
@@ -1,12 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
<Network xmlns="http://soap.sforce.com/2006/04/metadata">
<allowInternalUserLogin>false</allowInternalUserLogin>
<allowMembersToFlag>false</allowMembersToFlag>
- <changePasswordTemplate
- >unfiled$public/CommunityChangePasswordEmailTemplate</changePasswordTemplate>
- <communityRoles />
- <disableReputationRecordConversations
- >false</disableReputationRecordConversations>
+ <changePasswordTemplate>unfiled$public/CommunityChangePasswordEmailTemplate</changePasswordTemplate>
+ <communityRoles/>
+ <disableReputationRecordConversations>false</disableReputationRecordConversations>
<emailSenderAddress>OCM_Te2amPJ@olympus.com.cn</emailSenderAddress>
<emailSenderName>濂ユ灄宸存柉娑堣�楀搧绯荤粺</emailSenderName>
<enableCustomVFErrorPageOverrides>false</enableCustomVFErrorPageOverrides>
@@ -26,8 +24,7 @@
<enableTopicAssignmentRules>false</enableTopicAssignmentRules>
<enableTopicSuggestions>true</enableTopicSuggestions>
<enableUpDownVote>false</enableUpDownVote>
- <forgotPasswordTemplate
- >unfiled$public/CommunityForgotPasswordEmailTemplate</forgotPasswordTemplate>
+ <forgotPasswordTemplate>unfiled$public/CommunityForgotPasswordEmailTemplate</forgotPasswordTemplate>
<gatherCustomerSentimentData>false</gatherCustomerSentimentData>
<networkMemberGroups>
<profile>admin</profile>
@@ -39,14 +36,11 @@
<profile>901_缁忛攢鍟嗙ぞ鍖烘櫘閫氭潈闄恄2閲嶉獙璇�(鑳介噺)</profile>
</networkMemberGroups>
<networkPageOverrides>
- <changePasswordPageOverrideSetting
- >Standard</changePasswordPageOverrideSetting>
- <forgotPasswordPageOverrideSetting
- >Standard</forgotPasswordPageOverrideSetting>
+ <changePasswordPageOverrideSetting>Standard</changePasswordPageOverrideSetting>
+ <forgotPasswordPageOverrideSetting>Standard</forgotPasswordPageOverrideSetting>
<homePageOverrideSetting>VisualForce</homePageOverrideSetting>
<loginPageOverrideSetting>Standard</loginPageOverrideSetting>
- <selfRegProfilePageOverrideSetting
- >Standard</selfRegProfilePageOverrideSetting>
+ <selfRegProfilePageOverrideSetting>Standard</selfRegProfilePageOverrideSetting>
</networkPageOverrides>
<picassoSite>Site1</picassoSite>
<selfRegistration>false</selfRegistration>
@@ -67,6 +61,5 @@
<standardTab>report</standardTab>
</tabs>
<urlPathPrefix>customer</urlPathPrefix>
- <welcomeTemplate
- >unfiled$public/CommunityWelcomeEmailTemplate</welcomeTemplate>
+ <welcomeTemplate>unfiled$public/CommunityWelcomeEmailTemplate</welcomeTemplate>
</Network>
diff --git "a/force-app/main/default/networks/\347\224\265\345\255\220\347\255\276\346\224\266\347\263\273\347\273\237.network-meta.xml" "b/force-app/main/default/networks/\347\224\265\345\255\220\347\255\276\346\224\266\347\263\273\347\273\237.network-meta.xml"
index 28c0aac..375b6b5 100644
--- "a/force-app/main/default/networks/\347\224\265\345\255\220\347\255\276\346\224\266\347\263\273\347\273\237.network-meta.xml"
+++ "b/force-app/main/default/networks/\347\224\265\345\255\220\347\255\276\346\224\266\347\263\273\347\273\237.network-meta.xml"
@@ -1,12 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
<Network xmlns="http://soap.sforce.com/2006/04/metadata">
<allowInternalUserLogin>false</allowInternalUserLogin>
<allowMembersToFlag>false</allowMembersToFlag>
- <changePasswordTemplate
- >unfiled$public/CommunityChangePasswordEmailTemplate</changePasswordTemplate>
- <communityRoles />
- <disableReputationRecordConversations
- >false</disableReputationRecordConversations>
+ <changePasswordTemplate>unfiled$public/CommunityChangePasswordEmailTemplate</changePasswordTemplate>
+ <communityRoles/>
+ <disableReputationRecordConversations>false</disableReputationRecordConversations>
<emailSenderAddress>it_sfdc@olympus.com.cn</emailSenderAddress>
<emailSenderName>濂ユ灄宸存柉鐢靛瓙绛炬敹绯荤粺</emailSenderName>
<enableCustomVFErrorPageOverrides>false</enableCustomVFErrorPageOverrides>
@@ -26,21 +24,17 @@
<enableTopicAssignmentRules>true</enableTopicAssignmentRules>
<enableTopicSuggestions>false</enableTopicSuggestions>
<enableUpDownVote>false</enableUpDownVote>
- <forgotPasswordTemplate
- >unfiled$public/CommunityForgotPasswordEmailTemplate</forgotPasswordTemplate>
+ <forgotPasswordTemplate>unfiled$public/CommunityForgotPasswordEmailTemplate</forgotPasswordTemplate>
<gatherCustomerSentimentData>false</gatherCustomerSentimentData>
<networkMemberGroups>
<profile>admin</profile>
</networkMemberGroups>
<networkPageOverrides>
- <changePasswordPageOverrideSetting
- >Standard</changePasswordPageOverrideSetting>
- <forgotPasswordPageOverrideSetting
- >Designer</forgotPasswordPageOverrideSetting>
+ <changePasswordPageOverrideSetting>Standard</changePasswordPageOverrideSetting>
+ <forgotPasswordPageOverrideSetting>Designer</forgotPasswordPageOverrideSetting>
<homePageOverrideSetting>Designer</homePageOverrideSetting>
<loginPageOverrideSetting>Designer</loginPageOverrideSetting>
- <selfRegProfilePageOverrideSetting
- >Designer</selfRegProfilePageOverrideSetting>
+ <selfRegProfilePageOverrideSetting>Designer</selfRegProfilePageOverrideSetting>
</networkPageOverrides>
<picassoSite>Site3</picassoSite>
<selfRegistration>false</selfRegistration>
@@ -52,6 +46,5 @@
<standardTab>Chatter</standardTab>
</tabs>
<urlPathPrefix>eSignSystem</urlPathPrefix>
- <welcomeTemplate
- >unfiled$public/CommunityWelcomeEmailTemplate</welcomeTemplate>
+ <welcomeTemplate>unfiled$public/CommunityWelcomeEmailTemplate</welcomeTemplate>
</Network>
diff --git a/force-app/main/default/objects/LicenceReminderDate__c/LicenceReminderDate__c.object-meta.xml b/force-app/main/default/objects/LicenceReminderDate__c/LicenceReminderDate__c.object-meta.xml
index ceabf9e..e948f19 100644
--- a/force-app/main/default/objects/LicenceReminderDate__c/LicenceReminderDate__c.object-meta.xml
+++ b/force-app/main/default/objects/LicenceReminderDate__c/LicenceReminderDate__c.object-meta.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
<CustomObject xmlns="http://soap.sforce.com/2006/04/metadata">
<customSettingsType>List</customSettingsType>
<description>LEX Upgrade</description>
diff --git a/force-app/main/default/objects/LicenceReminderDate__c/fields/ReminderDays__c.field-meta.xml b/force-app/main/default/objects/LicenceReminderDate__c/fields/ReminderDays__c.field-meta.xml
index 7bb7f48..98ff6d1 100644
--- a/force-app/main/default/objects/LicenceReminderDate__c/fields/ReminderDays__c.field-meta.xml
+++ b/force-app/main/default/objects/LicenceReminderDate__c/fields/ReminderDays__c.field-meta.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>ReminderDays__c</fullName>
<externalId>false</externalId>
diff --git a/force-app/main/default/objects/NoteStay__c/NoteStay__c.object-meta.xml b/force-app/main/default/objects/NoteStay__c/NoteStay__c.object-meta.xml
index 5cd4961..d568636 100644
--- a/force-app/main/default/objects/NoteStay__c/NoteStay__c.object-meta.xml
+++ b/force-app/main/default/objects/NoteStay__c/NoteStay__c.object-meta.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
<CustomObject xmlns="http://soap.sforce.com/2006/04/metadata">
<customSettingsType>List</customSettingsType>
<enableFeeds>false</enableFeeds>
diff --git a/force-app/main/default/objects/NoteStay__c/fields/IsStay__c.field-meta.xml b/force-app/main/default/objects/NoteStay__c/fields/IsStay__c.field-meta.xml
index 38d9d12..b9acfb8 100644
--- a/force-app/main/default/objects/NoteStay__c/fields/IsStay__c.field-meta.xml
+++ b/force-app/main/default/objects/NoteStay__c/fields/IsStay__c.field-meta.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>IsStay__c</fullName>
<defaultValue>false</defaultValue>
diff --git a/force-app/main/default/sites/Consumable.site-meta.xml b/force-app/main/default/sites/Consumable.site-meta.xml
index c202c1c..b88f44c 100644
--- a/force-app/main/default/sites/Consumable.site-meta.xml
+++ b/force-app/main/default/sites/Consumable.site-meta.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
<CustomSite xmlns="http://soap.sforce.com/2006/04/metadata">
<active>true</active>
<allowGuestPaymentsApi>false</allowGuestPaymentsApi>
@@ -20,14 +20,12 @@
<inMaintenancePage>InMaintenance</inMaintenancePage>
<indexPage>CommunitiesLanding</indexPage>
<masterLabel>Consumable绯荤粺</masterLabel>
- <referrerPolicyOriginWhenCrossOrigin
- >true</referrerPolicyOriginWhenCrossOrigin>
+ <referrerPolicyOriginWhenCrossOrigin>true</referrerPolicyOriginWhenCrossOrigin>
<requireHttps>true</requireHttps>
<selfRegPage>CommunitiesSelfReg</selfRegPage>
- <serverIsDown>SNA_Demo1_sf_default_cdn_PqhAN</serverIsDown>
- <siteAdmin>linktan@deloitte.com.olympus</siteAdmin>
- <siteGuestRecordDefaultOwner
- >linktan@deloitte.com.olympus</siteGuestRecordDefaultOwner>
+ <serverIsDown>SNA_Consumable1_sf_default_cdn_Cpit8</serverIsDown>
+ <siteAdmin>buli@deloitte.com.cn</siteAdmin>
+ <siteGuestRecordDefaultOwner>buli@deloitte.com.cn</siteGuestRecordDefaultOwner>
<siteType>ChatterNetwork</siteType>
<subdomain>ocm</subdomain>
<urlPathPrefix>consumable</urlPathPrefix>
diff --git a/force-app/main/default/sites/Partner_Sales.site-meta.xml b/force-app/main/default/sites/Partner_Sales.site-meta.xml
index c8e3ae4..5852e6f 100644
--- a/force-app/main/default/sites/Partner_Sales.site-meta.xml
+++ b/force-app/main/default/sites/Partner_Sales.site-meta.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
<CustomSite xmlns="http://soap.sforce.com/2006/04/metadata">
<active>true</active>
<allowGuestPaymentsApi>false</allowGuestPaymentsApi>
@@ -21,11 +21,10 @@
<inactiveIndexPage>CommunitiesLogin</inactiveIndexPage>
<indexPage>CommunitiesLanding</indexPage>
<masterLabel>Partner Sales</masterLabel>
- <referrerPolicyOriginWhenCrossOrigin
- >false</referrerPolicyOriginWhenCrossOrigin>
+ <referrerPolicyOriginWhenCrossOrigin>false</referrerPolicyOriginWhenCrossOrigin>
<requireHttps>true</requireHttps>
<selfRegPage>CommunitiesSelfReg</selfRegPage>
- <serverIsDown>SNA_Partner_Sales1_sf_default_cdn_JaBaQ</serverIsDown>
+ <serverIsDown>SNA_Partner_Sales1_sf_default_cdn_zOZJ2</serverIsDown>
<siteAdmin>sb04@sb.com</siteAdmin>
<siteGuestRecordDefaultOwner>sb04@sb.com</siteGuestRecordDefaultOwner>
<siteType>ChatterNetwork</siteType>
diff --git a/force-app/main/default/sites/Site.site-meta.xml b/force-app/main/default/sites/Site.site-meta.xml
index df7bbe4..0852723 100644
--- a/force-app/main/default/sites/Site.site-meta.xml
+++ b/force-app/main/default/sites/Site.site-meta.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
<CustomSite xmlns="http://soap.sforce.com/2006/04/metadata">
<active>true</active>
<allowGuestPaymentsApi>false</allowGuestPaymentsApi>
@@ -8,7 +8,7 @@
<allowStandardLookups>false</allowStandardLookups>
<allowStandardPortalPages>true</allowStandardPortalPages>
<allowStandardSearch>false</allowStandardSearch>
- <authorizationRequiredPage>LEXCommunityRouter</authorizationRequiredPage>
+ <authorizationRequiredPage>CommunitiesLogin</authorizationRequiredPage>
<bandwidthExceededPage>BandwidthExceeded</bandwidthExceededPage>
<browserXssProtection>false</browserXssProtection>
<clickjackProtectionLevel>SameOriginOnly</clickjackProtectionLevel>
@@ -21,8 +21,7 @@
<inactiveIndexPage>CommunitiesLogin</inactiveIndexPage>
<indexPage>TopPage</indexPage>
<masterLabel>娑堣�楀搧绠＄悊绯荤粺</masterLabel>
- <referrerPolicyOriginWhenCrossOrigin
- >false</referrerPolicyOriginWhenCrossOrigin>
+ <referrerPolicyOriginWhenCrossOrigin>false</referrerPolicyOriginWhenCrossOrigin>
<requireHttps>true</requireHttps>
<selfRegPage>CommunitiesSelfReg</selfRegPage>
<siteAdmin>sb04@sb.com</siteAdmin>
diff --git a/force-app/main/default/sites/Site2.site-meta.xml b/force-app/main/default/sites/Site2.site-meta.xml
index 356bb1a..5661a2f 100644
--- a/force-app/main/default/sites/Site2.site-meta.xml
+++ b/force-app/main/default/sites/Site2.site-meta.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
<CustomSite xmlns="http://soap.sforce.com/2006/04/metadata">
<active>true</active>
<allowGuestPaymentsApi>false</allowGuestPaymentsApi>
@@ -20,10 +20,10 @@
<inMaintenancePage>InMaintenance</inMaintenancePage>
<indexPage>CommunitiesLanding</indexPage>
<masterLabel>鐢靛瓙绛炬敹绯荤粺</masterLabel>
- <referrerPolicyOriginWhenCrossOrigin
- >true</referrerPolicyOriginWhenCrossOrigin>
+ <referrerPolicyOriginWhenCrossOrigin>true</referrerPolicyOriginWhenCrossOrigin>
<requireHttps>true</requireHttps>
<selfRegPage>CommunitiesSelfReg</selfRegPage>
+ <serverIsDown>SNA_Site3_sf_default_cdn_qqC8x</serverIsDown>
<siteAdmin>it_prectech@olympus.com.cn</siteAdmin>
<siteGuestRecordDefaultOwner>olympus@proto.1</siteGuestRecordDefaultOwner>
<siteType>ChatterNetwork</siteType>
diff --git a/force-app/main/default/sites/extsurvey.site-meta.xml b/force-app/main/default/sites/extsurvey.site-meta.xml
index 50af949..24d4f62 100644
--- a/force-app/main/default/sites/extsurvey.site-meta.xml
+++ b/force-app/main/default/sites/extsurvey.site-meta.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
<CustomSite xmlns="http://soap.sforce.com/2006/04/metadata">
<active>false</active>
<allowGuestPaymentsApi>false</allowGuestPaymentsApi>
@@ -18,14 +18,12 @@
<fileNotFoundPage>FileNotFound</fileNotFoundPage>
<genericErrorPage>Exception</genericErrorPage>
<inMaintenancePage>InMaintenance</inMaintenancePage>
- <indexPage>ISO_DemandOAD_PDF</indexPage>
+ <indexPage>genjinbaobiao</indexPage>
<masterLabel>澶栭儴璋冩煡闂嵎</masterLabel>
- <referrerPolicyOriginWhenCrossOrigin
- >false</referrerPolicyOriginWhenCrossOrigin>
+ <referrerPolicyOriginWhenCrossOrigin>false</referrerPolicyOriginWhenCrossOrigin>
<requireHttps>true</requireHttps>
<siteAdmin>sb21@sunbridge.com</siteAdmin>
<siteGuestRecordDefaultOwner>olympus@proto.1</siteGuestRecordDefaultOwner>
<siteType>Visualforce</siteType>
<subdomain>ocmquestionnaire</subdomain>
- <urlPathPrefix>extsurvey</urlPathPrefix>
</CustomSite>
diff --git a/force-app/main/default/triggers/ConsumableOrderDetail2Trigger.trigger b/force-app/main/default/triggers/ConsumableOrderDetail2Trigger.trigger
index 51c8bd0..8529340 100644
--- a/force-app/main/default/triggers/ConsumableOrderDetail2Trigger.trigger
+++ b/force-app/main/default/triggers/ConsumableOrderDetail2Trigger.trigger
@@ -284,10 +284,11 @@
update consumableOrderlist;
}
}
-
+ //Back up by DTT - Li Jun 2023-06-14 Start for reduce soql times
// 2018骞�8鏈�9鏃� HWAG-B3D9UV 鑾峰彇鎵�鏈夌殑record ID start by 寮犵帀灞�
- List<RecordType> allrtList = [select Id,DeveloperName from RecordType where SobjectType = 'Consumable_orderdetails__c'];
+ //List<RecordType> allrtList = [select Id,DeveloperName from RecordType where SobjectType = 'Consumable_orderdetails__c'];
// 2018骞�8鏈�9鏃� HWAG-B3D9UV 鑾峰彇鎵�鏈夌殑record ID end by 寮犵帀灞�
+ //Back up by DTT - Li Jun 2023-06-14 Start
//鍒拌揣鍜岃繑鍝佹椂,鐢熸垚鎴栦慨鏀规秷璐瑰搧璁㈣揣鏄庣粏
Set<String> arrivedSet = new Set<String>();
Set<String> returnSet = new Set<String>();
@@ -351,21 +352,25 @@
String key = '' + ar.get('Consumable_Arrived_order__c') + ar.get('Asset_Model_No__c');
keyCount.put(key, Integer.valueOf(ar.get('recordCount')));
}
- // 2018骞�8鏈�9鏃� HWAG-B3D9UV 鏇夸唬涓嬮潰SQL select start by 寮犵帀灞�
- List<RecordType> rtList = new List<RecordType>();
- for(RecordType rtl : allrtList){
- if('Detail1_Arrival'.equals(rtl.DeveloperName)){
- rtList.add(rtl);
- }
- }
+ //Back up by DTT - Li Jun 2023-06-14 Start
+ // 2018骞�8鏈�9鏃� HWAG-B3D9UV 鏇夸唬涓嬮潰SQL select start by 寮犵帀灞�
+ // List<RecordType> rtList = new List<RecordType>();
+ // for(RecordType rtl : allrtList){
+ // if('Detail1_Arrival'.equals(rtl.DeveloperName)){
+ // rtList.add(rtl);
+ // }
+ // }
// 2018骞�8鏈�9鏃� HWAG-B3D9UV 鏇夸唬涓嬮潰SQL select end by 寮犵帀灞�
+ //Back up by DTT - Li Jun 2023-06-14 End
/* 2018骞�8鏈�9鏃� HWAG-B3D9UV 鍘熻幏鍙� recordtype start by 寮犵帀灞�
List<RecordType> rtList = [select Id from RecordType where DeveloperName = 'Detail1_Arrival' and SobjectType = 'Consumable_orderdetails__c'];
2018骞�8鏈�9鏃� HWAG-B3D9UV 鍘熻幏鍙� recordtype end by 寮犵帀灞� */
- Id recordTypeId = null;
- if (rtList.size() > 0) recordTypeId = rtList[0].Id;
-
+ //Back up by DTT - Li Jun 2023-06-14 Start
+ // Id recordTypeId = null;
+ // if (rtList.size() > 0) recordTypeId = rtList[0].Id;
+ //Back up by DTT - Li Jun 2023-06-14 End
+ Id recordtypeId = Schema.SObjectType.Consumable_Orderdetails__c.getRecordTypeInfosByDeveloperName().get('Detail1_Arrival').getRecordTypeId();
results = [select Consumable_order__c, count(Id) noCount
from Consumable_orderdetails__c
where Consumable_order__c in :arrivedSet
@@ -554,22 +559,22 @@
String key = '' + ar.get('Consumable_Return_order__c') + ar.get('Asset_Model_No__c');
keyCount.put(key, Integer.valueOf(ar.get('recordCount')));
}
-
+ //Back up by DTT - Li Jun 2023-06-14 Start for reduce soql times
// 2018骞�8鏈�9鏃� HWAG-B3D9UV 鏇夸唬涓嬮潰SQL select start by 寮犵帀灞�
- List<RecordType> rtList = new List<RecordType>();
- for(RecordType rtl : allrtList){
- if('Detail1_ReturnGoods'.equals(rtl.DeveloperName)){
- rtList.add(rtl);
- }
- }
+ // List<RecordType> rtList = new List<RecordType>();
+ // for(RecordType rtl : allrtList){
+ // if('Detail1_ReturnGoods'.equals(rtl.DeveloperName)){
+ // rtList.add(rtl);
+ // }
+ // }
// 2018骞�8鏈�9鏃� HWAG-B3D9UV 鏇夸唬涓嬮潰SQL select end by 寮犵帀灞�
-
+ //Back up by DTT - Li Jun 2023-06-14 End
/* 2018骞�8鏈�9鏃� HWAG-B3D9UV 鍘熻幏鍙� recordtype start by 寮犵帀灞�
List<RecordType> rtList = [select Id from RecordType where DeveloperName = 'Detail1_ReturnGoods' and SobjectType = 'Consumable_orderdetails__c'];
2018骞�8鏈�9鏃� HWAG-B3D9UV 鍘熻幏鍙� recordtype end by 寮犵帀灞� */
- Id recordTypeId = null;
- if (rtList.size() > 0) recordTypeId = rtList[0].Id;
+ Id recordTypeId = Schema.SObjectType.Consumable_Orderdetails__c.getRecordTypeInfosByDeveloperName().get('Detail1_ReturnGoods').getRecordTypeId();
+ //if (rtList.size() > 0) recordTypeId = rtList[0].Id;
results = [select Consumable_order__c, count(Id) noCount
from Consumable_orderdetails__c
diff --git a/force-app/main/default/triggers/ConsumableOrderDetail2Trigger.trigger-meta.xml b/force-app/main/default/triggers/ConsumableOrderDetail2Trigger.trigger-meta.xml
index eebd71b..7acf013 100644
--- a/force-app/main/default/triggers/ConsumableOrderDetail2Trigger.trigger-meta.xml
+++ b/force-app/main/default/triggers/ConsumableOrderDetail2Trigger.trigger-meta.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<ApexTrigger xmlns="http://soap.sforce.com/2006/04/metadata">
- <apiVersion>40.0</apiVersion>
+ <apiVersion>50.0</apiVersion>
<status>Active</status>
</ApexTrigger>
diff --git a/force-app/main/default/triggers/ConsumableOrderTrigger.trigger b/force-app/main/default/triggers/ConsumableOrderTrigger.trigger
index b572b6d..eb3c913 100644
--- a/force-app/main/default/triggers/ConsumableOrderTrigger.trigger
+++ b/force-app/main/default/triggers/ConsumableOrderTrigger.trigger
@@ -38,8 +38,6 @@
zMaps.put(local.Opportunity__c,local.name);
}
}
-
-
sAlist = [SELECT ContractNO__c,Opportunity__c FROM Statu_Achievements__c WHERE Opportunity__c = :zMaps.keySet()];
for(Statu_Achievements__c sa : sAlist) {
diff --git a/force-app/main/default/triggers/ContentDocumentLink.trigger b/force-app/main/default/triggers/ContentDocumentLink.trigger
index fca83c5..368da2a 100644
--- a/force-app/main/default/triggers/ContentDocumentLink.trigger
+++ b/force-app/main/default/triggers/ContentDocumentLink.trigger
@@ -1,5 +1,8 @@
trigger ContentDocumentLink on ContentDocumentLink (before delete, after insert) {
+ if((!Test.isRunningTest())&&UserInfo.getUserId()==System.Label.ByPassTrigger){
+ return;
+ }
system.debug('enter ContentDocumentLink');
system.debug('Trigger.new = ' + (List<ContentDocumentLink>) Trigger.new);
system.debug('Trigger.old = ' + (List<ContentDocumentLink>) Trigger.old);
diff --git a/force-app/main/default/triggers/ContentDocumentTrigger.trigger b/force-app/main/default/triggers/ContentDocumentTrigger.trigger
index ed34043..68a2e4e 100644
--- a/force-app/main/default/triggers/ContentDocumentTrigger.trigger
+++ b/force-app/main/default/triggers/ContentDocumentTrigger.trigger
@@ -1,4 +1,7 @@
trigger ContentDocumentTrigger on ContentDocument(before delete) {
+ if((!Test.isRunningTest())&&UserInfo.getUserId()==System.Label.ByPassTrigger){
+ return;
+ }
System.debug('enter ContentDocumentTrigger');
// system.debug('Trigger.new = ' + (List<ContentDocument>) Trigger.new);
// system.debug('Trigger.old = ' + (List<ContentDocument>) Trigger.old);
diff --git a/manifest/package.xml b/manifest/package.xml
index c873ffe..6895fb4 100644
--- a/manifest/package.xml
+++ b/manifest/package.xml
@@ -1,8 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<Package xmlns="http://soap.sforce.com/2006/04/metadata">
- <types>
- <members>LexConInvoicedetailsControllerTest</members>
- <name>ApexClass</name>
+ <types>
+ <members>LexContactPIPLAura</members>
+ <name>AuraDefinitionBundle</name>
</types>
+ <types>
+ <members>lexNewAndEditContactPIPL</members>
+ <name>LightningComponentBundle</name>
+ </types>
<version>52.0</version>
</Package>
--
Gitblit v1.9.1