Merge branch 'main' of github.com:jtt-fan/29WxOrder

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;

29WxOrderWpf/Ctrls/OrderCtrls/OrderTaskDialogView.xaml

@@ -187,6 +187,9 @@
 											<DataTrigger Binding="{Binding Status}" Value="3">
 												<Setter Property="Foreground" Value="#F56C6C" />
 											</DataTrigger>
+											<DataTrigger Binding="{Binding Status}" Value="4">
+												<Setter Property="Foreground" Value="#F56C6C" />
+											</DataTrigger>
 										</Style.Triggers>
 									</Style>
 								</TextBlock.Style>

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;
 	}
 
 	/// <summary>任务列表</summary>

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);
+				});
 			}
 		}
 

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<PullWXOrderResult> PostAndGetTaskIdAsync(string url, string data)
 		{
 			var result = await ERPHttp.e57PostResponseAsync<PullWXOrderResult>(url, data);
-			if (result.Code != 200) throw new Exception(result.Msg);
 			return result;
 		}
 	}

Work/ERP.API/TaskStatus.cs

@@ -21,6 +21,8 @@ namespace Work.ERP.API
 		/// 已人为中断
 		/// </summary>
 		[Description("已人为中断")]
-		ManuallyInterrupted = 3
+		ManuallyInterrupted = 3,
+		[Description("失败")]
+		Fail = 4
 	}
 }

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
 
         /// <summary>
         /// 检查更新
@@ -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
 
         /// <summary>
         /// 检查文件
@@ -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<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
@@ -3840,6 +3842,6 @@ o.push(parseInt(n.substring(0, 8), 2), parseInt(n.substring(8, 16), 2)), t = [].
 //参数strCookie   取Cookie nano_fp字段值 Xpdql09bX0TJn0XbnT_uqL5US3wdN9vG2BJGHiby  nano_fp=Xpdql09bX0TJn0XbnT_uqL5US3wdN9vG2BJGHiby
 //host = 抓包看到的来路
 ";
-        #endregion
+		#endregion
     }
 }