优化中转仓处理逻辑
This commit is contained in:
1 parent
82165f25a8
commit
15b8288a98
9 files changed
+90
-115
No files matched your search
@@ -1435,17 +1435,6 @@
|
||||
Orientation="Vertical"
|
||||
VerticalSpacing="6">
|
||||
|
||||
<Button
|
||||
x:Name="btnTransitInfo"
|
||||
Height="22"
|
||||
MinWidth="38"
|
||||
Margin="0,0,0,0"
|
||||
HorizontalAlignment="Center"
|
||||
Click="btnTransitInfo_Click"
|
||||
Content="云仓详情"
|
||||
Style="{StaticResource BasePageButtonLightStyle}"
|
||||
Visibility="Collapsed" />
|
||||
|
||||
<Button
|
||||
x:Name="btnMapSkus"
|
||||
Height="22"
|
||||
@@ -1512,7 +1501,24 @@
|
||||
Click="btnDirectBuyOrder_Click"
|
||||
Content="直发拍单"
|
||||
Style="{StaticResource BasePageButtonLightStyle}"
|
||||
Visibility="{Binding BtnDirectBuyOrderVisibility}"/>
|
||||
Visibility="{Binding BtnDirectBuyOrderVisibility}" />
|
||||
|
||||
<Button
|
||||
x:Name="btnChangeWaybill"
|
||||
MinWidth="38"
|
||||
MinHeight="20"
|
||||
Margin="0,0,0,0"
|
||||
Padding="0"
|
||||
HorizontalAlignment="Center"
|
||||
d:Visibility="Visible"
|
||||
Click="btnChangeWaybill_Click"
|
||||
FontSize="11"
|
||||
Style="{StaticResource BasePageButtonLightStyle}"
|
||||
Visibility="{Binding ItemOrder.IsShowChangeWaybillBtn, Converter={StaticResource VisibleToVisibilityConverter}}">
|
||||
<TextBlock TextAlignment="Center">
|
||||
补发/修改<LineBreak />
|
||||
物流</TextBlock>
|
||||
</Button>
|
||||
|
||||
<!-- 礼品发货 -->
|
||||
<Button
|
||||
@@ -1534,20 +1540,17 @@
|
||||
Orientation="Vertical"
|
||||
VerticalSpacing="5">
|
||||
|
||||
<Button
|
||||
x:Name="btnChangeWaybill"
|
||||
MinWidth="38"
|
||||
MinHeight="20"
|
||||
Margin="0,0,0,0"
|
||||
Padding="0"
|
||||
HorizontalAlignment="Center"
|
||||
d:Visibility="Visible"
|
||||
Click="btnChangeWaybill_Click"
|
||||
Content="补发/修改物流"
|
||||
FontSize="11"
|
||||
Style="{StaticResource BasePageButtonLightStyle}"
|
||||
Visibility="{Binding ItemOrder.IsShowChangeWaybillBtn, Converter={StaticResource VisibleToVisibilityConverter}}" />
|
||||
|
||||
<Button
|
||||
x:Name="btnTransitInfo"
|
||||
Height="22"
|
||||
MinWidth="38"
|
||||
Margin="0,0,0,0"
|
||||
HorizontalAlignment="Center"
|
||||
Click="btnTransitInfo_Click"
|
||||
Content="云仓详情"
|
||||
Style="{StaticResource BasePageButtonLightStyle}"
|
||||
Visibility="{Binding ItemTransitOrderWithVoid, Converter={StaticResource hasValueToVisibilityConverter}}" />
|
||||
<!--<Button
|
||||
x:Name="btnAddEditTransitWarehouseReject_New"
|
||||
MinWidth="38"
|
||||
|
||||
@@ -1974,6 +1974,17 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
|
||||
private async void borderWarehouseStatus_MouseUp(object sender, MouseButtonEventArgs e)
|
||||
{
|
||||
ShowTransitDetail();
|
||||
}
|
||||
|
||||
private void btnTransitInfo_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
ShowTransitDetail();
|
||||
}
|
||||
|
||||
void ShowTransitDetail()
|
||||
{
|
||||
//return;
|
||||
if (this.DataContext is oms_wei_order_item_info orderItem)
|
||||
{
|
||||
oms_wei_order_item_transit_model transitInfo = new oms_wei_order_item_transit_model()
|
||||
@@ -1992,28 +2003,6 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
}.ShowDialog();
|
||||
}
|
||||
}
|
||||
|
||||
private void btnTransitInfo_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
////return;
|
||||
//if (this.DataContext is oms_wei_order_item_info orderItem)
|
||||
//{
|
||||
// oms_wei_order_item_transit_model transitInfo = new oms_wei_order_item_transit_model()
|
||||
// {
|
||||
// OrderItem = orderItem,
|
||||
// };
|
||||
|
||||
// OrderTransitListCtrl OrderTransitListCtrl = new OrderTransitListCtrl(transitInfo);
|
||||
// new DialogWindow()
|
||||
// {
|
||||
// Title = "仓库订单详情 - 当前订单 " + orderItem.order_id,
|
||||
// Content = OrderTransitListCtrl,
|
||||
// Width = SystemParameters.PrimaryScreenWidth < 1920 ? SystemParameters.PrimaryScreenWidth : SystemParameters.PrimaryScreenWidth * 90 / 100,
|
||||
// Height = SystemParameters.PrimaryScreenHeight * 90 / 100,
|
||||
// WindowStartupLocation = WindowStartupLocation.CenterScreen,
|
||||
// }.ShowDialog();
|
||||
//}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -86,7 +86,7 @@ internal class OrderTransitService
|
||||
}
|
||||
else
|
||||
{
|
||||
var msg = BaseRegex.GetStringJson(ref discardRst, "msg");
|
||||
var msg = BaseRegex.GetStringJsonByRegs(ref discardRst, discardRst, "msg");
|
||||
if (!isSilent)
|
||||
BaseMsgWindow.ShowInfo("订单作废失败,服务端返回 " + msg);
|
||||
|
||||
|
||||
Reference in new issue
Block a user