优化中转仓处理拍单流程 隐藏部分不可用功能

This commit is contained in:
wule committed 2026-11-06 16:11:23 +08:00
1 parent 27ac748f33
commit 518365a0d3
30 files changed
+1237 -634

No files matched your search

+106 -18
View File
@@ -1,11 +1,13 @@
using AllBase.Helper;
using AllBase.Model.MvvmBaseClasses;
using NaiBa.Util;
using NaiBa.Util.Extension;
using Newtonsoft.Json.Linq;
using NPOI.SS.Formula.Functions;
using Org.BouncyCastle.Asn1.Mozilla;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Text;
@@ -20,13 +22,104 @@ namespace AllBase.Model.DBModel
{
public class oms_wei_order_item_info : PropertyNotifyObject
{
///// <summary>
///// 订单对应店铺
///// </summary>
//public ShopLoginInfo Shop
//{
// get { return this.GetValue(x => x.Shop); }
// set { this.SetValue(x => x.Shop, value); }
public List<oms_wei_order_item_transit_detail_info> TransitPackageList
{
get { return this.GetValue(x => x.TransitPackageList); }
set
{
this.SetValue(x => x.TransitPackageList, value);
TransitPackageLatest = TransitPackageList.OrderByDescending(p => p.CreateTime).FirstOrDefault(p => p.TransitVoidStatus != "已作废") ??
TransitPackageList.OrderByDescending(p => p.CreateTime).FirstOrDefault() ??
new oms_wei_order_item_transit_detail_info();
}
}
public oms_wei_order_item_transit_detail_info TransitPackageLatest
{
get { return this.GetValue(x => x.TransitPackageLatest); }
set
{
this.SetValue(x => x.TransitPackageLatest, value);
TransitPackageLatestWarehouseStatusStr = value?.TransitTypeStr + value?.WarehouseStatus;
TransitPackageLatestVoidStatusStr = value?.TransitVoidStatus == "已作废" ? value?.TransitTypeStr + "已作废" : "";
if (order_id == "3740305724012410112")
{
}
if (value != null && value?.TransitTypeStr != "发货包裹")
VoidPackageTypeStr = "作废" + value?.TransitTypeStr;
else
{
VoidPackageTypeStr = "";
if (value != null) value.VoidPackageBtnVisibility = Visibility.Collapsed;
}
}
}
public string TransitPackageLatestWarehouseStatusStr
{
get { return this.GetValue(x => x.TransitPackageLatestWarehouseStatusStr); }
set
{
this.SetValue(x => x.TransitPackageLatestWarehouseStatusStr, value);
var str = value ?? "";
TransitPackageLatestWarehouseStatusStrVisibility = str.Length > 0 ? Visibility.Visible : Visibility.Collapsed;
// 状态文字颜色
if (str.Contains("已出库"))
WarehouseWaybillStatusStrColor = GlobalConfig.GreenBrush;
else if (str.Contains("已入库") || str.Contains("拦截到仓") || str.Contains("未入库"))
WarehouseWaybillStatusStrColor = GlobalConfig.YellowBrush;
else // if (str.Contains("待取号"))
WarehouseWaybillStatusStrColor = GlobalConfig.RedBrush;
// 状态边框颜色
if (str.Contains("已出库"))
WarehouseWaybillStatusBorderColor = GlobalConfig.GreenBrush75;
else if (str.Contains("已入库") || str.Contains("拦截到仓") || str.Contains("未入库"))
WarehouseWaybillStatusBorderColor = GlobalConfig.YellowBrush75;
else // if (str.Contains("待取号"))
WarehouseWaybillStatusBorderColor = GlobalConfig.RedBrush75;
// 状态背景颜色
if (str.Contains("已出库"))
WarehouseWaybillStatusBackColor = GlobalConfig.GreenBrush35;
else if (str.Contains("已入库") || str.Contains("拦截到仓") || str.Contains("未入库"))
WarehouseWaybillStatusBackColor = GlobalConfig.YellowBrush35;
else // if (str.Contains("待取号"))
WarehouseWaybillStatusBackColor = GlobalConfig.RedBrush35;
}
}
public Visibility TransitPackageLatestWarehouseStatusStrVisibility
{
get { return this.GetValue(x => x.TransitPackageLatestWarehouseStatusStrVisibility); }
set { this.SetValue(x => x.TransitPackageLatestWarehouseStatusStrVisibility, value); }
}
public string TransitPackageLatestVoidStatusStr
{
get { return this.GetValue(x => x.TransitPackageLatestVoidStatusStr); }
set { this.SetValue(x => x.TransitPackageLatestVoidStatusStr, value); TransitPackageLatestVoidStatusStrVisibility = string.IsNullOrEmpty(value) ? Visibility.Collapsed : Visibility.Visible; }
}
public Visibility TransitPackageLatestVoidStatusStrVisibility
{
get { return this.GetValue(x => x.TransitPackageLatestVoidStatusStrVisibility); }
set { this.SetValue(x => x.TransitPackageLatestVoidStatusStrVisibility, value); }
}
public string VoidPackageTypeStr
{
get { return this.GetValue(x => x.VoidPackageTypeStr); }
set { this.SetValue(x => x.VoidPackageTypeStr, value); }
}
///// <summary>
///// 订单对应店铺
///// </summary>
//public ShopLoginInfo Shop
//{
// get { return this.GetValue(x => x.Shop); }
// set { this.SetValue(x => x.Shop, value); }
//}
/// <summary>
@@ -38,7 +131,6 @@ namespace AllBase.Model.DBModel
set { this.SetValue(x => x.OrderItemVisibility, value); }
}
#region 订单采购参数
/// <summary>
/// 采购关联
@@ -889,7 +981,7 @@ namespace AllBase.Model.DBModel
}
public void SetTransitRefundStatusStr()
{
TransitRefundStatusStr = oms_wei_order_item_transit_info.GetTransitBuyerRefundStatusStr(this, ItemTransitOrder ?? ItemTransitOrderWithVoid);
TransitRefundStatusStr = oms_wei_order_item_transit_model.GetTransitBuyerRefundStatusStr(this, ItemTransitOrder ?? ItemTransitOrderWithVoid);
if (TransitRefundStatusStr.Contains("退款成功"))
TransitRefundStatusBackColor = GlobalConfig.GreenBrush;
@@ -1708,20 +1800,16 @@ namespace AllBase.Model.DBModel
}
//oms_wei_order_item_transit_model transitInfo = new oms_wei_order_item_transit_model()
//{
// OrderItem = this,
//};
//TransitPackageList = [.. transitInfo.OrderItemTransitDetailList];
oms_wei_order_item_transit_model transitInfo = new oms_wei_order_item_transit_model()
{
OrderItem = this,
};
TransitPackageList = [.. transitInfo.OrderItemTransitDetailList];
}
/// <summary> 初始化物流明细信息 </summary>
public void SetEWaybillInfo()
{
if (order_id == "3738794693820307200")
{
}
if (this.ItemOrder?.latestEWaybills?.Count > 0 && !string.IsNullOrEmpty(ItemTransitOrderWithVoid?.express_2_waybill))
LatestTransitEWaybill = ItemOrder.latestEWaybills.FirstOrDefault(ew => ew.waybill_id == ItemTransitOrderWithVoid.express_2_waybill);
else