fix

AutoTurnOver.DB/report.cs

@@ -4153,7 +4153,7 @@ where t2.hq_type='fba仓'").ToList();
 
             // 查询真实的调拨在途
             var datas = _connection.Query<dc_base_trans_expectarrivaltime_temp>(@"select 
-t2.expectarrivaltime as 'expectarrivaltime',
+ifnull(t8.expectarrivaltime,t2.expectarrivaltime) as 'expectarrivaltime',
 t1.sku as 'bailun_sku',
 t2.targetwareno as 'warehouse_code',
 t1.deliverycount - t1.storagecount as 'count',
@@ -4162,7 +4162,9 @@ ifnull(t2.purchasecode,'') as 'purchase_id'
 from dc_base_transfer_info_skus as t1 
 left join dc_base_transfer_info as t2 on t1.dataid =t2.dataid
 left join dc_base_warehouse as t3 on t2.targetwareno = t3.warehouse_code
-where t2.isdeleted=0 and t2.stateid not in (5,11,12)
and t1.deliverycount > t1.storagecount
+left join ( select * from  dc_lms_order_transfer_current_node GROUP BY data_id,sku ) as t8 on t2.dataid = t8.data_id and t1.sku = t8.sku
+where t2.isdeleted=0 and t2.stateid not in (5,11,12)
+and t1.deliverycount > t1.storagecount
 and t3.hq_type='fba仓' and t2.expectarrivaltime >='1991-01-01'").ToList();
 
             // 计算国内入库，还没有调拨单的数据

ResetOutofstock/Program.cs

@@ -17,7 +17,7 @@ namespace ResetOutofstock
             {
                 
                 var now = DateTime.Now;
-                report.GenerateWeekTagStockDatas();
+                //report.GenerateWeekTagStockDatas();
             }
             catch (Exception ex)
             {