Compare commits

..

2 Commits

Author SHA1 Message Date
Administrator
c6fd76f937 Merge branch 'jackYun' of http://8.130.121.29:3000/yuyubo/YunTongJackYunTask into jackYun 2025-07-23 14:27:56 +08:00
Administrator
db6f97a954 0 2025-07-23 14:27:52 +08:00

View File

@@ -58,24 +58,24 @@ namespace MyCode.Project.WebApi.Controllers
/// <summary>
/// 抓WMS订单
/// </summary>
[HttpGet]
[AllowAnonymous]
public List<WMStoJackyunInventoryMovementView1> GetList(DateTime now)
{
return _wMSService.GetList(now);
}
//[HttpGet]
//[AllowAnonymous]
//public List<WMStoJackyunInventoryMovementView1> GetList(DateTime now)
//{
// return _wMSService.GetList(now);
//}
#endregion
#region
/// <summary>
/// 合并吉客云订单到新表
/// </summary>
[HttpGet]
[AllowAnonymous]
public string GetAndMergeJackYunOrder(string now)
{
return _jackYunTaskService.GetAndMergeJackYunOrder(now);
}
//[HttpGet]
//[AllowAnonymous]
//public string GetAndMergeJackYunOrder(string now)
//{
// return _jackYunTaskService.GetAndMergeJackYunOrder(now);
//}
#endregion