Browse Source

采购方案保存采购时间

updatebug
shanji 2 years ago
parent
commit
4e902efe5a
  1. 5
      BBWYB.Client/Models/APIModel/Response/PurchaseSchemeResponse.cs
  2. 6
      BBWYB.Client/Models/PurchaseScheme/PurchaseScheme.cs
  3. 2
      BBWYB.Client/Views/Order/ChoosePurchaseScheme.xaml
  4. 5
      BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
  5. 3
      BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs
  6. 5
      BBWYB.Server.Model/Db/PurchaseScheme/PurchaseScheme.cs
  7. 7
      BBWYB.Server.Model/Dto/Request/PurchaseOrder/CargoParamRequest.cs

5
BBWYB.Client/Models/APIModel/Response/PurchaseSchemeResponse.cs

@ -32,6 +32,11 @@ namespace BBWYB.Client.Models
/// </summary>
public Platform PurchasePlatform { get; set; }
/// <summary>
/// 最后采购时间
/// </summary>
public DateTime? LastPurchaseTime { get; set; }
public List<PurchaseSchemeProductResponse> PurchaseSchemeProductList { get; set; }
}

6
BBWYB.Client/Models/PurchaseScheme/PurchaseScheme.cs

@ -1,4 +1,5 @@
using CommunityToolkit.Mvvm.ComponentModel;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
@ -37,6 +38,11 @@ namespace BBWYB.Client.Models
/// </summary>
public Platform PurchasePlatform { get; set; }
/// <summary>
/// 最后采购时间
/// </summary>
public DateTime? LastPurchaseTime { get; set; }
/// <summary>
/// 采购方案的商品集合
/// </summary>

2
BBWYB.Client/Views/Order/ChoosePurchaseScheme.xaml

@ -112,6 +112,8 @@
<TextBlock Text="{Binding PurchasePlatform}" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="{Binding PurchaserName}" Style="{StaticResource middleTextBlock}" Grid.Column="1"/>
<TextBlock Text="{Binding PurchaserLocation}" Style="{StaticResource middleTextBlock}" Grid.Column="2"/>
<TextBlock Text="{Binding DefaultCost}" Style="{StaticResource middleTextBlock}" Grid.Column="3"/>
<TextBlock Text="{Binding LastPurchaseTime,StringFormat=yyyy-MM-dd HH:mm:ss}" Grid.Column="4"/>
<Border x:Name="bd" Grid.Column="5" Background="{StaticResource Border.Background}">
<TextBlock Text="选择" Style="{StaticResource middleTextBlock}"/>

5
BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs

@ -171,6 +171,7 @@ namespace BBWYB.Server.Business
List<OrderCostDetail> insertOrderCostDetails = new List<OrderCostDetail>();
List<OrderPurchaseInfo> insertOrderPurchaseInfos = new List<OrderPurchaseInfo>();
List<long> updatePurchaseTimeSchemeIdList = new List<long>();
IInsert<OrderCost> insertOrderCost = null;
IUpdate<OrderCost> updateOrderCost = null;
var totalPurchaseAmount = 0M;
@ -184,6 +185,8 @@ namespace BBWYB.Server.Business
var client = ppPlatformClientFactory.GetClient((AdapterEnums.PlatformType)cargoParamGroup.PurchasePlatform);
var extJson = extJArray.FirstOrDefault(j => j.Value<string>("PurchaserId") == cargoParamGroup.PurchaserId);
updatePurchaseTimeSchemeIdList.AddRange(cargoParamGroup.CargoParamList.Select(p => p.SchemeId).Distinct());
var orderProductParamList = CombineRepeatPurchaseSku(cargoParamGroup.CargoParamList);
var createOrderResponse = client.CreateOrder(new PP_CreateOrderRequest()
@ -313,6 +316,8 @@ namespace BBWYB.Server.Business
fsql.Insert(insertOrderPurchaseInfos).ExecuteAffrows();
updateOrderCost?.ExecuteAffrows();
insertOrderCost?.ExecuteAffrows();
if (updatePurchaseTimeSchemeIdList.Count() > 0)
fsql.Update<PurchaseScheme>(updatePurchaseTimeSchemeIdList).Set(p => p.LastPurchaseTime, DateTime.Now).ExecuteAffrows();
fsql.Update<Order>(request.OrderId).SetIf(dbOrder.OrderState == Enums.OrderState., o => o.OrderState, Model.Enums.OrderState.)
.SetIf(!string.IsNullOrEmpty(request.Remark), o => o.PurchaseRemark, request.Remark)
.Set(o => o.IsPurchased, true)

3
BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs

@ -159,7 +159,8 @@ namespace BBWYB.Server.Business
DefaultCost = ps.DefaultCost,
RealCost = ps.RealCost,
CreateTime = ps.CreateTime,
PurchasePlatform = ps.PurchasePlatform
PurchasePlatform = ps.PurchasePlatform,
LastPurchaseTime = ps.LastPurchaseTime
});
if (purchaseSchemeList.Count > 0)

5
BBWYB.Server.Model/Db/PurchaseScheme/PurchaseScheme.cs

@ -46,6 +46,11 @@ namespace BBWYB.Server.Model.Db
public long ShopId { get; set; }
/// <summary>
/// 最后采购时间
/// </summary>
public DateTime? LastPurchaseTime { get; set; }
[Column(MapType = typeof(int), DbType = "int(1)")]
public Enums.Platform PurchasePlatform { get; set; }

7
BBWYB.Server.Model/Dto/Request/PurchaseOrder/CargoParamRequest.cs

@ -10,13 +10,20 @@
/// 采购SkuId
/// </summary>
public string SkuId { get; set; }
public string SpecId { get; set; }
public int Quantity { get; set; }
/// <summary>
/// 订单SkuId
/// </summary>
public string BelongSkuId { get; set; }
/// <summary>
/// 采购方案Id
/// </summary>
public long SchemeId { get; set; }
}
public class CargoParamGroupRequest
{

Loading…
Cancel
Save