优化中转仓处理拍单流程 隐藏部分不可用功能
This commit is contained in:
1 parent
27ac748f33
commit
518365a0d3
30 files changed
+1237
-634
No files matched your search
@@ -40,6 +40,11 @@ namespace _29WxOrderWpf.ViewModels
|
||||
get { return this.GetValue(x => x.OrderItem); }
|
||||
set { this.SetValue(x => x.OrderItem, value); }
|
||||
}
|
||||
public oms_wei_external_procurement_log_info TransitOrder
|
||||
{
|
||||
get { return this.GetValue(x => x.TransitOrder); }
|
||||
set { this.SetValue(x => x.TransitOrder, value); }
|
||||
}
|
||||
public string purchaserNote
|
||||
{
|
||||
get { return this.GetValue(x => x.purchaserNote); }
|
||||
@@ -98,7 +103,12 @@ namespace _29WxOrderWpf.ViewModels
|
||||
|
||||
public void AddExtraPackages()
|
||||
{
|
||||
var transitOrder = OrderItem.ItemTransitOrder ?? OrderItem.ItemTransitOrderWithVoid;
|
||||
if (TransitOrder == null)
|
||||
{
|
||||
//TransitOrder = OrderItem.ItemTransitOrder ?? OrderItem.ItemTransitOrderWithVoid;
|
||||
BaseMsgWindow.ShowError("未找到云仓发货包裹,请确认包裹存在");
|
||||
return;
|
||||
}
|
||||
var transitExtraOrder = OrderItem.ItemTransitExtraOrders.FirstOrDefault(t => t.order_void_status != 1);
|
||||
if (transitExtraOrder != null)
|
||||
{
|
||||
@@ -113,20 +123,20 @@ namespace _29WxOrderWpf.ViewModels
|
||||
body["postage"] = ((basePostage + BaseClass.PostagePerOrderDiff) * 100).ParseToInt().ParseToString();
|
||||
|
||||
body["packType"] = "2";
|
||||
body["batchId"] = transitOrder.order_code + "-" + ((OrderItem.ItemTransitExtraOrders?.Count).ParseToInt() + 1);
|
||||
body["batchId"] = TransitOrder.order_code + "-" + ((OrderItem.ItemTransitExtraOrders?.Count).ParseToInt() + 1);
|
||||
body["orderNo"] = OrderItem.order_id;
|
||||
body["orderCode"] = transitOrder.order_code;
|
||||
body["orderCode"] = TransitOrder.order_code;
|
||||
|
||||
// 未出库填上游物流,已出库填下游物流
|
||||
if (transitOrder.warehouse_status != 2)
|
||||
if (TransitOrder.warehouse_status != 2)
|
||||
{
|
||||
body["logisticsCode"] = transitOrder.express_1_company;
|
||||
body["logisticsExpressCode"] = transitOrder.express_1_waybill;
|
||||
body["logisticsCode"] = TransitOrder.express_1_company;
|
||||
body["logisticsExpressCode"] = TransitOrder.express_1_waybill;
|
||||
}
|
||||
else
|
||||
{
|
||||
body["logisticsCode"] = transitOrder.express_2_company;
|
||||
body["logisticsExpressCode"] = transitOrder.express_2_waybill;
|
||||
body["logisticsCode"] = TransitOrder.express_2_company;
|
||||
body["logisticsExpressCode"] = TransitOrder.express_2_waybill;
|
||||
}
|
||||
|
||||
body["accountUser"] = BaseClass.UserName;
|
||||
|
||||
Reference in new issue
Block a user