Commit 3f75ee50 by 泽锋 李

海外仓的采购建议,如果是美国的则下海运,英国的则下铁路运输

parent 1de70c96
......@@ -19,7 +19,7 @@ namespace AutoGeneratePurchaseAdvise
//PurchaseAdviseServices.AutoPushBuySys(4);
//PurchaseAdviseServices.AutoPushBuySys(2);
//dc_auto_first_order_sku_dao.GeneratePurchaseAdvise();
//PurchaseAdviseServices.AutoPushBuySys(4);
//PurchaseAdviseServices.AutoPushBuySys(2);
var builder = new HostBuilder().ConfigureServices((hostContext, services) =>
{
services.AddHostedService<GeneratePurchaseAdviseBackgroundService>();
......
......@@ -23,6 +23,11 @@ namespace AutoTurnOver.Models.ApiDto
///<summary>
///运输方式
/// -1 = 无
/// 1 = 陆运
/// 2 = 海运
/// 3 = 空运
/// 铁路运输= 4
///</summary>
public int bp_sendtype { get; set; }
......
......@@ -206,6 +206,10 @@ namespace AutoTurnOver.Models
/// 仓库类型
/// </summary>
public string warehouse_type { get; set; }
/// <summary>
/// 站点
/// </summary>
public string area_name { get; set; }
/// <summary>
/// 运输方式
......
......@@ -122,7 +122,7 @@ namespace AutoTurnOver.Services
DateTime now = DateTime.Now;
// 查询未推送成功的采购建议的明细
var detailList = purchase_advise.BuyDetailList(datas.Select(s => s.id).ToList(), false);
foreach (var item in detailList.GroupBy(s => new { s.warehouse_code, s.warehouse_type }))
foreach (var item in detailList.GroupBy(s => new { s.warehouse_code, s.warehouse_type,s.area_name }))
{
mPlanToPurchaseDto data = new mPlanToPurchaseDto
......@@ -135,6 +135,16 @@ namespace AutoTurnOver.Services
bp_remark = $"用户{user.UserName} 在 aims 操作推送-"+ remarks
};
data.bp_sendtype = data.bp_send == 1 ? 4 : -1;
if ("fba".Equals(item.Key.warehouse_type,StringComparison.CurrentCultureIgnoreCase))
{
if("美国".Equals(item.Key.area_name, StringComparison.CurrentCultureIgnoreCase))
{
data.bp_sendtype = 2;
}else if ("英国".Equals(item.Key.area_name, StringComparison.CurrentCultureIgnoreCase))
{
data.bp_sendtype = 4;
}
}
var sendtype = item.Max(s => s.sendtype);
if (sendtype > 0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment