This commit is contained in:
余宇波 2025-08-14 17:27:25 +08:00
parent b1949ecace
commit 0fb2096e55
2 changed files with 8 additions and 7 deletions

View File

@ -508,7 +508,7 @@ FROM #PLChongDianZhuangHeTong ;");
NULL NULL
END AS 'OrderAllAmount', -- END AS 'OrderAllAmount', --
CASE CASE
WHEN ROW_NUMBER() OVER (PARTITION BY A.F_CONTRACTNUMBER ORDER BY fid desc ,FIDENTITYID) = 1 THEN WHEN ROW_NUMBER() OVER (PARTITION BY A.F_CONTRACTNUMBER ORDER BY A.fid desc ,B.FENTRYID) = 1 THEN
C.FBILLALLAMOUNT_LC - ISNULL(ABS(B3.FBillAllAmount_LC), 0) - ISNULL(H6.FALLAMOUNT_LC, 0) C.FBILLALLAMOUNT_LC - ISNULL(ABS(B3.FBillAllAmount_LC), 0) - ISNULL(H6.FALLAMOUNT_LC, 0)
ELSE ELSE
NULL NULL
@ -790,7 +790,7 @@ where TableName IN ('#PLChongDianZhuangHeTong') AND #tempDaBiao.AFBILLNO=B.AFBIL
sql += string.Format($@"/*dialect*/ sql += string.Format($@"/*dialect*/
Select Select
*, *,
ROW_NUMBER() OVER (ORDER BY Date desc,FID DESC,FENTRYID) AS FIDENTITYID ROW_NUMBER() OVER (ORDER BY Date desc,FID DESC ,[TableName],FENTRYID) AS FIDENTITYID
INTO {tableName} INTO {tableName}
From From
(SELECT [TableName] (SELECT [TableName]
@ -881,7 +881,7 @@ where TableName IN ('#PLChongDianZhuangHeTong') AND #tempDaBiao.AFBILLNO=B.AFBIL
{ {
ReportTitles reportTitles = new ReportTitles(); ReportTitles reportTitles = new ReportTitles();
DynamicObject customFilter = filter.FilterParameter.CustomFilter; DynamicObject customFilter = filter.FilterParameter.CustomFilter;
if (customFilter != null) if (customFilter != null)
{ {
// 下单时间 // 下单时间

View File

@ -25,7 +25,7 @@ BEGIN
,[退],[],[],[],[],[],[],[],[],[],[], ,[退],[],[],[],[],[],[],[],[],[],[],
[1-6],[7-12],[13-18],[19],[1],[-],[],[ID],[],[],[],[],[],[] [1-6],[7-12],[13-18],[19],[1],[-],[],[ID],[],[],[],[],[],[]
,[],[ID],[],[],[],[()],[()] ,[],[] ,[],[],[],[] ,[],[ID],[],[],[],[()],[()] ,[],[] ,[],[],[],[]
,[K3整单累计发货金额()],[K3整单累计退货金额()],[K3整单累计专票金额()],[K3整单累计普票金额()],[K3累计发货金额()],[K3累计退货金额()],[K3累计专票金额()],[K3累计普票金额()]) ,[K3整单累计发货金额()],[K3整单累计退货金额()],[K3整单累计专票金额()],[K3整单累计普票金额()],[K3累计发货金额()],[K3累计退货金额()],[K3累计专票金额()],[K3累计普票金额()],)
SELECT SELECT
[ID],[ID],[ID],[],[F_RecConditionId],[],[],[],[],[SBU] [ID],[ID],[ID],[],[F_RecConditionId],[],[],[],[],[SBU]
,[],[],[],[],[],[],[],[],[],[],[], ,[],[],[],[],[],[],[],[],[],[],[],
@ -35,7 +35,7 @@ SELECT
,0 [退],0 [],0 [],0 [],0 [],NULL [],0 [],0 [],NULL [],NULL [],0 [], ,0 [退],0 [],0 [],0 [],0 [],NULL [],0 [],0 [],NULL [],NULL [],0 [],
NULL [1-6],NULL [7-12],NULL [13-18],NULL [19],NULL [1],NULL [-],NULL [],[ID],[],[],[],[],[] NULL [1-6],NULL [7-12],NULL [13-18],NULL [19],NULL [1],NULL [-],NULL [],[ID],[],[],[],[],[]
,[] ,[],[ID],[],[],[],[()],[()],[],[] ,[],[],[],[] ,[] ,[],[ID],[],[],[],[()],[()],[],[] ,[],[],[],[]
,0 [K3整单累计发货金额()],0 [K3整单累计退货金额()],0 [K3整单累计专票金额()],0 [K3整单累计普票金额()],0 [K3累计发货金额()],0 [K3累计退货金额()],0 [K3累计专票金额()],0 [K3累计普票金额()] ,0 [K3整单累计发货金额()],0 [K3整单累计退货金额()],0 [K3整单累计专票金额()],0 [K3整单累计普票金额()],0 [K3累计发货金额()],0 [K3累计退货金额()],0 [K3累计专票金额()],0 [K3累计普票金额()],
FROM ( FROM (
SELECT A.FID [ID] SELECT A.FID [ID]
,ISNULL(O.fid,l.fid) [ID] ,ISNULL(O.fid,l.fid) [ID]
@ -178,6 +178,7 @@ WHERE aa.FCreditStatus='A' AND aa.FRowAuditStatus='A' AND bb.FNUMBER=Cccc.FNUMBE
,Cccc.FNUMBER AS [] ,Cccc.FNUMBER AS []
,0 [()],0 [()] ,0 [()],0 [()]
,ISNULL(a.F_expenses,0) [] ,ISNULL(a.F_expenses,0) []
,ISNULL(a.F_expenses,0) []
,ISNULL(ISNULL(N.F_res,O.FNAME),L.FNAME) [],w.[],0 [],0 [] ,ISNULL(ISNULL(N.F_res,O.FNAME),L.FNAME) [],w.[],0 [],0 []
,uuu.FNAME AS [] ,uuu.FNAME AS []
-----------------from -------- -----------------from --------
@ -356,7 +357,7 @@ UPDATE [ZRP_YingShouMingXi_yuyubo] set
--,[]=CASE WHEN [] IS NOT NULL AND [] <= GETDATE() AND [] >'1990-01-01' AND []>0 THEN [] ELSE NULL END --,[]=CASE WHEN [] IS NOT NULL AND [] <= GETDATE() AND [] >'1990-01-01' AND []>0 THEN [] ELSE NULL END
--,[]=CASE WHEN [] IS NOT NULL AND [] <= GETDATE() AND [] >'1990-01-01' AND []>0 THEN([]-[退]-[])*[]*0.01*ISNULL([],100)*0.01 ELSE 0 END --,[]=CASE WHEN [] IS NOT NULL AND [] <= GETDATE() AND [] >'1990-01-01' AND []>0 THEN([]-[退]-[])*[]*0.01*ISNULL([],100)*0.01 ELSE 0 END
,[]=CASE WHEN [] >0 THEN ([]+[K3整单累计发货金额()]-[退]-[K3整单累计退货金额()]/- [] )*[]*0.01 ELSE 0 end ,[]=CASE WHEN [] >0 THEN ([]+[K3整单累计发货金额()]-[退]-[K3整单累计退货金额()]/- [] )*[]*0.01+[] ELSE 0 end
,[]= CASE WHEN []>='1990-01-01' AND [] IS NOT NULL THEN '验收完成' ,[]= CASE WHEN []>='1990-01-01' AND [] IS NOT NULL THEN '验收完成'
WHEN []>='1990-01-01' AND [] IS NOT NULL THEN '调试完成' WHEN []>='1990-01-01' AND [] IS NOT NULL THEN '调试完成'
WHEN ISNULL([],'') <> '' THEN [] WHEN ISNULL([],0) = 0 THEN '未启动' WHEN ISNULL([],'') <> '' THEN [] WHEN ISNULL([],0) = 0 THEN '未启动'
@ -618,7 +619,7 @@ FROM
,[K3累计专票金额()] ,[K3累计专票金额()]
,[K3累计普票金额()] ,[K3累计普票金额()]
FROM [ZRP_YingShouMingXi_yuyubo] A FROM [ZRP_YingShouMingXi_yuyubo] A
WHERE ([]-[退()]-[K3整单累计退货金额()]/)<>[()] WHERE ([]-[退()]-[K3整单累计退货金额()]/+[])<>[()]
ORDER BY A.[ID],[ID],[ID]; ORDER BY A.[ID],[ID],[ID];
update ReceivablesDetailsTable set F_061=B.F_061, F_054=B.F_054 ,F_055=B.F_055,F_056=B.F_056 update ReceivablesDetailsTable set F_061=B.F_061, F_054=B.F_054 ,F_055=B.F_055,F_056=B.F_056