111
This commit is contained in:
parent
298a273980
commit
2358d434d9
@ -57,7 +57,7 @@ SELECT A.FID [
|
|||||||
,[整单累计发货金额]=ISNULL( (SELECT SUM(B.FBillAllAmount) AS '累计发货金额' FROM T_SAL_DELIVERYNOTICE SAL WITH(NOLOCK)
|
,[整单累计发货金额]=ISNULL( (SELECT SUM(B.FBillAllAmount) AS '累计发货金额' FROM T_SAL_DELIVERYNOTICE SAL WITH(NOLOCK)
|
||||||
INNER JOIN T_SAL_DELIVERYNOTICEFIN B WITH(NOLOCK) ON SAL.FID =B.FID
|
INNER JOIN T_SAL_DELIVERYNOTICEFIN B WITH(NOLOCK) ON SAL.FID =B.FID
|
||||||
WHERE SAL.FDOCUMENTSTATUS= 'C' AND SAL.F_PAPERCONTRACT = A.F_contractnumber AND SAL.FSALEORGID=a.FSALEORGID),0)
|
WHERE SAL.FDOCUMENTSTATUS= 'C' AND SAL.F_PAPERCONTRACT = A.F_contractnumber AND SAL.FSALEORGID=a.FSALEORGID),0)
|
||||||
+ISNULL((SELECT SUM(F_sendAmount) FROM T_SAL_ORDERENTRY bb WHERE bb.fid=a.fid ) ,0)
|
-- +ISNULL((SELECT SUM(old.发货金额) FROM T_SAL_ORDER bb LEFT JOIN oldk3seorder0701 old ON bb.F_CONTRACTNUMBER=old.合同号 WHERE bb.fid=a.fid ) ,0) //要单独列显示K3数据,因为K3是本位币
|
||||||
|
|
||||||
,[开票日期]=NULL
|
,[开票日期]=NULL
|
||||||
--,[开票日期]=ISNULL((CASE WHEN SUBSTRING(U.FNUMBER,1,1)= 'W' THEN T.开票日期 ELSE T.没有红色的开票日期 END ),'')
|
--,[开票日期]=ISNULL((CASE WHEN SUBSTRING(U.FNUMBER,1,1)= 'W' THEN T.开票日期 ELSE T.没有红色的开票日期 END ),'')
|
||||||
@ -76,7 +76,8 @@ SELECT A.FID [
|
|||||||
FROM T_SAL_RETURNNOTICE AA WITH(NOLOCK)
|
FROM T_SAL_RETURNNOTICE AA WITH(NOLOCK)
|
||||||
INNER JOIN T_SAL_RETURNNOTICEFIN B WITH(NOLOCK) ON AA.FID =B.FID
|
INNER JOIN T_SAL_RETURNNOTICEFIN B WITH(NOLOCK) ON AA.FID =B.FID
|
||||||
WHERE AA.FDOCUMENTSTATUS= 'C' AND aa.FSALEORGID = a.FSALEORGID
|
WHERE AA.FDOCUMENTSTATUS= 'C' AND aa.FSALEORGID = a.FSALEORGID
|
||||||
AND AA.F_SOURPAPERCONTRACT=a.F_CONTRACTNUMBER),0)+ ISNULL((SELECT SUM([退货金额]) FROM [oldk3seorder0701] WHERE a.FSaleOrgId=100302 AND 合同号=a.F_CONTRACTNUMBER),0)
|
AND AA.F_SOURPAPERCONTRACT=a.F_CONTRACTNUMBER),0)
|
||||||
|
-- + ISNULL((SELECT SUM([退货金额]) FROM [oldk3seorder0701] WHERE a.FSaleOrgId=100302 AND 合同号=a.F_CONTRACTNUMBER),0) //要单独列显示K3数据,因为K3是本位币
|
||||||
|
|
||||||
|
|
||||||
,[整单累计开票金额] =AD.发票总金额
|
,[整单累计开票金额] =AD.发票总金额
|
||||||
@ -286,8 +287,8 @@ UPDATE [ZRP_YingShouMingXi_yuyubo] SET [
|
|||||||
[开票日期2]=
|
[开票日期2]=
|
||||||
ISNULL( (
|
ISNULL( (
|
||||||
SELECT
|
SELECT
|
||||||
STRING_AGG(CONVERT(NVARCHAR(10),kaipiaoriqi,23)+'---'+FORMAT( F_GeneralInvoice,'0.00')+'元',',')[开票日期2] FROM (
|
STRING_AGG(CONVERT(NVARCHAR(10),kaipiaoriqi,23)+'---'+FORMAT( F_GeneralInvoice,'0.00')+'元',',')[开票日期2] FROM (
|
||||||
SELECT F_PaperNumber, t0.FSALEORGID,
|
SELECT F_PaperNumber, t0.FSALEORGID,
|
||||||
CASE WHEN F_ORDERCATEGORY ='67283ced82f38d' THEN FINVOICEDATE
|
CASE WHEN F_ORDERCATEGORY ='67283ced82f38d' THEN FINVOICEDATE
|
||||||
WHEN F_ORDERCATEGORY !='67283ced82f38d' AND F_GENERALINVOICE='Y' THEN NULL ELSE FINVOICEDATE END AS kaipiaoriqi
|
WHEN F_ORDERCATEGORY !='67283ced82f38d' AND F_GENERALINVOICE='Y' THEN NULL ELSE FINVOICEDATE END AS kaipiaoriqi
|
||||||
,CASE WHEN F_ORDERCATEGORY ='67283ced82f38d' THEN FAFTERTOTALTAX
|
,CASE WHEN F_ORDERCATEGORY ='67283ced82f38d' THEN FAFTERTOTALTAX
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user