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

新增吉克云销售数据推送到金蝶云星空

Browse Source
This commit is contained in:
朱斌
2025-07-18 10:14:31 +08:00
parent 99c400da6c
commit 5b04ef20c2
33 changed files with 2101 additions and 657 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Reportapi/FrameWork/Fleck/Fleck.csproj
View File

@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Fleck</RootNamespace> <RootNamespace>Fleck</RootNamespace>
<AssemblyName>Fleck</AssemblyName> <AssemblyName>Fleck</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>

2
Reportapi/FrameWork/SqlSugar/SqlSugar.csproj
View File

@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>SqlSugar</RootNamespace> <RootNamespace>SqlSugar</RootNamespace>
<AssemblyName>SqlSugar</AssemblyName> <AssemblyName>SqlSugar</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>

3
Reportapi/FrameWork/SwashbuckleEx/Swashbuckle.Core/Swashbuckle.Core.csproj
View File

@@ -9,8 +9,9 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Swashbuckle</RootNamespace> <RootNamespace>Swashbuckle</RootNamespace>
<AssemblyName>Swashbuckle.Core</AssemblyName> <AssemblyName>Swashbuckle.Core</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>

8
Reportapi/FrameWork/SwashbuckleEx/Swashbuckle.Core/app.config
View File

@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<runtime> <runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" /> <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
</configuration> <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>

3
Reportapi/FrameWork/SwashbuckleEx/Swashbuckle.WebHost/Swashbuckle.WebHost.csproj
View File

@@ -9,8 +9,9 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Swashbuckle.WebHost</RootNamespace> <RootNamespace>Swashbuckle.WebHost</RootNamespace>
<AssemblyName>Swashbuckle.WebHost</AssemblyName> <AssemblyName>Swashbuckle.WebHost</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>

28
Reportapi/MyCode.Project.Domain/App.config
View File

@@ -1,33 +1,33 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<runtime> <runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" /> <assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-0.85.4.369" newVersion="0.85.4.369" /> <bindingRedirect oldVersion="0.0.0.0-0.85.4.369" newVersion="0.85.4.369"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" /> <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" /> <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /> <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" /> <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" /> <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0"/>
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration> <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>

58
Reportapi/MyCode.Project.Domain/Message/Request/KingDee/BillSave.cs
View File

@@ -1,4 +1,5 @@
using System; using MyCode.Project.Domain.Message.Request.KingDee.SaveModel;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
@@ -9,22 +10,61 @@ namespace MyCode.Project.Domain.Message.Request.KingDee
public class BillSave public class BillSave
{ {
/// <summary> /// <summary>
/// 更新字段 /// 需要更新的字段，数组类型，格式：[key1,key2,...] （非必录）
/// 注（更新字段时Model数据包中必须设置内码，若更新单据体字段还需设置分录内码）
/// </summary> /// </summary>
public List<string> NeedUpDateFields { get; set; } public List<string> NeedUpDateFields { get; set; }
/// <summary> /// <summary>
/// 返回字段 /// 需返回结果的字段集合，数组类型，格式：[key,entitykey.key,...]（非必录）
/// 注（返回单据体字段格式：entitykey.key）
/// </summary> /// </summary>
public List<string> NeedReturnFields { get; set; } public List<string> NeedReturnFields { get; set; }
/// <summary>
public bool IsDeleteEntry { get; set; } /// 是否删除已存在的分录，布尔类型，默认true（非必录）
/// </summary>
public string IsDeleteEntry { get; set; }
/// <summary>
/// 表单所在的子系统内码，字符串类型（非必录）
/// </summary>
public string SubSystemId { get; set; }
/// <summary>
/// 是否验证所有的基础资料有效性，布尔类，默认false（非必录）
/// </summary>
public bool IsVerifyBaseDataField { get; set; }
/// <summary>
/// 是否批量填充分录，默认true（非必录）
/// </summary>
public string IsEntryBatchFill { get; set; }
/// <summary>
/// 是否验证数据合法性标志，布尔类型，默认true（非必录）
/// 注（设为false时不对数据合法性进行校验）
/// </summary>
public string ValidateFlag { get; set; }
/// <summary>
/// 是否用编码搜索基础资料，布尔类型，默认true（非必录）
/// </summary>
public string NumberSearch { get; set; }
/// <summary>
/// 是否自动调整JSON字段顺序，布尔类型，默认false（非必录）
/// </summary>
public string IsAutoAdjustField { get; set; }
/// <summary>
///交互标志集合，字符串类型，分号分隔，格式："flag1;flag2;..."（非必录）
///例如（允许负库存标识：STK_InvCheckResult）
/// </summary>
public string InterationFlags { get; set; }
/// <summary>
/// 是否允许忽略交互，布尔类型，默认true（非必录）
/// </summary>
public string IgnoreInterationFlag { get; set; }
/// <summary>
/// 是否控制精度，为true时对金额、单价和数量字段进行精度验证，默认false（非必录）
/// </summary>
public string IsControlPrecision { get; set; }
/// <summary> /// <summary>
/// 表单数据包，JSON类型（必录） /// 表单数据包，JSON类型（必录）
/// </summary> /// </summary>
public object Model { get; set; } public BaseModel Model { get; set; }
} }

16
Reportapi/MyCode.Project.Domain/Message/Request/KingDee/SaveModel/BaseModel.cs Normal file
View File

@@ -0,0 +1,16 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace MyCode.Project.Domain.Message.Request.KingDee.SaveModel
{
public class BaseModel
{
public string GetRequestString()
{
return "";
}
}
}

1232
Reportapi/MyCode.Project.Domain/Message/Request/KingDee/SaveModel/SaleOrderModel - 复制.cs Normal file
View File

File diff suppressed because it is too large Load Diff

354
Reportapi/MyCode.Project.Domain/Message/Request/KingDee/FSaleOrderEntry.cs → Reportapi/MyCode.Project.Domain/Message/Request/KingDee/SaveModel/SaleOrderModel.cs
View File

