Skip to content

D
data-center-auto
Commit dcca51d9 by lizefeng
Options

调拨单更新，刷新周转表，没有百伦sku字段的时候，要跳过

parent 3efb5e51
Showing with 59 additions and 62 deletions
AutoTurnOver.DB/db_config.cs
......@@ -1978,7 +1978,7 @@ and start_date<=@end_date and end_date>=@start_date
if (is_reset_data)
{
_connection.Insert(new dc_base_queue
dc_base_queue_dao.Insert(new dc_base_queue
{
submit_date = DateTime.Now,
error_message = "",
......@@ -1987,7 +1987,7 @@ and start_date<=@end_date and end_date>=@start_date
message = new { bailun_sku = data.bailun_sku, warehouse_code = data.warehouse_code }.ToJson(),
type = "刷新周转表",
remarks = "配置预测销量"
});
},data.bailun_sku);
}
return "";
}
......
AutoTurnOver.DB/dc_aims_transfer_warehouse_dao.cs
......@@ -198,7 +198,7 @@ and bailun_order_status !='Canceled'
_connection.Execute(" insert into dc_base_stock(`bailun_sku`,`warehouse_code`) values(@bailun_sku,@warehouse_code) ",new { logData.bailun_sku, warehouse_code = logData.to_warehouse_code });
_connection.Insert(new dc_base_queue
dc_base_queue_dao.Insert(new dc_base_queue
{
submit_date = DateTime.Now,
error_message = "",
......@@ -207,7 +207,7 @@ and bailun_order_status !='Canceled'
message = new { bailun_sku = logData.bailun_sku, warehouse_code = logData.to_warehouse_code }.ToJson(),
type = "刷新周转表",
remarks = "转仓任务"
});
},logData.bailun_sku);
}
......
AutoTurnOver.DB/dc_auto_turnover.cs
......@@ -549,7 +549,7 @@ from dc_auto_turnover as dat
{
foreach (var item in datas)
{
_connection.Insert(new dc_base_queue
dc_base_queue_dao.Insert(new dc_base_queue
{
submit_date = DateTime.Now,
error_message = "",
......@@ -558,7 +558,7 @@ from dc_auto_turnover as dat
message = new { bailun_sku = item.bailun_sku, warehouse_code = item.warehouse_code }.ToJson(),
type = "刷新周转表",
remarks = "刷新已停止监控的历史数据"
});
},item.bailun_sku);
}
}
}
......@@ -1240,7 +1240,7 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
/// </summary>
public static void ResetPurchaseAdviseSingle(string bailun_sku, string warehouse_code, string remarks)
{
_connection.Insert(new dc_base_queue
dc_base_queue_dao.Insert(new dc_base_queue
{
submit_date = DateTime.Now,
error_message = "",
......@@ -1249,7 +1249,7 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
message = new { bailun_sku = bailun_sku, warehouse_code = warehouse_code }.ToJson(),
type = "刷新周转表",
remarks = remarks
});
},bailun_sku);
}
public static void WaitTurnoverQueueTask()
......@@ -2736,7 +2736,7 @@ where t1.gmt_modified>=@btime and t1.warehouse_code='GB4PXBL' limit {(page-1)*ro
{
foreach (var item in bailun_skus)
{
_connection.Insert( new dc_base_queue
dc_base_queue_dao.Insert( new dc_base_queue
{
submit_date = DateTime.Now,
error_message = "",
......@@ -2745,7 +2745,7 @@ where t1.gmt_modified>=@btime and t1.warehouse_code='GB4PXBL' limit {(page-1)*ro
message = new { bailun_sku = item.bailun_sku, warehouse_code = item.warehouse_code }.ToJson(),
type = "刷新周转表",
remarks = "7点之后，补算 路腾仓"
});
},item.bailun_sku);
}
}
}
......
AutoTurnOver.DB/dc_base_queue_dao.cs 0 → 100644
using AutoTurnOver.Models;
using System;
using System.Collections.Generic;
using System.Text;
namespace AutoTurnOver.DB
{
public class dc_base_queue_dao : connectionHelper
{
public static void Insert(dc_base_queue data, string bailun_sku)
{
if (data != null)
{
if (!string.IsNullOrWhiteSpace(bailun_sku))
{
_connection.Insert(data);
}
}
}
}
}
AutoTurnOver.DB/report.cs
......@@ -4141,7 +4141,7 @@ where t1.bailun_order_status != 'Canceled'
head_transport = "fba仓".Equals(item.hq_type, StringComparison.OrdinalIgnoreCase) ? "海运" : "空运"
});
_connection.Insert(new dc_base_queue
dc_base_queue_dao.Insert(new dc_base_queue
{
submit_date = DateTime.Now,
error_message = "",
......@@ -4150,7 +4150,7 @@ where t1.bailun_order_status != 'Canceled'
message = new { bailun_sku = item.bailun_sku, warehouse_code = item.warehouse_code }.ToJson(),
type = "刷新周转表",
remarks = "初始化默认运输方式"
});
},item.bailun_sku);
}
}
......
AutoTurnOver.Services/ConfigServices.cs
......@@ -846,7 +846,7 @@ namespace AutoTurnOver.Services
source_from = 4 // 标记来源是导销量
});
MyMySqlConnection._connection.Insert(new dc_base_queue
dc_base_queue_dao.Insert(new dc_base_queue
{
submit_date = DateTime.Now,
error_message = "",
......@@ -855,7 +855,7 @@ namespace AutoTurnOver.Services
message = new { bailun_sku = bailun_sku, warehouse_code = warehouse_code }.ToJson(),
type = "刷新周转表",
remarks = "配置预测销量"
});
},bailun_sku);
row["导入结果"] = "成功";
......
AutoTurnOver.Services/PurchaseAdviseServices.cs
......@@ -35,33 +35,6 @@ namespace AutoTurnOver.Services
purchase_advise.ImportDetailed(mainID.Value,date, is_clear_data: is_clear_data);
// 如果有临时单，则需要切换回来
//if(change_datas!=null && change_datas.Count >= 1)
//{
// foreach (var item in change_datas)
// {
// MyMySqlConnection._connection.Insert(new dc_base_queue
// {
// submit_date = DateTime.Now,
// error_message = "",
// consume_date = null,
// error_stack_trace = "",
// message = new { bailun_sku = item.bailun_sku, warehouse_code = item.warehouse_code }.ToJson(),
// type = "刷新周转表",
// remarks = "配置预测销量"
// });
// }
//}
if (is_bak)
{
//dc_task_download_dao.PushData<dc_base_stock_search_dto>(new dc_task_download
//{
// parameter = new { }.ToJson(),
// task_name = "周转表"
//}, new UserData { UserName = "sys-bak" });
}
}
catch (Exception ex)
{
......
AutoTurnOver.Services/PurchaseAverageTargetServices.cs
......@@ -42,7 +42,7 @@ namespace AutoTurnOver.Services
var chageSkuList = AveragePurchase.GetTransferChangeSku(days, bailun_sku);
foreach (var skuItem in chageSkuList)
{
if( skuItem.warehouse_code== "GB4PXBL")
if (skuItem.warehouse_code == "GB4PXBL")
{
}
......@@ -74,8 +74,8 @@ namespace AutoTurnOver.Services
// 查询评价下单天数
List<create_order_days_dto> create_order_days = conn.Query<create_order_days_dto>(@"select t1.push_date,t2.create_time,t2.`no` from dc_auto_purchase_advise_detailed as t1
left join dc_auto_purchase_advise as t2 on t1.main_id =t2.id
where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and t1.ispush=1 LIMIT 30", new { bailun_sku = skuItem.bailun_sku, warehouse_code=skuItem.warehouse_code }).Where(s=>s.push_date!=null).AsList();
if(create_order_days!=null&& create_order_days.Count >= 1)
where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and t1.ispush=1 LIMIT 30", new { bailun_sku = skuItem.bailun_sku, warehouse_code = skuItem.warehouse_code }).Where(s => s.push_date != null).AsList();
if (create_order_days != null && create_order_days.Count >= 1)
{
decimal total_days = 0;
foreach (var create_order_days_item in create_order_days)
......@@ -125,7 +125,7 @@ where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and t1.isp
create_date = null,
pay_time = null,
pay_type = "",
sign_time =null,
sign_time = null,
put_time = null
});
}
......@@ -161,7 +161,7 @@ where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and t1.isp
if (tempPurchase.pay_type == 1)
{
temp_s_delivery_days = (int)Math.Ceiling((itemArrivalList.Min(s => s.last_signtime) - tempPurchase.pay_time).Value.TotalHours / 24);
pay_days = (int)Math.Ceiling(( tempPurchase.pay_time-tempPurchase.create_time).Value.TotalHours / 24);
pay_days = (int)Math.Ceiling((tempPurchase.pay_time - tempPurchase.create_time).Value.TotalHours / 24);
sum_pay_day_count++;
}
else
......@@ -190,7 +190,7 @@ where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and t1.isp
pay_type = (tempPurchase.pay_type == 1 ? "先款后货" : "先货后款"),
sign_time = itemArrivalList.Min(s => s.last_signtime),
put_time = (inboundList.OrderByDescending(s => s.update_time).FirstOrDefault(s => s.purchase_id == itemArrivalList.Key) ?? new Models.dc_base_purchase.dc_base_purchase_inbound_dto()).update_time,
pay_days= pay_days
pay_days = pay_days
});
}
......@@ -198,7 +198,7 @@ where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and t1.isp
// 平均采购交期
var temp_delivery_days = delivery_days / purchaseList.Count;
data.delivery_days = temp_delivery_days;
if(sum_pay_day_count>0 && sum_pay_days > 0)
if (sum_pay_day_count > 0 && sum_pay_days > 0)
{
data.payment_type = sum_pay_days / sum_pay_day_count;
}
......@@ -212,7 +212,7 @@ where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and t1.isp
if (has_self)
{
if(has_jit)
if (has_jit)
{
// jit 交期写死3天
data.delivery_days = 3;
......@@ -220,7 +220,7 @@ where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and t1.isp
else
{
// 自产海外仓 读配置
data.delivery_days = (int)Math.Ceiling( WriteConfig(conn, skuItem, data.payment_type, has_jit));
data.delivery_days = (int)Math.Ceiling(WriteConfig(conn, skuItem, data.payment_type, has_jit));
}
data.payment_type = 2; // 先货后款
......@@ -250,7 +250,7 @@ where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and t1.isp
AveragePurchase.Save(data, conn);
}
conn.Insert(new dc_base_queue
dc_base_queue_dao.Insert(new dc_base_queue
{
submit_date = DateTime.Now,
error_message = "",
......@@ -259,7 +259,7 @@ where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and t1.isp
message = new { bailun_sku = data.bailun_sku, warehouse_code = data.warehouse_code }.ToJson(),
type = "刷新周转表",
remarks = "重算采购平均交期"
});
}, data.bailun_sku);
}
task_log.CompleteTime = DateTime.Now;
......@@ -287,7 +287,7 @@ where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and t1.isp
/// <param name="pay_type">付款方式 1= 先款后货 2 = 先货后款</param>
/// <param name="has_jit">是否jit</param>
/// <returns></returns>
public static decimal WriteConfig(MyMySqlConnection conn, temp_sku_dto skuItem,int pay_type, bool has_jit)
public static decimal WriteConfig(MyMySqlConnection conn, temp_sku_dto skuItem, int pay_type, bool has_jit)
{
var pay_days = 0;
if (pay_type == 1)
......@@ -305,7 +305,7 @@ where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and t1.isp
var skuData = conn.QuerySingleOrDefault<dc_base_sku>(" select * from dc_base_sku where bailun_sku=@bailun_sku ", new { bailun_sku = skuItem.bailun_sku });
if (skuData != null)
{
if (skuItem.hq_type == "国内仓" && skuItem.warehouse_code!= "GZBLZZG")
if (skuItem.hq_type == "国内仓" && skuItem.warehouse_code != "GZBLZZG")
{
sku_sign_days = skuData.supplier_delivery;
}
......@@ -335,7 +335,7 @@ where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and t1.isp
return sku_sign_days;
}
public static void CalculationTransfer(string bailun_sku = "", int days = 30,bool has_transfer = false)
public static void CalculationTransfer(string bailun_sku = "", int days = 30, bool has_transfer = false)
{
MyMySqlConnection conn = connectionHelper._connection;
......@@ -553,7 +553,7 @@ where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and t1.isp
dataWarehouse.abroad_inbound_delivery_ocean = oceanlmsAvg.Select(s => s.FirstOrDefault().calculation_put_days).Average();
dataWarehouse.transfer_order_days_ocean = oceanlmsAvg.Select(s => s.FirstOrDefault().calculation_order_days).Average();
}
if(oceanlmsAvg != null && oceanlmsAvg.Where(s=>s.Any(v=>v.calculation_sail_days > 0)).Count() >= 1)
if (oceanlmsAvg != null && oceanlmsAvg.Where(s => s.Any(v => v.calculation_sail_days > 0)).Count() >= 1)
{
var sail_order_datas = oceanlmsAvg.Where(s => s.Any(v => v.calculation_sail_days > 0)).ToList();
......@@ -591,7 +591,7 @@ where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and t1.isp
targetwareno = skuItem.warehouse_code
});
if (lmsTransportCountDatas != null && lmsTransportCountDatas.Count>=1)
if (lmsTransportCountDatas != null && lmsTransportCountDatas.Count >= 1)
{
var lmsTransportCountData = lmsTransportCountDatas.FirstOrDefault();
dataWarehouse.product_count = lmsTransportCountData.product_count;
......@@ -606,7 +606,7 @@ where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and t1.isp
AveragePurchase.Save(dataWarehouse, conn);
conn.Insert(new dc_base_queue
dc_base_queue_dao.Insert(new dc_base_queue
{
submit_date = DateTime.Now,
error_message = "",
......@@ -615,7 +615,7 @@ where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and t1.isp
message = new { bailun_sku = dataWarehouse.bailun_sku, warehouse_code = dataWarehouse.warehouse_code }.ToJson(),
type = "刷新周转表",
remarks = "重算调拨平均交期"
});
}, dataWarehouse.bailun_sku);
}
catch (Exception ex)
......@@ -756,7 +756,8 @@ where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and t1.isp
/// </summary>
public static void SynchroTransferTransportType()
{
if (DateTime.Now.Hour < 8) {
if (DateTime.Now.Hour < 8)
{
return;
}
var task_name = $"SynchroTransferTransportType_v6";
......@@ -790,14 +791,14 @@ where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and t1.isp
var datas = conn.Query<sku_warehouse_code_dto>($@" select t1.bailun_sku,t1.warehouse_code from dc_base_stock as t1 left join dc_base_warehouse as t2 on t1.warehouse_code =t2.warehouse_code
where t2.hq_type not in ('国内仓') and t1.gmt_modified>=@btime and t1.gmt_modified <=@etime
order by t1.gmt_modified asc
limit {(page-1)*rows},{rows} ",new { btime = new_task_synchro_log.start_time,etime = new_task_synchro_log.end_time }).ToList();
limit {(page - 1) * rows},{rows} ", new { btime = new_task_synchro_log.start_time, etime = new_task_synchro_log.end_time }).ToList();
page++;
if (datas.Count <= 0) { break; }
foreach (var orderItem in datas)
{
try
{
var lmsTransportCountDatas = ApiUtility.GetLmsTransportCountList(new Models.ApiDto.api_transport_count_order_transfer_query_dto { bailun_sku = orderItem.bailun_sku, targetwareno = orderItem .warehouse_code});
var lmsTransportCountDatas = ApiUtility.GetLmsTransportCountList(new Models.ApiDto.api_transport_count_order_transfer_query_dto { bailun_sku = orderItem.bailun_sku, targetwareno = orderItem.warehouse_code });
if (lmsTransportCountDatas != null && lmsTransportCountDatas.Count >= 1)
{
......
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