From 3682fcfee958a946752ffc99c14f152b047ea6a9 Mon Sep 17 00:00:00 2001 From: 王 垚 <1402714037@qq.com> Date: 星期一, 22 三月 2021 14:53:21 +0800 Subject: [PATCH] 日计划重复导入 实现方式修改 增加判断 --- src/BLL/Demo.TimedTaskPlugIn/Config/kdapi.config | 9 + src/BLL/Demo.BillView/Config/kdapi.config | 6 src/BLL/Demo.TimedTaskPlugIn/Demo.TimedTaskPlugIn.csproj | 15 + src/BLL/Demo.BillView/app.config | 12 src/BLL/Demo.DynamicForm/Config/kdapi.config | 9 + src/BLL/Demo.TimedTaskPlugIn/PRD/DayPlanPPBomBillTimeTask.cs | 3 src/BLL/Demo.TimedTaskPlugIn/PRD/StockChangeDynamicAlignment.cs | 6 src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs | 8 src/BLL/Demo.Report/Demo.Report.csproj | 19 ++ src/BLL/Demo.ListView/Config/kdapi.config | 9 + src/BLL/Demo.Report/Config/kdapi.config | 9 + src/BLL/Demo.Utility/Demo.Utility.csproj | 18 ++ src/BLL/Demo.CommonFilter/Config/kdapi.config | 9 + src/BLL/Demo.TimedTaskPlugIn/app.config | 11 + src/BLL/Demo.CommonFilter/packages.config | 3 src/BLL/Demo.ListView/packages.config | 3 src/BLL/Demo.Utility/Config/kdapi.config | 9 + src/BLL/Demo.OperationService/packages.config | 3 src/BLL/Demo.BillView/PRD/Pro_TlPush.cs | 2 src/BLL/Demo.TimedTaskPlugIn/packages.config | 1 src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs | 13 - src/BLL/Demo.SysReportView/Config/kdapi.config | 9 + src/BLL/Demo.BillView/Demo.BillView.csproj | 17 + src/BLL/Demo.CommonFilter/Demo.CommonFilter.csproj | 19 ++ src/BLL/Demo.Report/packages.config | 3 src/BLL/Demo.SysReportView/Demo.SysReportView.csproj | 19 ++ src/BLL/Demo.OperationService/Config/kdapi.config | 9 + src/BLL/Demo.BillView/packages.config | 3 src/Model/Demo.Model/Model/DayPlanModel.cs | 2 src/BLL/Demo.ListView/Demo.ListView.csproj | 19 ++ src/BLL/Demo.DynamicForm/packages.config | 6 src/BLL/Demo.SysReportView/packages.config | 3 /dev/null | 60 -------- src/BLL/Demo.Utility/packages.config | 2 src/BLL/Demo.DynamicForm/Demo.DynamicForm.csproj | 22 +++ src/BLL/Demo.OperationService/Demo.OperationService.csproj | 15 ++ 36 files changed, 278 insertions(+), 107 deletions(-) diff --git a/src/BLL/Demo.BillView/Config/kdapi.config b/src/BLL/Demo.BillView/Config/kdapi.config index f8141a0..25b63df 100644 --- a/src/BLL/Demo.BillView/Config/kdapi.config +++ b/src/BLL/Demo.BillView/Config/kdapi.config @@ -1,9 +1,9 @@ 锘�<?xml version="1.0" encoding="utf-8" ?> <configuration> <appSettings> - <add key="DbId" value="5f9258a311401c"></add> - <add key="UserName" value="Administrator"></add> + <add key="DbId" value="5e8c33972fbb61"></add> + <add key="UserName" value="Administrator"></add> <add key="PassWord" value="888888"></add> - <add key="KDApiUrl" value="http://localhost//k3cloud/"></add> + <add key="KDApiUrl" value="http://localhost/K3Cloud/"></add> </appSettings> </configuration> \ No newline at end of file diff --git a/src/BLL/Demo.BillView/Demo.BillView.csproj b/src/BLL/Demo.BillView/Demo.BillView.csproj index 869c3eb..f7bb938 100644 --- a/src/BLL/Demo.BillView/Demo.BillView.csproj +++ b/src/BLL/Demo.BillView/Demo.BillView.csproj @@ -102,9 +102,14 @@ <Reference Include="Kingdee.BOS.Web, Version=7.2.904.6, Culture=neutral, processorArchitecture=MSIL"> <HintPath>..\..\..\packages\ZD.Cloud.Common.7.2.3\lib\net452\Kingdee.BOS.Web.dll</HintPath> </Reference> - <Reference Include="Kingdee.BOS.WebApi.Client, Version=7.6.2003.9, Culture=neutral, processorArchitecture=MSIL"> - <SpecificVersion>False</SpecificVersion> - <HintPath>C:\Users\14027\Desktop\鏈�鏂扮増bin鏂囦欢3.16\Kingdee.BOS.WebApi.Client.dll</HintPath> + <Reference Include="Kingdee.BOS.WebApi.Client, Version=7.6.2052.7, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\ZD.Cloud.WebApi.7.6.1\lib\net452\Kingdee.BOS.WebApi.Client.dll</HintPath> + </Reference> + <Reference Include="Kingdee.BOS.WebApi.FormService, Version=7.6.2052.7, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\ZD.Cloud.WebApi.7.6.1\lib\net452\Kingdee.BOS.WebApi.FormService.dll</HintPath> + </Reference> + <Reference Include="Kingdee.BOS.WebApi.ServicesStub, Version=7.6.2052.7, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\ZD.Cloud.WebApi.7.6.1\lib\net452\Kingdee.BOS.WebApi.ServicesStub.dll</HintPath> </Reference> <Reference Include="Kingdee.BOS.WinForm.KDS20Lib, Version=7.0.104.1, Culture=neutral, processorArchitecture=MSIL"> <HintPath>..\..\..\packages\ZD.Cloud.Common.7.2.3\lib\net452\Kingdee.BOS.WinForm.KDS20Lib.dll</HintPath> @@ -198,9 +203,11 @@ <Reference Include="ZD.Cloud.Logger, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <HintPath>..\..\..\packages\ZD.Cloud.Logger.1.1.0\lib\net40\ZD.Cloud.Logger.dll</HintPath> </Reference> + <Reference Include="ZD.Cloud.WebApi, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\ZD.Cloud.WebApi.7.6.1\lib\net452\ZD.Cloud.WebApi.dll</HintPath> + </Reference> <Reference Include="ZD.Share, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <SpecificVersion>False</SpecificVersion> - <HintPath>C:\Users\14027\Desktop\bin鏂囦欢\ZD.Share.dll</HintPath> + <HintPath>..\..\..\packages\ZD.Share.1.0.3\lib\net452\ZD.Share.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> diff --git a/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs b/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs index 0daf256..899d8ce 100644 --- a/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs +++ b/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs @@ -14,9 +14,9 @@ using Newtonsoft.Json.Linq; using ZD.Cloud.Logger; using Demo.Model.Model; -using ZD.Share.Common; using System.Linq; -using Demo.Utility; +using ZD.Share.Common; +using ZD.Cloud.WebApi; namespace Demo.BillView.PRD { @@ -354,7 +354,7 @@ JArray Entry = new JArray(); if (Convert.ToString(current["FDayPlanID"]) != "0") { - sql = $" /*dialect*/ select FEntryID,FHMASTERDATE from SC_WORKBILLSORTBILLSub where FID={Convert.ToString(current["FDayPlanID"])} "; + sql = $" /*dialect*/ select FEntryID, FHMASTERDATE from SC_WORKBILLSORTBILLSub where FID={Convert.ToString(current["FDayPlanID"])} "; List<DayPlanModel> dayPlanModel = new List<DayPlanModel>(); dayPlanModel = DBServiceHelper.ExecuteDataSet(Context, sql).ToModelList<DayPlanModel>(); int fseq = 1; @@ -368,7 +368,7 @@ jsonFPOOrderEntry.Add("FHQty ", Convert.ToString(current["FT" + "" + i + ""])); ;//鏃ヨ鍒掓暟閲� jsonFPOOrderEntry.Add("FColumn", "FT" + "" + i + ""); ;//瀵瑰簲鐨勫垪澶� //jsonFPOOrderEntry.Add("FSEQ", fseq); ;//搴忓彿 - List<DayPlanModel> _dayPlanModel = dayPlanModel.Where(x => x.FHMASTERDATE == date.AddDays(i).ToShortDateString()).ToList(); + List<DayPlanModel> _dayPlanModel = dayPlanModel.Where(x => x.FHMASTERDATE == date.AddDays(i)).ToList(); if (_dayPlanModel.Count > 0) { jsonFPOOrderEntry.Add("FEntryID", _dayPlanModel.FirstOrDefault().FEntryID); ;//搴忓彿 diff --git a/src/BLL/Demo.BillView/PRD/Pro_TlPush.cs b/src/BLL/Demo.BillView/PRD/Pro_TlPush.cs index 5225edc..6d72db2 100644 --- a/src/BLL/Demo.BillView/PRD/Pro_TlPush.cs +++ b/src/BLL/Demo.BillView/PRD/Pro_TlPush.cs @@ -1,6 +1,5 @@ 锘縰sing System; using System.ComponentModel; -using Demo.Utility; using Kingdee.BOS.Core.Bill; using Kingdee.BOS.Core.Bill.PlugIn; using Kingdee.BOS.Core.DynamicForm; @@ -10,6 +9,7 @@ using Kingdee.BOS.Orm.DataEntity; using Newtonsoft.Json.Linq; using ZD.Cloud.Logger; +using ZD.Cloud.WebApi; namespace Demo.BillView.PRD { diff --git a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs index b54443b..d1f3ea9 100644 --- a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs +++ b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs @@ -1,15 +1,12 @@ 锘縰sing Demo.Model.Model; using Demo.Model.Model.PODemandPlan; -using Demo.Utility; using K3Cloud.Extend.Utils; using Kingdee.BOS.Core; -using Kingdee.BOS.Core.Bill.PlugIn; using Kingdee.BOS.Core.Const; using Kingdee.BOS.Core.DynamicForm; using Kingdee.BOS.Core.DynamicForm.PlugIn; using Kingdee.BOS.Core.DynamicForm.PlugIn.Args; using Kingdee.BOS.Core.DynamicForm.PlugIn.ControlModel; -using Kingdee.BOS.Core.Metadata; using Kingdee.BOS.Core.Metadata.EntityElement; using Kingdee.BOS.JSON; using Kingdee.BOS.KDThread; @@ -19,26 +16,18 @@ using Kingdee.BOS.Util; using Kingdee.K3.Core.SCM.STK; using Kingdee.K3.SCM.ServiceHelper; -using Newtonsoft.Json; using Newtonsoft.Json.Linq; using NPOI.HSSF.UserModel; -using NPOI.SS.Formula.Functions; using NPOI.SS.UserModel; using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; using System.Diagnostics; -using System.IO; using System.Linq; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using System.Text; -using System.Threading; -using System.Threading.Tasks; using System.Web; -using System.Windows.Documents; using ZD.Cloud.Logger; +using ZD.Cloud.WebApi; using ZD.Share.Common; namespace Demo.DynamicForm.PRD diff --git a/src/BLL/Demo.BillView/app.config b/src/BLL/Demo.BillView/app.config index 1d99b30..c583060 100644 --- a/src/BLL/Demo.BillView/app.config +++ b/src/BLL/Demo.BillView/app.config @@ -1,15 +1,15 @@ -<?xml version="1.0" encoding="utf-8"?> +锘�<?xml version="1.0" encoding="utf-8"?> <configuration> <runtime> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <dependentAssembly> - <assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral"/> - <bindingRedirect oldVersion="0.0.0.0-1.8.6.0" newVersion="1.8.6.0"/> + <assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-1.8.6.0" newVersion="1.8.6.0" /> </dependentAssembly> <dependentAssembly> - <assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral"/> - <bindingRedirect oldVersion="0.0.0.0-1.2.0.246" newVersion="1.2.0.246"/> + <assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-1.2.0.246" newVersion="1.2.0.246" /> </dependentAssembly> </assemblyBinding> </runtime> -<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/></startup></configuration> +<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" /></startup></configuration> diff --git a/src/BLL/Demo.BillView/packages.config b/src/BLL/Demo.BillView/packages.config index 058107e..61d093d 100644 --- a/src/BLL/Demo.BillView/packages.config +++ b/src/BLL/Demo.BillView/packages.config @@ -7,6 +7,7 @@ <package id="SharpZipLib" version="1.2.0" targetFramework="net472" /> <package id="ZD.Cloud.Common" version="7.2.3" targetFramework="net472" /> <package id="ZD.Cloud.Logger" version="1.1.0" targetFramework="net472" /> + <package id="ZD.Cloud.WebApi" version="7.6.1" targetFramework="net452" /> <package id="ZD.Newtonsoft.Json" version="1.0.0" targetFramework="net472" /> - <package id="ZD.Share" version="1.0.0" targetFramework="net472" /> + <package id="ZD.Share" version="1.0.3" targetFramework="net452" /> </packages> \ No newline at end of file diff --git a/src/BLL/Demo.CommonFilter/Config/kdapi.config b/src/BLL/Demo.CommonFilter/Config/kdapi.config new file mode 100644 index 0000000..25b63df --- /dev/null +++ b/src/BLL/Demo.CommonFilter/Config/kdapi.config @@ -0,0 +1,9 @@ +锘�<?xml version="1.0" encoding="utf-8" ?> +<configuration> + <appSettings> + <add key="DbId" value="5e8c33972fbb61"></add> + <add key="UserName" value="Administrator"></add> + <add key="PassWord" value="888888"></add> + <add key="KDApiUrl" value="http://localhost/K3Cloud/"></add> + </appSettings> +</configuration> \ No newline at end of file diff --git a/src/BLL/Demo.CommonFilter/Demo.CommonFilter.csproj b/src/BLL/Demo.CommonFilter/Demo.CommonFilter.csproj index a77317f..ef96df2 100644 --- a/src/BLL/Demo.CommonFilter/Demo.CommonFilter.csproj +++ b/src/BLL/Demo.CommonFilter/Demo.CommonFilter.csproj @@ -82,6 +82,15 @@ <Reference Include="Kingdee.BOS.Web.HTML, Version=7.5.1507.2, Culture=neutral, processorArchitecture=MSIL"> <HintPath>..\..\..\packages\ZD.Cloud.Common.7.5.1.2\lib\net452\Kingdee.BOS.Web.HTML.dll</HintPath> </Reference> + <Reference Include="Kingdee.BOS.WebApi.Client, Version=7.6.2052.7, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\ZD.Cloud.WebApi.7.6.1\lib\net452\Kingdee.BOS.WebApi.Client.dll</HintPath> + </Reference> + <Reference Include="Kingdee.BOS.WebApi.FormService, Version=7.6.2052.7, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\ZD.Cloud.WebApi.7.6.1\lib\net452\Kingdee.BOS.WebApi.FormService.dll</HintPath> + </Reference> + <Reference Include="Kingdee.BOS.WebApi.ServicesStub, Version=7.6.2052.7, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\ZD.Cloud.WebApi.7.6.1\lib\net452\Kingdee.BOS.WebApi.ServicesStub.dll</HintPath> + </Reference> <Reference Include="Kingdee.BOS.WeiXin.Core, Version=7.5.1507.2, Culture=neutral, processorArchitecture=MSIL"> <HintPath>..\..\..\packages\ZD.Cloud.Common.7.5.1.2\lib\net452\Kingdee.BOS.WeiXin.Core.dll</HintPath> </Reference> @@ -112,6 +121,9 @@ <Reference Include="Kingdee.K3.SCM.ServiceHelper, Version=7.5.1507.2, Culture=neutral, processorArchitecture=MSIL"> <HintPath>..\..\..\packages\ZD.Cloud.Common.7.5.1.2\lib\net452\Kingdee.K3.SCM.ServiceHelper.dll</HintPath> </Reference> + <Reference Include="Newtonsoft.Json, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\ZD.Newtonsoft.Json.1.0.0\lib\Newtonsoft.Json.dll</HintPath> + </Reference> <Reference Include="System" /> <Reference Include="System.Core" /> <Reference Include="System.Xml.Linq" /> @@ -120,11 +132,18 @@ <Reference Include="System.Data" /> <Reference Include="System.Net.Http" /> <Reference Include="System.Xml" /> + <Reference Include="ZD.Cloud.WebApi, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\ZD.Cloud.WebApi.7.6.1\lib\net452\ZD.Cloud.WebApi.dll</HintPath> + </Reference> + <Reference Include="ZD.Share, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\ZD.Share.1.0.3\lib\net452\ZD.Share.dll</HintPath> + </Reference> </ItemGroup> <ItemGroup> <Compile Include="Properties\AssemblyInfo.cs" /> </ItemGroup> <ItemGroup> + <None Include="Config\kdapi.config" /> <None Include="packages.config" /> </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> diff --git a/src/BLL/Demo.CommonFilter/packages.config b/src/BLL/Demo.CommonFilter/packages.config index 7658684..02a42b4 100644 --- a/src/BLL/Demo.CommonFilter/packages.config +++ b/src/BLL/Demo.CommonFilter/packages.config @@ -1,4 +1,7 @@ 锘�<?xml version="1.0" encoding="utf-8"?> <packages> <package id="ZD.Cloud.Common" version="7.5.1.2" targetFramework="net472" /> + <package id="ZD.Cloud.WebApi" version="7.6.1" targetFramework="net472" /> + <package id="ZD.Newtonsoft.Json" version="1.0.0" targetFramework="net472" /> + <package id="ZD.Share" version="1.0.3" targetFramework="net472" /> </packages> \ No newline at end of file diff --git a/src/BLL/Demo.DynamicForm/Config/kdapi.config b/src/BLL/Demo.DynamicForm/Config/kdapi.config new file mode 100644 index 0000000..25b63df --- /dev/null +++ b/src/BLL/Demo.DynamicForm/Config/kdapi.config @@ -0,0 +1,9 @@ +锘�<?xml version="1.0" encoding="utf-8" ?> +<configuration> + <appSettings> + <add key="DbId" value="5e8c33972fbb61"></add> + <add key="UserName" value="Administrator"></add> + <add key="PassWord" value="888888"></add> + <add key="KDApiUrl" value="http://localhost/K3Cloud/"></add> + </appSettings> +</configuration> \ No newline at end of file diff --git a/src/BLL/Demo.DynamicForm/Demo.DynamicForm.csproj b/src/BLL/Demo.DynamicForm/Demo.DynamicForm.csproj index fdac406..f056527 100644 --- a/src/BLL/Demo.DynamicForm/Demo.DynamicForm.csproj +++ b/src/BLL/Demo.DynamicForm/Demo.DynamicForm.csproj @@ -31,6 +31,18 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> + <Reference Include="Kingdee.BOS.WebApi.Client, Version=7.6.2052.7, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\ZD.Cloud.WebApi.7.6.1\lib\net452\Kingdee.BOS.WebApi.Client.dll</HintPath> + </Reference> + <Reference Include="Kingdee.BOS.WebApi.FormService, Version=7.6.2052.7, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\ZD.Cloud.WebApi.7.6.1\lib\net452\Kingdee.BOS.WebApi.FormService.dll</HintPath> + </Reference> + <Reference Include="Kingdee.BOS.WebApi.ServicesStub, Version=7.6.2052.7, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\ZD.Cloud.WebApi.7.6.1\lib\net452\Kingdee.BOS.WebApi.ServicesStub.dll</HintPath> + </Reference> + <Reference Include="Newtonsoft.Json, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\ZD.Newtonsoft.Json.1.0.0\lib\Newtonsoft.Json.dll</HintPath> + </Reference> <Reference Include="System" /> <Reference Include="System.Core" /> <Reference Include="System.Xml.Linq" /> @@ -39,6 +51,12 @@ <Reference Include="System.Data" /> <Reference Include="System.Net.Http" /> <Reference Include="System.Xml" /> + <Reference Include="ZD.Cloud.WebApi, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\ZD.Cloud.WebApi.7.6.1\lib\net452\ZD.Cloud.WebApi.dll</HintPath> + </Reference> + <Reference Include="ZD.Share, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\ZD.Share.1.0.3\lib\net452\ZD.Share.dll</HintPath> + </Reference> </ItemGroup> <ItemGroup> <Compile Include="Properties\AssemblyInfo.cs" /> @@ -46,5 +64,9 @@ <ItemGroup> <Folder Include="PRD\" /> </ItemGroup> + <ItemGroup> + <None Include="Config\kdapi.config" /> + <None Include="packages.config" /> + </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> </Project> \ No newline at end of file diff --git a/src/BLL/Demo.DynamicForm/packages.config b/src/BLL/Demo.DynamicForm/packages.config new file mode 100644 index 0000000..3b2d54e --- /dev/null +++ b/src/BLL/Demo.DynamicForm/packages.config @@ -0,0 +1,6 @@ +锘�<?xml version="1.0" encoding="utf-8"?> +<packages> + <package id="ZD.Cloud.WebApi" version="7.6.1" targetFramework="net472" /> + <package id="ZD.Newtonsoft.Json" version="1.0.0" targetFramework="net472" /> + <package id="ZD.Share" version="1.0.3" targetFramework="net472" /> +</packages> \ No newline at end of file diff --git a/src/BLL/Demo.ListView/Config/kdapi.config b/src/BLL/Demo.ListView/Config/kdapi.config new file mode 100644 index 0000000..25b63df --- /dev/null +++ b/src/BLL/Demo.ListView/Config/kdapi.config @@ -0,0 +1,9 @@ +锘�<?xml version="1.0" encoding="utf-8" ?> +<configuration> + <appSettings> + <add key="DbId" value="5e8c33972fbb61"></add> + <add key="UserName" value="Administrator"></add> + <add key="PassWord" value="888888"></add> + <add key="KDApiUrl" value="http://localhost/K3Cloud/"></add> + </appSettings> +</configuration> \ No newline at end of file diff --git a/src/BLL/Demo.ListView/Demo.ListView.csproj b/src/BLL/Demo.ListView/Demo.ListView.csproj index 0e4ec50..d7d0f34 100644 --- a/src/BLL/Demo.ListView/Demo.ListView.csproj +++ b/src/BLL/Demo.ListView/Demo.ListView.csproj @@ -82,6 +82,15 @@ <Reference Include="Kingdee.BOS.Web.HTML, Version=7.5.1507.2, Culture=neutral, processorArchitecture=MSIL"> <HintPath>..\..\..\packages\ZD.Cloud.Common.7.5.1.2\lib\net452\Kingdee.BOS.Web.HTML.dll</HintPath> </Reference> + <Reference Include="Kingdee.BOS.WebApi.Client, Version=7.6.2052.7, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\ZD.Cloud.WebApi.7.6.1\lib\net452\Kingdee.BOS.WebApi.Client.dll</HintPath> + </Reference> + <Reference Include="Kingdee.BOS.WebApi.FormService, Version=7.6.2052.7, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\ZD.Cloud.WebApi.7.6.1\lib\net452\Kingdee.BOS.WebApi.FormService.dll</HintPath> + </Reference> + <Reference Include="Kingdee.BOS.WebApi.ServicesStub, Version=7.6.2052.7, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\ZD.Cloud.WebApi.7.6.1\lib\net452\Kingdee.BOS.WebApi.ServicesStub.dll</HintPath> + </Reference> <Reference Include="Kingdee.BOS.WeiXin.Core, Version=7.5.1507.2, Culture=neutral, processorArchitecture=MSIL"> <HintPath>..\..\..\packages\ZD.Cloud.Common.7.5.1.2\lib\net452\Kingdee.BOS.WeiXin.Core.dll</HintPath> </Reference> @@ -112,6 +121,9 @@ <Reference Include="Kingdee.K3.SCM.ServiceHelper, Version=7.5.1507.2, Culture=neutral, processorArchitecture=MSIL"> <HintPath>..\..\..\packages\ZD.Cloud.Common.7.5.1.2\lib\net452\Kingdee.K3.SCM.ServiceHelper.dll</HintPath> </Reference> + <Reference Include="Newtonsoft.Json, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\ZD.Newtonsoft.Json.1.0.0\lib\Newtonsoft.Json.dll</HintPath> + </Reference> <Reference Include="System" /> <Reference Include="System.Core" /> <Reference Include="System.Xml.Linq" /> @@ -120,11 +132,18 @@ <Reference Include="System.Data" /> <Reference Include="System.Net.Http" /> <Reference Include="System.Xml" /> + <Reference Include="ZD.Cloud.WebApi, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\ZD.Cloud.WebApi.7.6.1\lib\net452\ZD.Cloud.WebApi.dll</HintPath> + </Reference> + <Reference Include="ZD.Share, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\ZD.Share.1.0.3\lib\net452\ZD.Share.dll</HintPath> + </Reference> </ItemGroup> <ItemGroup> <Compile Include="Properties\AssemblyInfo.cs" /> </ItemGroup> <ItemGroup> + <None Include="Config\kdapi.config" /> <None Include="packages.config" /> </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> diff --git a/src/BLL/Demo.ListView/packages.config b/src/BLL/Demo.ListView/packages.config index 7658684..02a42b4 100644 --- a/src/BLL/Demo.ListView/packages.config +++ b/src/BLL/Demo.ListView/packages.config @@ -1,4 +1,7 @@ 锘�<?xml version="1.0" encoding="utf-8"?> <packages> <package id="ZD.Cloud.Common" version="7.5.1.2" targetFramework="net472" /> + <package id="ZD.Cloud.WebApi" version="7.6.1" targetFramework="net472" /> + <package id="ZD.Newtonsoft.Json" version="1.0.0" targetFramework="net472" /> + <package id="ZD.Share" version="1.0.3" targetFramework="net472" /> </packages> \ No newline at end of file diff --git a/src/BLL/Demo.OperationService/Config/kdapi.config b/src/BLL/Demo.OperationService/Config/kdapi.config new file mode 100644 index 0000000..25b63df --- /dev/null +++ b/src/BLL/Demo.OperationService/Config/kdapi.config @@ -0,0 +1,9 @@ +锘�<?xml version="1.0" encoding="utf-8" ?> +<configuration> + <appSettings> + <add key="DbId" value="5e8c33972fbb61"></add> + <add key="UserName" value="Administrator"></add> + <add key="PassWord" value="888888"></add> + <add key="KDApiUrl" value="http://localhost/K3Cloud/"></add> + </appSettings> +</configuration> \ No newline at end of file diff --git a/src/BLL/Demo.OperationService/Demo.OperationService.csproj b/src/BLL/Demo.OperationService/Demo.OperationService.csproj index 738c18e..05744f1 100644 --- a/src/BLL/Demo.OperationService/Demo.OperationService.csproj +++ b/src/BLL/Demo.OperationService/Demo.OperationService.csproj @@ -83,6 +83,15 @@ <Reference Include="Kingdee.BOS.Web.HTML, Version=7.5.1507.2, Culture=neutral, processorArchitecture=MSIL"> <HintPath>..\..\..\packages\ZD.Cloud.Common.7.5.1.2\lib\net452\Kingdee.BOS.Web.HTML.dll</HintPath> </Reference> + <Reference Include="Kingdee.BOS.WebApi.Client, Version=7.6.2052.7, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\ZD.Cloud.WebApi.7.6.1\lib\net452\Kingdee.BOS.WebApi.Client.dll</HintPath> + </Reference> + <Reference Include="Kingdee.BOS.WebApi.FormService, Version=7.6.2052.7, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\ZD.Cloud.WebApi.7.6.1\lib\net452\Kingdee.BOS.WebApi.FormService.dll</HintPath> + </Reference> + <Reference Include="Kingdee.BOS.WebApi.ServicesStub, Version=7.6.2052.7, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\ZD.Cloud.WebApi.7.6.1\lib\net452\Kingdee.BOS.WebApi.ServicesStub.dll</HintPath> + </Reference> <Reference Include="Kingdee.BOS.WeiXin.Core, Version=7.5.1507.2, Culture=neutral, processorArchitecture=MSIL"> <HintPath>..\..\..\packages\ZD.Cloud.Common.7.5.1.2\lib\net452\Kingdee.BOS.WeiXin.Core.dll</HintPath> </Reference> @@ -121,8 +130,11 @@ <Reference Include="System.Data" /> <Reference Include="System.Net.Http" /> <Reference Include="System.Xml" /> + <Reference Include="ZD.Cloud.WebApi, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\ZD.Cloud.WebApi.7.6.1\lib\net452\ZD.Cloud.WebApi.dll</HintPath> + </Reference> <Reference Include="ZD.Share, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\..\..\packages\ZD.Share.1.0.2\lib\net452\ZD.Share.dll</HintPath> + <HintPath>..\..\..\packages\ZD.Share.1.0.3\lib\net452\ZD.Share.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> @@ -131,6 +143,7 @@ <Compile Include="SCM\SAL_SaleOrder\SAL_SaleOrderSubmit.cs" /> </ItemGroup> <ItemGroup> + <None Include="Config\kdapi.config" /> <None Include="packages.config" /> </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> diff --git a/src/BLL/Demo.OperationService/packages.config b/src/BLL/Demo.OperationService/packages.config index 7eacc2b..f54443a 100644 --- a/src/BLL/Demo.OperationService/packages.config +++ b/src/BLL/Demo.OperationService/packages.config @@ -1,6 +1,7 @@ 锘�<?xml version="1.0" encoding="utf-8"?> <packages> <package id="ZD.Cloud.Common" version="7.5.1.2" targetFramework="net452" /> + <package id="ZD.Cloud.WebApi" version="7.6.1" targetFramework="net472" /> <package id="ZD.Newtonsoft.Json" version="1.0.0" targetFramework="net452" /> - <package id="ZD.Share" version="1.0.2" targetFramework="net452" /> + <package id="ZD.Share" version="1.0.3" targetFramework="net472" /> </packages> \ No newline at end of file diff --git a/src/BLL/Demo.Report/Config/kdapi.config b/src/BLL/Demo.Report/Config/kdapi.config new file mode 100644 index 0000000..25b63df --- /dev/null +++ b/src/BLL/Demo.Report/Config/kdapi.config @@ -0,0 +1,9 @@ +锘�<?xml version="1.0" encoding="utf-8" ?> +<configuration> + <appSettings> + <add key="DbId" value="5e8c33972fbb61"></add> + <add key="UserName" value="Administrator"></add> + <add key="PassWord" value="888888"></add> + <add key="KDApiUrl" value="http://localhost/K3Cloud/"></add> + </appSettings> +</configuration> \ No newline at end of file diff --git a/src/BLL/Demo.Report/Demo.Report.csproj b/src/BLL/Demo.Report/Demo.Report.csproj index d4c0884..f149f0a 100644 --- a/src/BLL/Demo.Report/Demo.Report.csproj +++ b/src/BLL/Demo.Report/Demo.Report.csproj @@ -82,6 +82,15 @@ <Reference Include="Kingdee.BOS.Web.HTML, Version=7.5.1507.2, Culture=neutral, processorArchitecture=MSIL"> <HintPath>..\..\..\packages\ZD.Cloud.Common.7.5.1.2\lib\net452\Kingdee.BOS.Web.HTML.dll</HintPath> </Reference> + <Reference Include="Kingdee.BOS.WebApi.Client, Version=7.6.2052.7, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\ZD.Cloud.WebApi.7.6.1\lib\net452\Kingdee.BOS.WebApi.Client.dll</HintPath> + </Reference> + <Reference Include="Kingdee.BOS.WebApi.FormService, Version=7.6.2052.7, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\ZD.Cloud.WebApi.7.6.1\lib\net452\Kingdee.BOS.WebApi.FormService.dll</HintPath> + </Reference> + <Reference Include="Kingdee.BOS.WebApi.ServicesStub, Version=7.6.2052.7, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\ZD.Cloud.WebApi.7.6.1\lib\net452\Kingdee.BOS.WebApi.ServicesStub.dll</HintPath> + </Reference> <Reference Include="Kingdee.BOS.WeiXin.Core, Version=7.5.1507.2, Culture=neutral, processorArchitecture=MSIL"> <HintPath>..\..\..\packages\ZD.Cloud.Common.7.5.1.2\lib\net452\Kingdee.BOS.WeiXin.Core.dll</HintPath> </Reference> @@ -112,6 +121,9 @@ <Reference Include="Kingdee.K3.SCM.ServiceHelper, Version=7.5.1507.2, Culture=neutral, processorArchitecture=MSIL"> <HintPath>..\..\..\packages\ZD.Cloud.Common.7.5.1.2\lib\net452\Kingdee.K3.SCM.ServiceHelper.dll</HintPath> </Reference> + <Reference Include="Newtonsoft.Json, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\ZD.Newtonsoft.Json.1.0.0\lib\Newtonsoft.Json.dll</HintPath> + </Reference> <Reference Include="System" /> <Reference Include="System.Core" /> <Reference Include="System.Xml.Linq" /> @@ -120,12 +132,19 @@ <Reference Include="System.Data" /> <Reference Include="System.Net.Http" /> <Reference Include="System.Xml" /> + <Reference Include="ZD.Cloud.WebApi, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\ZD.Cloud.WebApi.7.6.1\lib\net452\ZD.Cloud.WebApi.dll</HintPath> + </Reference> + <Reference Include="ZD.Share, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\ZD.Share.1.0.3\lib\net452\ZD.Share.dll</HintPath> + </Reference> </ItemGroup> <ItemGroup> <Compile Include="PRD\prd_ExtractionPlanDetail.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> </ItemGroup> <ItemGroup> + <None Include="Config\kdapi.config" /> <None Include="packages.config" /> </ItemGroup> <ItemGroup /> diff --git a/src/BLL/Demo.Report/packages.config b/src/BLL/Demo.Report/packages.config index 7658684..02a42b4 100644 --- a/src/BLL/Demo.Report/packages.config +++ b/src/BLL/Demo.Report/packages.config @@ -1,4 +1,7 @@ 锘�<?xml version="1.0" encoding="utf-8"?> <packages> <package id="ZD.Cloud.Common" version="7.5.1.2" targetFramework="net472" /> + <package id="ZD.Cloud.WebApi" version="7.6.1" targetFramework="net472" /> + <package id="ZD.Newtonsoft.Json" version="1.0.0" targetFramework="net472" /> + <package id="ZD.Share" version="1.0.3" targetFramework="net472" /> </packages> \ No newline at end of file diff --git a/src/BLL/Demo.SysReportView/Config/kdapi.config b/src/BLL/Demo.SysReportView/Config/kdapi.config new file mode 100644 index 0000000..25b63df --- /dev/null +++ b/src/BLL/Demo.SysReportView/Config/kdapi.config @@ -0,0 +1,9 @@ +锘�<?xml version="1.0" encoding="utf-8" ?> +<configuration> + <appSettings> + <add key="DbId" value="5e8c33972fbb61"></add> + <add key="UserName" value="Administrator"></add> + <add key="PassWord" value="888888"></add> + <add key="KDApiUrl" value="http://localhost/K3Cloud/"></add> + </appSettings> +</configuration> \ No newline at end of file diff --git a/src/BLL/Demo.SysReportView/Demo.SysReportView.csproj b/src/BLL/Demo.SysReportView/Demo.SysReportView.csproj index e02371f..5aa30f5 100644 --- a/src/BLL/Demo.SysReportView/Demo.SysReportView.csproj +++ b/src/BLL/Demo.SysReportView/Demo.SysReportView.csproj @@ -82,6 +82,15 @@ <Reference Include="Kingdee.BOS.Web.HTML, Version=7.5.1507.2, Culture=neutral, processorArchitecture=MSIL"> <HintPath>..\..\..\packages\ZD.Cloud.Common.7.5.1.2\lib\net452\Kingdee.BOS.Web.HTML.dll</HintPath> </Reference> + <Reference Include="Kingdee.BOS.WebApi.Client, Version=7.6.2052.7, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\ZD.Cloud.WebApi.7.6.1\lib\net452\Kingdee.BOS.WebApi.Client.dll</HintPath> + </Reference> + <Reference Include="Kingdee.BOS.WebApi.FormService, Version=7.6.2052.7, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\ZD.Cloud.WebApi.7.6.1\lib\net452\Kingdee.BOS.WebApi.FormService.dll</HintPath> + </Reference> + <Reference Include="Kingdee.BOS.WebApi.ServicesStub, Version=7.6.2052.7, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\ZD.Cloud.WebApi.7.6.1\lib\net452\Kingdee.BOS.WebApi.ServicesStub.dll</HintPath> + </Reference> <Reference Include="Kingdee.BOS.WeiXin.Core, Version=7.5.1507.2, Culture=neutral, processorArchitecture=MSIL"> <HintPath>..\..\..\packages\ZD.Cloud.Common.7.5.1.2\lib\net452\Kingdee.BOS.WeiXin.Core.dll</HintPath> </Reference> @@ -112,6 +121,9 @@ <Reference Include="Kingdee.K3.SCM.ServiceHelper, Version=7.5.1507.2, Culture=neutral, processorArchitecture=MSIL"> <HintPath>..\..\..\packages\ZD.Cloud.Common.7.5.1.2\lib\net452\Kingdee.K3.SCM.ServiceHelper.dll</HintPath> </Reference> + <Reference Include="Newtonsoft.Json, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\ZD.Newtonsoft.Json.1.0.0\lib\Newtonsoft.Json.dll</HintPath> + </Reference> <Reference Include="System" /> <Reference Include="System.Core" /> <Reference Include="System.Xml.Linq" /> @@ -120,11 +132,18 @@ <Reference Include="System.Data" /> <Reference Include="System.Net.Http" /> <Reference Include="System.Xml" /> + <Reference Include="ZD.Cloud.WebApi, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\ZD.Cloud.WebApi.7.6.1\lib\net452\ZD.Cloud.WebApi.dll</HintPath> + </Reference> + <Reference Include="ZD.Share, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\ZD.Share.1.0.3\lib\net452\ZD.Share.dll</HintPath> + </Reference> </ItemGroup> <ItemGroup> <Compile Include="Properties\AssemblyInfo.cs" /> </ItemGroup> <ItemGroup> + <None Include="Config\kdapi.config" /> <None Include="packages.config" /> </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> diff --git a/src/BLL/Demo.SysReportView/packages.config b/src/BLL/Demo.SysReportView/packages.config index 7658684..02a42b4 100644 --- a/src/BLL/Demo.SysReportView/packages.config +++ b/src/BLL/Demo.SysReportView/packages.config @@ -1,4 +1,7 @@ 锘�<?xml version="1.0" encoding="utf-8"?> <packages> <package id="ZD.Cloud.Common" version="7.5.1.2" targetFramework="net472" /> + <package id="ZD.Cloud.WebApi" version="7.6.1" targetFramework="net472" /> + <package id="ZD.Newtonsoft.Json" version="1.0.0" targetFramework="net472" /> + <package id="ZD.Share" version="1.0.3" targetFramework="net472" /> </packages> \ No newline at end of file diff --git a/src/BLL/Demo.TimedTaskPlugIn/Config/kdapi.config b/src/BLL/Demo.TimedTaskPlugIn/Config/kdapi.config new file mode 100644 index 0000000..25b63df --- /dev/null +++ b/src/BLL/Demo.TimedTaskPlugIn/Config/kdapi.config @@ -0,0 +1,9 @@ +锘�<?xml version="1.0" encoding="utf-8" ?> +<configuration> + <appSettings> + <add key="DbId" value="5e8c33972fbb61"></add> + <add key="UserName" value="Administrator"></add> + <add key="PassWord" value="888888"></add> + <add key="KDApiUrl" value="http://localhost/K3Cloud/"></add> + </appSettings> +</configuration> \ No newline at end of file diff --git a/src/BLL/Demo.TimedTaskPlugIn/Demo.TimedTaskPlugIn.csproj b/src/BLL/Demo.TimedTaskPlugIn/Demo.TimedTaskPlugIn.csproj index f70a271..554f3e9 100644 --- a/src/BLL/Demo.TimedTaskPlugIn/Demo.TimedTaskPlugIn.csproj +++ b/src/BLL/Demo.TimedTaskPlugIn/Demo.TimedTaskPlugIn.csproj @@ -83,8 +83,14 @@ <Reference Include="Kingdee.BOS.Web.HTML, Version=7.5.1507.2, Culture=neutral, processorArchitecture=MSIL"> <HintPath>..\..\..\packages\ZD.Cloud.Common.7.5.1.2\lib\net452\Kingdee.BOS.Web.HTML.dll</HintPath> </Reference> - <Reference Include="Kingdee.BOS.WebApi.Client"> - <HintPath>C:\Users\14027\Desktop\鏈�鏂扮増bin鏂囦欢\Kingdee.BOS.WebApi.Client.dll</HintPath> + <Reference Include="Kingdee.BOS.WebApi.Client, Version=7.6.2052.7, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\ZD.Cloud.WebApi.7.6.1\lib\net452\Kingdee.BOS.WebApi.Client.dll</HintPath> + </Reference> + <Reference Include="Kingdee.BOS.WebApi.FormService, Version=7.6.2052.7, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\ZD.Cloud.WebApi.7.6.1\lib\net452\Kingdee.BOS.WebApi.FormService.dll</HintPath> + </Reference> + <Reference Include="Kingdee.BOS.WebApi.ServicesStub, Version=7.6.2052.7, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\ZD.Cloud.WebApi.7.6.1\lib\net452\Kingdee.BOS.WebApi.ServicesStub.dll</HintPath> </Reference> <Reference Include="Kingdee.BOS.WeiXin.Core, Version=7.5.1507.2, Culture=neutral, processorArchitecture=MSIL"> <HintPath>..\..\..\packages\ZD.Cloud.Common.7.5.1.2\lib\net452\Kingdee.BOS.WeiXin.Core.dll</HintPath> @@ -133,6 +139,9 @@ <Reference Include="ZD.Cloud.Logger, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <HintPath>..\..\..\packages\ZD.Cloud.Logger.1.1.0\lib\net40\ZD.Cloud.Logger.dll</HintPath> </Reference> + <Reference Include="ZD.Cloud.WebApi, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\ZD.Cloud.WebApi.7.6.1\lib\net452\ZD.Cloud.WebApi.dll</HintPath> + </Reference> <Reference Include="ZD.Share, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> <HintPath>C:\Users\14027\Desktop\bin鏂囦欢\ZD.Share.dll</HintPath> @@ -145,6 +154,8 @@ <Compile Include="Properties\AssemblyInfo.cs" /> </ItemGroup> <ItemGroup> + <None Include="app.config" /> + <None Include="Config\kdapi.config" /> <None Include="packages.config" /> </ItemGroup> <ItemGroup> diff --git a/src/BLL/Demo.TimedTaskPlugIn/PRD/DayPlanPPBomBillTimeTask.cs b/src/BLL/Demo.TimedTaskPlugIn/PRD/DayPlanPPBomBillTimeTask.cs index 79292d3..7f25581 100644 --- a/src/BLL/Demo.TimedTaskPlugIn/PRD/DayPlanPPBomBillTimeTask.cs +++ b/src/BLL/Demo.TimedTaskPlugIn/PRD/DayPlanPPBomBillTimeTask.cs @@ -1,5 +1,4 @@ 锘縰sing System.ComponentModel; -using Kingdee.BOS.Contracts; using Kingdee.BOS; using Kingdee.BOS.Core; using Kingdee.BOS.ServiceHelper; @@ -9,7 +8,7 @@ using System; using Kingdee.BOS.Util; using System.Linq; -using Demo.Utility; +using ZD.Cloud.WebApi; namespace Demo.TimedTaskPlugIn.PRD { diff --git a/src/BLL/Demo.TimedTaskPlugIn/PRD/StockChangeDynamicAlignment.cs b/src/BLL/Demo.TimedTaskPlugIn/PRD/StockChangeDynamicAlignment.cs index c913233..65f57a8 100644 --- a/src/BLL/Demo.TimedTaskPlugIn/PRD/StockChangeDynamicAlignment.cs +++ b/src/BLL/Demo.TimedTaskPlugIn/PRD/StockChangeDynamicAlignment.cs @@ -1,5 +1,4 @@ 锘縰sing System.ComponentModel; -using Kingdee.BOS.Contracts; using Kingdee.BOS; using Kingdee.BOS.Core; using Kingdee.BOS.ServiceHelper; @@ -14,10 +13,7 @@ using System.Diagnostics; using System.Collections.Generic; using ZD.Share.Common; -using Kingdee.K3.Core.SCM.STK; -using Kingdee.BOS.Orm.DataEntity; -using Kingdee.K3.SCM.ServiceHelper; -using Demo.Utility; +using ZD.Cloud.WebApi; namespace Demo.TimedTaskPlugIn.PRD { diff --git a/src/BLL/Demo.TimedTaskPlugIn/app.config b/src/BLL/Demo.TimedTaskPlugIn/app.config new file mode 100644 index 0000000..184e6ae --- /dev/null +++ b/src/BLL/Demo.TimedTaskPlugIn/app.config @@ -0,0 +1,11 @@ +锘�<?xml version="1.0" encoding="utf-8"?> +<configuration> + <runtime> + <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> + <dependentAssembly> + <assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-1.8.6.0" newVersion="1.8.6.0" /> + </dependentAssembly> + </assemblyBinding> + </runtime> +</configuration> \ No newline at end of file diff --git a/src/BLL/Demo.TimedTaskPlugIn/packages.config b/src/BLL/Demo.TimedTaskPlugIn/packages.config index 1b80aa8..916e3e4 100644 --- a/src/BLL/Demo.TimedTaskPlugIn/packages.config +++ b/src/BLL/Demo.TimedTaskPlugIn/packages.config @@ -3,6 +3,7 @@ <package id="log4net" version="1.2.10" targetFramework="net472" /> <package id="ZD.Cloud.Common" version="7.5.1.2" targetFramework="net472" /> <package id="ZD.Cloud.Logger" version="1.1.0" targetFramework="net472" /> + <package id="ZD.Cloud.WebApi" version="7.6.1" targetFramework="net452" /> <package id="ZD.Newtonsoft.Json" version="1.0.0" targetFramework="net472" /> <package id="ZD.Share" version="1.0.3" targetFramework="net472" /> </packages> \ No newline at end of file diff --git a/src/BLL/Demo.Utility/CloudClient.cs b/src/BLL/Demo.Utility/CloudClient.cs deleted file mode 100644 index 9df6bb6..0000000 --- a/src/BLL/Demo.Utility/CloudClient.cs +++ /dev/null @@ -1,60 +0,0 @@ -锘縰sing Kingdee.BOS.WebApi.Client; -using Newtonsoft.Json.Linq; -using System; -using System.Collections.Generic; -using System.Configuration; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Demo.Utility -{ - public class CloudClient : K3CloudApiClient - { - public const string KDApiUrl = "http://localhost//k3cloud/"; - public CloudClient(string serverUrl = KDApiUrl) : base(serverUrl) - { - var dbId = GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "DbId"); - var useName = GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "UserName"); - var pwd = GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "PassWord"); - //var url = GetKey(AppDomain.CurrentDomain.SetupInformation.ApplicationBase + "/kdapi.config", "KDApiUrl"); - var loginResult = ValidateLogin(dbId, useName, pwd, 2052); - var resultType = JObject.Parse(loginResult)["LoginResultType"].Value<int>(); - //鐧诲綍缁撴灉绫诲瀷绛変簬1锛屼唬琛ㄧ櫥褰曟垚鍔� - if (resultType != 1) - { - throw new Exception("鐧诲綍澶辫触锛�"); - } - } - - public CloudClient(string serverUrl = KDApiUrl, int timeout = 3600) : base(serverUrl, timeout) - { - var dbId = GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "DbId"); - var useName = GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "UserName"); - var pwd = GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "PassWord"); - //var url = GetKey(AppDomain.CurrentDomain.SetupInformation.ApplicationBase + "/kdapi.config", "KDApiUrl"); - var loginResult = ValidateLogin(dbId, useName, pwd, 2052); - var resultType = JObject.Parse(loginResult)["LoginResultType"].Value<int>(); - //鐧诲綍缁撴灉绫诲瀷绛変簬1锛屼唬琛ㄧ櫥褰曟垚鍔� - if (resultType != 1) - { - throw new Exception("鐧诲綍澶辫触锛�"); - } - } - - public static String GetConfigKey(String configPath, String key) - { - Configuration ConfigurationInstance = ConfigurationManager.OpenMappedExeConfiguration(new ExeConfigurationFileMap() - { - ExeConfigFilename = configPath - }, ConfigurationUserLevel.None); - - - if (ConfigurationInstance.AppSettings.Settings[key] != null) - return ConfigurationInstance.AppSettings.Settings[key].Value; - else - - return string.Empty; - } - } -} diff --git a/src/BLL/Demo.Utility/Config/kdapi.config b/src/BLL/Demo.Utility/Config/kdapi.config new file mode 100644 index 0000000..25b63df --- /dev/null +++ b/src/BLL/Demo.Utility/Config/kdapi.config @@ -0,0 +1,9 @@ +锘�<?xml version="1.0" encoding="utf-8" ?> +<configuration> + <appSettings> + <add key="DbId" value="5e8c33972fbb61"></add> + <add key="UserName" value="Administrator"></add> + <add key="PassWord" value="888888"></add> + <add key="KDApiUrl" value="http://localhost/K3Cloud/"></add> + </appSettings> +</configuration> \ No newline at end of file diff --git a/src/BLL/Demo.Utility/Demo.Utility.csproj b/src/BLL/Demo.Utility/Demo.Utility.csproj index 27b5b29..421a65f 100644 --- a/src/BLL/Demo.Utility/Demo.Utility.csproj +++ b/src/BLL/Demo.Utility/Demo.Utility.csproj @@ -38,8 +38,14 @@ <Reference Include="ICSharpCode.SharpZipLib, Version=1.2.0.246, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL"> <HintPath>..\..\..\packages\SharpZipLib.1.2.0\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath> </Reference> - <Reference Include="Kingdee.BOS.WebApi.Client"> - <HintPath>C:\Users\14027\Desktop\鏈�鏂扮増bin鏂囦欢\Kingdee.BOS.WebApi.Client.dll</HintPath> + <Reference Include="Kingdee.BOS.WebApi.Client, Version=7.6.2052.7, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\ZD.Cloud.WebApi.7.6.1\lib\net452\Kingdee.BOS.WebApi.Client.dll</HintPath> + </Reference> + <Reference Include="Kingdee.BOS.WebApi.FormService, Version=7.6.2052.7, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\ZD.Cloud.WebApi.7.6.1\lib\net452\Kingdee.BOS.WebApi.FormService.dll</HintPath> + </Reference> + <Reference Include="Kingdee.BOS.WebApi.ServicesStub, Version=7.6.2052.7, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\ZD.Cloud.WebApi.7.6.1\lib\net452\Kingdee.BOS.WebApi.ServicesStub.dll</HintPath> </Reference> <Reference Include="Newtonsoft.Json, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <HintPath>..\..\..\packages\ZD.Newtonsoft.Json.1.0.0\lib\Newtonsoft.Json.dll</HintPath> @@ -68,12 +74,18 @@ <Reference Include="System.Data" /> <Reference Include="System.Net.Http" /> <Reference Include="System.Xml" /> + <Reference Include="ZD.Cloud.WebApi, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\ZD.Cloud.WebApi.7.6.1\lib\net452\ZD.Cloud.WebApi.dll</HintPath> + </Reference> + <Reference Include="ZD.Share, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\ZD.Share.1.0.3\lib\net452\ZD.Share.dll</HintPath> + </Reference> </ItemGroup> <ItemGroup> - <Compile Include="CloudClient.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> </ItemGroup> <ItemGroup> + <None Include="Config\kdapi.config" /> <None Include="packages.config" /> </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> diff --git a/src/BLL/Demo.Utility/packages.config b/src/BLL/Demo.Utility/packages.config index d590a1f..f20079f 100644 --- a/src/BLL/Demo.Utility/packages.config +++ b/src/BLL/Demo.Utility/packages.config @@ -3,5 +3,7 @@ <package id="NPOI" version="2.5.1" targetFramework="net472" /> <package id="Portable.BouncyCastle" version="1.8.6" targetFramework="net472" /> <package id="SharpZipLib" version="1.2.0" targetFramework="net472" /> + <package id="ZD.Cloud.WebApi" version="7.6.1" targetFramework="net452" /> <package id="ZD.Newtonsoft.Json" version="1.0.0" targetFramework="net472" /> + <package id="ZD.Share" version="1.0.3" targetFramework="net452" /> </packages> \ No newline at end of file diff --git a/src/Model/Demo.Model/Model/DayPlanModel.cs b/src/Model/Demo.Model/Model/DayPlanModel.cs index 2e08db2..3be3ab0 100644 --- a/src/Model/Demo.Model/Model/DayPlanModel.cs +++ b/src/Model/Demo.Model/Model/DayPlanModel.cs @@ -12,6 +12,6 @@ public class DayPlanModel { public string FEntryID { get; set; } - public string FHMASTERDATE { get; set; } + public DateTime FHMASTERDATE { get; set; } } } -- Gitblit v1.9.1