仓库退货订单逻辑 30%
This commit is contained in:
1 parent
d25374956e
commit
d5d235c0b0
18 files changed
+747
-39
No files matched your search
@@ -1,4 +1,5 @@
|
||||
using _29WxOrderWpf.BaseWindows;
|
||||
using AllBase;
|
||||
using AllBase.Helper;
|
||||
using AllBase.Model.DBModel;
|
||||
using NaiBa.Util.Extension;
|
||||
@@ -59,19 +60,27 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
shopLoginForm.ShowDialog();
|
||||
|
||||
if (shop.LoginStatus == "登录成功")
|
||||
{
|
||||
var is29SupplierRst = WxOrderSupplierBLL.GetWxSupplierList(shop);
|
||||
if (!is29SupplierRst.Contains("\"code\":0"))
|
||||
is29SupplierRst = WxOrderSupplierBLL.GetWxSupplierList(shop);
|
||||
if (is29SupplierRst.Contains("\"code\":0") && is29SupplierRst.Contains("\"name\":\"29供货商\""))
|
||||
{
|
||||
shop.Is29Supplier = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
ShopBLL.CheckShopLogin(shop);
|
||||
shop.Is29Supplier = false;
|
||||
}
|
||||
{
|
||||
shop.Is29Supplier = false;
|
||||
for (int i = 0; i < 100; i++)
|
||||
{
|
||||
var is29SupplierRst = WxOrderSupplierBLL.GetWxSupplierListV2(shop);
|
||||
if (!is29SupplierRst.Contains("\"code\":0"))
|
||||
is29SupplierRst = WxOrderSupplierBLL.GetWxSupplierListV2(shop);
|
||||
if (is29SupplierRst.Contains("\"code\":0") && is29SupplierRst.Contains("\"name\":\"29供货商\""))
|
||||
{
|
||||
shop.Is29Supplier = true;
|
||||
break;
|
||||
}
|
||||
else if (!is29SupplierRst.Contains("\"code\":0"))
|
||||
{
|
||||
ShopBLL.CheckShopLogin(shop);
|
||||
}
|
||||
int totalCount = BaseRegex.GetIntJson(ref is29SupplierRst, "totalCount");
|
||||
if (i * 20 >= totalCount)
|
||||
break;
|
||||
}
|
||||
|
||||
foreach (var ord in GlobalConfig.lstFilterOrder.Where(o => o.shop_id.ParseToString() == shop.ErpShopId).ToList())
|
||||
{
|
||||
// 更新代发管理情况
|
||||
|
||||
@@ -440,7 +440,13 @@
|
||||
<Path Margin="0,0,0,0" Fill="{StaticResource PageLinkBrush}" MouseLeftButtonDown="pathBuyerAfterSaleAddress_MouseLeftButtonDown" Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z" Stretch="Uniform" />
|
||||
</Border>
|
||||
</WrapPanel>
|
||||
|
||||
|
||||
<!--<WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="7" Width="auto" Visibility="{Binding AddEditTransitWarehouseAfterSaleStr,Converter={StaticResource HasTextVisibility}}">
|
||||
<TextBox Text="云仓退货:" Grid.Column="1" Grid.Row="2" Margin="0,1,-8,1" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderBrush="Transparent" BorderThickness="1"/>
|
||||
<Button Grid.Column="1" Grid.Row="2" x:Name="btnRetrunOrder" Background="Transparent" HorizontalAlignment="Center" Foreground="{StaticResource PageLinkBrush}" BorderBrush="Transparent"
|
||||
Margin="2,0,0,0" Content="退货" Click="btnReturnOrder_Click" Cursor="Hand"></Button>
|
||||
</WrapPanel>-->
|
||||
|
||||
</Grid>
|
||||
<!--操作-->
|
||||
<Grid Grid.Column="8" Background="Transparent" VerticalAlignment="Center">
|
||||
|
||||
@@ -1310,5 +1310,23 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void btnReturnOrder_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (this.DataContext is oms_wei_order_item_info orderItem)
|
||||
{
|
||||
//if (orderItem.ItemTransitOrder?.warehouse_status != 2 && orderItem.AddEditTransitWarehouseAfterSaleStr == "添加")
|
||||
//{
|
||||
// BaseMsgWindow.ShowError("商品未出库,请选择中转仓拒收!");
|
||||
// return;
|
||||
//}
|
||||
|
||||
if (TransitReturnOrderWindow.instance != null)
|
||||
TransitReturnOrderWindow.instance.Close();
|
||||
|
||||
TransitReturnOrderWindow.instance = new TransitReturnOrderWindow(orderItem);
|
||||
TransitReturnOrderWindow.instance.Show();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user