DB202303088261

李彤

2023-05-29 41a627eaaf29658a401ac43e4da838a5b622f44e

 force-app/main/default/classes/NFM202Controller.cls

@@ -58,17 +58,18 @@
        // LHJ 多年保修 20190812 End
        public String SFDC_DataID;
        public Detail_element[] Items;
    //报价试算
        //报价试算
        public ProductDetais[] ProductDetais; //报价试算行
        //20200810 ljh add start
        //public String IsCorrosion;
        //20200810 ljh add end
        //阿西赛多 wql 20210331
        public Boolean IsAcecide;

        // CHAN-C9P5WM 20211216 ssm 增加科室名 start
        public String DepartmentName;
        // CHAN-C9P5WM 20211216 ssm 增加科室名 end
        public String winBiddingDate;//SWAG-CCL6R7 2022-3-22 yjk 增加中标日
        public String CelonOpportunity;// 20220415 ljh SWAG-CCK8V4 add
    }

    public class Detail_element {
@@ -91,6 +92,10 @@
        public String ModelNo;
        public String productName;
        // CHAN-C9P5WM 20211216 ssm 增加产品型号和产品名称 end

        //lt 20220223 CHAN-CBW9FX 特殊交货期影响的对应  start
        public String DeliveryDate;
        //lt 20220223 CHAN-CBW9FX 特殊交货期影响的对应  end

    }

@@ -217,6 +222,12 @@
                                          // CHAN-C9P5WM 20211216 ssm 增加科室名 start
                                          Department_Name__c,
                                          // CHAN-C9P5WM 20211216 ssm 增加科室名 end

                                          //SWAG-CCL6R7 2022-3-22 yjk 增加中标日 start
                                          Closing_Bid_Date_Bid__c,
                                          Closing_Bid_Date__c,
                                          //SWAG-CCL6R7 2022-3-22 yjk 增加中标日 end
                                          CelonOpportunity__c,  // 20220415 ljh SWAG-CCK8V4 add
                                          Account.RecordType.DeveloperName

                                    from  Opportunity
@@ -251,6 +262,11 @@
                                                         // CHAN-C9P5WM 20211216 ssm 增加科室名 end
                                                         PricebookEntry.Product2.Packing_list_manual__c,
                                                         PricebookEntry.Product2.GuranteeType__c

                                                         //lt 20220223 CHAN-CBW9FX 特殊交货期影响的对应  start
                                                         ,DeliveryDate__c
                                                         //lt 20220223 CHAN-CBW9FX 特殊交货期影响的对应  end

                                                    from OpportunityLineItem 
                                                   where OpportunityId in :oppIds];
            
@@ -393,8 +409,15 @@
                    quotation.SFDC_DataID = opp.ID;
                    quotation.TransType = transTypeMap.get(opp.id);               // 询价区分
                    quotation.InquiryCode = opp.Opportunity_No__c;    // 询价编码
                    quotation.Quote_Code = opp.Estimation_No__c;                       // 报价编码
                    quotation.SalesPoint = opp.SAP_Province__c;   // SAP上传省
                    quotation.Quote_Code = opp.Estimation_No__c;      // 报价编码
                    //20230322 lt DB202303088261 两票制 SAP上传省增加 OSH-安徽省，但传给SPO “安徽省”  start
                    if(opp.SAP_Province__c == 'OSH-安徽省'){
                        quotation.SalesPoint = '安徽省';
                    }else{
                        quotation.SalesPoint = opp.SAP_Province__c;   // SAP上传省
                    }
                    // quotation.SalesPoint = opp.SAP_Province__c;   // SAP上传省
                    //20230322 lt DB202303088261 两票制 SAP上传省增加 OSH-安徽省，但传给SPO “安徽省”  end
                    quotation.Province = opp.State__c;                // 省份
                    quotation.City = opp.City__c;                     // 市/地区
                    quotation.HPCode = opp.HP_Management_Code__c;     // 医院代码
@@ -466,6 +489,10 @@
                    quotation.DepartmentName = opp.Department_Name__c;
                    // CHAN-C9P5WM 20211216 ssm 增加科室名 end

                    //SWAG-CCL6R7 2022-3-22 yjk 增加中标日 start
                    quotation.winBiddingDate = opp.Closing_Bid_Date_Bid__c ==null? NFMUtil.formatDate2Str(opp.Closing_Bid_Date__c) : NFMUtil.formatDate2Str(opp.Closing_Bid_Date_Bid__c);
                    //SWAG-CCL6R7 2022-3-22 yjk 增加中标日 end
                    quotation.CelonOpportunity = opp.CelonOpportunity__c; // 20220415 ljh ljh SWAG-CCK8V4 add
                    // 产品
                    List<OpportunityLineItem> oppLineList = oppIDMap.get(opp.id);
                    quotation.Items = new List<Detail_element>();
@@ -578,6 +605,11 @@
                        detail.ProductCode = oppLine.ProductCode__c;  // 产品编码（指OTCode）;
                        // 数量
                        detail.Quantity = oppLine.Quantity;

                        //lt 20220223 CHAN-CBW9FX 特殊交货期影响的对应   交货期 start 
                        detail.DeliveryDate = oppLine.DeliveryDate__c;
                        //lt 20220223 CHAN-CBW9FX 特殊交货期影响的对应  end

                        // LHJ SWAG-C9F9P8  20211206 增加规格 Start
                        // 规格
                        detail.Packing = oppLine.PricebookEntry.Product2.Packing_list_manual__c;