diff --git a/Pilot.Report.Exploitation/SBUYingShouBiao/SBUYingShouBiao.cs b/Pilot.Report.Exploitation/SBUYingShouBiao/SBUYingShouBiao.cs index c3fe72e..3690e66 100644 --- a/Pilot.Report.Exploitation/SBUYingShouBiao/SBUYingShouBiao.cs +++ b/Pilot.Report.Exploitation/SBUYingShouBiao/SBUYingShouBiao.cs @@ -261,7 +261,8 @@ FROM T_SAL_ORDERFIN aa result.Add(new SummaryField("预发货回款额", Kingdee.BOS.Core.Enums.BOSEnums.Enu_SummaryType.SUM)); result.Add(new SummaryField("预发货回款率", Kingdee.BOS.Core.Enums.BOSEnums.Enu_SummaryType.SUM)); result.Add(new SummaryField("回款目标", Kingdee.BOS.Core.Enums.BOSEnums.Enu_SummaryType.SUM)); - + result.Add(new SummaryField("仪表发货金额", Kingdee.BOS.Core.Enums.BOSEnums.Enu_SummaryType.SUM)); + result.Add(new SummaryField("系统验收金额", Kingdee.BOS.Core.Enums.BOSEnums.Enu_SummaryType.SUM)); return result; } diff --git a/非C#代码文件/收款单核销流水存储过程.sql b/非C#代码文件/收款单核销流水存储过程.sql index f293578..baef28f 100644 --- a/非C#代码文件/收款单核销流水存储过程.sql +++ b/非C#代码文件/收款单核销流水存储过程.sql @@ -13,7 +13,7 @@ CREATE PROCEDURE dbo.PR_YingShouSBU_yuyubo @BeginDATE DATETIME='2024-01-01' AS BEGIN -DELETE [ZZZ_HeXiaoBook] WHERE [ShouKuanFDate]>=@BeginDATE +DELETE [ZZZ_HeXiaoBook] WHERE [ShouKuanFDate]>=@BeginDATE OR ShouKuanType>0 DECLARE @FDATE DATETIME,@FBILLNO NVARCHAR(200),@ShouKuanFID INT,@FSALEORGID INT ,@F_contractnumber NVARCHAR(2000),@fid2 INT,@fid3 INT,@amount DECIMAL(18,2),@hexiao DECIMAL(18,2) ,@remark NVARCHAR(200); @@ -53,7 +53,7 @@ ORDER BY FDATE ,[BenCiHeXiao] ,[FSaleOrgId],Note,NoteFid,FExchangeRate,FSettleCurrId,FLOCALCURRID,[ShouKuanType],Remark) ( SELECT a.fid,a.FBILLNO,a.F_CONTRACTNUMBER,@ShouKuanFID,@FBILLNO,@FDATE - ,(CASE WHEN b.FALLAMOUNT22