diff --git a/BBWY.Client/Models/APIModel/Response/BatchPurchase/PurchaseOrderV2Response.cs b/BBWY.Client/Models/APIModel/Response/BatchPurchase/PurchaseOrderV2Response.cs
index 328ff1fa..62019c13 100644
--- a/BBWY.Client/Models/APIModel/Response/BatchPurchase/PurchaseOrderV2Response.cs
+++ b/BBWY.Client/Models/APIModel/Response/BatchPurchase/PurchaseOrderV2Response.cs
@@ -82,11 +82,11 @@ namespace BBWY.Client.Models
public bool? IsConvertToStock { get; set; } = false;
- ///
- /// 是否订阅快递100
- ///
+ /////
+ ///// 是否订阅快递100
+ /////
- public bool? IsSubscribeKuaiDi100 { get; set; } = false;
+ //public bool? IsSubscribeKuaiDi100 { get; set; } = false;
///
/// 采购单状态(待付款=0,待发货=1,待收货=2,待质检=3,待打包=4,待结算=5,已完成=6)
@@ -109,6 +109,8 @@ namespace BBWY.Client.Models
public long? PurchaseAccountId { get; set; }
+ public string PurchaseAccountName { get; set; }
+
///
/// 采购金额(采购货款+采购运费)
///
diff --git a/BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml b/BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml
index 5ca79c9f..2ca0d8f1 100644
--- a/BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml
+++ b/BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml
@@ -206,9 +206,9 @@
-
+ CommandParameter="{Binding PurchaseAccountName}" Margin="5,0,0,0"/>
p.Platform == purchasePlatform).GetOrderSimpleInfo(new GetOrderInfoRequest()
@@ -363,30 +363,66 @@ namespace BBWY.Server.Business
if (request.EndDate != null)
request.EndDate = request.EndDate.Value.Date.AddDays(1).AddSeconds(-1);
- var select = fsql.Select().Where(p => p.ShopId == request.ShopId);
+ var select = fsql.Select().LeftJoin((po, pa) => po.PurchaseAccountId == pa.Id)
+ .Where((po, pa) => po.ShopId == request.ShopId);
if (!string.IsNullOrEmpty(request.PurchaseOrderId))
{
- select = select.Where(p => p.Id == request.PurchaseOrderId);
+ select = select.Where((po, pa) => po.Id == request.PurchaseOrderId);
}
else
{
if (!string.IsNullOrEmpty(request.Spu) || !string.IsNullOrEmpty(request.Sku))
{
var childSelect = fsql.Select().As("posku")
- .WhereIf(!string.IsNullOrEmpty(request.Sku), posku => posku.SkuId == request.Sku)
- .WhereIf(!string.IsNullOrEmpty(request.Spu), posku => posku.ProductId == request.Spu);
+ .WhereIf(!string.IsNullOrEmpty(request.Sku), posku => posku.SkuId == request.Sku)
+ .WhereIf(!string.IsNullOrEmpty(request.Spu), posku => posku.ProductId == request.Spu);
- select = select.Where(p => childSelect.Where(posku => posku.PurchaseOrderId == p.Id).Any());
+ select = select.Where((po, pa) => childSelect.Where(posku => posku.PurchaseOrderId == po.Id).Any());
}
- select = select.WhereIf(request.PurchaserName != null, p => p.PurchaserName == request.PurchaserName)
- .WhereIf(request.PurchaseOrderState != null, p => p.OrderState == request.PurchaseOrderState)
- .WhereIf(request.StartDate != null, p => p.CreateTime >= request.StartDate)
- .WhereIf(request.EndDate != null, p => p.CreateTime <= request.EndDate);
+ select = select.WhereIf(request.PurchaserName != null, (po, pa) => po.PurchaserName == request.PurchaserName)
+ .WhereIf(request.PurchaseOrderState != null, (po, pa) => po.OrderState == request.PurchaseOrderState)
+ .WhereIf(request.StartDate != null, (po, pa) => po.CreateTime >= request.StartDate)
+ .WhereIf(request.EndDate != null, (po, pa) => po.CreateTime <= request.EndDate);
}
- var purchaseOrderList = select.OrderByDescending(p => p.CreateTime)
+ var purchaseOrderList = select.OrderByDescending((po, pa) => po.CreateTime)
.Count(out var total)
.Page(request.PageIndex, request.PageSize)
- .ToList();
+ .ToList((po, pa) => new PurchaseOrderV2Response
+ {
+ Id = po.Id,
+ ShopId = po.ShopId,
+ OrderState = po.OrderState,
+ PurchasePlatform = po.PurchasePlatform,
+ ConsigneeContactName = po.ConsigneeContactName,
+ ConsigneeMobile = po.ConsigneeMobile,
+ ConsigneeProvince = po.ConsigneeProvince,
+ ConsigneeCity = po.ConsigneeCity,
+ ConsigneeCounty = po.ConsigneeCounty,
+ ConsigneeTown = po.ConsigneeTown,
+ ConsigneeAddress = po.ConsigneeAddress,
+ PurchaserId = po.PurchaserId,
+ PurchaserName = po.PurchaserName,
+ PurchaseAccountId = po.PurchaseAccountId,
+ PurchaseAccountName = pa.AccountName,
+ PurchaseAmount = po.PurchaseAmount,
+ ProductAmount = po.ProductAmount,
+ PurchaseFreight = po.PurchaseFreight,
+ QualityInspectionAmount = po.QualityInspectionAmount,
+ InStorageAmount = po.InStorageAmount,
+ ConsumableAmount = po.ConsumableAmount,
+ FirstFreight = po.FirstFreight,
+ IsConvertToStock = po.IsConvertToStock,
+ Remark = po.Remark,
+ CreateTime = po.CreateTime,
+ PayTime = po.PayTime,
+ SignTime = po.SignTime,
+ CompletionTime = po.CompletionTime,
+ PurchaseMethod = po.PurchaseMethod,
+ PurchaseOrderMode = po.PurchaseOrderMode,
+ ExpressName = po.ExpressName,
+ WaybillNo = po.WaybillNo
+ //PackState = po.PackState
+ });
var purchaseOrderIdList = purchaseOrderList.Select(p => p.Id).ToList();
var purchaseOrderSkuList = fsql.Select().Where(posku => purchaseOrderIdList.Contains(posku.PurchaseOrderId)).ToList();
@@ -409,8 +445,10 @@ namespace BBWY.Server.Business
.ExecuteAffrows();
}
- return new PayPurchaseOrderResponse() { Success= payOrderResponse.Success,
- Msg = payOrderResponse.Msg
+ return new PayPurchaseOrderResponse()
+ {
+ Success = payOrderResponse.Success,
+ Msg = payOrderResponse.Msg
};
}
@@ -421,7 +459,7 @@ namespace BBWY.Server.Business
if (payOrderResponse.Success)
{
- var order =fsql.Select().Where(p => p.Id == request.OrderId).ToOne();
+ var order = fsql.Select().Where(p => p.Id == request.OrderId).ToOne();
fsql.Update(order)
.Set(a => a.OrderState, Enums.PurchaseOrderState.已取消)
.ExecuteAffrows();
diff --git a/BBWY.Server.Model/Dto/Response/PurchaseOrderV2/PurchaseOrderV2Response.cs b/BBWY.Server.Model/Dto/Response/PurchaseOrderV2/PurchaseOrderV2Response.cs
index 8544cf83..d173498b 100644
--- a/BBWY.Server.Model/Dto/Response/PurchaseOrderV2/PurchaseOrderV2Response.cs
+++ b/BBWY.Server.Model/Dto/Response/PurchaseOrderV2/PurchaseOrderV2Response.cs
@@ -5,11 +5,12 @@ namespace BBWY.Server.Model.Dto
{
public class PurchaseOrderV2Response : PurchaseOrderV2
{
+ public string PurchaseAccountName { get; set; }
public IList ItemList { get; set; }
}
public class PurchaseOrderV2ListResponse
- {
+ {
public long Count { get; set; }
public IList ItemList { get; set; }