diff --git a/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs b/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs index cb2281f..dfb875d 100644 --- a/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs +++ b/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs @@ -277,7 +277,25 @@ WHERE D.FNUMBER NOT IN ( 'P', 'E', 'C','CS','CW','B' ) AND A.FID NOT IN ( SELECT FID FROM #PaiChuGongSi - ) {wheresql}; "); + ) {wheresql}; + + INSERT INTO #XiTongHeTong (AFBILLNO,F_ORDERTYPE,Date,Month,ContractNumber,FSALEORGID,FID,FENTRYID,TableName) + (SELECT o.FBILLNO,o.F_ORDERTYPE, CONVERT(NVARCHAR, o.FApproveDate, 23) AS 'Date', --日期 + MONTH(o.FApproveDate) AS 'Month', --月份 + o.F_CONTRACTNUMBER AS 'ContractNumber', --纸质合同号 + o.FSALEORGID ,o.FID,b.FENTRYID ,'#XiTongHeTong' AS TableName FROM + T_SAL_ORDERENTRY B --销售订单明细表 + LEFT JOIN + dbo.T_SAL_ORDER o ON b.fid=o.FID + LEFT JOIN T_SAL_ORDERENTRY_F B2 --销售订单明细_F表 + ON B.FENTRYID = B2.FENTRYID + JOIN T_SAL_ORDERFIN C --销售订单_财务表 + ON o.FID = C.FID + WHERE EXISTS ( + SELECT 1 + FROM #XiTongHeTong x + WHERE o.F_CONTRACTNUMBER LIKE x.ContractNumber + '%' AND o.F_CONTRACTNUMBER <> x.ContractNumber ) AND b.FQTY>0 ) ; +"); //兴诺明细的充电桩系统合同CS、CW diff --git a/非C#代码文件/特价明细表SQL22.sql b/非C#代码文件/特价明细表SQL22.sql index 1e6a58e..db85ca1 100644 --- a/非C#代码文件/特价明细表SQL22.sql +++ b/非C#代码文件/特价明细表SQL22.sql @@ -61,7 +61,9 @@ WHERE AND A.FID NOT IN ( SELECT FID FROM #PaiChuGongSi - ) AND 1=1 AND a.F_CONTRACTNUMBER like '%S202504070045X%' ; /*dialect*/ + ) AND 1=1 AND a.F_CONTRACTNUMBER like '%S202508080020X%' ; + + /*dialect*/ SELECT A.FBILLNO AS 'AFBILLNO', 'XT' F_ORDERTYPE, CONVERT(NVARCHAR, A.FApproveDate, 23) AS 'Date', -- @@ -101,7 +103,29 @@ WHERE D.FNUMBER NOT IN ( 'P', 'E', 'C','CS','CW','B' ) AND A.FID NOT IN ( SELECT FID FROM #PaiChuGongSi - ) AND 1=1 AND a.F_CONTRACTNUMBER like '%S202504070045X%'; /*dialect*/ + ) AND 1=1 AND a.F_CONTRACTNUMBER like '%S202508080020X%'; + + --SELECT * FROM #XiTongHeTong + INSERT INTO #XiTongHeTong (AFBILLNO,F_ORDERTYPE,Date,Month,ContractNumber,FSALEORGID,FID,FENTRYID,TableName) + (SELECT o.FBILLNO,o.F_ORDERTYPE, CONVERT(NVARCHAR, o.FApproveDate, 23) AS 'Date', -- + MONTH(o.FApproveDate) AS 'Month', --· + o.F_CONTRACTNUMBER AS 'ContractNumber', --ֽʺͬ + o.FSALEORGID ,o.FID,b.FENTRYID ,'#XiTongHeTong' AS TableName FROM + T_SAL_ORDERENTRY B --۶ϸ + LEFT JOIN + dbo.T_SAL_ORDER o ON b.fid=o.FID + LEFT JOIN T_SAL_ORDERENTRY_F B2 --۶ϸ_F + ON B.FENTRYID = B2.FENTRYID + JOIN T_SAL_ORDERFIN C --۶_ + ON o.FID = C.FID + WHERE EXISTS ( + SELECT 1 + FROM #XiTongHeTong x + WHERE o.F_CONTRACTNUMBER LIKE x.ContractNumber + '%' AND o.F_CONTRACTNUMBER <> x.ContractNumber ) AND b.FQTY>0 ) + + --SELECT * FROM T_SAL_ORDER o WHERE o.F_CONTRACTNUMBER LIKE '%S202508080020X%' + + /*dialect*/ SELECT A.FBILLNO AS 'AFBILLNO', 'CDZ' F_ORDERTYPE, CONVERT(NVARCHAR, A.FApproveDate, 23) AS 'Date', -- @@ -152,7 +176,7 @@ WHERE ( SELECT FID FROM #PaiChuGongSi ) - AND G.FNUMBER LIKE 'V%' AND 1=1 AND a.F_CONTRACTNUMBER like '%S202504070045X%' ; /*dialect*/ + AND G.FNUMBER LIKE 'V%' AND 1=1 AND a.F_CONTRACTNUMBER like '%S202508080020X%' ; /*dialect*/ SELECT A.FBILLNO AS 'AFBILLNO', A.F_ORDERTYPE, CONVERT(NVARCHAR, A.FApproveDate, 23) AS 'Date', -- @@ -206,7 +230,7 @@ WHERE ( SELECT FID FROM #PaiChuGongSi ) - AND G.FNUMBER not LIKE 'V%' AND 1=1 AND a.F_CONTRACTNUMBER like '%S202504070045X%'; /*dialect*/ + AND G.FNUMBER not LIKE 'V%' AND 1=1 AND a.F_CONTRACTNUMBER like '%S202508080020X%'; /*dialect*/ /*dialect*/ SELECT * INTO #TempTable3 @@ -221,7 +245,7 @@ UNION ALL SELECT * FROM #PLChongDianZhuangHeTong ; -/*dialect*/ + /*dialect*/ SELECT AAA.TableName, A.FBILLNO AS 'AFBILLNO', AAA.F_ORDERTYPE, CONVERT(NVARCHAR, A.FApproveDate, 23) AS 'Date', -- @@ -340,7 +364,7 @@ FROM #PLChongDianZhuangHeTong ; ON B.FENTRYID = B2.FENTRYID LEFT JOIN ( - SELECT Aq2.FBillAllAmount_LC, + SELECT Aq.FALLAMOUNT_LC AS FBillAllAmount_LC, Aq.* FROM ( @@ -369,12 +393,10 @@ FROM #PLChongDianZhuangHeTong ; GROUP BY W2.FSID, W2.FSBILLID ) Aq - JOIN - ( SELECT W2.FSBILLID, - STRING_AGG(CONVERT(NVARCHAR, W1.FDATE, 23), ',') AS 'FDate', + SUM(W1.FPRICEUNITQTY) AS 'FRETNOTICEQTY', SUM(W1.FALLAMOUNT_LC) AS 'FBillAllAmount_LC' FROM @@ -573,7 +595,7 @@ FROM #PLChongDianZhuangHeTong ; ON W1.FENTRYID = W2.FENTRYID WHERE W2.FSTABLENAME = 'T_SAL_ORDERENTRY' ) H7 - ON B.FENTRYID = H7.FSID AND 1=1 AND a.F_CONTRACTNUMBER like '%S202504070045X%' ; + ON B.FENTRYID = H7.FSID AND 1=1 AND a.F_CONTRACTNUMBER like '%S202508080020X%' ; @@ -629,7 +651,7 @@ WHERE F_K3SEQ=k3. Select *, ROW_NUMBER() OVER (ORDER BY Date desc,FID DESC ,[TableName],FENTRYID) AS FIDENTITYID - + From (SELECT [TableName] ,[AFBILLNO] @@ -706,6 +728,6 @@ WHERE F_K3SEQ=k3. FROM #tempDaBiao t1 where Quantity<>0 ) t1 - + WHERE t1.ProductsCode='H.01.5001.0004' order by Sort desc,Date desc ,fid desc ,FIDENTITYID --DROP TABLE #PaiChuGongSi , #YiBiaoHeTong , #XiTongHeTong ,#TempTable3 ,#PLChongDianZhuangHeTong_yibiao,#tempDaBiao,#XNChongDianZhuangHeTong,#PLChongDianZhuangHeTong \ No newline at end of file