|
@ -258,6 +258,9 @@ namespace BBWYB.Server.Business |
|
|
List<long> updatePurchaseTimeSchemeIdList = new List<long>(); |
|
|
List<long> updatePurchaseTimeSchemeIdList = new List<long>(); |
|
|
List<OrderPurchaseRelationInfo> insertOrderPurchaseRelationInfoList = new List<OrderPurchaseRelationInfo>(); |
|
|
List<OrderPurchaseRelationInfo> insertOrderPurchaseRelationInfoList = new List<OrderPurchaseRelationInfo>(); |
|
|
List<string> updatePurchaseTimeLimitTaskOrderSkuList = new List<string>(); |
|
|
List<string> updatePurchaseTimeLimitTaskOrderSkuList = new List<string>(); |
|
|
|
|
|
List<QiKuPackTaskSkuPurchaseSchemeIdRequest> notifyQikuPackSchemeParamList = null; |
|
|
|
|
|
if (dbOrder.IntoStoreType == Enums.IntoStoreType.发回齐越) |
|
|
|
|
|
notifyQikuPackSchemeParamList = new List<QiKuPackTaskSkuPurchaseSchemeIdRequest>(); |
|
|
|
|
|
|
|
|
#region 待更新
|
|
|
#region 待更新
|
|
|
IList<long> updateOrderCostDetailIdList = fsql.Select<OrderCostDetail>() |
|
|
IList<long> updateOrderCostDetailIdList = fsql.Select<OrderCostDetail>() |
|
@ -323,6 +326,8 @@ namespace BBWYB.Server.Business |
|
|
foreach (var cargoParam in cargoParamGroup.CargoParamList) |
|
|
foreach (var cargoParam in cargoParamGroup.CargoParamList) |
|
|
{ |
|
|
{ |
|
|
var orderSku = orderSkus.FirstOrDefault(osku => osku.SkuId == cargoParam.BelongSkuId); |
|
|
var orderSku = orderSkus.FirstOrDefault(osku => osku.SkuId == cargoParam.BelongSkuId); |
|
|
|
|
|
|
|
|
|
|
|
#region 创建订单采购关系
|
|
|
insertOrderPurchaseRelationInfoList.Add(new OrderPurchaseRelationInfo() |
|
|
insertOrderPurchaseRelationInfoList.Add(new OrderPurchaseRelationInfo() |
|
|
{ |
|
|
{ |
|
|
Id = idGenerator.NewLong(), |
|
|
Id = idGenerator.NewLong(), |
|
@ -337,7 +342,7 @@ namespace BBWYB.Server.Business |
|
|
SchemeId = cargoParam.SchemeId, |
|
|
SchemeId = cargoParam.SchemeId, |
|
|
SourceSkuId = orderSku?.BelongSkuId |
|
|
SourceSkuId = orderSku?.BelongSkuId |
|
|
}); |
|
|
}); |
|
|
|
|
|
#endregion
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
//采购单总件数,由于1688运费只存在订单层,sku层没有运费,所以需要以订单总件数为基础等比计算采购运费
|
|
|
//采购单总件数,由于1688运费只存在订单层,sku层没有运费,所以需要以订单总件数为基础等比计算采购运费
|
|
@ -435,6 +440,29 @@ namespace BBWYB.Server.Business |
|
|
updatePurchaseTimeLimitTaskOrderSkuList.Add(belongSkuId); |
|
|
updatePurchaseTimeLimitTaskOrderSkuList.Add(belongSkuId); |
|
|
} |
|
|
} |
|
|
#endregion
|
|
|
#endregion
|
|
|
|
|
|
|
|
|
|
|
|
#region 封装查询齐库合格证接口参数
|
|
|
|
|
|
if (dbOrder.IntoStoreType == Enums.IntoStoreType.发回齐越) |
|
|
|
|
|
{ |
|
|
|
|
|
foreach (var belongSkuId in belongSkuIdList) //订单skuId
|
|
|
|
|
|
{ |
|
|
|
|
|
var orderSku = orderSkus.FirstOrDefault(osku => osku.SkuId == belongSkuId); |
|
|
|
|
|
if (orderSku == null) |
|
|
|
|
|
continue; |
|
|
|
|
|
var cargoParam = cargoParamGroup.CargoParamList.FirstOrDefault(c => c.BelongSkuId == belongSkuId); |
|
|
|
|
|
if (cargoParam == null) |
|
|
|
|
|
continue; |
|
|
|
|
|
if (!notifyQikuPackSchemeParamList.Any(x => x.SkuId == orderSku.BelongSkuId)) |
|
|
|
|
|
{ |
|
|
|
|
|
notifyQikuPackSchemeParamList.Add(new QiKuPackTaskSkuPurchaseSchemeIdRequest() |
|
|
|
|
|
{ |
|
|
|
|
|
SkuId = orderSku.BelongSkuId, |
|
|
|
|
|
SkuPurchaseSchemeId = cargoParam.SchemeId.ToString() |
|
|
|
|
|
}); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
#endregion
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
#region 订单成本
|
|
|
#region 订单成本
|
|
@ -468,6 +496,15 @@ namespace BBWYB.Server.Business |
|
|
Task.Factory.StartNew(() => SendPurchaseOrderStateToC(dbOrder.Id, dbOrder.OrderState.Value), CancellationToken.None, TaskCreationOptions.None, taskSchedulerManager.PurchaseOrderCallbackTaskScheduler); |
|
|
Task.Factory.StartNew(() => SendPurchaseOrderStateToC(dbOrder.Id, dbOrder.OrderState.Value), CancellationToken.None, TaskCreationOptions.None, taskSchedulerManager.PurchaseOrderCallbackTaskScheduler); |
|
|
#endregion
|
|
|
#endregion
|
|
|
|
|
|
|
|
|
|
|
|
#region 查询齐库合格证
|
|
|
|
|
|
if (dbOrder.IntoStoreType == Enums.IntoStoreType.发回齐越 && |
|
|
|
|
|
notifyQikuPackSchemeParamList != null && |
|
|
|
|
|
notifyQikuPackSchemeParamList.Count() > 0) |
|
|
|
|
|
{ |
|
|
|
|
|
Task.Factory.StartNew(() => qiKuManager.SearchCerConfigured(request.OrderId, notifyQikuPackSchemeParamList, orderSkus), CancellationToken.None, TaskCreationOptions.None, taskSchedulerManager.PurchaseOrderCallbackTaskScheduler); |
|
|
|
|
|
} |
|
|
|
|
|
#endregion
|
|
|
|
|
|
|
|
|
fsql.Transaction(() => |
|
|
fsql.Transaction(() => |
|
|
{ |
|
|
{ |
|
|
if (updatePurchaseOrderIdList.Count() > 0) |
|
|
if (updatePurchaseOrderIdList.Count() > 0) |
|
@ -495,8 +532,8 @@ namespace BBWYB.Server.Business |
|
|
fsql.Update<Order>(request.OrderId).Set(o => o.OrderState, dbOrder.OrderState) |
|
|
fsql.Update<Order>(request.OrderId).Set(o => o.OrderState, dbOrder.OrderState) |
|
|
.SetIf(!string.IsNullOrEmpty(request.Remark), o => o.PurchaseRemark, request.Remark) |
|
|
.SetIf(!string.IsNullOrEmpty(request.Remark), o => o.PurchaseRemark, request.Remark) |
|
|
.Set(o => o.IsPurchased, true) |
|
|
.Set(o => o.IsPurchased, true) |
|
|
.Set(o => o.PackConfigState, Enums.PackConfigState.待配置) |
|
|
|
|
|
.ExecuteAffrows(); |
|
|
.ExecuteAffrows(); |
|
|
|
|
|
//.Set(o => o.PackConfigState, Enums.PackConfigState.待配置)
|
|
|
}); |
|
|
}); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
@ -2664,7 +2701,7 @@ namespace BBWYB.Server.Business |
|
|
{ |
|
|
{ |
|
|
var currentOrderPurchaseRelationList = orderPurchaseRelationList.Where(opri => opri.PurchaseOrderId == purchaseOrder.PurchaseOrderId).ToList(); |
|
|
var currentOrderPurchaseRelationList = orderPurchaseRelationList.Where(opri => opri.PurchaseOrderId == purchaseOrder.PurchaseOrderId).ToList(); |
|
|
|
|
|
|
|
|
Task.Factory.StartNew(() => qiKuManager.PublishQiKu(purchaseOrder, currentOrderPurchaseRelationList, currentPurchaseOrderSkuList, purchaseExpressOrderList), |
|
|
Task.Factory.StartNew(() => qiKuManager.PublishQiKuReceiveInfo(purchaseOrder, currentOrderPurchaseRelationList, currentPurchaseOrderSkuList, purchaseExpressOrderList), |
|
|
CancellationToken.None, |
|
|
CancellationToken.None, |
|
|
TaskCreationOptions.LongRunning, |
|
|
TaskCreationOptions.LongRunning, |
|
|
taskSchedulerManager.PurchaseOrderCallbackTaskScheduler); |
|
|
taskSchedulerManager.PurchaseOrderCallbackTaskScheduler); |
|
@ -2736,5 +2773,6 @@ namespace BBWYB.Server.Business |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|