fix

AutoTurnOver.DB/daily.cs

@@ -1323,15 +1323,14 @@ where id=@id
 select 
 
 sum(ifnull(t4.usable_stock,0)) as 'stock',
-t1.purchase_id as 'purchase_id',
-sum(ifnull(t1.quantity_purchase)) as 'quantity_purchase',
-sum(ifnull(t1.`quantity_arrival`)) as 'quantity_arrival',
-sum(ifnull(t1.`quantity_inbound`)) as 'quantity_inbound',
-sum(ifnull(t1.`quantity_not_inbound`)) as 'quantity_not_inbound',
-
-sum(ifnull(t8.distribution_quantity)) as 'prod_distribution_quantity',
-sum(ifnull(( t8.order_quantity - t8.distribution_quantity))) as 'prod_not_distribution_quantity',
-sum(ifnull(t8.prod_quantity)) as 'prod_quantity'
+sum(ifnull(t1.quantity_purchase,0)) as 'quantity_purchase',
+sum(ifnull(t1.`quantity_arrival`,0)) as 'quantity_arrival',
+sum(ifnull(t1.`quantity_inbound`,0)) as 'quantity_inbound',
+sum(ifnull(t1.`quantity_not_inbound`,0)) as 'quantity_not_inbound',
+
+sum(ifnull(t8.distribution_quantity,0)) as 'prod_distribution_quantity',
+sum(ifnull(( t8.order_quantity - t8.distribution_quantity),0)) as 'prod_not_distribution_quantity',
+sum(ifnull(t8.prod_quantity,0)) as 'prod_quantity'
 
 from dc_base_purchase_details as t1 
 left join dc_base_warehouse as t2 on t1.warehouse_code = t2.warehouse_code
@@ -1340,7 +1339,7 @@ left join dc_base_stock as t4 on t1.bailun_sku = t4.bailun_sku and t1.warehouse_
 left join dc_mid_transit as t5 on t1.bailun_sku = t5.bailun_sku and t1.warehouse_code = t5.warehouse_code
 left join dc_auto_turnover as t6 on t1.bailun_sku = t6.bailun_sku and t1.warehouse_code = t6.warehouse_code
 left join dc_auto_forecast_fluctuation as t7 on t1.bailun_sku = t7.bailun_sku and t1.warehouse_code = t7.warehouse_code
-left join dc_base_prod_order as t8 on t1.bailun_sku = t8.bailun_sku and t1.purchase_id = t8.purchase_no
+left join ( select * from dc_base_prod_order where is_delete=0 )  as t8 on t1.bailun_sku = t8.bailun_sku and t1.purchase_id = t8.purchase_no
 ";
                 if (search_data.has_tort != null)
                 {
@@ -1395,7 +1394,7 @@ left join dc_base_stock as t4 on t1.bailun_sku = t4.bailun_sku and t1.warehouse_
 left join dc_mid_transit as t5 on t1.bailun_sku = t5.bailun_sku and t1.warehouse_code = t5.warehouse_code
 left join dc_auto_turnover as t6 on t1.bailun_sku = t6.bailun_sku and t1.warehouse_code = t6.warehouse_code
 left join dc_auto_forecast_fluctuation as t7 on t1.bailun_sku = t7.bailun_sku and t1.warehouse_code = t7.warehouse_code
-left join dc_base_prod_order as t8 on t1.bailun_sku = t8.bailun_sku and t1.purchase_id = t8.purchase_no
+left join ( select * from dc_base_prod_order where is_delete=0 )   as t8 on t1.bailun_sku = t8.bailun_sku and t1.purchase_id = t8.purchase_no
 
 
 ";

AutoTurnOver.DB/dc_base_prod_order_dao.cs

@@ -37,6 +37,11 @@ namespace AutoTurnOver.DB
                 new_task_synchro_log.end_time = new_task_synchro_log.start_time.AddDays(89);
             }
 
+            if((new_task_synchro_log.end_time - new_task_synchro_log.start_time).TotalHours > 24 && new_task_synchro_log.end_time.ToString("yyyy-MM-dd")==DateTime.Now.ToString("yyyy-MM-dd"))
+            {
+                new_task_synchro_log.end_time = DateTime.Now.AddHours(-5);
+            }
+
             new_task_synchro_log.id = conn.Insert(new_task_synchro_log) ?? 0;
             int count = 0;