Merge branch 'SWAG-CCL6R7'

yangjieke

2022-03-22 08757a34e87bde82f3d1e3065f40d4204cd9f103

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

@@ -69,6 +69,10 @@
        // CHAN-C9P5WM 20211216 ssm 增加科室名 start
        public String DepartmentName;
        // CHAN-C9P5WM 20211216 ssm 增加科室名 end

        
        public String winBiddingDate;//SWAG-CCL6R7 2022-3-22 yjk 增加中标日

    }

    public class Detail_element {
@@ -91,6 +95,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 +225,11 @@
                                          // 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
                                          Account.RecordType.DeveloperName

                                    from  Opportunity
@@ -251,6 +264,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];
            
@@ -466,6 +484,9 @@
                    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
                    // 产品
                    List<OpportunityLineItem> oppLineList = oppIDMap.get(opp.id);
                    quotation.Items = new List<Detail_element>();
@@ -578,6 +599,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;