123
This commit is contained in:
@@ -271,6 +271,20 @@ namespace MyCode.Project.WebApi.Controllers
|
||||
_jackYunTaskService.GetStorageGoodsDocOutV2(now);
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
||||
#region 合并吉客云采购订单到新表
|
||||
/// <summary>
|
||||
/// 合并吉客云采购订单到新表
|
||||
/// </summary>
|
||||
[HttpGet]
|
||||
[AllowAnonymous]
|
||||
public string GetAndMergePushGoodsDocInOrder(string now)
|
||||
{
|
||||
return _jackYunTaskService.GetAndMergePushGoodsDocInOrder(now);
|
||||
}
|
||||
#endregion
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -22,9 +22,9 @@
|
||||
</system.webServer>
|
||||
<connectionStrings>
|
||||
<!-- 数据库测试-->
|
||||
<add name="WMSConn" connectionString="Data Source=58.252.252.77,30003; Initial Catalog=yuntong; User ID=sa;Password=123; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun2" providerName="System.Data.SqlClient" />
|
||||
<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="YunTongConn" connectionString="Data Source=58.252.252.77,30003; Initial Catalog=yuntong; User ID=sa;Password=123; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun1" 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" />
|
||||
|
||||
<!--测试MYSQL内网-->
|
||||
<!--<add name="MasterConn" connectionString="" providerName="MySql.Data.MySqlClient" />-->
|
||||
|
||||
Reference in New Issue
Block a user