@@ -1,4 +1,5 @@
using System; using MyCode.Project.Domain.Message.Request.KingDee.SaveModel;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
@@ -6,68 +7,179 @@ using System.Threading.Tasks;
namespace MyCode.Project.Domain.Message.Request.KingDee namespace MyCode.Project.Domain.Message.Request.KingDee
{ {
public class SaleOrderModel : BaseModel
public class FSaleOrderEntry
{ {
/// <summary> /// <summary>
/// 需要更新的字段，数组类型，格式：[key1,key2,...] （非必录） ///
/// 注（更新字段时Model数据包中必须设置内码，若更新单据体字段还需设置分录内码）
/// </summary> /// </summary>
public List<string> NeedUpDateFields { get; set; } public int FID { get; set; }
/// <summary> /// <summary>
/// 需返回结果的字段集合，数组类型，格式：[key,entitykey.key,...]（非必录） /// 单据类型
/// 注（返回单据体字段格式：entitykey.key）
/// </summary> /// </summary>
public List<string> NeedReturnFields { get; set; } public FBillTypeID FBillTypeID { get; set; }
/// <summary> /// <summary>
/// 是否删除已存在的分录，布尔类型，默认true（非必录） /// 单据编号
/// </summary> /// </summary>
public string IsDeleteEntry { get; set; } public string FBillNo { get; set; }
/// <summary> /// <summary>
/// 表单所在的子系统内码，字符串类型（非必录） /// 日期
/// </summary> /// </summary>
public string SubSystemId { get; set; } public string FDate { get; set; }
/// <summary> /// <summary>
/// 是否验证所有的基础资料有效性，布尔类，默认false（非必录） /// 销售组织
/// </summary> /// </summary>
public bool IsVerifyBaseDataField { get; set; } public FSaleOrgId FSaleOrgId { get; set; }
/// <summary> /// <summary>
/// 是否批量填充分录，默认true（非必录） /// 客户
/// </summary> /// </summary>
public string IsEntryBatchFill { get; set; } public FCustId FCustId { get; set; }
/// <summary> /// <summary>
/// 是否验证数据合法性标志，布尔类型，默认true（非必录） /// 交货方式
/// 注（设为false时不对数据合法性进行校验）
/// </summary> /// </summary>
public string ValidateFlag { get; set; } public FHeadDeliveryWay FHeadDeliveryWay { get; set; }
/// <summary> /// <summary>
/// 是否用编码搜索基础资料，布尔类型，默认true（非必录） /// 收货方
/// </summary> /// </summary>
public string NumberSearch { get; set; } public FReceiveId FReceiveId { get; set; }
/// <summary> /// <summary>
/// 是否自动调整JSON字段顺序，布尔类型，默认false（非必录） /// 交货地点
/// </summary> /// </summary>
public string IsAutoAdjustField { get; set; } public FHEADLOCID FHEADLOCID { get; set; }
/// <summary> /// <summary>
///交互标志集合，字符串类型，分号分隔，格式："flag1;flag2;..."（非必录） /// 对应组织
///例如（允许负库存标识：STK_InvCheckResult）
/// </summary> /// </summary>
public string InterationFlags { get; set; } public FCorrespondOrgId FCorrespondOrgId { get; set; }
/// <summary> /// <summary>
/// 是否允许忽略交互，布尔类型，默认true（非必录） /// 销售部门
/// </summary> /// </summary>
public string IgnoreInterationFlag { get; set; } public FSaleDeptId FSaleDeptId { get; set; }
/// <summary> /// <summary>
/// 是否控制精度，为true时对金额、单价和数量字段进行精度验证，默认false（非必录） /// 销售组
/// </summary> /// </summary>
public string IsControlPrecision { get; set; } public FSaleGroupId FSaleGroupId { get; set; }
/// <summary> /// <summary>
/// 表单数据包，JSON类型（必录） /// 销售员
/// </summary> /// </summary>
public Model Model { get; set; } public FSalerId FSalerId { get; set; }
/// <summary>
/// 收货方地址
/// </summary>
public string FReceiveAddress { get; set; }
/// <summary>
/// 结算方
/// </summary>
public FSettleId FSettleId { get; set; }
/// <summary>
/// 收货方联系人
/// </summary>
public FReceiveContact FReceiveContact { get; set; }
/// <summary>
/// 付款方
/// </summary>
public FChargeId FChargeId { get; set; }
/// <summary>
/// 移动销售订单编号
/// </summary>
public string FNetOrderBillNo { get; set; }
/// <summary>
/// 移动销售订单ID
/// </summary>
public int FNetOrderBillId { get; set; }
/// <summary>
/// 商机内码
/// </summary>
public int FOppID { get; set; }
/// <summary>
/// 销售阶段
/// </summary>
public FSalePhaseID FSalePhaseID { get; set; }
/// <summary>
/// 是否期初单据
/// </summary>
public string FISINIT { get; set; }
/// <summary>
/// 备注
/// </summary>
public string FNote { get; set; }
/// <summary>
///
/// </summary>
public string FIsMobile { get; set; }
/// <summary>
/// 订单来源
/// </summary>
public string FSOFrom { get; set; }
/// <summary>
/// 合同类型
/// </summary>
public string FContractType { get; set; }
/// <summary>
/// 销售合同内码
/// </summary>
public int FContractId { get; set; }
/// <summary>
/// 生成受托加工材料清单
/// </summary>
public string FIsUseOEMBomPush { get; set; }
/// <summary>
///
/// </summary>
public FWarehouse FWarehouse { get; set; }
/// <summary>
///
/// </summary>
public Foutlets Foutlets { get; set; }
/// <summary>
///
/// </summary>
public string FOrdertype { get; set; }
/// <summary>
/// 变更单主键
/// </summary>
public int FXPKID_H { get; set; }
/// <summary>
///
/// </summary>
public string FPushType { get; set; }
/// <summary>
/// 关闭原因
/// </summary>
public string FCloseReason { get; set; }
/// <summary>
/// 生成分销采购订单
/// </summary>
public string FIsUseDrpSalePOPush { get; set; }
/// <summary>
///
/// </summary>
public string FAutoShip { get; set; }
/// <summary>
///
/// </summary>
public string FIsOutStock { get; set; }
/// <summary>
/// 财务信息
/// </summary>
public FSaleOrderFinance FSaleOrderFinance { get; set; }
/// <summary>
/// 订单条款
/// </summary>
public List<FSaleOrderClauseItem> FSaleOrderClause { get; set; }
/// <summary>
/// 订单明细
/// </summary>
public List<FSaleOrderEntryItem> FSaleOrderEntry { get; set; }
/// <summary>
/// 收款计划
/// </summary>
public List<FSaleOrderPlanItem> FSaleOrderPlan { get; set; }
/// <summary>
/// 物流跟踪明细
/// </summary>
public List<FSalOrderTraceItem> FSalOrderTrace { get; set; }
} }
public class FBillTypeID public class FBillTypeID
{ {
/// <summary> /// <summary>
@@ -1055,178 +1167,4 @@ namespace MyCode.Project.Domain.Message.Request.KingDee
/// </summary> /// </summary>
public List<FSalOrderTraceDetailItem> FSalOrderTraceDetail { get; set; } public List<FSalOrderTraceDetailItem> FSalOrderTraceDetail { get; set; }
} }
public class Model
{
/// <summary>
///
/// </summary>
public int FID { get; set; }
/// <summary>
/// 单据类型
/// </summary>
public FBillTypeID FBillTypeID { get; set; }
/// <summary>
/// 单据编号
/// </summary>
public string FBillNo { get; set; }
/// <summary>
/// 日期
/// </summary>
public string FDate { get; set; }
/// <summary>
/// 销售组织
/// </summary>
public FSaleOrgId FSaleOrgId { get; set; }
/// <summary>
/// 客户
/// </summary>
public FCustId FCustId { get; set; }
/// <summary>
/// 交货方式
/// </summary>
public FHeadDeliveryWay FHeadDeliveryWay { get; set; }
/// <summary>
/// 收货方
/// </summary>
public FReceiveId FReceiveId { get; set; }
/// <summary>
/// 交货地点
/// </summary>
public FHEADLOCID FHEADLOCID { get; set; }
/// <summary>
/// 对应组织
/// </summary>
public FCorrespondOrgId FCorrespondOrgId { get; set; }
/// <summary>
/// 销售部门
/// </summary>
public FSaleDeptId FSaleDeptId { get; set; }
/// <summary>
/// 销售组
/// </summary>
public FSaleGroupId FSaleGroupId { get; set; }
/// <summary>
/// 销售员
/// </summary>
public FSalerId FSalerId { get; set; }
/// <summary>
/// 收货方地址
/// </summary>
public string FReceiveAddress { get; set; }
/// <summary>
/// 结算方
/// </summary>
public FSettleId FSettleId { get; set; }
/// <summary>
/// 收货方联系人
/// </summary>
public FReceiveContact FReceiveContact { get; set; }
/// <summary>
/// 付款方
/// </summary>
public FChargeId FChargeId { get; set; }
/// <summary>
/// 移动销售订单编号
/// </summary>
public string FNetOrderBillNo { get; set; }
/// <summary>
/// 移动销售订单ID
/// </summary>
public int FNetOrderBillId { get; set; }
/// <summary>
/// 商机内码
/// </summary>
public int FOppID { get; set; }
/// <summary>
/// 销售阶段
/// </summary>
public FSalePhaseID FSalePhaseID { get; set; }
/// <summary>
/// 是否期初单据
/// </summary>
public string FISINIT { get; set; }
/// <summary>
/// 备注
/// </summary>
public string FNote { get; set; }
/// <summary>
///
/// </summary>
public string FIsMobile { get; set; }
/// <summary>
/// 订单来源
/// </summary>
public string FSOFrom { get; set; }
/// <summary>
/// 合同类型
/// </summary>
public string FContractType { get; set; }
/// <summary>
/// 销售合同内码
/// </summary>
public int FContractId { get; set; }
/// <summary>
/// 生成受托加工材料清单
/// </summary>
public string FIsUseOEMBomPush { get; set; }
/// <summary>
///
/// </summary>
public FWarehouse FWarehouse { get; set; }
/// <summary>
///
/// </summary>
public Foutlets Foutlets { get; set; }
/// <summary>
///
/// </summary>
public string FOrdertype { get; set; }
/// <summary>
/// 变更单主键
/// </summary>
public int FXPKID_H { get; set; }
/// <summary>
///
/// </summary>
public string FPushType { get; set; }
/// <summary>
/// 关闭原因
/// </summary>
public string FCloseReason { get; set; }
/// <summary>
/// 生成分销采购订单
/// </summary>
public string FIsUseDrpSalePOPush { get; set; }
/// <summary>
///
/// </summary>
public string FAutoShip { get; set; }
/// <summary>
///
/// </summary>
public string FIsOutStock { get; set; }
/// <summary>
/// 财务信息
/// </summary>
public FSaleOrderFinance FSaleOrderFinance { get; set; }
/// <summary>
/// 订单条款
/// </summary>
public List<FSaleOrderClauseItem> FSaleOrderClause { get; set; }
/// <summary>
/// 订单明细
/// </summary>
public List<FSaleOrderEntryItem> FSaleOrderEntry { get; set; }
/// <summary>
/// 收款计划
/// </summary>
public List<FSaleOrderPlanItem> FSaleOrderPlan { get; set; }
/// <summary>
/// 物流跟踪明细
/// </summary>
public List<FSalOrderTraceItem> FSalOrderTrace { get; set; }
}
} }

6
Reportapi/MyCode.Project.Domain/MyCode.Project.Domain.csproj
View File

@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MyCode.Project.Domain</RootNamespace> <RootNamespace>MyCode.Project.Domain</RootNamespace>
<AssemblyName>MyCode.Project.Domain</AssemblyName> <AssemblyName>MyCode.Project.Domain</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages> <RestorePackages>true</RestorePackages>
@@ -67,7 +67,9 @@
<Compile Include="Message\Request\JackYun\OrderTradeFullInfoGetRequestBizData.cs" /> <Compile Include="Message\Request\JackYun\OrderTradeFullInfoGetRequestBizData.cs" />
<Compile Include="Message\Request\KingDee\BillDelete.cs" /> <Compile Include="Message\Request\KingDee\BillDelete.cs" />
<Compile Include="Message\Request\KingDee\BillSave.cs" /> <Compile Include="Message\Request\KingDee\BillSave.cs" />
<Compile Include="Message\Request\KingDee\FSaleOrderEntry.cs" /> <Compile Include="Message\Request\KingDee\SaveModel\BaseModel.cs" />
<Compile Include="Message\Request\KingDee\SaveModel\SaleOrderModel - 复制.cs" />
<Compile Include="Message\Request\KingDee\SaveModel\SaleOrderModel.cs" />
<Compile Include="Message\Request\TimeRange.cs" /> <Compile Include="Message\Request\TimeRange.cs" />
<Compile Include="Message\Response\Common\HeadFieldItem.cs" /> <Compile Include="Message\Response\Common\HeadFieldItem.cs" />
<Compile Include="Message\Response\Common\IdName.cs" /> <Compile Include="Message\Response\Common\IdName.cs" />

118
Reportapi/MyCode.Project.GenerateCode/App.config
View File

