Develop/Piolot_RepotForm_PeiHao
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Pilot.Report.Exploitation/KingDeeDll/Kingdee.BOS.App.dll Normal file
View File

Binary file not shown.

BIN
Pilot.Report.Exploitation/KingDeeDll/Kingdee.BOS.Contracts.dll Normal file
View File

Binary file not shown.

BIN
Pilot.Report.Exploitation/KingDeeDll/Kingdee.BOS.Core.dll Normal file
View File

Binary file not shown.

BIN
Pilot.Report.Exploitation/KingDeeDll/Kingdee.BOS.DataEntity.dll Normal file
View File

Binary file not shown.

BIN
Pilot.Report.Exploitation/KingDeeDll/Kingdee.BOS.ServiceHelper.dll Normal file
View File

Binary file not shown.

BIN
Pilot.Report.Exploitation/KingDeeDll/Kingdee.BOS.VerificationHelper.dll Normal file
View File

Binary file not shown.

BIN
Pilot.Report.Exploitation/KingDeeDll/Kingdee.BOS.Web.HTML.Core.dll Normal file
View File

Binary file not shown.

BIN
Pilot.Report.Exploitation/KingDeeDll/Kingdee.BOS.Web.HTML.dll Normal file
View File

Binary file not shown.

BIN
Pilot.Report.Exploitation/KingDeeDll/Kingdee.BOS.Web.dll Normal file
View File

Binary file not shown.

BIN
Pilot.Report.Exploitation/KingDeeDll/Kingdee.BOS.dll Normal file
View File

Binary file not shown.

BIN
Pilot.Report.Exploitation/KingDeeDll/Kingdee.K3.FIN.Business.PlugIn.dll Normal file
View File

Binary file not shown.

BIN
Pilot.Report.Exploitation/KingDeeDll/Kingdee.K3.FIN.Core.dll Normal file
View File

Binary file not shown.

BIN
Pilot.Report.Exploitation/KingDeeDll/Kingdee.K3.FIN.HS.Business.PlugIn.dll Normal file
View File

Binary file not shown.

BIN
Pilot.Report.Exploitation/KingDeeDll/Kingdee.K3.FIN.HS.ServiceHelper.dll Normal file
View File

Binary file not shown.

86
Pilot.Report.Exploitation/Pilot.Report.Exploitation.csproj
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>

17
Pilot.Report.Exploitation/Receivables/ReceivablesDetails.cs
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()))