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

This commit is contained in:
wule committed 2026-10-29 14:05:04 +08:00
1 parent 9545de7684
commit 1a5f40926b
6 files changed
+29 -16

No files matched your search

@@ -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))
@@ -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);
}
@@ -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"