修改拦截工单链接地址及其他一些改动

29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs

@@ -1718,7 +1718,10 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 				{
 					GlobalConfig.lstFilterOrder.Remove(orderExist);
 				});
-				orderExist = GlobalConfig.lstFilterOrder.ToList().FirstOrDefault(o => o.order_id == order.order_id);
+				lock (MainWindow._orderLock)
+				{
+					orderExist = GlobalConfig.lstFilterOrder.ToList().FirstOrDefault(o => o.order_id == order.order_id);
+				}
 			}
 
 			if (!GetOrderIsFilter(order))

29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs

@@ -1334,7 +1334,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 			else
 			{
 				rejectStatus = 2;
-				var err = BaseRegex.GetStringXmlByRegs(ref html, "msg");
+				var err = BaseRegex.GetStringXmlByRegs(ref html, html, "msg");
 				//BaseMsgWindow.ShowAnimateMessage("申请失败", "Error", 3);
 				throw new Exception("申请失败" + err);
 			}

29WxOrderWpf/Ctrls/OrderCtrls/OrderTransitListDetailCtrl.xaml

@@ -306,7 +306,7 @@
 							<!--<TextBlock>
 								云仓拒收<LineBreak />
 								退回总店</TextBlock>-->
-							<TextBlock>云仓拒收退回总店</TextBlock>
+							云仓拒收退回总店
 						</Button>
 						<Button
 							x:Name="btnAddEditTransitWarehouseAfterSale_n1"
@@ -317,7 +317,7 @@
 							Click="btnAddEditTransitWarehouseAfterSale_Click"
 							Style="{StaticResource BasePageButtonLightStyle}"
 							Visibility="{Binding ReturnPackageBtnVisibility}">
-							<TextBlock>拒收失败转寄总店</TextBlock>
+							拒收失败转寄总店
 						</Button>
 						<Button
 							x:Name="btnAddEditTransitWarehouseAfterSale_n2"
@@ -328,7 +328,7 @@
 							Click="btnAddEditTransitWarehouseAfterSale_Click"
 							Style="{StaticResource BasePageButtonLightStyle}"
 							Visibility="{Binding ReturnPackageBtnVisibility}">
-							<TextBlock>出库拦截退回仓库</TextBlock>
+							出库拦截退回仓库
 						</Button>
 						<Button
 							x:Name="btnTransitExtraPackages"

29WxOrderWpf/Windows/OrderWindows/TransitAfterSaleWindow.xaml.cs

@@ -152,14 +152,14 @@ namespace _29WxOrderWpf.Windows.OrderWindows
         {
 			if (string.IsNullOrEmpty(lblWorkOrderMsg.Content.ParseToString()))
 			{
-				// 已改为独立创建工单
-				//// 创建拦截退货包裹工单
-				//var workOrder = AddWorkOrder();
-				//if (!workOrder.Contains("\"success\":true"))
-				//{
-				//	BaseMsgWindow.ShowError("中转拦截包裹添加失败，" + BaseRegex.GetStringJson(ref workOrder, "message"), "", this);
-				//	return;
-				//}
+				// 后续为独立创建工单
+				// 创建拦截退货包裹工单
+				var workOrder = AddWorkOrder();
+				if (!workOrder.Contains("\"success\":true"))
+				{
+					BaseMsgWindow.ShowError("中转拦截包裹添加失败，" + BaseRegex.GetStringJson(ref workOrder, "message"), "", this);
+					return;
+				}
 			}
 			//{"success":true,"replayed":true,"operation":"replayed","ticket":{"id":"1d268a38-7f60-4295-9345-a8f21298181c","ticketNo":"WO-20260820102516-AE62D8F2","issueType":"拦截退回云仓-出库后","status":"pending_approval","queue":"pending"},"creatorBinding":{"bound":true,"clientUserId":"user_1784451034258_a6da3c","username":"18305598906"},"targetOrder":{"appId":"wx5cfcfda1fae03689","wechatOrderNo":"3737793636785868032","purchaseOrderNo":"260716-496899202560980","verified":true},"requestId":"2bbd8e98-0a95-4162-9fc1-b377644209ed"}
 

AllBase/Model/DBModel/oms_wei_order_item_transit_info.cs

@@ -60,7 +60,8 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject
 			{
 				var transitDetail = new oms_wei_order_item_transit_detail_info()
 				{
-					//RejectPackageBtnVisibility = Visibility.Visible,
+					//VoidPackageBtnVisibility = Visibility.Visible,
+					RejectPackageBtnVisibility = Visibility.Visible,
 					//ReturnPackageBtnVisibility = Visibility.Visible,
 					//ExtraPackagesBtnVisibility = Visibility.Visible,
 
@@ -387,7 +388,10 @@ public class oms_wei_order_item_transit_detail_info : PropertyNotifyObject
 {
 	public oms_wei_order_item_transit_detail_info() 
 	{
-		RejectPackageBtnVisibility = ReturnPackageBtnVisibility = ExtraPackagesBtnVisibility = Visibility.Collapsed;
+		VoidPackageBtnVisibility = Visibility.Collapsed;
+		RejectPackageBtnVisibility = Visibility.Collapsed;
+		ReturnPackageBtnVisibility = Visibility.Collapsed; 
+		ExtraPackagesBtnVisibility = Visibility.Collapsed;
 	}
 
 	public oms_wei_order_item_info oms_wei_order_item_info { get; set; }
@@ -591,6 +595,11 @@ public class oms_wei_order_item_transit_detail_info : PropertyNotifyObject
 		set { this.SetValue(x => x.ShelfTimeStr, value); }
 	}
 
+	public Visibility VoidPackageBtnVisibility
+	{
+		get { return this.GetValue(x => x.VoidPackageBtnVisibility); }
+		set { this.SetValue(x => x.VoidPackageBtnVisibility, value); }
+	}
 	public Visibility RejectPackageBtnVisibility
 	{
 		get { return this.GetValue(x => x.RejectPackageBtnVisibility); }

Work/_29Tools/BLL/HttpResponseTransitWorkOrderBLL.cs

@@ -13,7 +13,8 @@ namespace Work._29Tools.BLL
 {
 	public class HttpResponseTransitWorkOrderBLL
 	{
-		public static string WorkOrderUrl { get; set; } = "http://14.103.99.254";
+		//public static string WorkOrderUrl { get; set; } = "http://14.103.99.254";
+		public static string WorkOrderUrl { get; set; } = "https://ai.e57.cn";
 		public static string PostResponse(ShopLoginInfo shop, string _url, string _body, string referer)
 		{