diff --git a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs index 045ca8e..1178aed 100644 --- a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs +++ b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs @@ -2234,7 +2234,7 @@ namespace BBWYB.Server.Business #endregion #region 查询订单/采购sku/快递单/采购关系 - var dbOrder = fsql.Select(tpeo.OrderId).ToOne(o => new Order + var dbOrder = fsql.Select(orderPurchaseInfo.OrderId).ToOne(o => new Order { Id = o.Id, ShopId = o.ShopId, diff --git a/BBWYB.Server.Model/Enums.cs b/BBWYB.Server.Model/Enums.cs index f77cacf..bc848a1 100644 --- a/BBWYB.Server.Model/Enums.cs +++ b/BBWYB.Server.Model/Enums.cs @@ -83,8 +83,7 @@ /// 暂停 = 7 /// 已退款 = 8 /// Unknow = 100 - /// 打包中 = 140 - /// 待完结 = 150 + /// 待验收 = 140 /// public enum OrderState { @@ -101,8 +100,7 @@ 暂停 = 7, 已退款 = 8, Unknow = 100, - 打包中 = 140, - 待完结 = 150 + 待验收 = 140 //待配置 = 101, }