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

Merge branch 'jackYun' of http://8.130.121.29:3000/yuyubo/YunTongJackYunTask into jackYun

Browse Source
This commit is contained in:
朱斌 2025-07-18 17:41:57 +08:00
commit 78b1bdb2cc
4 changed files with 41 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Reportapi/MyCode.Project.Infrastructure/Common/JsonHelper.cs
View File

@ -117,20 +117,22 @@ namespace MyCode.Project.Infrastructure.Common
return "{}";
var result = "";
var settings = new JsonSerializerSettings();
if (isFirstLetterSmall == false)
{
result = JsonConvert.SerializeObject(target);
//result = JsonConvert.SerializeObject(target);
}
else
{
var settings = new JsonSerializerSettings();
settings.ContractResolver = new CamelCasePropertyNamesContractResolver();//首字母小写驼峰式命名
if(nullValueHandling)
settings.NullValueHandling = NullValueHandling.Ignore;
result = JsonConvert.SerializeObject(target,settings);
}
if (nullValueHandling)
settings.NullValueHandling = NullValueHandling.Ignore;
result = JsonConvert.SerializeObject(target, settings);
if (isConvertToSingleQuotes)
result = result.Replace("\"", "'");
return result;

5
Reportapi/MyCode.Project.Services/IServices/IWMSService.cs
View File

@ -21,5 +21,10 @@ namespace MyCode.Project.Services
/// 添加抓单的调度
/// </summary>
void AddTask();
/// <summary>
/// 添加“合并吉客云订单到新表”的任务
/// </summary>
void AddMergeJackYunOrder();
}
}

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

@ -22,13 +22,15 @@ namespace MyCode.Project.Services.Implementation
private IPushKingDeeOrderRepository _pushKingDeeOrderRepository;
private IPushKingDeeOrderItemRepository _pushKingDeeOrderItemRepository;
private IYTKJTShopParameterRepository _yTKJTShopParameterRepository;
private IWorkProcessService _workProcessService;
public JackYunTaskService(IJackOrdersRepository jackOrdersRepository
, IJackOrdersItemRepository jackOrdersItemRepository
, IPushKingDeeOrderRepository pushKingDeeOrderRepository
, IPushKingDeeOrderItemRepository pushKingDeeOrderItemRepository
, IYTKJTShopParameterRepository yTKJTShopParameterRepository
, IJackYunService jackYunService)
, IJackYunService jackYunService,
IWorkProcessService workProcessService )
{
_yTKJTShopParameterRepository = yTKJTShopParameterRepository;
_pushKingDeeOrderRepository = pushKingDeeOrderRepository;
@ -36,6 +38,7 @@ namespace MyCode.Project.Services.Implementation
_jackOrdersRepository = jackOrdersRepository;
_jackOrdersItemRepository = jackOrdersItemRepository;
_jackYunService = jackYunService;
_workProcessService = workProcessService;
}
#region TaskGetJackYunOrder(调度运行抓吉客云销售订单)
@ -47,7 +50,8 @@ namespace MyCode.Project.Services.Implementation
{
DateTime runTime = DateTime.Parse(now);
var list = _jackYunService.testTradeFullInfoGet(runTime);
SetOrder(list);
SetOrder(list);
_workProcessService.Add<IJackYunTaskService>(this.MerchantId, "GetAndMergeJackYunOrder", "合并吉客云订单到新表", now, 1);
}
#endregion
@ -156,6 +160,7 @@ namespace MyCode.Project.Services.Implementation
return JsonHelper.ToJson(list);
}
#endregion
#endregion
}
}

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

@ -100,10 +100,27 @@ namespace MyCode.Project.Services.Implementation
//trades = trades.Where(t => !oldids.Contains(new { t.WMS单号, t.单据行号 })).ToList();
}
_repository.Add<WMStoJackyunInventoryMovementView1>(trades);
if (trades.Count > 0)
{
_repository.Add<WMStoJackyunInventoryMovementView1>(trades);
}
string now = DateTime.Now.ToString();
_workProcessService.Add<IJackYunStockinService>(this.MerchantId, "SendInStock", "上传WMS的入库数据到吉客云", now, 1);
_workProcessService.Add<IJackYunStockinService>(this.MerchantId, "SendOutStock", "上传WMS的出库数据到吉客云", now, 1);
}
#endregion
#region AddMergeJackYunOrder(添加“合并吉客云订单到新表”的任务)
/// <summary>
/// 添加“合并吉客云订单到新表”的任务
/// </summary>
public void AddMergeJackYunOrder()
{
string now = DateTime.Now.ToString();
_workProcessService.Add<IJackYunTaskService>(this.MerchantId, "GetAndMergeJackYunOrder", "合并吉客云订单到新表", now, 1);
}
#endregion
}