diff --git a/29WxOrderWpf/Converters/OrderTaskStatusConverter.cs b/29WxOrderWpf/Converters/OrderTaskStatusConverter.cs
index d852de0..cd86425 100644
--- a/29WxOrderWpf/Converters/OrderTaskStatusConverter.cs
+++ b/29WxOrderWpf/Converters/OrderTaskStatusConverter.cs
@@ -23,6 +23,8 @@ namespace _29WxOrderWpf.Converters
return "已完成";
case TaskStatus.ManuallyInterrupted:
return "已中断";
+ case TaskStatus.Fail:
+ return "执行失败";
}
}
return value?.ToString() ?? string.Empty;
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderTaskDialogView.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderTaskDialogView.xaml
index 309113b..c4ec8f5 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderTaskDialogView.xaml
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderTaskDialogView.xaml
@@ -187,6 +187,9 @@
+
+
+
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderTaskDialogView.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderTaskDialogView.xaml.cs
index d211e2a..b93fd23 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderTaskDialogView.xaml.cs
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderTaskDialogView.xaml.cs
@@ -109,7 +109,7 @@ public class OrderTaskDialogViewModel : BindableBaseEx, IDisposable
if (IsShowAll == true)
return true;
- return task.Status == 1 || task.Status == 3;
+ return task.Status !=2;
}
/// 任务列表
diff --git a/29WxOrderWpf/Services/PullWXOrderService.cs b/29WxOrderWpf/Services/PullWXOrderService.cs
index a69bae0..3ab2374 100644
--- a/29WxOrderWpf/Services/PullWXOrderService.cs
+++ b/29WxOrderWpf/Services/PullWXOrderService.cs
@@ -91,10 +91,21 @@ namespace _29WxOrderWpf.Services
public async Task GetTaskStatus()
{
var tasks = await _kjdApi.GetWxTaskStatus();
+
if (tasks != null)
{
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);
+ });
}
}
diff --git a/Work/ERP.API/Orders/PullWXOrderServiceApi.cs b/Work/ERP.API/Orders/PullWXOrderServiceApi.cs
index cae7049..2eaa7a4 100644
--- a/Work/ERP.API/Orders/PullWXOrderServiceApi.cs
+++ b/Work/ERP.API/Orders/PullWXOrderServiceApi.cs
@@ -94,7 +94,7 @@ namespace Work.ERP.API.Orders
startTime = startTime.ToString("yyyy-MM-dd HH:mm:ss"),
endTime = endTime.ToString("yyyy-MM-dd HH:mm:ss"),
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);
@@ -104,7 +104,7 @@ namespace Work.ERP.API.Orders
}
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);
}
}
@@ -136,7 +136,7 @@ namespace Work.ERP.API.Orders
}
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);
}
}
@@ -179,7 +179,6 @@ namespace Work.ERP.API.Orders
private async Task PostAndGetTaskIdAsync(string url, string data)
{
var result = await ERPHttp.e57PostResponseAsync(url, data);
- if (result.Code != 200) throw new Exception(result.Msg);
return result;
}
}
diff --git a/Work/ERP.API/TaskStatus.cs b/Work/ERP.API/TaskStatus.cs
index 73503ba..7f876d1 100644
--- a/Work/ERP.API/TaskStatus.cs
+++ b/Work/ERP.API/TaskStatus.cs
@@ -21,6 +21,8 @@ namespace Work.ERP.API
/// 已人为中断
///
[Description("已人为中断")]
- ManuallyInterrupted = 3
+ ManuallyInterrupted = 3,
+ [Description("失败")]
+ Fail = 4
}
}
diff --git a/Work/Initialization.cs b/Work/Initialization.cs
index 8361e49..7c22506 100644
--- a/Work/Initialization.cs
+++ b/Work/Initialization.cs
@@ -43,11 +43,13 @@ namespace Work
BaseClass.IsMainCompany = true;
}
BaseClass.IsBuyer = FileBase.Exists(Application.StartupPath + "\\buyer.ini");
- Task.Run(() => { CheckUpdate(); });
- //new Thread(Update).Start();//--------检查更新
- //new Thread(GetAuthConfig).Start();
- //new Thread(new JumpUpProductNew().Ini).Start();
- new Thread(CheckFiles).Start();
+#if !DEBUG
+ Task.Run(() => { CheckUpdate(); });
+#endif
+ //new Thread(Update).Start();//--------检查更新
+ //new Thread(GetAuthConfig).Start();
+ //new Thread(new JumpUpProductNew().Ini).Start();
+ new Thread(CheckFiles).Start();
//new Thread(UpdateTime).Start();
//new Thread(GetMacCode).Start();
@@ -92,7 +94,7 @@ namespace Work
}
- #region 获取IP
+ #region 获取IP
public static void GetPublicIp()
{
try
@@ -133,7 +135,7 @@ namespace Work
}
}
- #endregion
+ #endregion
///
/// 检查更新
@@ -334,7 +336,7 @@ namespace Work
}
- #region 同步系统时间
+ #region 同步系统时间
[DllImport("kernel32.dll", SetLastError = true)]
public static extern int SetLocalTime(ref SystemTime lpSystemTime);
@@ -372,7 +374,7 @@ namespace Work
}
}
- #endregion
+ #endregion
///
/// 检查文件
@@ -575,7 +577,7 @@ namespace Work
FileBase.WriteAllText(ConfigFilePach, content, Encoding.UTF8);
}
- #region JS
+ #region JS
public static string JsCode = @"(function(f){if(typeof exports===""object""&&typeof module!==""undefined""){module.exports=f()}else if(typeof define===""function""&&define.amd){define([],f)}else{var g;if(typeof window!==""undefined""){g=window}else if(typeof global!==""undefined""){g=global}else if(typeof self!==""undefined""){g=self}else{g=this}g.pako = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require==""function""&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error(""Cannot find module '""+o+""'"");throw f.code=""MODULE_NOT_FOUND"",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require==""function""&&require;for(var o=0;o