diff --git a/国庆后的需求变化.txt b/国庆后的需求变化.txt
index 830cd04..63632fc 100644
--- a/国庆后的需求变化.txt
+++ b/国庆后的需求变化.txt
@@ -39,4 +39,3 @@
 产品分类= A
 A（储能、微电风、光储充）剩余部分  OK 
 
-223223
\ No newline at end of file
diff --git a/非C#代码文件/派诺合同明细存储过程.sql b/非C#代码文件/派诺合同明细存储过程.sql
index 062be8a..49d9521 100644
--- a/非C#代码文件/派诺合同明细存储过程.sql
+++ b/非C#代码文件/派诺合同明细存储过程.sql
@@ -5,16 +5,19 @@ SET QUOTED_IDENTIFIER ON
 GO
 ALTER Proc [dbo].[Get_PNHTMXBB]    
 (    
- @FSaleOrgId NVARCHAR(1000),--��֯    
+ --��֯    
  @FCZZHTH NVARCHAR(1000),--ֽ�ʺ�ͬ��    
  @FStartDate2 NVARCHAR(1000),    
  @FEndDate2 NVARCHAR(1000) ,
-  @FSaleOrgId2 NVARCHAR(1000)--����֯
+  @FSaleOrgId2 NVARCHAR(1000),--����֯
+  @SaleName NVARCHAR(500) --����Ա����
 )    
-AS    
+AS   
+
+DECLARE @FSaleOrgId NVARCHAR(1000)='';
 -- ������ʱ���洢��ѡ����֯ID
 CREATE TABLE #SelectedOrgs (OrgName NVARCHAR(255))
-
+CREATE TABLE #SelectedNames (SaleName NVARCHAR(255))
 -- �����������֯����������ָ������ʱ��
 IF ISNULL(@FSaleOrgId2, '') != ''
 BEGIN
@@ -26,6 +29,18 @@ BEGIN
     CROSS APPLY String.nodes('/X') AS Split(a)
 END
 
+
+-- �������������Ա����������ָ������ʱ��
+IF ISNULL( @SaleName, '') != ''
+BEGIN
+    INSERT INTO #SelectedNames (SaleName)
+    SELECT Split.a.value('.', 'NVARCHAR(255)') AS SaleName
+    FROM (
+        SELECT CAST('<X>'+REPLACE(@SaleName, ',', '</X><X>')+'</X>' AS XML) AS String
+    ) AS A
+    CROSS APPLY String.nodes('/X') AS Split(a)
+END
+
 --������ŵ��      
  SELECT A.FID AS FID 
  INTO #TEMP3
@@ -160,13 +175,6 @@ END AS '
   ,b.FENTRYID
   
  
---   SELECT name 
---FROM sys.tables 
---WHERE name LIKE '%COUNTRY%' OR name LIKE '%COUNTRY%'
---select * from CMK_T_OfferingCountryEntry
---        SELECT * FROM T_BD_COUNTRY_L
---        T_SAL_ORDER
-  --FENTRYID
 INTO #TABLEAAA    
 FROM    
 T_SAL_ORDER A    
@@ -229,12 +237,15 @@ AND (ISNULL(@FSaleOrgId,'') = '' or AB.FNAME = @FSaleOrgId)
 AND (ISNULL(@FSaleOrgId2,'') = '' OR MB.FNUMBER IN (SELECT OrgName FROM #SelectedOrgs) )    
 AND (ISNULL(@FCZZHTH,'') = '' or A.F_contractnumber like '%'+@FCZZHTH+'%')    
 AND (ISNULL(@FStartDate2,'') = '' or A.FAPPROVEDATE >= @FStartDate2)    
-AND (ISNULL(@FEndDate2,'') = '' or A.FAPPROVEDATE < DATEADD(DAY, 1, CONVERT(DATE, @FEndDate2)))       
+AND (ISNULL(@FEndDate2,'') = '' or A.FAPPROVEDATE < DATEADD(DAY, 1, CONVERT(DATE, @FEndDate2)))     
+AND (ISNULL(@SaleName,'') = '' OR ISNULL(O.FNAME,W1.FNAME)  IN (SELECT SaleName FROM #SelectedNames) )  ;
      
+	 
 
 
+  DROP TABLE #SelectedOrgs;
 
-  DROP TABLE #SelectedOrgs
+  DROP TABLE #SelectedNames;
      
  UPDATE #TABLEAAA SET ��̯���=b.[��ͬ�ܼ۱�λ��]   
  FROM (SELECT SUM(CONVERT(DECIMAL(18,2),[��ͬ�ܼ۱�λ��])) AS [��ͬ�ܼ۱�λ��]  ,FID FROM #TABLEAAA GROUP BY FID) b