fix

AutoTurnOver.DB/report.cs

@@ -3104,15 +3104,17 @@ where t2.hq_type='第三方仓库' and
 )
 );
 update dc_report_stock_week as t1,
-dc_base_sku as t2
+dc_base_sku as t2,
+dc_base_puhuo as t3 
 set t1.sku_tag = (
 case 
 when t2.buyer_name in ('古艳洋1','张莹霞','张莹霞1','黄镜洁') then '美容SKU'
-when t2. product_type_desc != '' then '普货-精准开发'
+when t3.bailun_sku is not null then '普货-精准开发'
+when t2.develop_time>='2020-05-31' then '普货-精准开发'
 else '清货'
 end
 )
-where t1.bailun_sku = t2.bailun_sku and t1.week_tag=@week_tag;
+where t1.bailun_sku = t2.bailun_sku and t1.bailun_sku = t3.bailun_sku and t1.week_tag=@week_tag;
 ", new { btime, etime, week_tag }, commandTimeout: 0);
         }
 

AutoTurnOver/Controllers/ReturnGoodsController.cs

@@ -31,6 +31,22 @@ namespace AutoTurnOver.Controllers
         }
         
         [HttpGet]
+        [BrowseLog("Bailun_aims", "访问【百伦自动周转系统】->【实时数据】->【下单需取货汇总】->【搜索】页面", 0)]
+        public JsonResult PickSkuPage([FromQuery]dc_auto_return_goods_sku_search_dto search)
+        {
+
+            var total = 0;
+            var service = new Services.ReturnGoodsConfigServices();
+            var list = service.PickSkuPage(search, search.offset ?? 0, search.limit ?? 0, ref total);
+
+            return new JsonResult(new
+            {
+                rows = list,
+                total = total,
+            });
+        }
+        
+        [HttpGet]
         [BrowseLog("Bailun_aims", "访问【百伦自动周转系统】->【自动下单管理】->【退货汇总】->【推送】操作", 0)]
         public JsonResult Push([FromQuery]dc_auto_return_goods_sku_search_dto search)
         {

ResetOutofstock/Program.cs

@@ -17,12 +17,12 @@ 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);
+                //dc_base_supplier_dao.SynchroBailunSupplier();
+                //dc_auto_pick_up_goods_order_dao.GenerateOrder(DateTime.Now.AddDays(-3), DateTime.Now);
                
                 //base_supplier_holiday_time_dao.SynchroData();
                 //report.ResetCashFlowData();
-                //report.StockWeekBackUp();
+                report.StockWeekBackUp();
                 //report.PurchaseWeekBackUp();
                 //report_cash_flow_dao.CalculationTransferOrder(now.AddMonths(-3), DateTime.Parse(now.AddDays(-1).ToString("yyyy-MM-dd 23:59:59")));
                 //report_cash_flow_dao.SynchroTransferCost();