From c51e03fbf2f6633d8e88aeec9dcb8df13524df8f Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期四, 13 七月 2023 12:00:06 +0800
Subject: [PATCH] backup0713
---
.sf/config.json | 2
force-app/main/default/reports/Store_Custom_ReportLink/new_report_0iF.report-meta.xml | 142 +++++++++++++++++++++++
manifest/package.xml | 5
force-app/main/default/classes/LexConsumableAccountControllerTest.cls | 8
force-app/main/default/classes/Batch_FixAttachmentToFiles.cls | 8
force-app/main/default/reports/Store_Custom_ReportLink/X2_Lky.report-meta.xml | 133 ++++++++++++++++++++++
manifest/LEXC03report2.xml | 9 +
7 files changed, 298 insertions(+), 9 deletions(-)
diff --git a/.sf/config.json b/.sf/config.json
index e8a7811..4c476fc 100644
--- a/.sf/config.json
+++ b/.sf/config.json
@@ -1,3 +1,3 @@
{
- "target-org": "OlympusStageEnv"
+ "target-org": "OlympusProd"
}
diff --git a/force-app/main/default/classes/Batch_FixAttachmentToFiles.cls b/force-app/main/default/classes/Batch_FixAttachmentToFiles.cls
index 06af07c..9c83139 100644
--- a/force-app/main/default/classes/Batch_FixAttachmentToFiles.cls
+++ b/force-app/main/default/classes/Batch_FixAttachmentToFiles.cls
@@ -31,11 +31,11 @@
Map<string, id> nameParentMaps = new Map<string, id>();
Set<String> attachmentIds = new Set<String>();
for (Attachment att : scope) {
- nameParentMaps.put(att.Name, att.ParentId);
+ nameParentMaps.put(att.Id, att.ParentId);
attachmentIds.add(att.Id);
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.PathOnClient = att.Id; //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
@@ -55,7 +55,7 @@
contentIds.add(cv.id);
}
List<ContentVersion> conDocuments = [
- SELECT ContentDocumentId, Title
+ SELECT ContentDocumentId, Title, PathOnClient
FROM ContentVersion
WHERE Id IN :contentIds
];
@@ -63,7 +63,7 @@
for (ContentVersion cv : conDocuments) {
ContentDocumentLink cDocLink = new ContentDocumentLink();
cDocLink.ContentDocumentId = cv.ContentDocumentId; //Add ContentDocumentId
- cDocLink.LinkedEntityId = nameParentMaps.get(cv.Title); //Add attachment parentId
+ cDocLink.LinkedEntityId = nameParentMaps.get(cv.PathOnClient); //Add attachment parentId
cDocLink.ShareType = 'V'; //V - Viewer permission. C - Collaborator permission. I - Inferred permission.
cDocLink.Visibility = 'AllUsers';
insertDocLinks.add(cDocLink);
diff --git a/force-app/main/default/classes/LexConsumableAccountControllerTest.cls b/force-app/main/default/classes/LexConsumableAccountControllerTest.cls
index 4bd6161..dd94bf5 100644
--- a/force-app/main/default/classes/LexConsumableAccountControllerTest.cls
+++ b/force-app/main/default/classes/LexConsumableAccountControllerTest.cls
@@ -11,21 +11,23 @@
static testMethod void testMethod1() {
User thisUser = [SELECT Id FROM User WHERE Id = :UserInfo.getUserId()];
System.runAs(thisUser) {
+ List<Account> accList = new List<Account>();
// 鍙栧紩鍏�
account1.Name = 'test1鍖婚櫌';
account1.RecordTypeId = '01210000000QemG';
// account1.Is_Active__c = '鑽夋涓�';
- insert account1;
+ accList.add(account1);
account2.Name = 'test2鍖婚櫌';
account2.RecordTypeId = '01210000000QemG';
// account2.Is_Active__c = '鏈夊姽';
- insert account2;
+ accList.add(account2);
account3.Name = 'test3鍖婚櫌';
account3.RecordTypeId = '01210000000QemG';
// account3.Is_Active__c = '鐢宠涓�';
- insert account3;
+ accList.add(account3);
+ insert accList;
consumable.Name = 'test1缁忛攢鍟�';
consumable.RecordTypeId = '01210000000Qem1';
diff --git a/force-app/main/default/reports/Store_Custom_ReportLink/X2_Lky.report-meta.xml b/force-app/main/default/reports/Store_Custom_ReportLink/X2_Lky.report-meta.xml
new file mode 100644
index 0000000..38c894e
--- /dev/null
+++ b/force-app/main/default/reports/Store_Custom_ReportLink/X2_Lky.report-meta.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<Report xmlns="http://soap.sforce.com/2006/04/metadata">
+ <columns>
+ <field>Consumable_order_details2__c.Consumable_order_minor__c</field>
+ </columns>
+ <columns>
+ <field>Consumable_order_details2__c.Opportunity_No__c</field>
+ </columns>
+ <columns>
+ <field>Consumable_order_details2__c.SalesDepartment_Dealer__c</field>
+ </columns>
+ <columns>
+ <field>Consumable_order_details2__c.Dealer_Info_text__c</field>
+ </columns>
+ <columns>
+ <field>Consumable_order_details2__c.Order_Dealer_Info__c</field>
+ </columns>
+ <columns>
+ <field>Consumable_order_details2__c.OT_Code__c</field>
+ </columns>
+ <columns>
+ <field>Consumable_order_details2__c.Asset_Model_No__c</field>
+ </columns>
+ <columns>
+ <field>Consumable_order_details2__c.Product_name__c</field>
+ </columns>
+ <columns>
+ <field>Consumable_order_details2__c.Category3__c</field>
+ </columns>
+ <columns>
+ <field>Consumable_order_details2__c.Product_OutDate__c</field>
+ </columns>
+ <columns>
+ <field>Consumable_order_details2__c.SerialLotNo__c</field>
+ </columns>
+ <columns>
+ <field>Consumable_order_details2__c.Detail_Count__c</field>
+ </columns>
+ <columns>
+ <aggregateTypes>Sum</aggregateTypes>
+ <field>Consumable_order_details2__c.Sale_unitPrice__c</field>
+ </columns>
+ <columns>
+ <field>Consumable_order_details2__c.Box_Piece__c</field>
+ </columns>
+ <columns>
+ <field>Consumable_order_details2__c.TracingCode__c</field>
+ </columns>
+ <columns>
+ <field>Consumable_order_details2__c.DICode__c</field>
+ </columns>
+ <columns>
+ <field>Consumable_order_details2__c.Recall_shipment__c</field>
+ </columns>
+ <columns>
+ <field>Consumable_order_details2__c.HospItal_Code__c</field>
+ </columns>
+ <columns>
+ <field>Consumable_order_details2__c.HospItal_Name__c</field>
+ </columns>
+ <columns>
+ <field>Consumable_order_details2__c.Order_ForCustomerText__c</field>
+ </columns>
+ <columns>
+ <field>Consumable_order_details2__c.HospItal_Classification__c</field>
+ </columns>
+ <columns>
+ <field>Consumable_order_details2__c.Consumable_ZS_order__c</field>
+ </columns>
+ <currency>CNY</currency>
+ <filter>
+ <booleanFilter>((((1 OR 2) AND 3) AND 4) AND 5) AND 6</booleanFilter>
+ <criteriaItems>
+ <column>Consumable_order_details2__c.Dealer_Shipment__c</column>
+ <columnToColumn>false</columnToColumn>
+ <isUnlocked>true</isUnlocked>
+ <operator>equals</operator>
+ <value>1</value>
+ </criteriaItems>
+ <criteriaItems>
+ <column>Consumable_order_details2__c.Dealer_Saled__c</column>
+ <columnToColumn>false</columnToColumn>
+ <isUnlocked>true</isUnlocked>
+ <operator>equals</operator>
+ <value>1</value>
+ </criteriaItems>
+ <criteriaItems>
+ <column>Consumable_order_details2__c.Dealer_Returned__c</column>
+ <columnToColumn>false</columnToColumn>
+ <isUnlocked>true</isUnlocked>
+ <operator>equals</operator>
+ <value>0</value>
+ </criteriaItems>
+ <criteriaItems>
+ <column>Consumable_order_details2__c.Dealer_Info_text__c</column>
+ <columnToColumn>false</columnToColumn>
+ <isUnlocked>true</isUnlocked>
+ <operator>notContain</operator>
+ <value>TEST,濂ユ灄宸存柉</value>
+ </criteriaItems>
+ <criteriaItems>
+ <column>Consumable_order_details2__c.NotShow_data__c</column>
+ <columnToColumn>false</columnToColumn>
+ <isUnlocked>true</isUnlocked>
+ <operator>equals</operator>
+ <value>0</value>
+ </criteriaItems>
+ <criteriaItems>
+ <column
+ >Consumable_order_details2__c.Is_DangerousChemicals__c</column>
+ <columnToColumn>false</columnToColumn>
+ <isUnlocked>true</isUnlocked>
+ <operator>equals</operator>
+ <value>0</value>
+ </criteriaItems>
+ <language>zh_CN</language>
+ </filter>
+ <format>Tabular</format>
+ <name>缁忛攢鍟嗗嚭璐�/閿�鍞姤琛�(2)鎸夌鐞嗙紪鐮� 鐨勫壇鏈�</name>
+ <params>
+ <name>co</name>
+ <value>1</value>
+ </params>
+ <reportType>CustomEntity$Consumable_order_details2__c</reportType>
+ <scope>organization</scope>
+ <showDetails>true</showDetails>
+ <showGrandTotal>true</showGrandTotal>
+ <showSubTotals>true</showSubTotals>
+ <timeFrameFilter>
+ <dateColumn>Consumable_order_details2__c.Product_OutDate__c</dateColumn>
+ <interval>INTERVAL_PREVCURFY</interval>
+ </timeFrameFilter>
+</Report>
diff --git a/force-app/main/default/reports/Store_Custom_ReportLink/new_report_0iF.report-meta.xml b/force-app/main/default/reports/Store_Custom_ReportLink/new_report_0iF.report-meta.xml
new file mode 100644
index 0000000..eac0975
--- /dev/null
+++ b/force-app/main/default/reports/Store_Custom_ReportLink/new_report_0iF.report-meta.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<Report xmlns="http://soap.sforce.com/2006/04/metadata">
+ <columns>
+ <field>CUST_NAME</field>
+ </columns>
+ <columns>
+ <field>Consumable_order_details2__c.Opportunity_No__c</field>
+ </columns>
+ <columns>
+ <field>Consumable_order_details2__c.ContractNo_text__c</field>
+ </columns>
+ <columns>
+ <field>Consumable_order_details2__c.Dealer_Info_text__c</field>
+ </columns>
+ <columns>
+ <field>Consumable_order_details2__c.Category3__c</field>
+ </columns>
+ <columns>
+ <field>Consumable_order_details2__c.Order_date__c</field>
+ </columns>
+ <columns>
+ <field>Consumable_order_details2__c.Consumable_product__c</field>
+ </columns>
+ <columns>
+ <field>Consumable_order_details2__c.Product_name__c</field>
+ </columns>
+ <columns>
+ <field>Consumable_order_details2__c.SerialLotNo__c</field>
+ </columns>
+ <columns>
+ <field>Consumable_order_details2__c.OT_Code__c</field>
+ </columns>
+ <columns>
+ <field>Consumable_order_details2__c.CFDA_Status__c</field>
+ </columns>
+ <columns>
+ <field
+ >Consumable_order_details2__c.Report_Product_Approbation__c</field>
+ </columns>
+ <columns>
+ <field>Consumable_order_details2__c.Report_Product_Expiration__c</field>
+ </columns>
+ <columns>
+ <field>Consumable_order_details2__c.Product_Date__c</field>
+ </columns>
+ <columns>
+ <field>Consumable_order_details2__c.Sterilization_limit__c</field>
+ </columns>
+ <columns>
+ <field>Consumable_order_details2__c.Bar_Code__c</field>
+ </columns>
+ <columns>
+ <field>Consumable_order_details2__c.DICode__c</field>
+ </columns>
+ <columns>
+ <aggregateTypes>Sum</aggregateTypes>
+ <field>Consumable_order_details2__c.Intra_Trade_List_RMB__c</field>
+ </columns>
+ <columns>
+ <field>Consumable_order_details2__c.Deliver_date__c</field>
+ </columns>
+ <columns>
+ <field>Consumable_order_details2__c.Arrive_date__c</field>
+ </columns>
+ <currency>CNY</currency>
+ <filter>
+ <criteriaItems>
+ <column>CUST_RECORDTYPE</column>
+ <columnToColumn>false</columnToColumn>
+ <isUnlocked>true</isUnlocked>
+ <operator>equals</operator>
+ <value>Consumable_order_details2__c.Detail2_Delivery</value>
+ </criteriaItems>
+ <criteriaItems>
+ <column>Consumable_order_details2__c.Dealer_Arrive__c</column>
+ <columnToColumn>false</columnToColumn>
+ <isUnlocked>true</isUnlocked>
+ <operator>equals</operator>
+ <value>1</value>
+ </criteriaItems>
+ <criteriaItems>
+ <column>Consumable_order_details2__c.Dealer_Shipment__c</column>
+ <columnToColumn>false</columnToColumn>
+ <isUnlocked>true</isUnlocked>
+ <operator>equals</operator>
+ <value>0</value>
+ </criteriaItems>
+ <criteriaItems>
+ <column>Consumable_order_details2__c.Dealer_Saled__c</column>
+ <columnToColumn>false</columnToColumn>
+ <isUnlocked>true</isUnlocked>
+ <operator>equals</operator>
+ <value>0</value>
+ </criteriaItems>
+ <criteriaItems>
+ <column>Consumable_order_details2__c.Lose_Flag__c</column>
+ <columnToColumn>false</columnToColumn>
+ <isUnlocked>true</isUnlocked>
+ <operator>equals</operator>
+ <value>0</value>
+ </criteriaItems>
+ <criteriaItems>
+ <column>Consumable_order_details2__c.Bar_Code__c</column>
+ <columnToColumn>false</columnToColumn>
+ <isUnlocked>true</isUnlocked>
+ <operator>notEqual</operator>
+ <value />
+ </criteriaItems>
+ <criteriaItems>
+ <column>Consumable_order_details2__c.Dealer_Info_text__c</column>
+ <columnToColumn>false</columnToColumn>
+ <isUnlocked>true</isUnlocked>
+ <operator>notContain</operator>
+ <value>TEST,濂ユ灄宸存柉</value>
+ </criteriaItems>
+ <criteriaItems>
+ <column
+ >Consumable_order_details2__c.Is_DangerousChemicals__c</column>
+ <columnToColumn>false</columnToColumn>
+ <isUnlocked>true</isUnlocked>
+ <operator>equals</operator>
+ <value>0</value>
+ </criteriaItems>
+ <language>zh_CN</language>
+ </filter>
+ <format>Tabular</format>
+ <name>缁忛攢鍟嗗簱瀛�</name>
+ <params>
+ <name>co</name>
+ <value>1</value>
+ </params>
+ <reportType>CustomEntity$Consumable_order_details2__c</reportType>
+ <scope>organization</scope>
+ <showDetails>true</showDetails>
+ <showGrandTotal>true</showGrandTotal>
+ <showSubTotals>true</showSubTotals>
+ <timeFrameFilter>
+ <dateColumn
+ >Consumable_order_details2__c.Guarantee_period_for_products__c</dateColumn>
+ <interval>INTERVAL_CUSTOM</interval>
+ </timeFrameFilter>
+</Report>
diff --git a/manifest/LEXC03report2.xml b/manifest/LEXC03report2.xml
new file mode 100644
index 0000000..02812cb
--- /dev/null
+++ b/manifest/LEXC03report2.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<Package xmlns="http://soap.sforce.com/2006/04/metadata">
+ <types>
+ <members>鐗圭害缁忛攢鍟哶鑷畾涔夐摼鎺ユ姤琛�/new_report_0iF</members>
+ <members>鐗圭害缁忛攢鍟哶鑷畾涔夐摼鎺ユ姤琛�/X2_Lky</members>
+ <name>Report</name>
+ </types>
+ <version>50.0</version>
+</Package>
diff --git a/manifest/package.xml b/manifest/package.xml
index 527d2f9..396a46d 100644
--- a/manifest/package.xml
+++ b/manifest/package.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<Package xmlns="http://soap.sforce.com/2006/04/metadata">
<types>
- <members>lexSaleAndDelivery</members>
+ <members>lexConsumableAccount</members>
<members>lexSummonsCreat</members>
+ <members>lexInventory</members>
+ <members>lexinventoryViewLWC</members>
+ <members>lexConsumable</members>
<name>LightningComponentBundle</name>
</types>
<version>52.0</version>
--
Gitblit v1.9.1