@@ -1,45 +1,45 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- <!--
For more information on how to configure your ASP.NET application, please visit For more information on how to configure your ASP.NET application, please visit
https://go.microsoft.com/fwlink/?LinkId=301879 https://go.microsoft.com/fwlink/?LinkId=301879
--> -->
<configuration> <configuration>
<configSections> <configSections>
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" /> <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
</configSections> </configSections>
<connectionStrings> <connectionStrings>
<add name="WMSConn" connectionString="Data Source=127.0.0.1; Initial Catalog=YunTong; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun2" providerName="System.Data.SqlClient" /> <add name="WMSConn" connectionString="Data Source=127.0.0.1; Initial Catalog=xietong; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun2" providerName="System.Data.SqlClient"/>
<add name="YunTongConn" connectionString="Data Source=127.0.0.1; Initial Catalog=YunTong; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun1" providerName="System.Data.SqlClient" /> <add name="YunTongConn" connectionString="Data Source=127.0.0.1; Initial Catalog=xietong; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun1" providerName="System.Data.SqlClient"/>
</connectionStrings> </connectionStrings>
<appSettings> <appSettings>
<!--解决swagger出错问题--> <!--解决swagger出错问题-->
<add key="aspnet:UseHostHeaderForRequestUrl" value="true" /> <add key="aspnet:UseHostHeaderForRequestUrl" value="true"/>
<!--当前环境,1:生产环境 0：开发环境--> <!--当前环境,1:生产环境 0：开发环境-->
<add key="Env" value="0" /> <add key="Env" value="0"/>
<add key="RedisAddress" value="" /> <add key="RedisAddress" value=""/>
<!--缓存前缀--> <!--缓存前缀-->
<add key="CachePrefix" value="" /> <add key="CachePrefix" value=""/>
<!--jwtkey--> <!--jwtkey-->
<add key="JwtKey" value="t9Hu5zhiFWunJR1+XDrUM6Jp2aAvTjOa/XoxOrZ7bbI=" /> <add key="JwtKey" value="t9Hu5zhiFWunJR1+XDrUM6Jp2aAvTjOa/XoxOrZ7bbI="/>
<!--是否输出Sql命令0:不输出 1:输出--> <!--是否输出Sql命令0:不输出 1:输出-->
<add key="OutputSql" value="1" /> <add key="OutputSql" value="1"/>
<!--是否输出请求日志--> <!--是否输出请求日志-->
<add key="OutputRequstLog" value="1" /> <add key="OutputRequstLog" value="1"/>
<!--本地上传的存放路径--> <!--本地上传的存放路径-->
<add key="UploadFolder" value="D:\" /> <add key="UploadFolder" value="D:\"/>
<!--取消owin启动--> <!--取消owin启动-->
<add key="owin:AutomaticAppStartup" value="false" /> <add key="owin:AutomaticAppStartup" value="false"/>
<!--钉钉通知机器人--> <!--钉钉通知机器人-->
<add key="DingDingApiUrl" value="" /> <add key="DingDingApiUrl" value=""/>
<!--区域层增加的前缀路径--> <!--区域层增加的前缀路径-->
<add key="AreaUrlPrePath" value="" /> <add key="AreaUrlPrePath" value=""/>
</appSettings> </appSettings>
<!-- <!--
@@ -51,9 +51,9 @@
</system.Web> </system.Web>
--> -->
<system.web> <system.web>
<authentication mode="None" /> <authentication mode="None"/>
<compilation debug="true" targetFramework="4.5" /> <compilation debug="true" targetFramework="4.5"/>
<httpRuntime targetFramework="4.5" /> <httpRuntime targetFramework="4.5"/>
</system.web> </system.web>
<log4net> <log4net>
@@ -61,106 +61,106 @@
<!--日志路径--> <!--日志路径-->
<param name="File" value="App_Log\" /> <param name="File" value="App_Log\"/>
<!--是否是向文件中追加日志--> <!--是否是向文件中追加日志-->
<param name="AppendToFile" value="true" /> <param name="AppendToFile" value="true"/>
<!--log保留天数--> <!--log保留天数-->
<param name="MaxSizeRollBackups" value="30" /> <param name="MaxSizeRollBackups" value="30"/>
<!--日志文件名是否是固定不变的--> <!--日志文件名是否是固定不变的-->
<param name="StaticLogFileName" value="false" /> <param name="StaticLogFileName" value="false"/>
<!--日志文件名格式为:2008-08-31.log--> <!--日志文件名格式为:2008-08-31.log-->
<param name="DatePattern" value="yyyy-MM-dd&quot;.log&quot;" /> <param name="DatePattern" value="yyyy-MM-dd&quot;.log&quot;"/>
<!--日志根据日期滚动--> <!--日志根据日期滚动-->
<param name="RollingStyle" value="Date" /> <param name="RollingStyle" value="Date"/>
<layout type="log4net.Layout.PatternLayout"> <layout type="log4net.Layout.PatternLayout">
<param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n %logger" /> <param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n %logger"/>
</layout> </layout>
</appender> </appender>
<logger name="MyCode.Project.Logger"> <logger name="MyCode.Project.Logger">
<level value="ERROR" /> <level value="ERROR"/>
<level value="INFO" /> <level value="INFO"/>
<appender-ref ref="RollingLogFileAppender" /> <appender-ref ref="RollingLogFileAppender"/>
</logger> </logger>
<root> <root>
<!--(高) OFF > FATAL > ERROR > WARN > INFO > DEBUG > ALL (低)--> <!--(高) OFF > FATAL > ERROR > WARN > INFO > DEBUG > ALL (低)-->
<level value="ERROR" /> <level value="ERROR"/>
<appender-ref ref="RollingLogFileAppender" /> <appender-ref ref="RollingLogFileAppender"/>
</root> </root>
</log4net> </log4net>
<runtime> <runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed" /> <assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed"/>
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" /> <assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35"/>
<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0" /> <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" /> <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35"/>
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" /> <bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" /> <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" /> <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" /> <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" /> <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" /> <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/>
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" /> <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Common.Logging.Core" publicKeyToken="af08829b84f0328e" culture="neutral" /> <assemblyIdentity name="Common.Logging.Core" publicKeyToken="af08829b84f0328e" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-3.3.1.0" newVersion="3.3.1.0" /> <bindingRedirect oldVersion="0.0.0.0-3.3.1.0" newVersion="3.3.1.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Common.Logging" publicKeyToken="af08829b84f0328e" culture="neutral" /> <assemblyIdentity name="Common.Logging" publicKeyToken="af08829b84f0328e" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-3.3.1.0" newVersion="3.3.1.0" /> <bindingRedirect oldVersion="0.0.0.0-3.3.1.0" newVersion="3.3.1.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" /> <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0" /> <bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" /> <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /> <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" /> <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" /> <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0"/>
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<system.codedom> <system.codedom>
<compilers> <compilers>
<compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:6 /nowarn:1659;1699;1701" /> <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:6 /nowarn:1659;1699;1701"/>
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:14 /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" /> <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:14 /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+"/>
</compilers> </compilers>
</system.codedom> </system.codedom>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration> <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>

2
Reportapi/MyCode.Project.GenerateCode/MyCode.Project.GenerateCode.csproj
View File

@@ -8,7 +8,7 @@
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<RootNamespace>MyCode.Project.GenerateCode</RootNamespace> <RootNamespace>MyCode.Project.GenerateCode</RootNamespace>
<AssemblyName>MyCode.Project.GenerateCode</AssemblyName> <AssemblyName>MyCode.Project.GenerateCode</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile /> <TargetFrameworkProfile />

2
Reportapi/MyCode.Project.Infrastructure/MyCode.Project.Infrastructure.csproj
View File

@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MyCode.Project.Infrastructure</RootNamespace> <RootNamespace>MyCode.Project.Infrastructure</RootNamespace>
<AssemblyName>MyCode.Project.Infrastructure</AssemblyName> <AssemblyName>MyCode.Project.Infrastructure</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages> <RestorePackages>true</RestorePackages>

28
Reportapi/MyCode.Project.Infrastructure/app.config
View File

@@ -1,32 +1,32 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<runtime> <runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" /> <assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-0.85.4.369" newVersion="0.85.4.369" /> <bindingRedirect oldVersion="0.0.0.0-0.85.4.369" newVersion="0.85.4.369"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" /> <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" /> <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /> <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" /> <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" /> <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0"/>
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration> <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>

17
Reportapi/MyCode.Project.OutSideService/IKingDeeService.cs Normal file
View File

@@ -0,0 +1,17 @@
using MyCode.Project.Domain.Message.Request.KingDee;
namespace MyCode.Project.OutSideService
{
public interface IKingDeeService
{
/// <summary>
/// 保存一个订单对象
/// </summary>
/// <param name="formId"></param>
/// <param name="billSave"></param>
/// <returns></returns>
string Save(string formId, BillSave billSave);
}
}

2
Reportapi/MyCode.Project.OutSideService/Implementation/KingDeeService.cs
View File

