This commit is contained in:
余宇波 2025-06-09 09:36:26 +08:00
parent c7ef926f9f
commit 7d73c70907
2 changed files with 24 additions and 9 deletions

View File

@ -300,7 +300,8 @@ else
//获取表1
var sql_1 = "";
sql_1 += string.Format($@"/*dialect*/Select * From (Select * From [ReceivablesDetailsTable] where {wheresql}
sql_1 += string.Format($@"/*dialect*/Select * From (Select [FId],[F_001],[F_002],[F_003],[F_004],[F_005],[F_006],[F_007],[F_008],[F_009],[F_010],[F_011],[F_012],[F_013],[F_014],[F_015],[F_016],[F_017],[F_018],[F_019],[F_020],[F_021],[F_022],[F_023],[F_024],[F_025],[F_026],[F_027],[F_028],[F_029],[F_030],[F_031],[F_032],[F_033],[F_034],[F_035],[F_036],[F_037],[F_038],[F_039],[F_040],[F_041],[F_042],[F_043],[F_044],[F_045],[F_046],[F_047],[F_048],[F_049],[F_050],[F_051],[F_052],[F_053],[F_054],[F_055],[F_056],[F_057],[F_058],[F_059],[F_000],[F_060],[F_061],[F_062],[F_063],[销售单主键ID],[销售员ID],[收款条件主键ID],[EditTime],[IfManualEdit],[F_064],[F_065],[F_066],[F_067],[F_068],[BiBie],[HuiLv],[DingDanZongE_YuanBi],[ZeRenRen],[XinYongEDu],[客户编码],[DaoKuanJinE_YuanBi],[YingShouHeJi_YuanBi],[YunZaFei],[LeiJiTuiHuoJinE_YuanBi]
From [ReceivablesDetailsTable] where {wheresql}
Union ALL
(Select
null,null,'',null,null,null,null,null,null,null,SUM(F_010),

View File

@ -156,7 +156,8 @@ SELECT A.FID [
,(SELECT ll.FNAME FROM dbo.T_BD_CURRENCY_L ll WITH(NOLOCK) where ll.FCURRENCYID=fin.FSettleCurrId ) AS []
,fin.FSettleCurrId [ID]
, fin.FExchangeRate []
, (0) []
, (SELECT TOP 1 FCreditAmount FROM T_CRE_CUSTARCHIVESENTRY aa LEFT JOIN T_BD_CUSTOMER bb ON aa.FObjectId=bb.FCUSTID
WHERE aa.FCreditStatus='A' AND aa.FRowAuditStatus='A' AND bb.FNUMBER=Cccc.FNUMBER ORDER BY aa.FExpiryDate desc) []
,Cccc.FNUMBER AS []
,0 [()],0 [()]
,ISNULL(a.F_expenses,0) []
@ -243,14 +244,13 @@ GROUP BY F_PaperNumber, FSALEORGID
--where [] !=''
WHERE []<>0 AND SUBSTRING([],1,1) != 'Z'
ORDER BY A.[ID],[ID],[ID];
UPDATE [ZRP_YingShouMingXi_yuyubo] SET [2]=ISNULL((SELECT STRING_AGG(CONVERT(NVARCHAR(10),SAL.FDATE,23)
+'---'+FORMAT( ISNULL(B.FBillAllAmount_LC,0),'0.00')+''
,',')
AS '发货日期' FROM T_SAL_DELIVERYNOTICE SAL WITH(NOLOCK)
INNER JOIN T_SAL_DELIVERYNOTICEFIN B WITH(NOLOCK) ON SAL.FID =B.FID
WHERE SAL.FDOCUMENTSTATUS= 'C' AND SAL.F_PAPERCONTRACT = []),'')
WHERE SAL.FDOCUMENTSTATUS= 'C' AND SAL.F_PAPERCONTRACT = [] AND sal.FSaleOrgId=[ZRP_YingShouMingXi_yuyubo].ID),'')
,
[2]=
ISNULL( (
@ -298,6 +298,20 @@ UPDATE [ZRP_YingShouMingXi_yuyubo] set
WHEN ISNULL( [],0) = ISNULL([],0) THEN '发货完成' WHEN ISNULL([],0) > ISNULL( [],0) THEN '发货中' END ;
SELECT sum(a.) [] , INTO #temp2 FROM (
SELECT AVG([]) AS [],ID,ID, FROM [ZRP_YingShouMingXi_yuyubo]
GROUP BY ID,ID,) a
GROUP BY
UPDATE [ZRP_YingShouMingXi_yuyubo] SET []=(SELECT CONVERT(NVARCHAR(10),MAX(SAL.FDATE),23)
AS '发货日期' FROM T_SAL_DELIVERYNOTICE SAL WITH(NOLOCK)
INNER JOIN T_SAL_DELIVERYNOTICEFIN B WITH(NOLOCK) ON SAL.FID =B.FID
WHERE SAL.FDOCUMENTSTATUS= 'C' AND SAL.F_PAPERCONTRACT = [] AND sal.FSaleOrgId=[ZRP_YingShouMingXi_yuyubo].ID)
FROM #temp2 b
WHERE [ZRP_YingShouMingXi_yuyubo].=b. and LIKE '%协议付款%' AND [ZRP_YingShouMingXi_yuyubo].[]>0
AND b.[]*[] > []*0.9
DROP TABLE #temp2
update [ZRP_YingShouMingXi_yuyubo] set
[]=CASE WHEN [] IS NOT NULL AND [] <= GETDATE() AND [] >'1990-01-01' AND []>0 THEN [] ELSE NULL END
@ -357,10 +371,10 @@ UPDATE [ZRP_YingShouMingXi_yuyubo] SET [
WHERE [] LIKE '联通%' OR [] LIKE '中国联合网络通信有限公司%'
UPDATE [ZRP_YingShouMingXi_yuyubo] SET []=bb.FCREDITAMOUNT
FROM (SELECT FCreditAmount,b.FUseOrgId,b.FNUMBER FROM T_CRE_CUSTARCHIVESENTRY a LEFT JOIN T_BD_CUSTOMER b ON a.FObjectId=b.FCUSTID
WHERE FCreditStatus='A' AND FRowAuditStatus='A') bb
WHERE bb.FNUMBER=[]
--UPDATE [ZRP_YingShouMingXi_yuyubo] SET []=bb.FCREDITAMOUNT
--FROM (SELECT FCreditAmount,b.FUseOrgId,b.FNUMBER FROM T_CRE_CUSTARCHIVESENTRY a LEFT JOIN T_BD_CUSTOMER b ON a.FObjectId=b.FCUSTID
--WHERE FCreditStatus='A' AND FRowAuditStatus='A') bb
--WHERE bb.FNUMBER=[]
--SELECT TOP 100 []=ISNULL((SELECT STRING_AGG(CONVERT(NVARCHAR(10),SAL.FDATE,23)+'---'+CONVERT(NVARCHAR(100),ROUND(B.FBillAllAmount_LC,2)),',')) AS '发货日期' FROM T_SAL_DELIVERYNOTICE SAL WITH(NOLOCK)
--INNER JOIN T_SAL_DELIVERYNOTICEFIN B WITH(NOLOCK) ON SAL.FID =B.FID