This commit is contained in:
余宇波 2025-10-22 16:45:32 +08:00
parent ad7cf756bf
commit 27a39836e5

View File

@ -24,7 +24,7 @@ as
-- @FEDate + 1天 -- @FEDate + 1天
SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate); SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate);
SELECT D.FENTRYID,sum(b.fqty) AS 'FQTY',sum(E.FAllAmount_LC) AS 'FAMOUNT' SELECT D.FENTRYID,SUM(b.fqty) AS 'FQTY',SUM(E.FAllAmount_LC) AS 'FAMOUNT'
INTO #SAL INTO #SAL
FROM T_SAL_DELIVERYNOTICE A FROM T_SAL_DELIVERYNOTICE A
INNER JOIN T_SAL_DELIVERYNOTICEENTRY B ON A.FID = B.FID INNER JOIN T_SAL_DELIVERYNOTICEENTRY B ON A.FID = B.FID
@ -32,14 +32,14 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate);
INNER JOIN T_SAL_DELIVERYNOTICEENTRY_LK C ON C.FENTRYID = B.FENTRYID INNER JOIN T_SAL_DELIVERYNOTICEENTRY_LK C ON C.FENTRYID = B.FENTRYID
INNER JOIN T_SAL_ORDERENTRY D ON D.FID = C.FSBILLID AND D.FENTRYID = C.FSID INNER JOIN T_SAL_ORDERENTRY D ON D.FID = C.FSBILLID AND D.FENTRYID = C.FSID
WHERE A.FDOCUMENTSTATUS= 'C' WHERE A.FDOCUMENTSTATUS= 'C'
AND (@FSaleOrgIdName = '' Or A.FSALEORGID = @FSaleOrgId) AND (@FSaleOrgIdName = '' OR A.FSALEORGID = @FSaleOrgId)
AND (ISNULL(@FSDate,'') = '' or A.FAPPROVEDATE > @FSDateDate) AND (ISNULL(@FSDate,'') = '' OR A.FAPPROVEDATE > @FSDateDate)
AND (ISNULL(@FEDate,'') = '' or A.FAPPROVEDATE < @FEDateDate) AND (ISNULL(@FEDate,'') = '' OR A.FAPPROVEDATE < @FEDateDate)
AND (a.F_PAPERCONTRACT=@FPaperContract OR @FPaperContract='') AND (a.F_PAPERCONTRACT=@FPaperContract OR @FPaperContract='')
GROUP BY D.FENTRYID GROUP BY D.FENTRYID
SELECT D.FENTRYID,sum(b.fqty) AS 'FQTY',sum(E.FAllAmount_LC) AS 'FAMOUNT' SELECT D.FENTRYID,SUM(b.fqty) AS 'FQTY',SUM(E.FAllAmount_LC) AS 'FAMOUNT'
INTO #RETURN INTO #RETURN
FROM T_SAL_RETURNNOTICE A FROM T_SAL_RETURNNOTICE A
INNER JOIN T_SAL_RETURNNOTICEENTRY B ON A.FID = B.FID INNER JOIN T_SAL_RETURNNOTICEENTRY B ON A.FID = B.FID
@ -47,14 +47,14 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate);
INNER JOIN T_SAL_RETURNNOTICEENTRY_LK C ON C.FENTRYID = B.FENTRYID INNER JOIN T_SAL_RETURNNOTICEENTRY_LK C ON C.FENTRYID = B.FENTRYID
INNER JOIN T_SAL_ORDERENTRY D ON D.FID = C.FSBILLID AND D.FENTRYID = C.FSID INNER JOIN T_SAL_ORDERENTRY D ON D.FID = C.FSBILLID AND D.FENTRYID = C.FSID
WHERE A.FDOCUMENTSTATUS= 'C' WHERE A.FDOCUMENTSTATUS= 'C'
AND (@FSaleOrgIdName = '' Or A.FSALEORGID = @FSaleOrgId) AND (@FSaleOrgIdName = '' OR A.FSALEORGID = @FSaleOrgId)
AND (ISNULL(@FSDate,'') = '' or A.FAPPROVEDATE > @FSDateDate) AND (ISNULL(@FSDate,'') = '' OR A.FAPPROVEDATE > @FSDateDate)
AND (ISNULL(@FEDate,'') = '' or A.FAPPROVEDATE < @FEDateDate) AND (ISNULL(@FEDate,'') = '' OR A.FAPPROVEDATE < @FEDateDate)
AND (a.F_PAPERCONTRACT=@FPaperContract OR @FPaperContract='') AND (a.F_PAPERCONTRACT=@FPaperContract OR @FPaperContract='')
GROUP BY D.FENTRYID GROUP BY D.FENTRYID
SELECT F.FENTRYID,sum(b.FREALQTY) AS 'FQTY',sum(G.FALLAMOUNT_LC) AS 'FAMOUNT' SELECT F.FENTRYID,SUM(b.FREALQTY) AS 'FQTY',SUM(G.FALLAMOUNT_LC) AS 'FAMOUNT'
INTO #OUTSTOCK INTO #OUTSTOCK
FROM T_SAL_OUTSTOCK A FROM T_SAL_OUTSTOCK A
INNER JOIN T_SAL_OUTSTOCKENTRY B ON A.FID = B.FID INNER JOIN T_SAL_OUTSTOCKENTRY B ON A.FID = B.FID
@ -64,13 +64,13 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate);
INNER JOIN T_SAL_DELIVERYNOTICEENTRY_LK E ON E.FENTRYID = D.FENTRYID INNER JOIN T_SAL_DELIVERYNOTICEENTRY_LK E ON E.FENTRYID = D.FENTRYID
INNER JOIN T_SAL_ORDERENTRY F ON F.FID = E.FSBILLID AND F.FENTRYID = E.FSID INNER JOIN T_SAL_ORDERENTRY F ON F.FID = E.FSBILLID AND F.FENTRYID = E.FSID
WHERE A.FDOCUMENTSTATUS= 'C' WHERE A.FDOCUMENTSTATUS= 'C'
AND (@FSaleOrgIdName = '' Or A.FSALEORGID = @FSaleOrgId) AND (@FSaleOrgIdName = '' OR A.FSALEORGID = @FSaleOrgId)
AND (ISNULL(@FSDate,'') = '' or A.FAPPROVEDATE > @FSDateDate) AND (ISNULL(@FSDate,'') = '' OR A.FAPPROVEDATE > @FSDateDate)
AND (ISNULL(@FEDate,'') = '' or A.FAPPROVEDATE < @FEDateDate) AND (ISNULL(@FEDate,'') = '' OR A.FAPPROVEDATE < @FEDateDate)
AND (a.F_CONTRACTNUMBER=@FPaperContract OR @FPaperContract='') AND (a.F_CONTRACTNUMBER=@FPaperContract OR @FPaperContract='')
GROUP BY F.FENTRYID GROUP BY F.FENTRYID
SELECT F.FENTRYID,sum(b.FREALQTY) AS 'FQTY',sum(G.FALLAMOUNT_LC) AS 'FAMOUNT' SELECT F.FENTRYID,SUM(b.FREALQTY) AS 'FQTY',SUM(G.FALLAMOUNT_LC) AS 'FAMOUNT'
INTO #RETURNSTOCK INTO #RETURNSTOCK
FROM T_SAL_RETURNSTOCK A FROM T_SAL_RETURNSTOCK A
INNER JOIN T_SAL_RETURNSTOCKENTRY B ON A.FID = B.FID INNER JOIN T_SAL_RETURNSTOCKENTRY B ON A.FID = B.FID
@ -80,9 +80,9 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate);
INNER JOIN T_SAL_RETURNNOTICEENTRY_LK E ON E.FENTRYID = D.FENTRYID INNER JOIN T_SAL_RETURNNOTICEENTRY_LK E ON E.FENTRYID = D.FENTRYID
INNER JOIN T_SAL_ORDERENTRY F ON F.FID = E.FSBILLID AND F.FENTRYID = E.FSID INNER JOIN T_SAL_ORDERENTRY F ON F.FID = E.FSBILLID AND F.FENTRYID = E.FSID
WHERE A.FDOCUMENTSTATUS= 'C' WHERE A.FDOCUMENTSTATUS= 'C'
AND (@FSaleOrgIdName = '' Or A.FSALEORGID = @FSaleOrgId) AND (@FSaleOrgIdName = '' OR A.FSALEORGID = @FSaleOrgId)
AND (ISNULL(@FSDate,'') = '' or A.FAPPROVEDATE > @FSDateDate) AND (ISNULL(@FSDate,'') = '' OR A.FAPPROVEDATE > @FSDateDate)
AND (ISNULL(@FEDate,'') = '' or A.FAPPROVEDATE < @FEDateDate) AND (ISNULL(@FEDate,'') = '' OR A.FAPPROVEDATE < @FEDateDate)
AND (a.F_CONTRACTNUMBER=@FPaperContract OR @FPaperContract='') AND (a.F_CONTRACTNUMBER=@FPaperContract OR @FPaperContract='')
GROUP BY F.FENTRYID GROUP BY F.FENTRYID
@ -172,11 +172,20 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate);
,d.FNAME as '产品名称' ---- ,d.FNAME as '产品名称' ----
,d.FSPECIFICATION as '规格型号'---- ,d.FSPECIFICATION as '规格型号'----
,CONCAT(A.F_contractnumber,d.FSPECIFICATION ) as '订单规格型号' --H()+J ,CONCAT(A.F_contractnumber,d.FSPECIFICATION ) as '订单规格型号' --H()+J
,CASE WHEN E.FNUMBER LIKE 'L%' AND HT.FNUMBER = 'SX' AND ISNULL(b.F_ProjectProposal,'') != '' ,CASE WHEN E.F_114 IS NOT NULL AND E.F_114 !=' ' AND E.F_114 !='' THEN E.F_114 WHEN E.FNUMBER IN ('E','ES','NWE','HKE') THEN '储能、微电风、光储充剩余部分'
THEN CONCAT(b.F_ProjectProposal,'的剩余部分') ELSE E.F_114 END AS '型号分类' ---- WHEN E.FNUMBER IN ('B','BS') THEN 'BMS产品线剩余部分'
,CASE WHEN E.FNUMBER LIKE 'L%' AND HT.FNUMBER = 'SX' AND ISNULL(b.F_ProjectProposal,'') != '' WHEN E.FNUMBER IN ('C','CS','CW','CY') THEN '充电桩剩余部分'
THEN CONCAT(b.F_ProjectProposal,'的剩余部分') ELSE E.F_115 END AS '产品分类'---- WHEN E.FNUMBER not IN ('E','ES','NWE','HKE','BS') THEN '' ELSE E.F_114 END AS '型号分类' ----
,E.F_116 AS '产品线'----线 ,CASE WHEN E.F_115 IS NOT NULL AND E.F_115 !=' ' AND E.F_115 !='' THEN E.F_115 WHEN E.FNUMBER IN ('E','ES','NWE','HKE') THEN '储能、微电风、光储充剩余部分'
WHEN E.FNUMBER IN ('C','CS','CW','CY') THEN '充电桩剩余部分'
WHEN E.FNUMBER IN ('B','BS') THEN 'BMS产品线剩余部分'
WHEN E.FNUMBER NOT IN ('E','ES','NWE','HKE','BS') THEN ''
ELSE E.F_115 END AS '产品分类'----
, CASE WHEN E.F_116 IS NOT NULL AND E.F_116 !=' ' AND E.F_116 !='' THEN E.F_116 WHEN E.FNUMBER IN ('E','ES','NWE','HKE') THEN '储能、微电风、光储充'
WHEN E.FNUMBER IN ('C','CS','CW','CY') THEN '充电桩业务'
WHEN E.FNUMBER IN ('B','BS') THEN 'BMS产品线'
WHEN E.FNUMBER NOT IN ('E','ES','NWE','HKE','BS') THEN ''
ELSE E.F_116 END AS '产品线'----线
--,'' as '业务线' -- --,'' as '业务线' --
,CASE WHEN A.F_VRYF_Combo_lsn LIKE '%XTZHT%' THEN '系统主合同' ,CASE WHEN A.F_VRYF_Combo_lsn LIKE '%XTZHT%' THEN '系统主合同'
WHEN A.F_VRYF_Combo_lsn LIKE '%SXTXS%' THEN '随系统销售' WHEN A.F_VRYF_Combo_lsn LIKE '%SXTXS%' THEN '随系统销售'