增加字段,调整金蝶DLL的位置

This commit is contained in:
余宇波 2025-03-21 09:53:55 +08:00
parent 1d09121892
commit 8e6ae37c39
17 changed files with 82 additions and 41 deletions

Binary file not shown.

View File

@ -49,47 +49,58 @@
<Reference Include="ExtendedNumerics.BigDecimal, Version=2025.1001.2.129, Culture=neutral, PublicKeyToken=65f1315a45ad8949, processorArchitecture=MSIL">
<HintPath>..\packages\ExtendedNumerics.BigDecimal.2025.1001.2.129\lib\net48\ExtendedNumerics.BigDecimal.dll</HintPath>
</Reference>
<Reference Include="Kingdee.BOS">
<HintPath>..\..\T_MSS\mises\Maxcess\Common\Kingdee\Kingdee.BOS.dll</HintPath>
<Reference Include="Kingdee.BOS, Version=9.0.116.12, Culture=neutral, PublicKeyToken=null" />
<Reference Include="Kingdee.BOS.App, Version=9.0.116.12, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>KingDeeDll\Kingdee.BOS.App.dll</HintPath>
</Reference>
<Reference Include="Kingdee.BOS.App">
<HintPath>..\..\T_MSS\mises\Maxcess\Common\Kingdee\Kingdee.BOS.App.dll</HintPath>
<Reference Include="Kingdee.BOS.Contracts, Version=9.0.116.12, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>KingDeeDll\Kingdee.BOS.Contracts.dll</HintPath>
</Reference>
<Reference Include="Kingdee.BOS.Contracts">
<HintPath>..\..\T_MSS\mises\Maxcess\Common\Kingdee\Kingdee.BOS.Contracts.dll</HintPath>
<Reference Include="Kingdee.BOS.Core, Version=9.0.116.12, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>KingDeeDll\Kingdee.BOS.Core.dll</HintPath>
</Reference>
<Reference Include="Kingdee.BOS.Core">
<HintPath>..\..\T_MSS\mises\Maxcess\Common\Kingdee\Kingdee.BOS.Core.dll</HintPath>
<Reference Include="Kingdee.BOS.DataEntity, Version=9.0.116.12, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>KingDeeDll\Kingdee.BOS.DataEntity.dll</HintPath>
</Reference>
<Reference Include="Kingdee.BOS.DataEntity">
<HintPath>..\..\T_MSS\mises\Maxcess\Common\Kingdee\Kingdee.BOS.DataEntity.dll</HintPath>
<Reference Include="Kingdee.BOS.ServiceHelper, Version=9.0.116.12, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>KingDeeDll\Kingdee.BOS.ServiceHelper.dll</HintPath>
</Reference>
<Reference Include="Kingdee.BOS.ServiceHelper">
<HintPath>..\..\T_MSS\mises\Maxcess\Common\Kingdee\Kingdee.BOS.ServiceHelper.dll</HintPath>
<Reference Include="Kingdee.BOS.VerificationHelper, Version=9.0.78.3, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>KingDeeDll\Kingdee.BOS.VerificationHelper.dll</HintPath>
</Reference>
<Reference Include="Kingdee.BOS.VerificationHelper">
<HintPath>..\..\T_MSS\mises\Maxcess\Common\Kingdee\Kingdee.BOS.VerificationHelper.dll</HintPath>
<Reference Include="Kingdee.BOS.Web, Version=9.0.116.12, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>KingDeeDll\Kingdee.BOS.Web.dll</HintPath>
</Reference>
<Reference Include="Kingdee.BOS.Web">
<HintPath>..\..\T_MSS\mises\Maxcess\Common\Kingdee\Kingdee.BOS.Web.dll</HintPath>
<Reference Include="Kingdee.BOS.Web.HTML, Version=9.0.116.12, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>KingDeeDll\Kingdee.BOS.Web.HTML.dll</HintPath>
</Reference>
<Reference Include="Kingdee.BOS.Web.HTML">
<HintPath>..\..\T_MSS\mises\Maxcess\Common\Kingdee\Kingdee.BOS.Web.HTML.dll</HintPath>
<Reference Include="Kingdee.BOS.Web.HTML.Core, Version=9.0.78.3, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>KingDeeDll\Kingdee.BOS.Web.HTML.Core.dll</HintPath>
</Reference>
<Reference Include="Kingdee.BOS.Web.HTML.Core">
<HintPath>..\..\T_MSS\mises\Maxcess\Common\Kingdee\Kingdee.BOS.Web.HTML.Core.dll</HintPath>
<Reference Include="Kingdee.K3.FIN.Business.PlugIn, Version=9.0.78.3, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>KingDeeDll\Kingdee.K3.FIN.Business.PlugIn.dll</HintPath>
</Reference>
<Reference Include="Kingdee.K3.FIN.Business.PlugIn">
<HintPath>..\..\T_MSS\mises\Maxcess\Common\Kingdee\Kingdee.K3.FIN.Business.PlugIn.dll</HintPath>
<Reference Include="Kingdee.K3.FIN.Core, Version=9.0.116.12, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>KingDeeDll\Kingdee.K3.FIN.Core.dll</HintPath>
</Reference>
<Reference Include="Kingdee.K3.FIN.Core">
<HintPath>..\..\T_MSS\mises\Maxcess\Common\Kingdee\Kingdee.K3.FIN.Core.dll</HintPath>
<Reference Include="Kingdee.K3.FIN.HS.Business.PlugIn, Version=9.0.78.3, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>KingDeeDll\Kingdee.K3.FIN.HS.Business.PlugIn.dll</HintPath>
</Reference>
<Reference Include="Kingdee.K3.FIN.HS.Business.PlugIn">
<HintPath>..\..\T_MSS\mises\Maxcess\Common\Kingdee\Kingdee.K3.FIN.HS.Business.PlugIn.dll</HintPath>
</Reference>
<Reference Include="Kingdee.K3.FIN.HS.ServiceHelper">
<HintPath>..\..\T_MSS\mises\Maxcess\Common\Kingdee\Kingdee.K3.FIN.HS.ServiceHelper.dll</HintPath>
<Reference Include="Kingdee.K3.FIN.HS.ServiceHelper, Version=9.0.78.3, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>KingDeeDll\Kingdee.K3.FIN.HS.ServiceHelper.dll</HintPath>
</Reference>
<Reference Include="MathNet.Numerics, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cd8b63ad3d691a37, processorArchitecture=MSIL">
<HintPath>..\packages\MathNet.Numerics.Signed.5.0.0\lib\net48\MathNet.Numerics.dll</HintPath>
@ -203,7 +214,22 @@
<None Include="app.config" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup />
<ItemGroup>
<Content Include="KingDeeDll\Kingdee.BOS.App.dll" />
<Content Include="KingDeeDll\Kingdee.BOS.Contracts.dll" />
<Content Include="KingDeeDll\Kingdee.BOS.Core.dll" />
<Content Include="KingDeeDll\Kingdee.BOS.DataEntity.dll" />
<Content Include="KingDeeDll\Kingdee.BOS.dll" />
<Content Include="KingDeeDll\Kingdee.BOS.ServiceHelper.dll" />
<Content Include="KingDeeDll\Kingdee.BOS.VerificationHelper.dll" />
<Content Include="KingDeeDll\Kingdee.BOS.Web.dll" />
<Content Include="KingDeeDll\Kingdee.BOS.Web.HTML.Core.dll" />
<Content Include="KingDeeDll\Kingdee.BOS.Web.HTML.dll" />
<Content Include="KingDeeDll\Kingdee.K3.FIN.Business.PlugIn.dll" />
<Content Include="KingDeeDll\Kingdee.K3.FIN.Core.dll" />
<Content Include="KingDeeDll\Kingdee.K3.FIN.HS.Business.PlugIn.dll" />
<Content Include="KingDeeDll\Kingdee.K3.FIN.HS.ServiceHelper.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>

View File

@ -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()))

View File

@ -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]