111
This commit is contained in:
parent
6335e88415
commit
de8447bece
@ -1,14 +1,12 @@
|
||||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<Jobs>
|
||||
<job name="EveryTimeJob" desc="定时执行的调度" enabled="true" type="MyCode.Project.ScheduleTask.Jobs.EveryJob,MyCode.Project.ScheduleTask" CronExpression="*/10 * * * * ?" runonce="false"/>
|
||||
<job name="AddOrderJob" desc="添加抓单的调度" enabled="true" type="MyCode.Project.ScheduleTask.Jobs.AddOrderJob,MyCode.Project.ScheduleTask" CronExpression="*/10 * * * * ?" runonce="false"/>
|
||||
<job name="AddOrderJob" desc="添加抓单的调度" enabled="true" type="MyCode.Project.ScheduleTask.Jobs.AddOrderJob,MyCode.Project.ScheduleTask" CronExpression="0 0 3 * * ?" runonce="false"/>
|
||||
</Jobs>
|
||||
<!--
|
||||
<job name="CalOrderMoreThan500Job" desc="计算消费超过500" enabled="true" type="MyCode.Project.ScheduleTask.Jobs.CalOrderMoreThan500Job,MyCode.Project.ScheduleTask" CronExpression="*/10 * * * * ?" runonce="false" />
|
||||
<job name="AnsyLxmBaseDataJob" desc="同步流行美基础资料任务" enabled="true" type="MyCode.Project.ScheduleTask.Jobs.AnsyLxmBaseDataJob,MyCode.Project.ScheduleTask" CronExpression="0 0 1 * * ?" runonce="false" />
|
||||
<job name="AnsyLxmDataJob" desc="自动同步MSSQL到MYSQL" enabled="true" type="MyCode.Project.ScheduleTask.Jobs.AnsyLxmDataJob,MyCode.Project.ScheduleTask" CronExpression="*/20 * * * * ?" runonce="false" />
|
||||
<job name="QueueJob" desc="定时执行的调度" enabled="true" type="MyCode.Project.ScheduleTask.Jobs.QueueJob,MyCode.Project.ScheduleTask" CronExpression="*/1 * * * * ?" runonce="false" />
|
||||
<job name="AnsyLxmHasGiftJob" desc="补充赠品到LxmSheetMore" enabled="true" type="MyCode.Project.ScheduleTask.Jobs.AnsyLxmHasGiftJob,MyCode.Project.ScheduleTask" CronExpression="*/50 * * * * ?" runonce="false" />
|
||||
<job name="AnsyLxmServiceOrderJob" desc="同步服务次数" enabled="true" type="MyCode.Project.ScheduleTask.Jobs.AnsyLxmServiceOrderJob,MyCode.Project.ScheduleTask" CronExpression="*/5 * * * * ?" runonce="false" />
|
||||
<job name="AnsyLxmUseDaysJob" desc="自动同步使用天数MSSQL到MYSQL" enabled="true" type="MyCode.Project.ScheduleTask.Jobs.AnsyLxmUseDaysJob,MyCode.Project.ScheduleTask" CronExpression="*/30 * * * * ?" runonce="false" />
|
||||
<job name="WebSocketJob" desc="WebSocket任务" enabled="true" type="MyCode.Project.ScheduleTask.Jobs.WebSocketJob,MyCode.Project.ScheduleTask" CronExpression="*/1 * * * * ?" runonce="true" />
|
||||
|
||||
@ -19,7 +19,7 @@ namespace MyCode.Project.Services.Implementation
|
||||
_yTKJTShopParameterRepository = yTKJTShopParameterRepository;
|
||||
}
|
||||
|
||||
DateTime startTime = DateTime.Parse("2025-06-01");
|
||||
DateTime startTime = DateTime.Parse("2025-08-01");
|
||||
/// <summary>
|
||||
/// 请求开放平台服务
|
||||
/// </summary>
|
||||
@ -57,8 +57,7 @@ namespace MyCode.Project.Services.Implementation
|
||||
/// <exception cref="BaseException"></exception>
|
||||
public List<TradesItem> testTradeFullInfoGet(DateTime now)
|
||||
{
|
||||
if (now < startTime)
|
||||
now = startTime;
|
||||
|
||||
int total = 1;
|
||||
var shopConfigs = _yTKJTShopParameterRepository.Queryable().Where(t => t.FDOCUMENTSTATUS == "C").ToList();
|
||||
|
||||
@ -67,6 +66,11 @@ namespace MyCode.Project.Services.Implementation
|
||||
//string value1 = "2025-06-20 00:00:00";//DateTime.Now.Date.ToString("yyyy-MM-dd HH:mm:ss");
|
||||
string value = now.Date.AddDays(-7).ToString("yyyy-MM-dd");
|
||||
string value1 = now.Date.ToString("yyyy-MM-dd");
|
||||
if (now.Date.AddDays(-7) < startTime)
|
||||
{
|
||||
value = startTime.ToString("yyyy-MM-dd");
|
||||
}
|
||||
|
||||
requestBizData.StartModified = "";// DateTime.ParseExact(value, "yyyy-MM-dd HH:mm:ss", System.Globalization.CultureInfo.InvariantCulture, System.Globalization.DateTimeStyles.None);
|
||||
|
||||
requestBizData.EndModified = ""; //DateTime.ParseExact(value1, "yyyy-MM-dd HH:mm:ss", System.Globalization.CultureInfo.InvariantCulture, System.Globalization.DateTimeStyles.None);
|
||||
|
||||
@ -114,7 +114,8 @@ namespace MyCode.Project.Services.Implementation
|
||||
List<PushKingDeeOrder> pushKingDeeOrders = new List<PushKingDeeOrder>();
|
||||
list.ForEach(sheet =>
|
||||
{
|
||||
if (pushKingDeeOrders.Where(t => t.ShopId == sheet.ShopId && t.WarehouseId == sheet.WarehouseId).Count() > 0)
|
||||
if (pushKingDeeOrders.Where(t => t.ShopId == sheet.ShopId && t.WarehouseId == sheet.WarehouseId
|
||||
&& t.ConsignTime.Value.ToString("yyyy-MM-dd")==sheet.ConsignTime).Count() > 0)
|
||||
{
|
||||
return;
|
||||
}
|
||||
@ -125,7 +126,7 @@ namespace MyCode.Project.Services.Implementation
|
||||
pushKingDeeOrder.UpdateTime = DateTime.Now;
|
||||
pushKingDeeOrders.Add(pushKingDeeOrder);
|
||||
|
||||
var tempList = list.Where(t => t.ShopId == sheet.ShopId && t.WarehouseId == sheet.WarehouseId).ToList();
|
||||
var tempList = list.Where(t => t.ShopId == sheet.ShopId && t.WarehouseId == sheet.WarehouseId && sheet.ConsignTime == t.ConsignTime).ToList();
|
||||
tempList.ForEach(item =>
|
||||
{
|
||||
PushKingDeeOrderItem pushKingDeeOrderItem = new PushKingDeeOrderItem();
|
||||
|
||||
@ -22,7 +22,7 @@ namespace MyCode.Project.Services.Implementation
|
||||
{
|
||||
|
||||
|
||||
DateTime startTime = DateTime.Parse("2025-06-01");
|
||||
DateTime startTime = DateTime.Parse("2025-08-01");
|
||||
|
||||
private IWMStoJackyunInventoryMovementView2Repository _wMStoJackyunInventoryMovementView3Repository;
|
||||
private IRepository _repository;
|
||||
|
||||
@ -34,9 +34,9 @@ namespace MyCode.Project.WebApi.Controllers
|
||||
/// </summary>
|
||||
[HttpGet]
|
||||
[AllowAnonymous]
|
||||
public void TaskSendKingdeeSaleOrderById(string id)
|
||||
public string TaskSendKingdeeSaleOrderById(string id)
|
||||
{
|
||||
_orderPushService.PushOrderToKingDee(id);
|
||||
return _orderPushService.PushOrderToKingDee(id);
|
||||
}
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user