diff --git a/非C#代码文件/派诺合同明细存储过程.sql b/非C#代码文件/派诺合同明细存储过程.sql index 3f489bb..f0007c1 100644 --- a/非C#代码文件/派诺合同明细存储过程.sql +++ b/非C#代码文件/派诺合同明细存储过程.sql @@ -17,22 +17,23 @@ as SELECT A.FID AS FID INTO #TEMP3 FROM T_SAL_ORDER A - INNER JOIN T_BD_CUSTOMER_L C ON C.FCUSTID= A.FCUSTID AND C.FLOCALEID= 2052 + INNER JOIN T_BD_CUSTOMER_L C ON C.FCUSTID= A.FCUSTID AND C.FLOCALEID= 2052 + INNER JOIN T_BD_CUSTOMER Cccc WITH(NOLOCK) ON Cccc.FCUSTID= A.FCUSTID LEFT JOIN V_BD_SALESMAN_L L ON L.fid = A.FSALERID left JOIN T_PerformanceSharing M ON M.FSOURCEBILLNO = A.FBILLNO AND M.FDOCUMENTSTATUS = 'C' left JOIN T_PerformanceSharingEntry N ON N.FID=M.FID LEFT JOIN V_BD_SALESMAN_L O ON O.fid= N.FSALEID LEFT JOIN ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACO ON ACO.=O.FNAME LEFT JOIN ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACL ON ACL.=L.FNAME - WHERE A.FSALEORGID = 100302 AND + WHERE A.FSALEORGID = 100302 AND ( ACO. = '̼ǿ' OR ACL. = '̼ǿ' - OR C.FNAME IN ('ŵƼۣ޹˾','人ŵƼչ޹˾') + OR C.FNAME IN ('ŵƼۣ޹˾','人ŵƼչ޹˾')) OR (C.FCUSTID = 1150173 AND (ACO. = 'Ŷ' OR ACL. = 'Ŷ')) OR L.FNAME = 'ŵ' OR A.FID IN (110185,207800) AND (ISNULL(@FStartDate2,'') = '' or A.FAPPROVEDATE > @FStartDate2) - AND (ISNULL(@FEndDate2,'') = '' or A.FAPPROVEDATE< @FEndDate2) + AND (ISNULL(@FEndDate2,'') = '' or A.FAPPROVEDATE< @FEndDate2) or Cccc.F_correlation = '1' Select @@ -140,7 +141,7 @@ LEFT JOIN (Select a1.FORDERNUMBER,MAX(a1.FOPENSTATUS)'FOPENSTATUS' From T_AR_RECEIVABLEENTRY a1 JOIN T_AR_RECEIVABLE a2 on a1.FID = a2.FID Where ISNULL(a1.FORDERNUMBER,'') != '' AND a2.FDOCUMENTSTATUS = 'C' GROUP BY FORDERNUMBER) D on A.FBILLNO = D.FORDERNUMBER -- -Where A.FDocumentStatus = 'C' AND B.FMANUALROWCLOSE != '1' AND A.FMANUALCLOSE != '1' +Where A.FDocumentStatus = 'C' AND A.FMANUALCLOSE != '1' AND A.FSALEORGID = 100302 AND W8.FNumber !='Z' AND A.FID NOT IN (SELECT * FROM #TEMP3) AND (ISNULL(@FSaleOrgId,'') = '' or AB.FNAME = @FSaleOrgId) @@ -253,11 +254,12 @@ LEFT JOIN (Select a1.FORDERNUMBER,MAX(a1.FOPENSTATUS)'FOPENSTATUS' From T_AR_RECEIVABLEENTRY a1 JOIN T_AR_RECEIVABLE a2 on a1.FID = a2.FID Where ISNULL(a1.FORDERNUMBER,'') != '' AND a2.FDOCUMENTSTATUS = 'C' GROUP BY FORDERNUMBER) D on A.FBILLNO = D.FORDERNUMBER -- -Where A.FDocumentStatus = 'C' AND B.FMANUALROWCLOSE != '1' AND A.FMANUALCLOSE != '1' +Where A.FDocumentStatus = 'C' AND A.FMANUALCLOSE != '1' AND A.FSALEORGID != 100302 AND W8.FNumber !='Z' AND (ISNULL(@FSaleOrgId,'') = '' or AB.FNAME = @FSaleOrgId) 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 A.FID NOT IN (SELECT * FROM #TEMP3) Select * From #TABLEAAA UNION ALL (Select * From #TABLEBBB) \ No newline at end of file