Commit 0f854916 by 泽锋 李

fix

parent f8d76ab6
...@@ -1779,7 +1779,7 @@ left join dc_lms_order_transfer_current_node as t8 on t1.dataid = t8.data_id and ...@@ -1779,7 +1779,7 @@ left join dc_lms_order_transfer_current_node as t8 on t1.dataid = t8.data_id and
var countSql = @" var countSql = @"
select select
count(1) 1
from dc_base_transfer_info as t1 from dc_base_transfer_info as t1
left join dc_base_transfer_info_skus as t2 on t1.dataid =t2.dataid left join dc_base_transfer_info_skus as t2 on t1.dataid =t2.dataid
left join dc_base_warehouse as t3 on t1.targetwareno =t3.warehouse_code left join dc_base_warehouse as t3 on t1.targetwareno =t3.warehouse_code
...@@ -1950,18 +1950,21 @@ left join dc_lms_order_transfer_current_node as t8 on t1.dataid = t8.data_id and ...@@ -1950,18 +1950,21 @@ left join dc_lms_order_transfer_current_node as t8 on t1.dataid = t8.data_id and
} }
else else
{ {
sql += " group by t2.sku,t8.transfer_no ";
countSql += " group by t2.sku,t8.transfer_no ";
if (search_data.limit > 1000) if (search_data.limit > 1000)
{ {
total = 0; total = 0;
} }
else else
{ {
total = _connection.QueryFirst<int>(countSql, parameters, commandTimeout: 0); total = _connection.Query<int>(countSql, parameters, commandTimeout: 0).Count();
} }
} }
if (!string.IsNullOrEmpty(search_data.sort) && !string.IsNullOrEmpty(search_data.order)) if (!string.IsNullOrEmpty(search_data.sort) && !string.IsNullOrEmpty(search_data.order))
{ {
......
...@@ -87,7 +87,7 @@ where t1.stateid!=5 and t1.isdeleted=0 and t2.deliverycount>t2.storagecount").To ...@@ -87,7 +87,7 @@ where t1.stateid!=5 and t1.isdeleted=0 and t2.deliverycount>t2.storagecount").To
/// </summary> /// </summary>
public static void SynchroLmsTransferOrder() public static void SynchroLmsTransferOrder()
{ {
var task_name = "SynchroLmsTransferOrder_v7"; var task_name = "SynchroLmsTransferOrder_v8";
var conn = _connection; var conn = _connection;
// 查询最后一次成功抓取的记录 // 查询最后一次成功抓取的记录
var last_task_synchro_log = conn.QuerySingleOrDefault<task_synchro_log>(" select * from task_synchro_log where task_name=@task_name and status=1 order by end_time desc limit 1 ", new { task_name = task_name }); var last_task_synchro_log = conn.QuerySingleOrDefault<task_synchro_log>(" select * from task_synchro_log where task_name=@task_name and status=1 order by end_time desc limit 1 ", new { task_name = task_name });
...@@ -144,7 +144,9 @@ where t1.stateid!=5 and t1.isdeleted=0 and t2.deliverycount>t2.storagecount").To ...@@ -144,7 +144,9 @@ where t1.stateid!=5 and t1.isdeleted=0 and t2.deliverycount>t2.storagecount").To
surplus_node_days=item.surplus_node_days, surplus_node_days=item.surplus_node_days,
sys_update_date = DateTime.Now, sys_update_date = DateTime.Now,
quantity = item.quantity, quantity = item.quantity,
storage_count = item.storage_count storage_count = item.storage_count,
sign_time = item.sign_time,
put_time = item.put_time,
}; };
db_data.id = MyMySqlConnection._connection.QueryFirstOrDefault<int?>(" select id from dc_lms_order_transfer_current_node where `data_id`=@data_id and box_id=@box_id and sku=@sku ", new db_data.id = MyMySqlConnection._connection.QueryFirstOrDefault<int?>(" select id from dc_lms_order_transfer_current_node where `data_id`=@data_id and box_id=@box_id and sku=@sku ", new
......
...@@ -41,6 +41,8 @@ namespace AutoTurnOver.Models.ApiDto ...@@ -41,6 +41,8 @@ namespace AutoTurnOver.Models.ApiDto
public DateTime? expectarrivaltime { get; set; } public DateTime? expectarrivaltime { get; set; }
public int quantity { get; set; } public int quantity { get; set; }
public int storage_count { get; set; } public int storage_count { get; set; }
public DateTime? sign_time { get; set; }
public DateTime? put_time { get; set; }
} }
} }
......
...@@ -27,6 +27,15 @@ namespace AutoTurnOver.Models ...@@ -27,6 +27,15 @@ namespace AutoTurnOver.Models
public DateTime? expectarrivaltime { get; set; } public DateTime? expectarrivaltime { get; set; }
public DateTime sys_update_date { get; set; } public DateTime sys_update_date { get; set; }
public int quantity { get; set; } public int quantity { get; set; }
/// <summary>
/// 实际签收时间
/// </summary>
public DateTime? sign_time { get; set; }
/// <summary>
/// 实际入库时间
/// </summary>
public DateTime? put_time { get; set; }
public int storage_count { get; set; } public int storage_count { get; set; }
} }
} }
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