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

111

Browse Source
This commit is contained in:
余宇波 2025-07-28 17:28:21 +08:00
parent 6335e88415
commit de8447bece
5 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Reportapi/MyCode.Project.ScheduleTask/JobConfig.xml
View File

@ -1,14 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<Jobs> <Jobs>
<job name="EveryTimeJob" desc="定时执行的调度" enabled="true" type="MyCode.Project.ScheduleTask.Jobs.EveryJob,MyCode.Project.ScheduleTask" CronExpression="*/10 * * * * ?" runonce="false"/> <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> </Jobs>
<!-- <!--
<job name="CalOrderMoreThan500Job" desc="计算消费超过500" enabled="true" type="MyCode.Project.ScheduleTask.Jobs.CalOrderMoreThan500Job,MyCode.Project.ScheduleTask" CronExpression="*/10 * * * * ?" runonce="false" /> <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="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="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="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="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" /> <job name="WebSocketJob" desc="WebSocket任务" enabled="true" type="MyCode.Project.ScheduleTask.Jobs.WebSocketJob,MyCode.Project.ScheduleTask" CronExpression="*/1 * * * * ?" runonce="true" />

10
Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs
View File

@ -19,7 +19,7 @@ namespace MyCode.Project.Services.Implementation
_yTKJTShopParameterRepository = yTKJTShopParameterRepository; _yTKJTShopParameterRepository = yTKJTShopParameterRepository;
} }
DateTime startTime = DateTime.Parse("2025-06-01"); DateTime startTime = DateTime.Parse("2025-08-01");
/// <summary> /// <summary>
/// 请求开放平台服务 /// 请求开放平台服务
/// </summary> /// </summary>
@ -57,8 +57,7 @@ namespace MyCode.Project.Services.Implementation
/// <exception cref="BaseException"></exception> /// <exception cref="BaseException"></exception>
public List<TradesItem> testTradeFullInfoGet(DateTime now) public List<TradesItem> testTradeFullInfoGet(DateTime now)
{ {
if (now < startTime)
now = startTime;
int total = 1; int total = 1;
var shopConfigs = _yTKJTShopParameterRepository.Queryable().Where(t => t.FDOCUMENTSTATUS == "C").ToList(); 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 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 value = now.Date.AddDays(-7).ToString("yyyy-MM-dd");
string value1 = now.Date.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.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); requestBizData.EndModified = ""; //DateTime.ParseExact(value1, "yyyy-MM-dd HH:mm:ss", System.Globalization.CultureInfo.InvariantCulture, System.Globalization.DateTimeStyles.None);

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

@ -114,7 +114,8 @@ namespace MyCode.Project.Services.Implementation
List<PushKingDeeOrder> pushKingDeeOrders = new List<PushKingDeeOrder>(); List<PushKingDeeOrder> pushKingDeeOrders = new List<PushKingDeeOrder>();
list.ForEach(sheet => 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; return;
} }
@ -125,7 +126,7 @@ namespace MyCode.Project.Services.Implementation
pushKingDeeOrder.UpdateTime = DateTime.Now; pushKingDeeOrder.UpdateTime = DateTime.Now;
pushKingDeeOrders.Add(pushKingDeeOrder); 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 => tempList.ForEach(item =>
{ {
PushKingDeeOrderItem pushKingDeeOrderItem = new PushKingDeeOrderItem(); PushKingDeeOrderItem pushKingDeeOrderItem = new PushKingDeeOrderItem();

2
Reportapi/MyCode.Project.Services/Implementation/WMSService.cs
View File

@ -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 IWMStoJackyunInventoryMovementView2Repository _wMStoJackyunInventoryMovementView3Repository;
private IRepository _repository; private IRepository _repository;

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

@ -34,9 +34,9 @@ namespace MyCode.Project.WebApi.Controllers
/// </summary> /// </summary>
[HttpGet] [HttpGet]
[AllowAnonymous] [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> /// <summary>
/// 抓WMS订单 /// 抓WMS订单
/// </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
#region 合并吉客云订单到新表 #region 合并吉客云订单到新表
/// <summary> /// <summary>
/// 合并吉客云订单到新表 /// 合并吉客云订单到新表
/// </summary> /// </summary>
//[HttpGet] [HttpGet]
//[AllowAnonymous] [AllowAnonymous]
//public string GetAndMergeJackYunOrder(string now) public string GetAndMergeJackYunOrder(string now)
//{ {
// return _jackYunTaskService.GetAndMergeJackYunOrder(now); return _jackYunTaskService.GetAndMergeJackYunOrder(now);
//} }
#endregion #endregion