parent: a68c8c52 | 补丁 | 提交 | ignore whitespace
buli
2023-07-13 c51e03fbf2f6633d8e88aeec9dcb8df13524df8f 
backup0713
3个文件已添加
4个文件已修改
307 ■■■■■ 已修改文件
.sf/config.json 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/classes/Batch_FixAttachmentToFiles.cls 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/classes/LexConsumableAccountControllerTest.cls 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/reports/Store_Custom_ReportLink/X2_Lky.report-meta.xml 133 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/reports/Store_Custom_ReportLink/new_report_0iF.report-meta.xml 142 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manifest/LEXC03report2.xml 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manifest/package.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 .sf/config.json


@@ -1,3 +1,3 @@


{


  "target-org": "OlympusStageEnv"


  "target-org": "OlympusProd"


}




 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);




 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';




 force-app/main/default/reports/Store_Custom_ReportLink/X2_Lky.report-meta.xml


New file


@@ -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>




 force-app/main/default/reports/Store_Custom_ReportLink/new_report_0iF.report-meta.xml


New file


@@ -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>




 manifest/LEXC03report2.xml


New file


@@ -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>




 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>