同步订单增加一些代码,修改多店铺同步异常返回提示
This commit is contained in:
1 parent
7c7116f9f2
commit
60e4b332cb
6 files changed
+24
-7
No files matched your search
@@ -23,6 +23,8 @@ namespace _29WxOrderWpf.Converters
|
|||||||
return "已完成";
|
return "已完成";
|
||||||
case TaskStatus.ManuallyInterrupted:
|
case TaskStatus.ManuallyInterrupted:
|
||||||
return "已中断";
|
return "已中断";
|
||||||
|
case TaskStatus.Fail:
|
||||||
|
return "执行失败";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return value?.ToString() ?? string.Empty;
|
return value?.ToString() ?? string.Empty;
|
||||||
|
|||||||
@@ -187,6 +187,9 @@
|
|||||||
<DataTrigger Binding="{Binding Status}" Value="3">
|
<DataTrigger Binding="{Binding Status}" Value="3">
|
||||||
<Setter Property="Foreground" Value="#F56C6C" />
|
<Setter Property="Foreground" Value="#F56C6C" />
|
||||||
</DataTrigger>
|
</DataTrigger>
|
||||||
|
<DataTrigger Binding="{Binding Status}" Value="4">
|
||||||
|
<Setter Property="Foreground" Value="#F56C6C" />
|
||||||
|
</DataTrigger>
|
||||||
</Style.Triggers>
|
</Style.Triggers>
|
||||||
</Style>
|
</Style>
|
||||||
</TextBlock.Style>
|
</TextBlock.Style>
|
||||||
|
|||||||
@@ -109,7 +109,7 @@ public class OrderTaskDialogViewModel : BindableBaseEx, IDisposable
|
|||||||
if (IsShowAll == true)
|
if (IsShowAll == true)
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
return task.Status == 1 || task.Status == 3;
|
return task.Status !=2;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>任务列表</summary>
|
/// <summary>任务列表</summary>
|
||||||
|
|||||||
@@ -91,10 +91,21 @@ namespace _29WxOrderWpf.Services
|
|||||||
public async Task GetTaskStatus()
|
public async Task GetTaskStatus()
|
||||||
{
|
{
|
||||||
var tasks = await _kjdApi.GetWxTaskStatus();
|
var tasks = await _kjdApi.GetWxTaskStatus();
|
||||||
|
|
||||||
if (tasks != null)
|
if (tasks != null)
|
||||||
{
|
{
|
||||||
Tasks.Clear();
|
Tasks.Clear();
|
||||||
tasks.ForEach(a => Tasks.Add(a));
|
tasks.ForEach(a =>
|
||||||
|
{
|
||||||
|
if (!string.IsNullOrEmpty(a.TaskFailReason))
|
||||||
|
{
|
||||||
|
if (a.TaskFailReason.Contains("任务执行异常"))
|
||||||
|
{
|
||||||
|
a.Status = 4;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Tasks.Add(a);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -94,7 +94,7 @@ namespace Work.ERP.API.Orders
|
|||||||
startTime = startTime.ToString("yyyy-MM-dd HH:mm:ss"),
|
startTime = startTime.ToString("yyyy-MM-dd HH:mm:ss"),
|
||||||
endTime = endTime.ToString("yyyy-MM-dd HH:mm:ss"),
|
endTime = endTime.ToString("yyyy-MM-dd HH:mm:ss"),
|
||||||
clientUserName = BaseClass.UserName,
|
clientUserName = BaseClass.UserName,
|
||||||
remark=$"同步 {startTime.ToString("yyyy-MM-dd")}/{endTime.ToString("dd")}"
|
remark = $"同步 {startTime.ToString("yyyy-MM-dd")}/{endTime.ToString("dd")}"
|
||||||
});
|
});
|
||||||
var result = await PostAndGetTaskIdAsync("/prod-api/api/oms-api/client/sync/pull_order", data);
|
var result = await PostAndGetTaskIdAsync("/prod-api/api/oms-api/client/sync/pull_order", data);
|
||||||
|
|
||||||
@@ -104,7 +104,7 @@ namespace Work.ERP.API.Orders
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
string msg = string.Join("\n", result.Data.Select(a => $"{a.shopName},{a.message}"));
|
string msg = string.Join("\n", result.Data.Select(a => $"{a.shopName},任务正在执行中"));
|
||||||
throw new Exception(msg);
|
throw new Exception(msg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -136,7 +136,7 @@ namespace Work.ERP.API.Orders
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
string msg = string.Join("\n", result.Data.Select(a => $"{a.shopName},{a.message}"));
|
string msg = string.Join("\n", result.Data.Select(a => $"{a.shopName},任务正在执行中"));
|
||||||
throw new Exception(msg);
|
throw new Exception(msg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -179,7 +179,6 @@ namespace Work.ERP.API.Orders
|
|||||||
private async Task<PullWXOrderResult> PostAndGetTaskIdAsync(string url, string data)
|
private async Task<PullWXOrderResult> PostAndGetTaskIdAsync(string url, string data)
|
||||||
{
|
{
|
||||||
var result = await ERPHttp.e57PostResponseAsync<PullWXOrderResult>(url, data);
|
var result = await ERPHttp.e57PostResponseAsync<PullWXOrderResult>(url, data);
|
||||||
if (result.Code != 200) throw new Exception(result.Msg);
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,6 +21,8 @@ namespace Work.ERP.API
|
|||||||
/// 已人为中断
|
/// 已人为中断
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[Description("已人为中断")]
|
[Description("已人为中断")]
|
||||||
ManuallyInterrupted = 3
|
ManuallyInterrupted = 3,
|
||||||
|
[Description("失败")]
|
||||||
|
Fail = 4
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user