Compare commits
2 Commits
192dce4357
...
78b1bdb2cc
| Author | SHA1 | Date | |
|---|---|---|---|
| 78b1bdb2cc | |||
| 228640df46 |
141
Reportapi/MyCode.Project.Domain/Message/Request/WMS/SaleOrder.cs
Normal file
141
Reportapi/MyCode.Project.Domain/Message/Request/WMS/SaleOrder.cs
Normal file
@ -0,0 +1,141 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace MyCode.Project.Domain.Message.Request.WMS
|
||||
{
|
||||
public class SaleOrder
|
||||
{
|
||||
/// <summary>
|
||||
/// 单据编号
|
||||
/// </summary>
|
||||
public string OrderNo { get; set; }
|
||||
/// <summary>
|
||||
/// 公司组织
|
||||
/// </summary>
|
||||
public string CompanyId { get; set; }
|
||||
/// <summary>
|
||||
/// 同步日期时间
|
||||
/// </summary>
|
||||
public string ReadTime { get; set; }
|
||||
/// <summary>
|
||||
/// 销售类型
|
||||
/// </summary>
|
||||
public string OrderType { get; set; }
|
||||
/// <summary>
|
||||
/// 客户编码
|
||||
/// </summary>
|
||||
public string CustAccount { get; set; }
|
||||
/// <summary>
|
||||
/// 单据日期
|
||||
/// </summary>
|
||||
public string OrderTime { get; set; }
|
||||
/// <summary>
|
||||
/// WMS仓库
|
||||
/// </summary>
|
||||
public string WarehouseId { get; set; }
|
||||
/// <summary>
|
||||
/// 货主
|
||||
/// </summary>
|
||||
public string CustomerId { get; set; }
|
||||
/// <summary>
|
||||
/// 下发系统
|
||||
/// </summary>
|
||||
public string Channel { get; set; }
|
||||
/// <summary>
|
||||
/// 单据类型
|
||||
/// </summary>
|
||||
public string ItemType { get; set; }
|
||||
/// <summary>
|
||||
/// 单据总数量
|
||||
/// </summary>
|
||||
public int TotalQty { get; set; }
|
||||
/// <summary>
|
||||
/// 单据总金额
|
||||
/// </summary>
|
||||
public decimal TotalMount { get; set; }
|
||||
/// <summary>
|
||||
/// 备注
|
||||
/// </summary>
|
||||
public string Comment { get; set; }
|
||||
/// <summary>
|
||||
/// 单据创建日期时间
|
||||
/// </summary>
|
||||
public string CreateTime { get; set; }
|
||||
/// <summary>
|
||||
/// 订单明细
|
||||
/// </summary>
|
||||
public Line[] Lines { get; set; }
|
||||
}
|
||||
|
||||
public class Line
|
||||
{
|
||||
/// <summary>
|
||||
/// 单据编号
|
||||
/// </summary>
|
||||
public string OrderNo { get; set; }
|
||||
/// <summary>
|
||||
/// 公司组织
|
||||
/// </summary>
|
||||
public string CompanyId { get; set; }
|
||||
/// <summary>
|
||||
/// 销售类型
|
||||
/// </summary>
|
||||
public string OrderType { get; set; }
|
||||
/// <summary>
|
||||
/// 行号
|
||||
/// </summary>
|
||||
public int LineNo { get; set; }
|
||||
/// <summary>
|
||||
/// 货主
|
||||
/// </summary>
|
||||
public string CustomerId { get; set; }
|
||||
/// <summary>
|
||||
/// SKU
|
||||
/// </summary>
|
||||
public string Sku { get; set; }
|
||||
/// <summary>
|
||||
/// 条码
|
||||
/// </summary>
|
||||
public string Barcode { get; set; }
|
||||
/// <summary>
|
||||
/// 行数量
|
||||
/// </summary>
|
||||
public int OrderQty { get; set; }
|
||||
/// <summary>
|
||||
/// 单位
|
||||
/// </summary>
|
||||
public string OrderUnit { get; set; }
|
||||
/// <summary>
|
||||
/// 价格
|
||||
/// </summary>
|
||||
public decimal OrderPrice { get; set; }
|
||||
/// <summary>
|
||||
/// 物料编码
|
||||
/// </summary>
|
||||
public string ItemId { get; set; }
|
||||
/// <summary>
|
||||
/// 尺寸
|
||||
/// </summary>
|
||||
public string SizeType { get; set; }
|
||||
/// <summary>
|
||||
/// 颜色
|
||||
/// </summary>
|
||||
public string Color { get; set; }
|
||||
/// <summary>
|
||||
/// ERP仓库
|
||||
/// </summary>
|
||||
public string LocationId { get; set; }
|
||||
/// <summary>
|
||||
/// 部门
|
||||
/// </summary>
|
||||
public string Comment { get; set; }
|
||||
/// <summary>
|
||||
/// 创建日期时间
|
||||
/// </summary>
|
||||
public string CreateTime { get; set; }
|
||||
}
|
||||
|
||||
}
|
||||
@ -69,6 +69,7 @@
|
||||
<Compile Include="Message\Request\KingDee\BillSave.cs" />
|
||||
<Compile Include="Message\Request\KingDee\SaveModel\SaleOrderModel.cs" />
|
||||
<Compile Include="Message\Request\TimeRange.cs" />
|
||||
<Compile Include="Message\Request\WMS\SaleOrder.cs" />
|
||||
<Compile Include="Message\Response\Common\HeadFieldItem.cs" />
|
||||
<Compile Include="Message\Response\Common\IdName.cs" />
|
||||
<Compile Include="Message\Response\Common\ItemResult.cs" />
|
||||
|
||||
@ -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
|
||||
https://go.microsoft.com/fwlink/?LinkId=301879
|
||||
@ -6,7 +6,7 @@
|
||||
<configuration>
|
||||
<configSections>
|
||||
|
||||
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
|
||||
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
|
||||
|
||||
</configSections>
|
||||
|
||||
@ -14,43 +14,43 @@
|
||||
|
||||
<connectionStrings>
|
||||
|
||||
<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=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=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=xietong; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun1" providerName="System.Data.SqlClient" />
|
||||
|
||||
</connectionStrings>
|
||||
<appSettings>
|
||||
<!--解决swagger出错问题-->
|
||||
<add key="aspnet:UseHostHeaderForRequestUrl" value="true"/>
|
||||
<add key="aspnet:UseHostHeaderForRequestUrl" value="true" />
|
||||
<!--当前环境,1:生产环境 0:开发环境-->
|
||||
<add key="Env" value="0"/>
|
||||
<add key="Env" value="0" />
|
||||
<!--因公司IP时常变化,先用13跳转-->
|
||||
<add key="RedisAddress" value="19VhOco9ayRaH41syZnWYn2S46x3FcKIjYKgr6K3L/tu7vmlJvhB0CKrIBfMVl1Y"/>
|
||||
<add key="RedisAddress" value="19VhOco9ayRaH41syZnWYn2S46x3FcKIjYKgr6K3L/tu7vmlJvhB0CKrIBfMVl1Y" />
|
||||
<!--缓存前缀-->
|
||||
<add key="CachePrefix" value="lxm-report:dev:"/>
|
||||
<add key="CachePrefix" value="lxm-report:dev:" />
|
||||
<!--jwtkey-->
|
||||
<add key="JwtKey" value="4ea0180d8f8c1ce11343e9104c682bc4"/>
|
||||
<add key="JwtKey" value="4ea0180d8f8c1ce11343e9104c682bc4" />
|
||||
<!--是否输出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启动-->
|
||||
<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\-->
|
||||
<!--服务器文件保存的路径,这里调度用,如果是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\" />-->
|
||||
|
||||
<!--Socket的URL,13生产服务器配置:ws://172.18.166.162:8282/-->
|
||||
<!--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/" />
|
||||
|
||||
|
||||
|
||||
@ -70,142 +70,142 @@
|
||||
</system.Web>
|
||||
-->
|
||||
<system.web>
|
||||
<authentication mode="None"/>
|
||||
<compilation debug="true" targetFramework="4.5"/>
|
||||
<httpRuntime targetFramework="4.5"/>
|
||||
<authentication mode="None" />
|
||||
<compilation debug="true" targetFramework="4.5" />
|
||||
<httpRuntime targetFramework="4.5" />
|
||||
<httpModules>
|
||||
<add name="ApplicationInsightsWebTracking" type="Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web"/>
|
||||
<add name="ApplicationInsightsWebTracking" type="Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web" />
|
||||
</httpModules>
|
||||
</system.web>
|
||||
|
||||
|
||||
<system.webServer>
|
||||
<modules>
|
||||
<remove name="FormsAuthentication"/>
|
||||
<remove name="ApplicationInsightsWebTracking"/>
|
||||
<add name="ApplicationInsightsWebTracking" type="Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web" preCondition="managedHandler"/>
|
||||
<remove name="FormsAuthentication" />
|
||||
<remove name="ApplicationInsightsWebTracking" />
|
||||
<add name="ApplicationInsightsWebTracking" type="Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web" preCondition="managedHandler" />
|
||||
</modules>
|
||||
<handlers>
|
||||
<remove name="ExtensionlessUrlHandler-Integrated-4.0"/>
|
||||
<remove name="OPTIONSVerbHandler"/>
|
||||
<remove name="TRACEVerbHandler"/>
|
||||
<add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0"/>
|
||||
<remove name="ExtensionlessUrlHandler-Integrated-4.0" />
|
||||
<remove name="OPTIONSVerbHandler" />
|
||||
<remove name="TRACEVerbHandler" />
|
||||
<add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
|
||||
</handlers>
|
||||
<validation validateIntegratedModeConfiguration="false"/>
|
||||
<validation validateIntegratedModeConfiguration="false" />
|
||||
</system.webServer>
|
||||
|
||||
<log4net>
|
||||
<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保留天数-->
|
||||
<param name="MaxSizeRollBackups" value="30"/>
|
||||
<param name="MaxSizeRollBackups" value="30" />
|
||||
<!--日志文件名是否是固定不变的-->
|
||||
<param name="StaticLogFileName" value="false"/>
|
||||
<param name="StaticLogFileName" value="false" />
|
||||
<!--日志文件名格式为:2008-08-31.log-->
|
||||
<param name="DatePattern" value="yyyy-MM-dd".log""/>
|
||||
<param name="DatePattern" value="yyyy-MM-dd".log"" />
|
||||
<!--日志根据日期滚动-->
|
||||
<param name="RollingStyle" value="Date"/>
|
||||
<param name="RollingStyle" value="Date" />
|
||||
<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>
|
||||
<filter type="log4net.Filter.LevelRangeFilter">
|
||||
<levelMin value="ERROR"/>
|
||||
<levelMax value="ERROR"/>
|
||||
<levelMin value="ERROR" />
|
||||
<levelMax value="ERROR" />
|
||||
</filter>
|
||||
</appender>
|
||||
|
||||
<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保留天数-->
|
||||
<param name="MaxSizeRollBackups" value="30"/>
|
||||
<param name="MaxSizeRollBackups" value="30" />
|
||||
<!--日志文件名是否是固定不变的-->
|
||||
<param name="StaticLogFileName" value="false"/>
|
||||
<param name="StaticLogFileName" value="false" />
|
||||
<!--日志文件名格式为:2008-08-31.log-->
|
||||
<param name="DatePattern" value="yyyy-MM-dd".log""/>
|
||||
<param name="DatePattern" value="yyyy-MM-dd".log"" />
|
||||
<!--日志根据日期滚动-->
|
||||
<param name="RollingStyle" value="Date"/>
|
||||
<param name="RollingStyle" value="Date" />
|
||||
<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>
|
||||
<filter type="log4net.Filter.LevelRangeFilter">
|
||||
<levelMin value="INFO"/>
|
||||
<levelMax value="INFO"/>
|
||||
<levelMin value="INFO" />
|
||||
<levelMax value="INFO" />
|
||||
</filter>
|
||||
</appender>
|
||||
|
||||
|
||||
<root>
|
||||
<!--(高) OFF > FATAL > ERROR > WARN > INFO > DEBUG > ALL (低)-->
|
||||
<level value="ALL"/>
|
||||
<appender-ref ref="InfoLogFileAppender"/>
|
||||
<appender-ref ref="RollingLogFileAppender"/>
|
||||
<level value="ALL" />
|
||||
<appender-ref ref="InfoLogFileAppender" />
|
||||
<appender-ref ref="RollingLogFileAppender" />
|
||||
</root>
|
||||
</log4net>
|
||||
|
||||
<runtime>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
|
||||
<assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35"/>
|
||||
<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0"/>
|
||||
<assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" />
|
||||
<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234"/>
|
||||
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
|
||||
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
|
||||
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
|
||||
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
|
||||
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/>
|
||||
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
|
||||
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
|
||||
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Common.Logging.Core" publicKeyToken="af08829b84f0328e" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-3.3.1.0" newVersion="3.3.1.0"/>
|
||||
<assemblyIdentity name="Common.Logging.Core" publicKeyToken="af08829b84f0328e" culture="neutral" />
|
||||
<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"/>
|
||||
<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>
|
||||
<assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0"/>
|
||||
<assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.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"/>
|
||||
<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"/>
|
||||
<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.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0"/>
|
||||
<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" />
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
|
||||
<system.codedom>
|
||||
<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="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=\"Web\" /optionInfer+"/>
|
||||
<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=\"Web\" /optionInfer+" />
|
||||
</compilers>
|
||||
</system.codedom>
|
||||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
|
||||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" /></startup></configuration>
|
||||
|
||||
@ -1,32 +1,32 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<configuration>
|
||||
<runtime>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-0.85.4.369" newVersion="0.85.4.369"/>
|
||||
<assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-0.85.4.369" newVersion="0.85.4.369" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
|
||||
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
|
||||
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
||||
<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"/>
|
||||
<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"/>
|
||||
<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.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0"/>
|
||||
<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" />
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
|
||||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" /></startup></configuration>
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
using MyCode.Project.Domain.Message.Request.KingDee;
|
||||
using MyCode.Project.Domain.Message.Request.KingDee.SaveModel;
|
||||
using MyCode.Project.Domain.Message.Request.WMS;
|
||||
using MyCode.Project.Domain.Message.Response.JackYun;
|
||||
using MyCode.Project.Domain.Model;
|
||||
using MyCode.Project.Domain.Repositories;
|
||||
@ -10,6 +11,7 @@ using MyCode.Project.OutSideService;
|
||||
using MyCode.Project.Repositories;
|
||||
using MyCode.Project.Repositories.Common;
|
||||
using MyCode.Project.Services.IServices;
|
||||
using RestSharp;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
@ -177,8 +179,55 @@ namespace MyCode.Project.Services.Implementation
|
||||
|
||||
private string PushWMSSaleOrder(PushKingDeeOrder pushKingdeeOrder)
|
||||
{
|
||||
var itemList = _pushKingDeeOrderItemRepository
|
||||
.Queryable()
|
||||
.Where(t => pushKingdeeOrder.Id == t.PushKingDeeOrderId)
|
||||
.ToList();
|
||||
// 新建销售订单实例
|
||||
var order = new SaleOrder();
|
||||
// 赋值
|
||||
order.CreateTime = pushKingdeeOrder.CreateTime?.ToString("yyyy/MM/dd");
|
||||
order.OrderNo = pushKingdeeOrder.Id.ToString();
|
||||
order.CompanyId = string.Empty; // 公司Id
|
||||
order.OrderType = pushKingdeeOrder.TradeType == 8 ? "8" : "4"; // 订单类型
|
||||
order.CustomerId = string.Empty; // 货主ID
|
||||
order.WarehouseId = pushKingdeeOrder?.WarehouseId;
|
||||
order.OrderTime = pushKingdeeOrder.ConsignTime?.ToString("yyyy/MM/dd");
|
||||
order.Channel = string.Empty; // 下发系统
|
||||
order.ItemType = string.Empty; // 单据类型
|
||||
order.TotalQty = itemList.Sum(n => n.SellCount);
|
||||
order.TotalMount = itemList.Sum(n => n.SellTotal);
|
||||
order.CreateTime = pushKingdeeOrder.CreateTime?.ToString("yyyy/MM/dd");
|
||||
order.ReadTime = DateTime.Now.ToString("yyyy/MM/dd");
|
||||
order.Lines = itemList.Select(n => new Line()
|
||||
{
|
||||
OrderNo = pushKingdeeOrder.Id.ToString(),
|
||||
CompanyId = string.Empty, // 公司Id
|
||||
OrderType = pushKingdeeOrder.TradeType == 8 ? "8" : "4", // 订单类型
|
||||
LineNo = itemList.IndexOf(n) + 1,
|
||||
CustomerId = string.Empty, // 货主ID
|
||||
Sku = n.Barcode,
|
||||
Barcode = n.Barcode,
|
||||
OrderQty = n.SellCount,
|
||||
OrderPrice = Math.Round(n.DivideSellTotal / n.SellCount, 10),
|
||||
ItemId = n.GoodsId, // 商品
|
||||
}).ToArray();
|
||||
|
||||
return string.Empty;
|
||||
var uri = "";
|
||||
|
||||
var requestString = JsonHelper.ToJson(order, false, false, true);
|
||||
var client = new RestClient($"{uri}/sale/order/return");
|
||||
client.Timeout = -1;
|
||||
var request = new RestRequest(Method.POST);
|
||||
request.AddHeader("Content-Type", "application/json");
|
||||
request.AddParameter("application/json", requestString, ParameterType.RequestBody);
|
||||
IRestResponse response = client.Execute(request);
|
||||
|
||||
|
||||
|
||||
var resultString = string.Empty;
|
||||
LogHelper.Info(resultString);
|
||||
return resultString;
|
||||
}
|
||||
|
||||
private string PushKingdeeSaleOrder(PushKingDeeOrder pushKingdeeOrder)
|
||||
@ -206,7 +255,7 @@ namespace MyCode.Project.Services.Implementation
|
||||
FNUMBER = pushKingdeeOrder.TradeType == 8 ? "XSDD05_SYS" : "XSDD01_SYS"
|
||||
},
|
||||
FOrdertype = pushKingdeeOrder.TradeType == 8 ? "8" : "4",
|
||||
FDate = pushKingdeeOrder.CreateTime?.ToString("yyyy/MM/dd"),
|
||||
FDate = pushKingdeeOrder.ConsignTime?.ToString("yyyy/MM/dd"),
|
||||
FSaleOrgId = new FSaleOrgId()
|
||||
{
|
||||
FNumber = "" // 固定组织
|
||||
|
||||
@ -74,6 +74,9 @@
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\Lib\Newtonsoft.Json.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="RestSharp, Version=106.11.4.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\RestSharp.106.11.4\lib\net452\RestSharp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.ComponentModel.DataAnnotations" />
|
||||
<Reference Include="System.Data.DataSetExtensions" />
|
||||
<Reference Include="System.IO.Compression" />
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
<package id="AutoMapper" version="6.1.1" targetFramework="net45" />
|
||||
<package id="log4net" version="2.0.8" targetFramework="net45" />
|
||||
<package id="MiniExcel" version="1.30.0" targetFramework="net461" />
|
||||
<package id="RestSharp" version="106.11.4" targetFramework="net48" />
|
||||
<package id="Senparc.CO2NET" version="0.4.1" targetFramework="net461" />
|
||||
<package id="Senparc.CO2NET.APM" version="0.2.0" targetFramework="net461" />
|
||||
<package id="Senparc.NeuChar" version="0.5.0" targetFramework="net461" />
|
||||
|
||||
@ -1,60 +1,60 @@
|
||||
<?xml version="1.0"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
For more information on how to configure your ASP.NET application, please visit
|
||||
https://go.microsoft.com/fwlink/?LinkId=301879
|
||||
-->
|
||||
<configuration>
|
||||
<configSections>
|
||||
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
|
||||
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
|
||||
</configSections>
|
||||
<system.webServer>
|
||||
<httpProtocol>
|
||||
<customHeaders>
|
||||
<add name="Access-Control-Allow-Origin" value="*"/>
|
||||
<add name="Access-Control-Allow-Methods" value="*"/>
|
||||
<add name="Access-Control-Allow-Headers" value="Content-type,Authorization,*"/>
|
||||
<add name="Access-Control-Request-Headers" value="*"/>
|
||||
<add name="Access-Control-Request-Method" value="*"/>
|
||||
<add name="Access-Control-Allow-Credentials" value="*"/>
|
||||
<add name="Access-Control-Max-Age" value="1728000"/>
|
||||
<add name="Access-Control-Allow-Origin" value="*" />
|
||||
<add name="Access-Control-Allow-Methods" value="*" />
|
||||
<add name="Access-Control-Allow-Headers" value="Content-type,Authorization,*" />
|
||||
<add name="Access-Control-Request-Headers" value="*" />
|
||||
<add name="Access-Control-Request-Method" value="*" />
|
||||
<add name="Access-Control-Allow-Credentials" value="*" />
|
||||
<add name="Access-Control-Max-Age" value="1728000" />
|
||||
</customHeaders>
|
||||
</httpProtocol>
|
||||
</system.webServer>
|
||||
<connectionStrings>
|
||||
<!-- 数据库测试-->
|
||||
<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=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=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=xietong; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun1" providerName="System.Data.SqlClient" />
|
||||
<!--测试MYSQL内网-->
|
||||
<!--<add name="MasterConn" connectionString="" providerName="MySql.Data.MySqlClient" />-->
|
||||
</connectionStrings>
|
||||
<appSettings>
|
||||
<!--解决swagger出错问题-->
|
||||
<add key="aspnet:UseHostHeaderForRequestUrl" value="true"/>
|
||||
<add key="aspnet:UseHostHeaderForRequestUrl" value="true" />
|
||||
<!--当前环境,1:生产环境 0:开发环境-->
|
||||
<add key="Env" value="0"/>
|
||||
<add key="Env" value="0" />
|
||||
<!--因公司IP时常变化,先用13跳转-->
|
||||
<add key="RedisAddress" value=""/>
|
||||
<add key="RedisAddress" value="" />
|
||||
<!--缓存前缀-->
|
||||
<add key="CachePrefix" value=""/>
|
||||
<add key="CachePrefix" value="" />
|
||||
<!--jwtkey-->
|
||||
<add key="JwtKey" value="t9Hu5zhiFWunJR1+XDrUM6Jp2aAvTjOa/XoxOrZ7bbI="/>
|
||||
<add key="JwtKey" value="t9Hu5zhiFWunJR1+XDrUM6Jp2aAvTjOa/XoxOrZ7bbI=" />
|
||||
<!--是否输出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启动-->
|
||||
<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\-->
|
||||
<!--服务器文件保存的路径,这里调度用,如果是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="WebSocketUrl" value="ws://127.0.0.1:9798/"/>
|
||||
<add key="WebSocketUrl" value="ws://127.0.0.1:9798/" />
|
||||
</appSettings>
|
||||
<!--
|
||||
有关 web.config 更改的说明,请参见 http://go.microsoft.com/fwlink/?LinkId=235367。
|
||||
@ -65,54 +65,54 @@
|
||||
</system.Web>
|
||||
-->
|
||||
<system.web>
|
||||
<authentication mode="None"/>
|
||||
<compilation debug="true" targetFramework="4.8"/>
|
||||
<httpRuntime targetFramework="4.6.1"/>
|
||||
<customErrors mode="Off"/>
|
||||
<authentication mode="None" />
|
||||
<compilation debug="true" targetFramework="4.8" />
|
||||
<httpRuntime targetFramework="4.6.1" />
|
||||
<customErrors mode="Off" />
|
||||
</system.web>
|
||||
<log4net>
|
||||
<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保留天数-->
|
||||
<param name="MaxSizeRollBackups" value="30"/>
|
||||
<param name="MaxSizeRollBackups" value="30" />
|
||||
<!--日志文件名是否是固定不变的-->
|
||||
<param name="StaticLogFileName" value="false"/>
|
||||
<param name="StaticLogFileName" value="false" />
|
||||
<!--日志文件名格式为:2008-08-31.log-->
|
||||
<param name="DatePattern" value="yyyy-MM-dd".log""/>
|
||||
<param name="DatePattern" value="yyyy-MM-dd".log"" />
|
||||
<!--日志根据日期滚动-->
|
||||
<param name="RollingStyle" value="Date"/>
|
||||
<param name="RollingStyle" value="Date" />
|
||||
<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>
|
||||
<filter type="log4net.Filter.LevelRangeFilter">
|
||||
<levelMin value="ERROR"/>
|
||||
<levelMax value="ERROR"/>
|
||||
<filter type="log4net.Filter.DenyAllFilter"/>
|
||||
<levelMin value="ERROR" />
|
||||
<levelMax value="ERROR" />
|
||||
<filter type="log4net.Filter.DenyAllFilter" />
|
||||
</filter>
|
||||
</appender>
|
||||
<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保留天数-->
|
||||
<param name="MaxSizeRollBackups" value="30"/>
|
||||
<param name="MaxSizeRollBackups" value="30" />
|
||||
<!--日志文件名是否是固定不变的-->
|
||||
<param name="StaticLogFileName" value="false"/>
|
||||
<param name="StaticLogFileName" value="false" />
|
||||
<!--日志文件名格式为:2008-08-31.log-->
|
||||
<param name="DatePattern" value="yyyy-MM-dd".log""/>
|
||||
<param name="DatePattern" value="yyyy-MM-dd".log"" />
|
||||
<!--日志根据日期滚动-->
|
||||
<param name="RollingStyle" value="Date"/>
|
||||
<param name="RollingStyle" value="Date" />
|
||||
<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>
|
||||
<filter type="log4net.Filter.LevelRangeFilter">
|
||||
<levelMin value="INFO"/>
|
||||
<levelMax value="INFO"/>
|
||||
<filter type="log4net.Filter.DenyAllFilter"/>
|
||||
<levelMin value="INFO" />
|
||||
<levelMax value="INFO" />
|
||||
<filter type="log4net.Filter.DenyAllFilter" />
|
||||
</filter>
|
||||
</appender>
|
||||
<!-- MySQL Appender -->
|
||||
@ -152,84 +152,84 @@
|
||||
</appender>-->
|
||||
<root>
|
||||
<!--(高) OFF > FATAL > ERROR > WARN > INFO > DEBUG > ALL (低)-->
|
||||
<level value="ALL"/>
|
||||
<appender-ref ref="InfoLogFileAppender"/>
|
||||
<appender-ref ref="RollingLogFileAppender"/>
|
||||
<appender-ref ref="AdoNetAppender"/>
|
||||
<level value="ALL" />
|
||||
<appender-ref ref="InfoLogFileAppender" />
|
||||
<appender-ref ref="RollingLogFileAppender" />
|
||||
<appender-ref ref="AdoNetAppender" />
|
||||
</root>
|
||||
</log4net>
|
||||
<runtime>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
|
||||
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35"/>
|
||||
<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0"/>
|
||||
<assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" />
|
||||
<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234"/>
|
||||
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
|
||||
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
|
||||
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
|
||||
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
|
||||
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/>
|
||||
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
|
||||
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
|
||||
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Common.Logging.Core" publicKeyToken="af08829b84f0328e" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-3.3.1.0" newVersion="3.3.1.0"/>
|
||||
<assemblyIdentity name="Common.Logging.Core" publicKeyToken="af08829b84f0328e" culture="neutral" />
|
||||
<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"/>
|
||||
<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>
|
||||
<assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0"/>
|
||||
<assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.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"/>
|
||||
<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>
|
||||
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
|
||||
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
|
||||
<assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<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"/>
|
||||
<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" />
|
||||
</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"/>
|
||||
<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"/>
|
||||
<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"/>
|
||||
<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>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
<system.codedom>
|
||||
<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="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=\"Web\" /optionInfer+"/>
|
||||
<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=\"Web\" /optionInfer+" />
|
||||
</compilers>
|
||||
</system.codedom>
|
||||
</configuration>
|
||||
Loading…
x
Reference in New Issue
Block a user