From e8e6f2823de59eb7c6fc3cb1b36020ac093cac6b Mon Sep 17 00:00:00 2001
From: yuyubo <1870149533@qq.com>
Date: Fri, 18 Jul 2025 16:52:11 +0800
Subject: [PATCH 1/3] 1
---
.../Common/JsonHelper.cs | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/Reportapi/MyCode.Project.Infrastructure/Common/JsonHelper.cs b/Reportapi/MyCode.Project.Infrastructure/Common/JsonHelper.cs
index 0d10a7c..d0cbca9 100644
--- a/Reportapi/MyCode.Project.Infrastructure/Common/JsonHelper.cs
+++ b/Reportapi/MyCode.Project.Infrastructure/Common/JsonHelper.cs
@@ -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;
From a7fd4de781f1725063f7814c7b175665daab0013 Mon Sep 17 00:00:00 2001
From: yuyubo <1870149533@qq.com>
Date: Fri, 18 Jul 2025 17:09:55 +0800
Subject: [PATCH 2/3] 11
---
.../MyCode.Project.Services/IServices/IWMSService.cs | 5 +++++
.../Implementation/JackYunTaskService.cs | 11 ++++++++---
.../Implementation/WMSService.cs | 12 ++++++++++++
3 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/Reportapi/MyCode.Project.Services/IServices/IWMSService.cs b/Reportapi/MyCode.Project.Services/IServices/IWMSService.cs
index ae6bade..dff1170 100644
--- a/Reportapi/MyCode.Project.Services/IServices/IWMSService.cs
+++ b/Reportapi/MyCode.Project.Services/IServices/IWMSService.cs
@@ -21,5 +21,10 @@ namespace MyCode.Project.Services
/// 添加抓单的调度
///
void AddTask();
+
+ ///
+ /// 添加“合并吉客云订单到新表”的任务
+ ///
+ void AddMergeJackYunOrder();
}
}
diff --git a/Reportapi/MyCode.Project.Services/Implementation/JackYunTaskService.cs b/Reportapi/MyCode.Project.Services/Implementation/JackYunTaskService.cs
index ec91370..9873c15 100644
--- a/Reportapi/MyCode.Project.Services/Implementation/JackYunTaskService.cs
+++ b/Reportapi/MyCode.Project.Services/Implementation/JackYunTaskService.cs
@@ -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(this.MerchantId, "GetAndMergeJackYunOrder", "合并吉客云订单到新表", now, 1);
}
#endregion
@@ -156,6 +160,7 @@ namespace MyCode.Project.Services.Implementation
return JsonHelper.ToJson(list);
}
- #endregion
+ #endregion
+
}
}
diff --git a/Reportapi/MyCode.Project.Services/Implementation/WMSService.cs b/Reportapi/MyCode.Project.Services/Implementation/WMSService.cs
index 4b8081c..67b9424 100644
--- a/Reportapi/MyCode.Project.Services/Implementation/WMSService.cs
+++ b/Reportapi/MyCode.Project.Services/Implementation/WMSService.cs
@@ -106,6 +106,18 @@ namespace MyCode.Project.Services.Implementation
}
#endregion
+
+ #region AddMergeJackYunOrder(添加“合并吉客云订单到新表”的任务)
+ ///
+ /// 添加“合并吉客云订单到新表”的任务
+ ///
+ public void AddMergeJackYunOrder()
+ {
+ string now = DateTime.Now.ToString();
+ _workProcessService.Add(this.MerchantId, "GetAndMergeJackYunOrder", "合并吉客云订单到新表", now, 1);
+
+ }
+ #endregion
}
From 192dce4357f14692ae628a793563eb1526f42ecf Mon Sep 17 00:00:00 2001
From: yuyubo <1870149533@qq.com>
Date: Fri, 18 Jul 2025 17:27:27 +0800
Subject: [PATCH 3/3] 11
---
.../Implementation/WMSService.cs | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/Reportapi/MyCode.Project.Services/Implementation/WMSService.cs b/Reportapi/MyCode.Project.Services/Implementation/WMSService.cs
index 67b9424..af805df 100644
--- a/Reportapi/MyCode.Project.Services/Implementation/WMSService.cs
+++ b/Reportapi/MyCode.Project.Services/Implementation/WMSService.cs
@@ -100,10 +100,15 @@ namespace MyCode.Project.Services.Implementation
//trades = trades.Where(t => !oldids.Contains(new { t.WMS单号, t.单据行号 })).ToList();
}
-
- _repository.Add(trades);
+ if (trades.Count > 0)
+ {
+ _repository.Add(trades);
+
+ }
+ string now = DateTime.Now.ToString();
+ _workProcessService.Add(this.MerchantId, "SendInStock", "上传WMS的入库数据到吉客云", now, 1);
+ _workProcessService.Add(this.MerchantId, "SendOutStock", "上传WMS的出库数据到吉客云", now, 1);
-
}
#endregion