fix

AutoGeneratePurchaseAdvise/Program.cs

@@ -22,33 +22,6 @@ namespace AutoGeneratePurchaseAdvise
             try
             {
 
-                //PurchaseAdviseServices.Generate(DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd 00:00:00")));
-
-
-                //PurchaseAdviseServices.GenerateTemp(DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd 13:13:00")));
-                //PurchaseAdviseServices.AutoPushBuySys(2);
-
-                //PurchaseAdviseServices.AutoPushBuySys(1);
-                //PurchaseAdviseServices.AutoPushBuySys(2);
-                //PurchaseAdviseServices.AutoPushBuySys(3);
-                //PurchaseAdviseServices.AutoPushBuySys(6);
-                //PurchaseAdviseServices.AutoPushBuySys(7);
-                //report.ResetTransExpectArrivaltime();
-                //PurchaseAdviseServices.AutoPushBuySys(1);
-                //report.PurchaseWeekBackUp();
-                //report.ResetTransExpectArrivaltime();
-                //PurchaseAdviseServices.AutoPushBuySys(4);
-                //PurchaseAdviseServices.AutoPushBuySys(4);
-                //purchase_advise.ReplaceLogistics(DateTime.Now, "935619301", "MMDUKFBA");
-                //PurchaseAdviseServices.Generate(DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd 00:00:00")));
-                //report.PurchaseWeekBackUp();
-                //PurchaseAdviseServices.Generate(DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd 00:00:00")));
-                //PurchaseAdviseServices.Generate(DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd 00:00:00"))); 
-                //PurchaseAdviseServices.AutoPushBuySys(4);
-                //new SkuAutoTurnServices().ResetPurchaseAdvise();
-                //new SkuAutoTurnServices().ResetPurchaseAdvise();
-                //new SkuAutoTurnServices().ResetPurchaseAdviseByTransfer();
-                //PurchaseAdviseServices.Generate($"下午的补充周转 {DateTime.Now.ToString("HH: mm")}", DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd 12:30:00")));
             }
             catch (Exception ex)
             {

AutoTurnOver.DB/dc_auto_turnover.cs

@@ -1628,4 +1628,6 @@ from dc_auto_turnover_air where gmt_modified>=@btime and gmt_modified<=@etime
     }
 
 
+
+
 }
\ No newline at end of file

AutoTurnOver.DB/dc_base_trans_temp_schedule_dao.cs

@@ -91,7 +91,7 @@ namespace AutoTurnOver.DB
                             gmt_create_date = DateTime.Now,
                             gmt_update_date = DateTime.Now,
                             is_aims = item.isAims == true ? 1 : 0,
-                            is_delete = item.isDeleted == true ? 1 : 0,
+                            is_delete = (item.isDeleted == true || itemSku.tempState==2) ? 1 : 0,
                             is_temp_data = item.isTempData == true ? 1 : 0,
                             is_exception = item.IsException == true ? 1 : 0,
                             product_name = itemSku.productName,

AutoTurnOver.DB/report.cs

@@ -4081,8 +4081,6 @@ where t2.hq_type='fba仓'").ToList();
         public static void ResetTransExpectArrivaltime()
         {
           
-
-
             // 查询真实的调拨在途
             var datas = _connection.Query<dc_base_trans_expectarrivaltime_temp>(@"select 
 t2.expectarrivaltime as 'expectarrivaltime',
@@ -4097,7 +4095,6 @@ 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
 and t3.hq_type='fba仓' and t2.expectarrivaltime >='1991-01-01'").ToList();
 
-
             // 计算国内入库，还没有调拨单的数据
             var temp_p_datas = _connection.Query<dc_base_trans_expectarrivaltime_temp>(@"select 
 t1.purchase_code as 'purchase_id', 

AutoTurnOver.Models/ApiDto/api_temp_schedule_response_dto.cs

@@ -70,6 +70,12 @@ namespace AutoTurnOver.Models.ApiDto
                 public string productName { get; set; }
                 public int productNum { get; set; }
                 public int tempDeliveryCount { get; set; }
+
+
+                /// <summary>
+                /// 2=作废
+                /// </summary>
+                public int tempState { get; set; }
             }
         }
        

AutoTurnOver.Purchase.AverageTarget/Program.cs

@@ -23,17 +23,7 @@ namespace AutoTurnOver.Purchase.AverageTarget
             Console.WriteLine("采购平均值计算任务启动...");
             try
             {
-                //PurchaseAverageTargetServices.CalculationTransfer("N-G-TOP");
-                //report.ResetTransExpectArrivaltime();
 
-                //report.ResetTransExpectArrivaltime();
-
-                //PurchaseAverageTargetServices.CalculationTransfer();
-                //report.ResetTransExpectArrivaltime();
-                //dc_auto_return_goods_config_dao.NewCalculation();
-                //PurchaseAverageTargetServices.Calculation("368720104", days: 360);
-                //PurchaseAverageTargetServices.CalculationTransfer("803597202", 360);
-                //PurchaseAverageTargetServices.CalculationTransfer(days: (360 * 3),has_transfer:true);
               
             }
             catch (Exception ex)

ResetOutofstock/Program.cs

@@ -17,25 +17,7 @@ namespace ResetOutofstock
             {
                 
                 var now = DateTime.Now;
-                //dc_base_supplier_dao.SynchroBailunSupplier();
-                //dc_auto_pick_up_goods_order_dao.GenerateOrder(DateTime.Now.AddDays(-3), DateTime.Now);
-                //report.PurchaseWeekBackUp();
-                //report.ResetOmsOutofstock();
-                //report.CalculationSalesTrend();
-                //report.ResetLastweekData();
-                //report.ResetOmsOutofstock();
-                //report.PurchaseWeekBackUp();
-                //report.PurchaseWeekBackUp();
-                //report.PurchaseWeekBackUp();
-                //await new TaskDownloadServices().Download();
-                //daily.ResetFbaExtendSales(DateTime.Now);
-                //dc_aims_transfer_warehouse_dao.TransferWarehouseTask();
-                //daily.ResetFbaExtendReview(DateTime.Now);
-                //report.PurchaseWeekBackUp();
-                //report.GenerateReportPlatformGoods();
 
-                //dc_auto_turnover.ResetHistory();
-                //dc_auto_turnover.CopyForecast();
                
             }
             catch (Exception ex)