@@ -9,7 +9,7 @@ using System.Linq;
namespace MyCode.Project.OutSideService.Implementation namespace MyCode.Project.OutSideService.Implementation
{ {
public class KingDeeService //: IKingDeeService public class KingDeeService : IKingDeeService
{ {
public KingDeeService() public KingDeeService()
{ {

3
Reportapi/MyCode.Project.OutSideService/MyCode.Project.OutSideService.csproj
View File

@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MyCode.Project.OutSideService</RootNamespace> <RootNamespace>MyCode.Project.OutSideService</RootNamespace>
<AssemblyName>MyCode.Project.OutSideService</AssemblyName> <AssemblyName>MyCode.Project.OutSideService</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
@@ -109,6 +109,7 @@
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="IKingDeeService.cs" />
<Compile Include="IBfyService.cs" /> <Compile Include="IBfyService.cs" />
<Compile Include="Implementation\BfyService.cs" /> <Compile Include="Implementation\BfyService.cs" />
<Compile Include="Implementation\KingDeeService.cs" /> <Compile Include="Implementation\KingDeeService.cs" />

24
Reportapi/MyCode.Project.OutSideService/app.config
View File

@@ -1,28 +1,28 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<runtime> <runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" /> <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" /> <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /> <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" /> <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" /> <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0"/>
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration> <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>

28
Reportapi/MyCode.Project.Repositories/App.config
View File

@@ -1,32 +1,32 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<runtime> <runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" /> <assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-0.85.4.369" newVersion="0.85.4.369" /> <bindingRedirect oldVersion="0.0.0.0-0.85.4.369" newVersion="0.85.4.369"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" /> <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" /> <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /> <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" /> <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" /> <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0"/>
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration> <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>

2
Reportapi/MyCode.Project.Repositories/MyCode.Project.Repositories.csproj
View File

@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MyCode.Project.Repositories</RootNamespace> <RootNamespace>MyCode.Project.Repositories</RootNamespace>
<AssemblyName>MyCode.Project.Repositories</AssemblyName> <AssemblyName>MyCode.Project.Repositories</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages> <RestorePackages>true</RestorePackages>

156
Reportapi/MyCode.Project.ScheduleTask/App.config
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- <!--
For more information on how to configure your ASP.NET application, please visit For more information on how to configure your ASP.NET application, please visit
https://go.microsoft.com/fwlink/?LinkId=301879 https://go.microsoft.com/fwlink/?LinkId=301879
@@ -6,7 +6,7 @@
<configuration> <configuration>
<configSections> <configSections>
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" /> <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
</configSections> </configSections>
@@ -14,45 +14,43 @@
<connectionStrings> <connectionStrings>
<add name="WMSConn" connectionString="Data Source=192.168.221.155; Initial Catalog=ESB_DTC; User ID=app_k3;Password=Postman2025k3; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun2" providerName="System.Data.SqlClient" /> <add name="WMSConn" connectionString="Data Source=127.0.0.1; Initial Catalog=xietong; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun2" providerName="System.Data.SqlClient"/>
<add name="YunTongConn" connectionString="Data Source=192.168.116.209; Initial Catalog=K3ZMFS_0905; User ID=app_jindie;Password=Ac661978!; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun1" providerName="System.Data.SqlClient" /> <add name="YunTongConn" connectionString="Data Source=127.0.0.1; Initial Catalog=xietong; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun1" providerName="System.Data.SqlClient"/>
<!--<add name="WMSConn" connectionString="Data Source=127.0.0.1; Initial Catalog=sdf; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=WMS" providerName="System.Data.SqlClient" />
<add name="YunTongConn" connectionString="Data Source=127.0.0.1; Initial Catalog=YunTong; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun1" providerName="System.Data.SqlClient" />-->
</connectionStrings> </connectionStrings>
<appSettings> <appSettings>
<!--解决swagger出错问题--> <!--解决swagger出错问题-->
<add key="aspnet:UseHostHeaderForRequestUrl" value="true" /> <add key="aspnet:UseHostHeaderForRequestUrl" value="true"/>
<!--当前环境,1:生产环境 0：开发环境--> <!--当前环境,1:生产环境 0：开发环境-->
<add key="Env" value="0" /> <add key="Env" value="0"/>
<!--因公司IP时常变化，先用13跳转--> <!--因公司IP时常变化，先用13跳转-->
<add key="RedisAddress" value="" /> <add key="RedisAddress" value="19VhOco9ayRaH41syZnWYn2S46x3FcKIjYKgr6K3L/tu7vmlJvhB0CKrIBfMVl1Y"/>
<!--缓存前缀--> <!--缓存前缀-->
<add key="CachePrefix" value="lxm-report:dev:" /> <add key="CachePrefix" value="lxm-report:dev:"/>
<!--jwtkey--> <!--jwtkey-->
<add key="JwtKey" value="4ea0180d8f8c1ce11343e9104c682bc4" /> <add key="JwtKey" value="4ea0180d8f8c1ce11343e9104c682bc4"/>
<!--是否输出Sql命令0:不输出 1:输出--> <!--是否输出Sql命令0:不输出 1:输出-->
<add key="OutputSql" value="0" /> <add key="OutputSql" value="0"/>
<!--是否输出请求日志--> <!--是否输出请求日志-->
<add key="OutputRequstLog" value="1" /> <add key="OutputRequstLog" value="1"/>
<!--本地上传的存放路径--> <!--本地上传的存放路径-->
<add key="UploadFolder" value="D:\" /> <add key="UploadFolder" value="D:\"/>
<!--取消owin启动--> <!--取消owin启动-->
<add key="owin:AutomaticAppStartup" value="false" /> <add key="owin:AutomaticAppStartup" value="false"/>
<!--钉钉通知机器人--> <!--钉钉通知机器人-->
<add key="DingDingApiUrl" value="" /> <add key="DingDingApiUrl" value=""/>
<!--区域层增加的前缀路径--> <!--区域层增加的前缀路径-->
<add key="AreaUrlPrePath" value="" /> <add key="AreaUrlPrePath" value=""/>
<!--生产环境D:\publish\lxm-report-api\App_File\--> <!--生产环境D:\publish\lxm-report-api\App_File\-->
<!--服务器文件保存的路径，这里调度用，如果是webapi则不需要用这个--> <!--服务器文件保存的路径，这里调度用，如果是webapi则不需要用这个-->
<add key="AppFilePath" value="D:\publish\api\App_File\" /> <add key="AppFilePath" value="D:\publish\LxmReportApi\api\App_File\"/>
<!--<add key="AppFilePath" value="D:\App_File\" />--> <!--<add key="AppFilePath" value="D:\App_File\" />-->
<!--Socket的URL，13生产服务器配置：ws://172.18.166.162:8282/--> <!--Socket的URL，13生产服务器配置：ws://172.18.166.162:8282/-->
<!--Socket的URL，110测试服务器配置：ws://172.18.243.207:9798/--> <!--Socket的URL，110测试服务器配置：ws://172.18.243.207:9798/-->
<add key="WebSocketUrl" value="ws://127.0.0.1:9798/" /> <add key="WebSocketUrl" value="ws://127.0.0.1:9798/"/>
@@ -72,142 +70,142 @@
</system.Web> </system.Web>
--> -->
<system.web> <system.web>
<authentication mode="None" /> <authentication mode="None"/>
<compilation debug="true" targetFramework="4.5" /> <compilation debug="true" targetFramework="4.5"/>
<httpRuntime targetFramework="4.5" /> <httpRuntime targetFramework="4.5"/>
<httpModules> <httpModules>
<add name="ApplicationInsightsWebTracking" type="Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web" /> <add name="ApplicationInsightsWebTracking" type="Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web"/>
</httpModules> </httpModules>
</system.web> </system.web>
<system.webServer> <system.webServer>
<modules> <modules>
<remove name="FormsAuthentication" /> <remove name="FormsAuthentication"/>
<remove name="ApplicationInsightsWebTracking" /> <remove name="ApplicationInsightsWebTracking"/>
<add name="ApplicationInsightsWebTracking" type="Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web" preCondition="managedHandler" /> <add name="ApplicationInsightsWebTracking" type="Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web" preCondition="managedHandler"/>
</modules> </modules>
<handlers> <handlers>
<remove name="ExtensionlessUrlHandler-Integrated-4.0" /> <remove name="ExtensionlessUrlHandler-Integrated-4.0"/>
<remove name="OPTIONSVerbHandler" /> <remove name="OPTIONSVerbHandler"/>
<remove name="TRACEVerbHandler" /> <remove name="TRACEVerbHandler"/>
<add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" /> <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0"/>
</handlers> </handlers>
<validation validateIntegratedModeConfiguration="false" /> <validation validateIntegratedModeConfiguration="false"/>
</system.webServer> </system.webServer>
<log4net> <log4net>
<appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender"> <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
<!--日志路径--> <!--日志路径-->
<param name="File" value="App_Log\Error\" /> <param name="File" value="App_Log\Error\"/>
<!--是否是向文件中追加日志--> <!--是否是向文件中追加日志-->
<param name="AppendToFile" value="true" /> <param name="AppendToFile" value="true"/>
<!--log保留天数--> <!--log保留天数-->
<param name="MaxSizeRollBackups" value="30" /> <param name="MaxSizeRollBackups" value="30"/>
<!--日志文件名是否是固定不变的--> <!--日志文件名是否是固定不变的-->
<param name="StaticLogFileName" value="false" /> <param name="StaticLogFileName" value="false"/>
<!--日志文件名格式为:2008-08-31.log--> <!--日志文件名格式为:2008-08-31.log-->
<param name="DatePattern" value="yyyy-MM-dd&quot;.log&quot;" /> <param name="DatePattern" value="yyyy-MM-dd&quot;.log&quot;"/>
<!--日志根据日期滚动--> <!--日志根据日期滚动-->
<param name="RollingStyle" value="Date" /> <param name="RollingStyle" value="Date"/>
<layout type="log4net.Layout.PatternLayout"> <layout type="log4net.Layout.PatternLayout">
<param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n %logger" /> <param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n %logger"/>
</layout> </layout>
<filter type="log4net.Filter.LevelRangeFilter"> <filter type="log4net.Filter.LevelRangeFilter">
<levelMin value="ERROR" /> <levelMin value="ERROR"/>
<levelMax value="ERROR" /> <levelMax value="ERROR"/>
</filter> </filter>
</appender> </appender>
<appender name="InfoLogFileAppender" type="log4net.Appender.RollingFileAppender"> <appender name="InfoLogFileAppender" type="log4net.Appender.RollingFileAppender">
<!--日志路径--> <!--日志路径-->
<param name="File" value="App_Log\Info\" /> <param name="File" value="App_Log\Info\"/>
<!--是否是向文件中追加日志--> <!--是否是向文件中追加日志-->
<param name="AppendToFile" value="true" /> <param name="AppendToFile" value="true"/>
<!--log保留天数--> <!--log保留天数-->
<param name="MaxSizeRollBackups" value="30" /> <param name="MaxSizeRollBackups" value="30"/>
<!--日志文件名是否是固定不变的--> <!--日志文件名是否是固定不变的-->
<param name="StaticLogFileName" value="false" /> <param name="StaticLogFileName" value="false"/>
<!--日志文件名格式为:2008-08-31.log--> <!--日志文件名格式为:2008-08-31.log-->
<param name="DatePattern" value="yyyy-MM-dd&quot;.log&quot;" /> <param name="DatePattern" value="yyyy-MM-dd&quot;.log&quot;"/>
<!--日志根据日期滚动--> <!--日志根据日期滚动-->
<param name="RollingStyle" value="Date" /> <param name="RollingStyle" value="Date"/>
<layout type="log4net.Layout.PatternLayout"> <layout type="log4net.Layout.PatternLayout">
<param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n %logger" /> <param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n %logger"/>
</layout> </layout>
<filter type="log4net.Filter.LevelRangeFilter"> <filter type="log4net.Filter.LevelRangeFilter">
<levelMin value="INFO" /> <levelMin value="INFO"/>
<levelMax value="INFO" /> <levelMax value="INFO"/>
</filter> </filter>
</appender> </appender>
<root> <root>
<!--(高) OFF > FATAL > ERROR > WARN > INFO > DEBUG > ALL (低)--> <!--(高) OFF > FATAL > ERROR > WARN > INFO > DEBUG > ALL (低)-->
<level value="ALL" /> <level value="ALL"/>
<appender-ref ref="InfoLogFileAppender" /> <appender-ref ref="InfoLogFileAppender"/>
<appender-ref ref="RollingLogFileAppender" /> <appender-ref ref="RollingLogFileAppender"/>
</root> </root>
</log4net> </log4net>
<runtime> <runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed" /> <assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed"/>
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" /> <assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35"/>
<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0" /> <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" /> <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35"/>
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" /> <bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" /> <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" /> <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" /> <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" /> <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" /> <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/>
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" /> <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Common.Logging.Core" publicKeyToken="af08829b84f0328e" culture="neutral" /> <assemblyIdentity name="Common.Logging.Core" publicKeyToken="af08829b84f0328e" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-3.3.1.0" newVersion="3.3.1.0" /> <bindingRedirect oldVersion="0.0.0.0-3.3.1.0" newVersion="3.3.1.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Common.Logging" publicKeyToken="af08829b84f0328e" culture="neutral" /> <assemblyIdentity name="Common.Logging" publicKeyToken="af08829b84f0328e" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-3.3.1.0" newVersion="3.3.1.0" /> <bindingRedirect oldVersion="0.0.0.0-3.3.1.0" newVersion="3.3.1.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" /> <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0" /> <bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /> <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" /> <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" /> <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0"/>
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<system.codedom> <system.codedom>
<compilers> <compilers>
<compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:6 /nowarn:1659;1699;1701" /> <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:6 /nowarn:1659;1699;1701"/>
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:14 /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" /> <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:14 /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+"/>
</compilers> </compilers>
</system.codedom> </system.codedom>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration> <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>

2
Reportapi/MyCode.Project.ScheduleTask/MyCode.Project.ScheduleTask.csproj
View File

@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MyCode.Project.ScheduleTask</RootNamespace> <RootNamespace>MyCode.Project.ScheduleTask</RootNamespace>
<AssemblyName>MyCode.Project.ScheduleTask</AssemblyName> <AssemblyName>MyCode.Project.ScheduleTask</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>

28
Reportapi/MyCode.Project.Services/App.config
View File

@@ -1,32 +1,32 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<runtime> <runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" /> <assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-0.85.4.369" newVersion="0.85.4.369" /> <bindingRedirect oldVersion="0.0.0.0-0.85.4.369" newVersion="0.85.4.369"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" /> <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" /> <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /> <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" /> <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" /> <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0"/>
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration> <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>

14
Reportapi/MyCode.Project.Services/IServices/IOrderPushService.cs Normal file
View File

@@ -0,0 +1,14 @@
using MyCode.Project.Domain.Model;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace MyCode.Project.Services.IServices
{
internal interface IOrderPushService
{
void PushOrderToKingDee(PushKingDeeOrder pushKingDeeOrder1);
}
}

1
Reportapi/MyCode.Project.Services/Implementation/JackYunTaskService.cs
View File

@@ -1,4 +1,5 @@
using MyCode.Project.Domain.Message.Response.JackYun; using MyCode.Project.Domain.Message.Response.JackYun;
using MyCode.Project.Domain.Message.Response.JackYun;
using MyCode.Project.Domain.Model; using MyCode.Project.Domain.Model;
using MyCode.Project.Domain.Repositories; using MyCode.Project.Domain.Repositories;
using MyCode.Project.Infrastructure.Common; using MyCode.Project.Infrastructure.Common;

224
Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs Normal file
View File

@@ -0,0 +1,224 @@
using MyCode.Project.Domain.Message.Request.KingDee;
using MyCode.Project.Domain.Message.Response.JackYun;
using MyCode.Project.Domain.Model;
using MyCode.Project.Domain.Repositories;
using MyCode.Project.Infrastructure.Common;
using MyCode.Project.Infrastructure.Exceptions;
using MyCode.Project.Infrastructure.JackYun;
using MyCode.Project.OutSideService;
using MyCode.Project.Repositories;
using MyCode.Project.Repositories.Common;
using MyCode.Project.Services.IServices;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace MyCode.Project.Services.Implementation
{
public class OrderPushService : IOrderPushService //, IOrderPushService
{
private IJackYunService _jackYunService;
private IJackOrdersRepository _jackOrdersRepository;
private IJackOrdersItemRepository _jackOrdersItemRepository;
private IPushKingDeeOrderRepository _pushKingDeeOrderRepository;
private IPushKingDeeOrderItemRepository _pushKingDeeOrderItemRepository;
private IYTKJTShopParameterRepository _yTKJTShopParameterRepository;
private IKingDeeService _kingDeeService;
public OrderPushService(IJackOrdersRepository jackOrdersRepository
, IJackOrdersItemRepository jackOrdersItemRepository
, IPushKingDeeOrderRepository pushKingDeeOrderRepository
, IPushKingDeeOrderItemRepository pushKingDeeOrderItemRepository
, IYTKJTShopParameterRepository yTKJTShopParameterRepository
, IJackYunService jackYunService
, IKingDeeService kingDeeService)
{
_yTKJTShopParameterRepository = yTKJTShopParameterRepository;
_pushKingDeeOrderRepository = pushKingDeeOrderRepository;
_pushKingDeeOrderItemRepository = pushKingDeeOrderItemRepository;
_jackOrdersRepository = jackOrdersRepository;
_jackOrdersItemRepository = jackOrdersItemRepository;
_jackYunService = jackYunService;
_kingDeeService = kingDeeService;
}
#region SetOrder(把吉客云订单存进本地数据库)
/// <summary>
/// 把吉客云订单存进本地数据库
/// </summary>
/// <param name="trades"></param>
[TransactionCallHandler]
public void SetOrder(List<TradesItem> trades)
{
var ids = trades.Select(t => t.tradeId).Distinct().ToList();
ids = _jackOrdersRepository.Queryable().Where(t => ids.Contains(t.TradeId)).Select(t => t.TradeId).Distinct().ToList();
if (ids.Count > 0)
trades = trades.Where(t => !ids.Contains(t.tradeId)).ToList();
List<JackOrders> jackOrdersList = new List<JackOrders>();
List<JackOrdersItem> ordersItemList = new List<JackOrdersItem>();
trades.ForEach(t =>
{
JackOrders jackOrders = new JackOrders();
jackOrders = AutoMapperHelper.AutoMappToSingle<JackOrders, TradesItem>(t);
jackOrders.Id = Guid.NewGuid();
jackOrders.Status = 0;
jackOrders.UpdateTime = DateTime.Now;
jackOrders.CreateTime = DateTime.Now;
if (t.goodsDetail != null)
{
var items = AutoMapperHelper.AutoMappToList<JackOrdersItem, GoodsDetailItem>(t.goodsDetail);
items.ForEach(k =>
{
k.JackOrdersId = jackOrders.Id;
});
jackOrdersList.Add(jackOrders);
ordersItemList.AddRange(items);
}
});
if (jackOrdersList.Count > 0)
{
_jackOrdersRepository.Add(jackOrdersList);
_jackOrdersItemRepository.Add(ordersItemList);
}
}
#endregion
#region GetAndMergeJackYunOrder(合并吉客云订单到新表)
/// <summary>
/// 合并吉客云订单到新表
/// </summary>
/// <returns></returns>
[TransactionCallHandler]
public string GetAndMergeJackYunOrder(string now)
{
var list = _jackOrdersItemRepository.GetPushOrder();
List<string> mesg = new List<string>();
var shopParemList = _yTKJTShopParameterRepository.Queryable().Where(t => t.FDOCUMENTSTATUS == "C").ToList();
List<PushKingDeeOrderItem> pushKingDeeOrderItems = new List<PushKingDeeOrderItem>();
List<PushKingDeeOrder> pushKingDeeOrders = new List<PushKingDeeOrder>();
list.ForEach(sheet =>
{
if (pushKingDeeOrders.Where(t => t.ShopId == sheet.ShopId && t.WarehouseId == sheet.WarehouseId).Count() > 0)
{
return;
}
PushKingDeeOrder pushKingDeeOrder = new PushKingDeeOrder();
pushKingDeeOrder = AutoMapperHelper.AutoMappToSingle<PushKingDeeOrder, PushOrderListResp>(sheet);
pushKingDeeOrder.Id = Guid.NewGuid();
pushKingDeeOrders.Add(pushKingDeeOrder);
var tempList = list.Where(t => t.ShopId == sheet.ShopId && t.WarehouseId == sheet.WarehouseId).ToList();
tempList.ForEach(item =>
{
PushKingDeeOrderItem pushKingDeeOrderItem = new PushKingDeeOrderItem();
pushKingDeeOrderItem = AutoMapperHelper.AutoMappToSingle<PushKingDeeOrderItem, PushOrderListResp>(item);
pushKingDeeOrderItem.PushKingDeeOrderId = pushKingDeeOrder.Id;
pushKingDeeOrderItem.Id = Guid.NewGuid();
pushKingDeeOrderItems.Add(pushKingDeeOrderItem);
});
//var shopParem = shopParemList.Where(h => h.FSHOPCODE == sheet.ShopId.Value.ToString()&& h.FWAREHOUSE.Value.ToString()==sheet.WarehouseId ).FirstOrDefault();
//if (shopParem != null)
//{
//}
//else
//{
// mesg.Add($@"店铺{sheet.ShopName}没有配置店铺参数或者配置的仓库不是 {sheet.WarehouseCode}");
//}
});
if (pushKingDeeOrders.Count > 0)
{
var oldList = _jackOrdersRepository.Queryable().Where(t => t.Status == 0).ToList();
oldList.ForEach(t =>
{
if (pushKingDeeOrders.Count(h => h.ShopId == t.ShopId && t.WarehouseId == h.WarehouseId) > 0)
{
t.Status = 1;
t.UpdateTime = DateTime.Now;
}
});
oldList = oldList.Where(t => t.Status == 1).ToList();
_jackOrdersRepository.Update(oldList);
_pushKingDeeOrderRepository.Add(pushKingDeeOrders);
_pushKingDeeOrderItemRepository.Add(pushKingDeeOrderItems);
}
return JsonHelper.ToJson(list);
}
#endregion
public void PushOrderToKingDee(PushKingDeeOrder pushKingDeeOrder1)
{
var orderSHeet = _pushKingDeeOrderRepository.Queryable().Where(t => pushKingDeeOrder1.Id == t.Id).First();
if (orderSHeet.Status != 0)
{
throw new BaseException("");
}
var itemList = _pushKingDeeOrderItemRepository.Queryable().Where(t => pushKingDeeOrder1.Id == t.PushKingDeeOrderId).ToList();
var one = _yTKJTShopParameterRepository.Queryable().Where(t => t.FSHOPCODE == orderSHeet.ShopCode).First();
// TODO 如果是False则同步到云星空销售订单
if (one.FSYNCHRONIZEWMS == "0")
{
// 遍历单体，构造单据体实体
var entryList = itemList.Select(n => new FSaleOrderEntryItem()
{
Fcode = n.Barcode, // 条码带出物料 、物料带出税额
FQty = n.SellCount, // 销售数量
}).ToList();
// 构建单据数据包
var model = new SaleOrderModel()
{
FID = 0, // 新增
FBillTypeID = new FBillTypeID()
{
// 1：零售业务7：售后发货；8：售后退货
FNUMBER = orderSHeet.TradeType == 8 ? "XSDD05_SYS" : "XSDD01_SYS"
},
FOrdertype = orderSHeet.TradeType == 8 ? "8" : "4",
FDate = orderSHeet.CreateTime?.ToString("yyyy/MM/dd"),
FSaleOrgId = new FSaleOrgId()
{
FNumber = "" // 固定组织
},
FCustId = new FCustId()
{
FNumber = "", // 客户？
},
FSalerId = new FSalerId()
{
FNumber = "", // 销售员
},
Foutlets = new Foutlets()
{
FNUMBER = orderSHeet.ShopCode, // 门店编码
},
FWarehouse = new FWarehouse()
{
FNUMBER = orderSHeet.WarehouseCode, // 仓库编码
},
FSaleOrderEntry = entryList
};
BillSave billSave = new BillSave()
{
Model = model
};
SaleOrderModel fSaleOrderEntry = new SaleOrderModel();
var resultString = _kingDeeService.Save("SAL_SaleOrder", billSave);
LogHelper.Info(resultString);
}
// 如果为True则同步到WMS
else
{
//wms
}
}
}
}

4
Reportapi/MyCode.Project.Services/MyCode.Project.Services.csproj
View File

@@ -12,7 +12,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MyCode.Project.Services</RootNamespace> <RootNamespace>MyCode.Project.Services</RootNamespace>
<AssemblyName>MyCode.Project.Services</AssemblyName> <AssemblyName>MyCode.Project.Services</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -116,6 +116,7 @@
<Compile Include="Implementation\AnsyDataProcessService.cs" /> <Compile Include="Implementation\AnsyDataProcessService.cs" />
<Compile Include="Implementation\ApiLogService.cs" /> <Compile Include="Implementation\ApiLogService.cs" />
<Compile Include="Implementation\JackYunStockinService.cs" /> <Compile Include="Implementation\JackYunStockinService.cs" />
<Compile Include="Implementation\OrderPushService.cs" />
<Compile Include="Implementation\WMSService.cs" /> <Compile Include="Implementation\WMSService.cs" />
<Compile Include="Implementation\JackYunService.cs" /> <Compile Include="Implementation\JackYunService.cs" />
<Compile Include="Implementation\JackYunTaskService.cs" /> <Compile Include="Implementation\JackYunTaskService.cs" />
@@ -125,6 +126,7 @@
<Compile Include="Implementation\WorkProcessService.cs" /> <Compile Include="Implementation\WorkProcessService.cs" />
<Compile Include="IServices\IAnsyDataProcessService.cs" /> <Compile Include="IServices\IAnsyDataProcessService.cs" />
<Compile Include="IServices\IJackYunStockinService.cs" /> <Compile Include="IServices\IJackYunStockinService.cs" />
<Compile Include="IServices\IOrderPushService.cs" />
<Compile Include="IServices\IWMSService.cs" /> <Compile Include="IServices\IWMSService.cs" />
<Compile Include="IServices\IJackYunTaskService.cs" /> <Compile Include="IServices\IJackYunTaskService.cs" />
<Compile Include="IServices\IJackYunService.cs" /> <Compile Include="IServices\IJackYunService.cs" />

24
Reportapi/MyCode.Project.WebApi/Controllers/TestController.cs
View File

@@ -13,18 +13,32 @@ namespace MyCode.Project.WebApi.Controllers
/// </summary> /// </summary>
public class TestController : BaseAPIController public class TestController : BaseAPIController
{ {
private IJackYunTaskService _jackYunTaskService; private IJackYunTaskService _jackYunTaskService;
private IWMSService _wMSService; private IWMSService _wMSService;
private IJackYunStockinService _jackYunStockinService; private IJackYunStockinService _jackYunStockinService;
private IOrderPushService _orderPushService;
public TestController(IJackYunTaskService jackYunTaskService, IWMSService wMSService , IJackYunStockinService jackYunStockinService) public TestController(IJackYunTaskService jackYunTaskService, IWMSService wMSService, IJackYunStockinService jackYunStockinService)
{ {
_jackYunTaskService = jackYunTaskService; _jackYunTaskService = jackYunTaskService;
_wMSService = wMSService; _wMSService = wMSService;
_jackYunStockinService = jackYunStockinService; _jackYunStockinService = jackYunStockinService;
} }
#region 调度运行抓吉客云销售订单
/// <summary>
/// 调度运行抓吉客云销售订单
/// </summary>
[HttpGet]
[AllowAnonymous]
public void TaskSendKingdeeSaleOrderById(string now)
{
_jackYunTaskService.TaskGetJackYunOrder(now);
}
#endregion
//#region 调度运行抓吉客云销售订单 //#region 调度运行抓吉客云销售订单
///// <summary> ///// <summary>
@@ -45,9 +59,9 @@ namespace MyCode.Project.WebApi.Controllers
/// </summary> /// </summary>
[HttpGet] [HttpGet]
[AllowAnonymous] [AllowAnonymous]
public List<WMStoJackyunInventoryMovementView1> GetList(DateTime now) public List<WMStoJackyunInventoryMovementView1> GetList(DateTime now)
{ {
return _wMSService.GetList(now); return _wMSService.GetList(now);
} }
#endregion #endregion
@@ -59,7 +73,7 @@ namespace MyCode.Project.WebApi.Controllers
[AllowAnonymous] [AllowAnonymous]
public string GetAndMergeJackYunOrder(string now) public string GetAndMergeJackYunOrder(string now)
{ {
return _jackYunTaskService.GetAndMergeJackYunOrder(now); return _jackYunTaskService.GetAndMergeJackYunOrder(now);
} }
#endregion #endregion

5
Reportapi/MyCode.Project.WebApi/MyCode.Project.WebApi.csproj
View File

@@ -15,7 +15,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MyCode.Project.WebApi</RootNamespace> <RootNamespace>MyCode.Project.WebApi</RootNamespace>
<AssemblyName>MyCode.Project.WebApi</AssemblyName> <AssemblyName>MyCode.Project.WebApi</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<MvcBuildViews>false</MvcBuildViews> <MvcBuildViews>false</MvcBuildViews>
<UseIISExpress>false</UseIISExpress> <UseIISExpress>false</UseIISExpress>
<IISExpressSSLPort /> <IISExpressSSLPort />
@@ -112,7 +112,6 @@
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.Runtime"> <Reference Include="System.Runtime">
<HintPath>..\Lib\System.Runtime.dll</HintPath> <HintPath>..\Lib\System.Runtime.dll</HintPath>
@@ -123,7 +122,6 @@
<Reference Include="System.ComponentModel.DataAnnotations" /> <Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Web" /> <Reference Include="System.Web" />
<Reference Include="System.Web.Abstractions" /> <Reference Include="System.Web.Abstractions" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Web.Routing" /> <Reference Include="System.Web.Routing" />
<Reference Include="System.Web.Services" /> <Reference Include="System.Web.Services" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
@@ -173,7 +171,6 @@
<Private>True</Private> <Private>True</Private>
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath> <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Xml.Linq" />
<Reference Include="Unity.WebApi"> <Reference Include="Unity.WebApi">
<HintPath>..\Lib\Unity.WebApi.dll</HintPath> <HintPath>..\Lib\Unity.WebApi.dll</HintPath>
</Reference> </Reference>

242
Reportapi/MyCode.Project.WebApi/Web.config
View File

@@ -1,107 +1,60 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0"?>
<!-- <!--
For more information on how to configure your ASP.NET application, please visit For more information on how to configure your ASP.NET application, please visit
https://go.microsoft.com/fwlink/?LinkId=301879 https://go.microsoft.com/fwlink/?LinkId=301879
--> -->
<configuration> <configuration>
<configSections> <configSections>
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" /> <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
</configSections> </configSections>
<system.webServer> <system.webServer>
<httpProtocol> <httpProtocol>
<customHeaders> <customHeaders>
<add name="Access-Control-Allow-Origin" value="*" /> <add name="Access-Control-Allow-Origin" value="*"/>
<add name="Access-Control-Allow-Methods" value="*" /> <add name="Access-Control-Allow-Methods" value="*"/>
<add name="Access-Control-Allow-Headers" value="Content-type,Authorization,*" /> <add name="Access-Control-Allow-Headers" value="Content-type,Authorization,*"/>
<add name="Access-Control-Request-Headers" value="*" /> <add name="Access-Control-Request-Headers" value="*"/>
<add name="Access-Control-Request-Method" value="*" /> <add name="Access-Control-Request-Method" value="*"/>
<add name="Access-Control-Allow-Credentials" value="*" /> <add name="Access-Control-Allow-Credentials" value="*"/>
<add name="Access-Control-Max-Age" value="1728000" /> <add name="Access-Control-Max-Age" value="1728000"/>
</customHeaders> </customHeaders>
</httpProtocol> </httpProtocol>
</system.webServer> </system.webServer>
<connectionStrings> <connectionStrings>
<!-- 数据库测试--> <!-- 数据库测试-->
<add name="WMSConn" connectionString="Data Source=127.0.0.1; Initial Catalog=sdf; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=WMS" providerName="System.Data.SqlClient" /> <add name="WMSConn" connectionString="Data Source=127.0.0.1; Initial Catalog=xietong; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun2" providerName="System.Data.SqlClient"/>
<add name="YunTongConn" connectionString="Data Source=127.0.0.1; Initial Catalog=YunTong; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun1" providerName="System.Data.SqlClient" /> <add name="YunTongConn" connectionString="Data Source=127.0.0.1; Initial Catalog=xietong; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun1" providerName="System.Data.SqlClient"/>
<!--测试MYSQL内网-->
<!--测试MYSQL内网-->
<!--<add name="MasterConn" connectionString="" providerName="MySql.Data.MySqlClient" />--> <!--<add name="MasterConn" connectionString="" providerName="MySql.Data.MySqlClient" />-->
</connectionStrings> </connectionStrings>
<appSettings> <appSettings>
<!--解决swagger出错问题--> <!--解决swagger出错问题-->
<add key="aspnet:UseHostHeaderForRequestUrl" value="true" /> <add key="aspnet:UseHostHeaderForRequestUrl" value="true"/>
<!--当前环境,1:生产环境 0：开发环境--> <!--当前环境,1:生产环境 0：开发环境-->
<add key="Env" value="0" /> <add key="Env" value="0"/>
<!--因公司IP时常变化，先用13跳转--> <!--因公司IP时常变化，先用13跳转-->
<add key="RedisAddress" value="" /> <add key="RedisAddress" value=""/>
<!--缓存前缀--> <!--缓存前缀-->
<add key="CachePrefix" value="" /> <add key="CachePrefix" value=""/>
<!--jwtkey--> <!--jwtkey-->
<add key="JwtKey" value="t9Hu5zhiFWunJR1+XDrUM6Jp2aAvTjOa/XoxOrZ7bbI=" /> <add key="JwtKey" value="t9Hu5zhiFWunJR1+XDrUM6Jp2aAvTjOa/XoxOrZ7bbI="/>
<!--是否输出Sql命令0:不输出 1:输出--> <!--是否输出Sql命令0:不输出 1:输出-->
<add key="OutputSql" value="0" /> <add key="OutputSql" value="0"/>
<!--是否输出请求日志--> <!--是否输出请求日志-->
<add key="OutputRequstLog" value="1" /> <add key="OutputRequstLog" value="1"/>
<!--本地上传的存放路径--> <!--本地上传的存放路径-->
<add key="UploadFolder" value="D:\" /> <add key="UploadFolder" value="D:\"/>
<!--取消owin启动--> <!--取消owin启动-->
<add key="owin:AutomaticAppStartup" value="false" /> <add key="owin:AutomaticAppStartup" value="false"/>
<!--钉钉通知机器人--> <!--钉钉通知机器人-->
<add key="DingDingApiUrl" value="" /> <add key="DingDingApiUrl" value=""/>
<!--区域层增加的前缀路径--> <!--区域层增加的前缀路径-->
<add key="AreaUrlPrePath" value="" /> <add key="AreaUrlPrePath" value=""/>
<!--生产环境D:\publish\lxm-report-api\App_File\--> <!--生产环境D:\publish\lxm-report-api\App_File\-->
<!--服务器文件保存的路径，这里调度用，如果是webapi则不需要用这个--> <!--服务器文件保存的路径，这里调度用，如果是webapi则不需要用这个-->
<add key="AppFilePath" value="D:\publish\LxmReportApi\api\App_File\" /> <add key="AppFilePath" value="D:\publish\LxmReportApi\api\App_File\"/>
<!--<add key="AppFilePath" value="D:\App_File\" />--> <!--<add key="AppFilePath" value="D:\App_File\" />-->
<add key="WebSocketUrl" value="ws://127.0.0.1:9798/" /> <add key="WebSocketUrl" value="ws://127.0.0.1:9798/"/>
<!-- 当前使用的 账套ID(即数据中心id) -->
<!-- 第三方系统登录授权的账套ID（即open.kingdee.com网站的第三方系统登录授权中的数据中心标识）-->
<!-- 在第三方系统登录授权页面点击“生成测试链接”按钮后即可查看 -->
<add key="X-KDApi-AcctID" value="66d918bdc00906"/>
<!-- 第三方系统登录授权的 集成用户名称 -->
<!-- 补丁版本为PT-146894 [7.7.0.202111]及后续的版本，则为指定用户登录列表中任一用户 -->
<!-- 若第三方系统登录授权已勾选“允许全部用户登录”，则无以上限制 -->
<add key="X-KDApi-UserName" value="吉客云" />
<!-- 第三方系统登录授权的 应用ID -->
<add key="X-KDApi-AppID" value="400925_wYdO4+jLQMDf091IQYTB48WNRjSaXKLu"/>
<!-- 第三方系统登录授权的 应用密钥 -->
<add key="X-KDApi-AppSec" value="41dfa53b0e634b72b01e303d14fa6e35"/>
<!-- 账套语系，默认2052 -->
<add key="X-KDApi-LCID" value="2052"/>
<!-- 组织编码，启用多组织时配置对应的组织编码才有效 -->
<!--<add key="X-KDApi-OrgNum" value="*****"/>-->
<!-- 服务Url地址(私有云和公有云都须配置金蝶云星空产品地址，K3Cloud/结尾)-->
<add key="X-KDApi-ServerUrl" value="http://localhost/k3cloud/"/>
</appSettings> </appSettings>
<!-- <!--
有关 web.config 更改的说明，请参见 http://go.microsoft.com/fwlink/?LinkId=235367。 有关 web.config 更改的说明，请参见 http://go.microsoft.com/fwlink/?LinkId=235367。
@@ -112,58 +65,56 @@
</system.Web> </system.Web>
--> -->
<system.web> <system.web>
<authentication mode="None" /> <authentication mode="None"/>
<compilation debug="true" targetFramework="4.6.1" /> <compilation debug="true" targetFramework="4.8"/>
<httpRuntime targetFramework="4.6.1" /> <httpRuntime targetFramework="4.6.1"/>
<customErrors mode="Off" /> <customErrors mode="Off"/>
</system.web> </system.web>
<log4net> <log4net>
<appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender"> <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
<!--日志路径--> <!--日志路径-->
<param name="File" value="App_Log\Error\" /> <param name="File" value="App_Log\Error\"/>
<!--是否是向文件中追加日志--> <!--是否是向文件中追加日志-->
<param name="AppendToFile" value="true" /> <param name="AppendToFile" value="true"/>
<!--log保留天数--> <!--log保留天数-->
<param name="MaxSizeRollBackups" value="30" /> <param name="MaxSizeRollBackups" value="30"/>
<!--日志文件名是否是固定不变的--> <!--日志文件名是否是固定不变的-->
<param name="StaticLogFileName" value="false" /> <param name="StaticLogFileName" value="false"/>
<!--日志文件名格式为:2008-08-31.log--> <!--日志文件名格式为:2008-08-31.log-->
<param name="DatePattern" value="yyyy-MM-dd&quot;.log&quot;" /> <param name="DatePattern" value="yyyy-MM-dd&quot;.log&quot;"/>
<!--日志根据日期滚动--> <!--日志根据日期滚动-->
<param name="RollingStyle" value="Date" /> <param name="RollingStyle" value="Date"/>
<layout type="log4net.Layout.PatternLayout"> <layout type="log4net.Layout.PatternLayout">
<param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n %logger" /> <param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n %logger"/>
</layout> </layout>
<filter type="log4net.Filter.LevelRangeFilter"> <filter type="log4net.Filter.LevelRangeFilter">
<levelMin value="ERROR" /> <levelMin value="ERROR"/>
<levelMax value="ERROR" /> <levelMax value="ERROR"/>
<filter type="log4net.Filter.DenyAllFilter" /> <filter type="log4net.Filter.DenyAllFilter"/>
</filter> </filter>
</appender> </appender>
<appender name="InfoLogFileAppender" type="log4net.Appender.RollingFileAppender"> <appender name="InfoLogFileAppender" type="log4net.Appender.RollingFileAppender">
<!--日志路径--> <!--日志路径-->
<param name="File" value="App_Log\Info\" /> <param name="File" value="App_Log\Info\"/>
<!--是否是向文件中追加日志--> <!--是否是向文件中追加日志-->
<param name="AppendToFile" value="true" /> <param name="AppendToFile" value="true"/>
<!--log保留天数--> <!--log保留天数-->
<param name="MaxSizeRollBackups" value="30" /> <param name="MaxSizeRollBackups" value="30"/>
<!--日志文件名是否是固定不变的--> <!--日志文件名是否是固定不变的-->
<param name="StaticLogFileName" value="false" /> <param name="StaticLogFileName" value="false"/>
<!--日志文件名格式为:2008-08-31.log--> <!--日志文件名格式为:2008-08-31.log-->
<param name="DatePattern" value="yyyy-MM-dd&quot;.log&quot;" /> <param name="DatePattern" value="yyyy-MM-dd&quot;.log&quot;"/>
<!--日志根据日期滚动--> <!--日志根据日期滚动-->
<param name="RollingStyle" value="Date" /> <param name="RollingStyle" value="Date"/>
<layout type="log4net.Layout.PatternLayout"> <layout type="log4net.Layout.PatternLayout">
<param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n %logger" /> <param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n %logger"/>
</layout> </layout>
<filter type="log4net.Filter.LevelRangeFilter"> <filter type="log4net.Filter.LevelRangeFilter">
<levelMin value="INFO" /> <levelMin value="INFO"/>
<levelMax value="INFO" /> <levelMax value="INFO"/>
<filter type="log4net.Filter.DenyAllFilter" /> <filter type="log4net.Filter.DenyAllFilter"/>
</filter> </filter>
</appender> </appender>
<!-- MySQL Appender --> <!-- MySQL Appender -->
<!--<appender name="AdoNetAppender" type="log4net.Appender.AdoNetAppender"> <!--<appender name="AdoNetAppender" type="log4net.Appender.AdoNetAppender">
<bufferSize value="1" /> <bufferSize value="1" />
@@ -199,91 +150,86 @@
</filter> </filter>
<filter type="log4net.Filter.DenyAllFilter" /> <filter type="log4net.Filter.DenyAllFilter" />
</appender>--> </appender>-->
<root> <root>
<!--(高) OFF > FATAL > ERROR > WARN > INFO > DEBUG > ALL (低)--> <!--(高) OFF > FATAL > ERROR > WARN > INFO > DEBUG > ALL (低)-->
<level value="ALL" /> <level value="ALL"/>
<appender-ref ref="InfoLogFileAppender" /> <appender-ref ref="InfoLogFileAppender"/>
<appender-ref ref="RollingLogFileAppender" /> <appender-ref ref="RollingLogFileAppender"/>
<appender-ref ref="AdoNetAppender" /> <appender-ref ref="AdoNetAppender"/>
</root> </root>
</log4net> </log4net>
<runtime> <runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" /> <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" /> <assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35"/>
<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0" /> <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" /> <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35"/>
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" /> <bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" /> <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" /> <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" /> <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" /> <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" /> <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/>
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" /> <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Common.Logging.Core" publicKeyToken="af08829b84f0328e" culture="neutral" /> <assemblyIdentity name="Common.Logging.Core" publicKeyToken="af08829b84f0328e" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-3.3.1.0" newVersion="3.3.1.0" /> <bindingRedirect oldVersion="0.0.0.0-3.3.1.0" newVersion="3.3.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Common.Logging" publicKeyToken="af08829b84f0328e" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.3.1.0" newVersion="3.3.1.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" /> <assemblyIdentity name="Common.Logging" publicKeyToken="af08829b84f0328e" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0" /> <bindingRedirect oldVersion="0.0.0.0-3.3.1.0" newVersion="3.3.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" /> <bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" /> <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /> <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" /> <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.0.0.0"/>
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<system.codedom> <system.codedom>
<compilers> <compilers>
<compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:6 /nowarn:1659;1699;1701" /> <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:6 /nowarn:1659;1699;1701"/>
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:14 /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" /> <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:14 /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+"/>
</compilers> </compilers>
</system.codedom> </system.codedom>
</configuration> </configuration>

118
Reportapi/MyCode.Project.ZHMDGenerateCode/App.config
View File

@@ -1,45 +1,45 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- <!--
For more information on how to configure your ASP.NET application, please visit For more information on how to configure your ASP.NET application, please visit
https://go.microsoft.com/fwlink/?LinkId=301879 https://go.microsoft.com/fwlink/?LinkId=301879
--> -->
<configuration> <configuration>
<configSections> <configSections>
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" /> <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
</configSections> </configSections>
<connectionStrings> <connectionStrings>
<add name="WMSConn" connectionString="Data Source=127.0.0.1; Initial Catalog=YunTong; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun2" providerName="System.Data.SqlClient" /> <add name="WMSConn" connectionString="Data Source=127.0.0.1; Initial Catalog=xietong; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun2" providerName="System.Data.SqlClient"/>
<add name="YunTongConn" connectionString="Data Source=127.0.0.1; Initial Catalog=YunTong; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun1" providerName="System.Data.SqlClient" /> <add name="YunTongConn" connectionString="Data Source=127.0.0.1; Initial Catalog=xietong; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun1" providerName="System.Data.SqlClient"/>
</connectionStrings> </connectionStrings>
<appSettings> <appSettings>
<!--解决swagger出错问题--> <!--解决swagger出错问题-->
<add key="aspnet:UseHostHeaderForRequestUrl" value="true" /> <add key="aspnet:UseHostHeaderForRequestUrl" value="true"/>
<!--当前环境,1:生产环境 0：开发环境--> <!--当前环境,1:生产环境 0：开发环境-->
<add key="Env" value="0" /> <add key="Env" value="0"/>
<add key="RedisAddress" value="" /> <add key="RedisAddress" value=""/>
<!--缓存前缀--> <!--缓存前缀-->
<add key="CachePrefix" value="lxm-report:dev:" /> <add key="CachePrefix" value="lxm-report:dev:"/>
<!--jwtkey--> <!--jwtkey-->
<add key="JwtKey" value="t9Hu5zhiFWunJR1+XDrUM6Jp2aAvTjOa/XoxOrZ7bbI=" /> <add key="JwtKey" value="t9Hu5zhiFWunJR1+XDrUM6Jp2aAvTjOa/XoxOrZ7bbI="/>
<!--是否输出Sql命令0:不输出 1:输出--> <!--是否输出Sql命令0:不输出 1:输出-->
<add key="OutputSql" value="1" /> <add key="OutputSql" value="1"/>
<!--是否输出请求日志--> <!--是否输出请求日志-->
<add key="OutputRequstLog" value="1" /> <add key="OutputRequstLog" value="1"/>
<!--本地上传的存放路径--> <!--本地上传的存放路径-->
<add key="UploadFolder" value="D:\" /> <add key="UploadFolder" value="D:\"/>
<!--取消owin启动--> <!--取消owin启动-->
<add key="owin:AutomaticAppStartup" value="false" /> <add key="owin:AutomaticAppStartup" value="false"/>
<!--钉钉通知机器人--> <!--钉钉通知机器人-->
<add key="DingDingApiUrl" value="" /> <add key="DingDingApiUrl" value=""/>
<!--区域层增加的前缀路径--> <!--区域层增加的前缀路径-->
<add key="AreaUrlPrePath" value="" /> <add key="AreaUrlPrePath" value=""/>
</appSettings> </appSettings>
<!-- <!--
@@ -51,9 +51,9 @@
</system.Web> </system.Web>
--> -->
<system.web> <system.web>
<authentication mode="None" /> <authentication mode="None"/>
<compilation debug="true" targetFramework="4.5" /> <compilation debug="true" targetFramework="4.5"/>
<httpRuntime targetFramework="4.5" /> <httpRuntime targetFramework="4.5"/>
</system.web> </system.web>
<log4net> <log4net>
@@ -61,106 +61,106 @@
<!--日志路径--> <!--日志路径-->
<param name="File" value="App_Log\" /> <param name="File" value="App_Log\"/>
<!--是否是向文件中追加日志--> <!--是否是向文件中追加日志-->
<param name="AppendToFile" value="true" /> <param name="AppendToFile" value="true"/>
<!--log保留天数--> <!--log保留天数-->
<param name="MaxSizeRollBackups" value="30" /> <param name="MaxSizeRollBackups" value="30"/>
<!--日志文件名是否是固定不变的--> <!--日志文件名是否是固定不变的-->
<param name="StaticLogFileName" value="false" /> <param name="StaticLogFileName" value="false"/>
<!--日志文件名格式为:2008-08-31.log--> <!--日志文件名格式为:2008-08-31.log-->
<param name="DatePattern" value="yyyy-MM-dd&quot;.log&quot;" /> <param name="DatePattern" value="yyyy-MM-dd&quot;.log&quot;"/>
<!--日志根据日期滚动--> <!--日志根据日期滚动-->
<param name="RollingStyle" value="Date" /> <param name="RollingStyle" value="Date"/>
<layout type="log4net.Layout.PatternLayout"> <layout type="log4net.Layout.PatternLayout">
<param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n %logger" /> <param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n %logger"/>
</layout> </layout>
</appender> </appender>
<logger name="MyCode.Project.Logger"> <logger name="MyCode.Project.Logger">
<level value="ERROR" /> <level value="ERROR"/>
<level value="INFO" /> <level value="INFO"/>
<appender-ref ref="RollingLogFileAppender" /> <appender-ref ref="RollingLogFileAppender"/>
</logger> </logger>
<root> <root>
<!--(高) OFF > FATAL > ERROR > WARN > INFO > DEBUG > ALL (低)--> <!--(高) OFF > FATAL > ERROR > WARN > INFO > DEBUG > ALL (低)-->
<level value="ERROR" /> <level value="ERROR"/>
<appender-ref ref="RollingLogFileAppender" /> <appender-ref ref="RollingLogFileAppender"/>
</root> </root>
</log4net> </log4net>
<runtime> <runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed" /> <assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed"/>
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" /> <assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35"/>
<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0" /> <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" /> <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35"/>
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" /> <bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" /> <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" /> <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" /> <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" /> <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" /> <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/>
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" /> <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Common.Logging.Core" publicKeyToken="af08829b84f0328e" culture="neutral" /> <assemblyIdentity name="Common.Logging.Core" publicKeyToken="af08829b84f0328e" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-3.3.1.0" newVersion="3.3.1.0" /> <bindingRedirect oldVersion="0.0.0.0-3.3.1.0" newVersion="3.3.1.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Common.Logging" publicKeyToken="af08829b84f0328e" culture="neutral" /> <assemblyIdentity name="Common.Logging" publicKeyToken="af08829b84f0328e" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-3.3.1.0" newVersion="3.3.1.0" /> <bindingRedirect oldVersion="0.0.0.0-3.3.1.0" newVersion="3.3.1.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" /> <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0" /> <bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" /> <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /> <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" /> <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" /> <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0"/>
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<system.codedom> <system.codedom>
<compilers> <compilers>
<compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:6 /nowarn:1659;1699;1701" /> <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:6 /nowarn:1659;1699;1701"/>
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:14 /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" /> <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:14 /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+"/>
</compilers> </compilers>
</system.codedom> </system.codedom>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration> <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>

2
Reportapi/MyCode.Project.ZHMDGenerateCode/MyCode.Project.ZHMDGenerateCode.csproj
View File

@@ -8,7 +8,7 @@
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<RootNamespace>MyCode.Project.GenerateCode</RootNamespace> <RootNamespace>MyCode.Project.GenerateCode</RootNamespace>
<AssemblyName>MyCode.Project.GenerateCode</AssemblyName> <AssemblyName>MyCode.Project.GenerateCode</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile /> <TargetFrameworkProfile />