diff --git a/Pilot.Report.Exploitation/KingDeeDll/Kingdee.BOS.App.dll b/Pilot.Report.Exploitation/KingDeeDll/Kingdee.BOS.App.dll new file mode 100644 index 0000000..b1467d2 Binary files /dev/null and b/Pilot.Report.Exploitation/KingDeeDll/Kingdee.BOS.App.dll differ diff --git a/Pilot.Report.Exploitation/KingDeeDll/Kingdee.BOS.Contracts.dll b/Pilot.Report.Exploitation/KingDeeDll/Kingdee.BOS.Contracts.dll new file mode 100644 index 0000000..2da2dc6 Binary files /dev/null and b/Pilot.Report.Exploitation/KingDeeDll/Kingdee.BOS.Contracts.dll differ diff --git a/Pilot.Report.Exploitation/KingDeeDll/Kingdee.BOS.Core.dll b/Pilot.Report.Exploitation/KingDeeDll/Kingdee.BOS.Core.dll new file mode 100644 index 0000000..cedd95a Binary files /dev/null and b/Pilot.Report.Exploitation/KingDeeDll/Kingdee.BOS.Core.dll differ diff --git a/Pilot.Report.Exploitation/KingDeeDll/Kingdee.BOS.DataEntity.dll b/Pilot.Report.Exploitation/KingDeeDll/Kingdee.BOS.DataEntity.dll new file mode 100644 index 0000000..d0baa93 Binary files /dev/null and b/Pilot.Report.Exploitation/KingDeeDll/Kingdee.BOS.DataEntity.dll differ diff --git a/Pilot.Report.Exploitation/KingDeeDll/Kingdee.BOS.ServiceHelper.dll b/Pilot.Report.Exploitation/KingDeeDll/Kingdee.BOS.ServiceHelper.dll new file mode 100644 index 0000000..9240855 Binary files /dev/null and b/Pilot.Report.Exploitation/KingDeeDll/Kingdee.BOS.ServiceHelper.dll differ diff --git a/Pilot.Report.Exploitation/KingDeeDll/Kingdee.BOS.VerificationHelper.dll b/Pilot.Report.Exploitation/KingDeeDll/Kingdee.BOS.VerificationHelper.dll new file mode 100644 index 0000000..4160c23 Binary files /dev/null and b/Pilot.Report.Exploitation/KingDeeDll/Kingdee.BOS.VerificationHelper.dll differ diff --git a/Pilot.Report.Exploitation/KingDeeDll/Kingdee.BOS.Web.HTML.Core.dll b/Pilot.Report.Exploitation/KingDeeDll/Kingdee.BOS.Web.HTML.Core.dll new file mode 100644 index 0000000..1c37225 Binary files /dev/null and b/Pilot.Report.Exploitation/KingDeeDll/Kingdee.BOS.Web.HTML.Core.dll differ diff --git a/Pilot.Report.Exploitation/KingDeeDll/Kingdee.BOS.Web.HTML.dll b/Pilot.Report.Exploitation/KingDeeDll/Kingdee.BOS.Web.HTML.dll new file mode 100644 index 0000000..37a8a8a Binary files /dev/null and b/Pilot.Report.Exploitation/KingDeeDll/Kingdee.BOS.Web.HTML.dll differ diff --git a/Pilot.Report.Exploitation/KingDeeDll/Kingdee.BOS.Web.dll b/Pilot.Report.Exploitation/KingDeeDll/Kingdee.BOS.Web.dll new file mode 100644 index 0000000..ae56477 Binary files /dev/null and b/Pilot.Report.Exploitation/KingDeeDll/Kingdee.BOS.Web.dll differ diff --git a/Pilot.Report.Exploitation/KingDeeDll/Kingdee.BOS.dll b/Pilot.Report.Exploitation/KingDeeDll/Kingdee.BOS.dll new file mode 100644 index 0000000..0b9ac56 Binary files /dev/null and b/Pilot.Report.Exploitation/KingDeeDll/Kingdee.BOS.dll differ diff --git a/Pilot.Report.Exploitation/KingDeeDll/Kingdee.K3.FIN.Business.PlugIn.dll b/Pilot.Report.Exploitation/KingDeeDll/Kingdee.K3.FIN.Business.PlugIn.dll new file mode 100644 index 0000000..475189f Binary files /dev/null and b/Pilot.Report.Exploitation/KingDeeDll/Kingdee.K3.FIN.Business.PlugIn.dll differ diff --git a/Pilot.Report.Exploitation/KingDeeDll/Kingdee.K3.FIN.Core.dll b/Pilot.Report.Exploitation/KingDeeDll/Kingdee.K3.FIN.Core.dll new file mode 100644 index 0000000..ab998e9 Binary files /dev/null and b/Pilot.Report.Exploitation/KingDeeDll/Kingdee.K3.FIN.Core.dll differ diff --git a/Pilot.Report.Exploitation/KingDeeDll/Kingdee.K3.FIN.HS.Business.PlugIn.dll b/Pilot.Report.Exploitation/KingDeeDll/Kingdee.K3.FIN.HS.Business.PlugIn.dll new file mode 100644 index 0000000..30800be Binary files /dev/null and b/Pilot.Report.Exploitation/KingDeeDll/Kingdee.K3.FIN.HS.Business.PlugIn.dll differ diff --git a/Pilot.Report.Exploitation/KingDeeDll/Kingdee.K3.FIN.HS.ServiceHelper.dll b/Pilot.Report.Exploitation/KingDeeDll/Kingdee.K3.FIN.HS.ServiceHelper.dll new file mode 100644 index 0000000..913d2da Binary files /dev/null and b/Pilot.Report.Exploitation/KingDeeDll/Kingdee.K3.FIN.HS.ServiceHelper.dll differ diff --git a/Pilot.Report.Exploitation/Pilot.Report.Exploitation.csproj b/Pilot.Report.Exploitation/Pilot.Report.Exploitation.csproj index 3f7bbfd..ebd5e88 100644 --- a/Pilot.Report.Exploitation/Pilot.Report.Exploitation.csproj +++ b/Pilot.Report.Exploitation/Pilot.Report.Exploitation.csproj @@ -49,47 +49,58 @@ ..\packages\ExtendedNumerics.BigDecimal.2025.1001.2.129\lib\net48\ExtendedNumerics.BigDecimal.dll - - ..\..\T_MSS\mises\Maxcess\Common\Kingdee\Kingdee.BOS.dll + + + False + KingDeeDll\Kingdee.BOS.App.dll - - ..\..\T_MSS\mises\Maxcess\Common\Kingdee\Kingdee.BOS.App.dll + + False + KingDeeDll\Kingdee.BOS.Contracts.dll - - ..\..\T_MSS\mises\Maxcess\Common\Kingdee\Kingdee.BOS.Contracts.dll + + False + KingDeeDll\Kingdee.BOS.Core.dll - - ..\..\T_MSS\mises\Maxcess\Common\Kingdee\Kingdee.BOS.Core.dll + + False + KingDeeDll\Kingdee.BOS.DataEntity.dll - - ..\..\T_MSS\mises\Maxcess\Common\Kingdee\Kingdee.BOS.DataEntity.dll + + False + KingDeeDll\Kingdee.BOS.ServiceHelper.dll - - ..\..\T_MSS\mises\Maxcess\Common\Kingdee\Kingdee.BOS.ServiceHelper.dll + + False + KingDeeDll\Kingdee.BOS.VerificationHelper.dll - - ..\..\T_MSS\mises\Maxcess\Common\Kingdee\Kingdee.BOS.VerificationHelper.dll + + False + KingDeeDll\Kingdee.BOS.Web.dll - - ..\..\T_MSS\mises\Maxcess\Common\Kingdee\Kingdee.BOS.Web.dll + + False + KingDeeDll\Kingdee.BOS.Web.HTML.dll - - ..\..\T_MSS\mises\Maxcess\Common\Kingdee\Kingdee.BOS.Web.HTML.dll + + False + KingDeeDll\Kingdee.BOS.Web.HTML.Core.dll - - ..\..\T_MSS\mises\Maxcess\Common\Kingdee\Kingdee.BOS.Web.HTML.Core.dll + + False + KingDeeDll\Kingdee.K3.FIN.Business.PlugIn.dll - - ..\..\T_MSS\mises\Maxcess\Common\Kingdee\Kingdee.K3.FIN.Business.PlugIn.dll + + False + KingDeeDll\Kingdee.K3.FIN.Core.dll - - ..\..\T_MSS\mises\Maxcess\Common\Kingdee\Kingdee.K3.FIN.Core.dll + + False + KingDeeDll\Kingdee.K3.FIN.HS.Business.PlugIn.dll - - ..\..\T_MSS\mises\Maxcess\Common\Kingdee\Kingdee.K3.FIN.HS.Business.PlugIn.dll - - - ..\..\T_MSS\mises\Maxcess\Common\Kingdee\Kingdee.K3.FIN.HS.ServiceHelper.dll + + False + KingDeeDll\Kingdee.K3.FIN.HS.ServiceHelper.dll ..\packages\MathNet.Numerics.Signed.5.0.0\lib\net48\MathNet.Numerics.dll @@ -203,7 +214,22 @@ - + + + + + + + + + + + + + + + + diff --git a/Pilot.Report.Exploitation/Receivables/ReceivablesDetails.cs b/Pilot.Report.Exploitation/Receivables/ReceivablesDetails.cs index 6388fbe..98e72fe 100644 --- a/Pilot.Report.Exploitation/Receivables/ReceivablesDetails.cs +++ b/Pilot.Report.Exploitation/Receivables/ReceivablesDetails.cs @@ -315,9 +315,10 @@ else FROM ( SELECT DISTINCT [销售单主键ID],hh.收款条件主键ID,F_036 FROM [ReceivablesDetailsTable] hh where {wheresql} ) a ) ,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,0,0,0,null,0 + , null, null, null, null, null From (select distinct [销售单主键ID],[销售员ID],[F_010],F_017,F_018,F_019,F_020,F_021,F_022 ,0 as F_024 ,F_025, - 0 as F_027,0 F_036 , null, null, null, null, null from + 0 as F_027,0 F_036 from [ReceivablesDetailsTable] where {wheresql} ) a )) W Order by W.F_001"); @@ -485,8 +486,8 @@ else #endregion } } - Loghelp.Log("合计"); - Loghelp.Log(sql_1); + //Loghelp.Log("合计"); + //Loghelp.Log(sql_1); var sql_List1 = DBUtils.ExecuteDynamicObject(Context, sql_1); int indexi = 0; @@ -628,6 +629,16 @@ else this.View.Model.SetValue("F_062", item["F_062"], indexi); //63 this.View.Model.SetValue("F_063", item["F_063"], indexi); + //64 + this.View.Model.SetValue("F_064", item["F_064"], indexi); + //65 + this.View.Model.SetValue("F_065", item["F_065"], indexi); + //66 + this.View.Model.SetValue("F_066", item["F_066"], indexi); + //67 + this.View.Model.SetValue("F_067", item["F_067"], indexi); + //68 + this.View.Model.SetValue("F_068", item["F_068"], indexi); //【订单总额、累计发货金额、累计退货金额、累计开票金额、累计到款金额、应收款合计、未出货总额、实际已出货应收款合计、】的明细需要去重 if (dicList.ContainsKey(item["销售单主键ID"].ToString() + "-" + item["销售员ID"].ToString())) diff --git a/应收明细SQL.sql b/应收明细SQL.sql index 06f69e7..014486e 100644 --- a/应收明细SQL.sql +++ b/应收明细SQL.sql @@ -209,7 +209,7 @@ update [ZRP_YingShouMingXi_yuyubo] set [ ,[ʱ]=CASE WHEN [ԤƵʱ] <= GETDATE() AND [ԤƵʱ] >'1990-01-01' THEN [ԤƵʱ] ELSE NULL END ,[ڽ]=CASE WHEN [ԤƵʱ] <= GETDATE() AND [ԤƵʱ] >'1990-01-01' THEN([ۼƷ]-[ۼ˻]-[ۼƵ])*[̯]*0.01*ISNULL([տ̯],100)*0.01 ELSE 0 END ,[ʵѳӦտϼ]=([ۼƷ]-[ۼ˻]- [ۼƵ] )*[̯]*0.01 -,[տ]=CASE WHEN []>6 THEN 'תӦרС' ELSE [Ա] END +,[տ]=CASE WHEN []>12 THEN 'תӦרС' ELSE [Ա] END ,[Ŀ׶]= CASE WHEN ISNULL([Ŀ],'') <> '' THEN [Ŀ] WHEN ISNULL([ۼƷ],0) = 0 THEN 'δ' WHEN ISNULL( [ۼƷ],0) = ISNULL([ܶ],0) THEN '' WHEN ISNULL([ܶ],0) > ISNULL( [ۼƷ],0) then '' END ,[-׶]=CASE WHEN []>=1 AND []<=6 THEN '1-6' WHEN []>=7 AND []<=12 THEN '7-12' WHEN []>=13 AND []<=18 @@ -218,9 +218,11 @@ WHEN ISNULL( [ --THEN 'ʦ' WHEN []>=19 THEN '' ELSE '' END ,[1-6]=CASE WHEN []>=1 AND []<=6 THEN [̯]-([ۼ˻]+[ۼƵ])*[̯]*0.01 ELSE 0 END ,[7-12]=CASE WHEN []>=7 AND []<=12 THEN [̯]-([ۼ˻]+[ۼƵ])*[̯]*0.01 ELSE 0 END - ,[13-18]=CASE WHEN []>=13 AND []<=18 THEN [̯]-([ۼ˻]+[ۼƵ])*[̯]*0.01 ELSE 0 END - ,[19]=CASE WHEN []>=19 THEN [̯]-([ۼ˻]+[ۼƵ])*[̯]*0.01 ELSE 0 END - ,[1]=CASE WHEN []>=12 THEN [̯]-([ۼ˻]+[ۼƵ])*[̯]*0.01 ELSE 0 END + ,[1-2]=CASE WHEN []>=13 AND []<=24 THEN [̯]-([ۼ˻]+[ۼƵ])*[̯]*0.01 ELSE 0 END + ,[2-3]=CASE WHEN []>=25 AND []<=36 THEN [̯]-([ۼ˻]+[ۼƵ])*[̯]*0.01 ELSE 0 END + ,[4-5]=CASE WHEN []>=37 AND []<=60 THEN [̯]-([ۼ˻]+[ۼƵ])*[̯]*0.01 ELSE 0 END + ,[5]=CASE WHEN []> 60 THEN [̯]-([ۼ˻]+[ۼƵ])*[̯]*0.01 ELSE 0 END + FROM [ZRP_YingShouMingXi_yuyubo] A update [ZRP_YingShouMingXi_yuyubo] SET []=CASE WHEN [] > '1990-01-01' THEN [] ELSE NULL END ,[]=CASE WHEN [] > '1990-01-01' THEN [] ELSE NULL END @@ -236,9 +238,10 @@ update [ZRP_YingShouMingXi_yuyubo] SET [ ,[F_022]=[δܶ],[F_023]=CONVERT(NVARCHAR(20),[ԤƵʱ],23),[F_024]=[δڽ],[F_025]=[ʵѳӦտϼ],[F_026]=[ʱ],[F_027]=[ڽ],[F_028]=[տ] ,[F_029]=[Ŀ׶],[F_030]=[Ŀ],[F_031]=[Ŀʱ],[F_032]=[Ŀʱ],[F_033]=[ʱ],[F_034]=CONVERT(NVARCHAR(20),[ʱʱ],23),[F_035]=[Ƿǰ] ,[F_036]=[],[F_037]=[-׶],[F_038]=[1-6],[F_039]=[7-12],[F_040]=[13-18],[F_041]=[19],[F_042]=[1],[F_043]=[] - ,[F_044]=[],[F_045]=[],[F_046]=CONVERT(NVARCHAR(20),[תרСʱ],23),[F_047]=[Ƿת],[F_048]=[Ƿ黹],[F_049]=[Ա] + ,[F_044]=[],[F_045]=[],[F_046]=CONVERT(NVARCHAR(20),[תרСʱ],23),[F_047]=[Ƿת],[F_048]=[Ƿ黹],[F_049]=[] ,[F_050]=[÷],[F_051]=[ȡֵ],[F_052]=[Ƿ],[F_053]=[ǷԤ] ,[F_059]=[ͬ],[F_000]=[֯ID],[F_062]=[Ƿ񼯲Ŀ],[F_063]=[],[EditTime]=GETDATE() + ,[F_064]=[1-2],[F_065]=[2-3],[F_066]=[3-4],[F_067]=[4-5],[F_068]=[5] FROM [ZRP_YingShouMingXi_yuyubo] B WHERE [ReceivablesDetailsTable].[ԱID]=b.[ԱID] AND [ReceivablesDetailsTable].[۵ID]=B.[۵ID] AND [ReceivablesDetailsTable].[տID]=B.[տID] @@ -253,15 +256,16 @@ update [ZRP_YingShouMingXi_yuyubo] SET [ INSERT INTO [ReceivablesDetailsTable] ( [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_059],[F_000] ,[F_062],[F_063],[۵ID],[ԱID],[տID],[EditTime],[IfManualEdit]) + [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_059],[F_000] ,[F_062],[F_063],[۵ID],[ԱID],[տID],[EditTime],[IfManualEdit] + ,[F_064],[F_065],[F_066],[F_067],[F_068]) SELECT [۵ID],[Ա],[SBU],[ϸ],[λ],[˾],[ͻ] ,[ֽʺͬ],[Ŀ],[ܶ],[ǩ],CONVERT(NVARCHAR(20),[],23),[տ],CONVERT(NVARCHAR(20), [],23), [Ӧձ],CONVERT(NVARCHAR(20),[Ʊ],23),[ۼƷ],[ۼ˻],[ۼƿƱ],[ۼƵ],[Ӧտϼ],[δܶ],CONVERT(NVARCHAR(20),[ԤƵʱ],23) ,[δڽ],[ʵѳӦտϼ],CONVERT(NVARCHAR(20),[ʱ],23) ,[ڽ],[տ],[Ŀ׶],[Ŀ],[Ŀʱ],[Ŀʱ],[ʱ],CONVERT(NVARCHAR(20),[ʱʱ],23),[Ƿǰ],[],[-׶],[1-6],[7-12],[13-18],[19] - ,[1],[],[],[],CONVERT(NVARCHAR(20),[תרСʱ],23),[Ƿת],[Ƿ黹],[Ա],[÷],[ȡֵ],[Ƿ],[ǷԤ] + ,[1],[],[],[],CONVERT(NVARCHAR(20),[תרСʱ],23),[Ƿת],[Ƿ黹],[],[÷],[ȡֵ],[Ƿ],[ǷԤ] ,[ͬ] ,[֯ID],[Ƿ񼯲Ŀ],[] - ,[۵ID],[ԱID],[տID],GETDATE(),0 + ,[۵ID],[ԱID],[տID],GETDATE(),0,[1-2],[2-3],[3-4],[4-5],[5] FROM [ZRP_YingShouMingXi_yuyubo] WHERE ISNULL([ǷѴ],0)=0 --DELETE [ReceivablesDetailsTable]