周转表新增待调拨数量字段

AutoGeneratePurchaseAdvise/Program.cs

@@ -21,7 +21,7 @@ namespace AutoGeneratePurchaseAdvise
                 //PurchaseAdviseServices.Generate(DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd 00:00:00")));
                 //PurchaseAdviseServices.Generate(DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd 12:00:00")));
 
-                //PurchaseAdviseServices.GenerateTemp(DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd 18:22:00")));
+                //PurchaseAdviseServices.GenerateTemp(DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd 15:30:00")));
                 //PurchaseAdviseServices.AutoPushBuySys(2);
 
                 //PurchaseAdviseServices.AutoPushBuySys(1);
@@ -29,6 +29,7 @@ namespace AutoGeneratePurchaseAdvise
                 //PurchaseAdviseServices.AutoPushBuySys(3);
                 //PurchaseAdviseServices.AutoPushBuySys(6);
                 //PurchaseAdviseServices.AutoPushBuySys(7);
+                //report.ResetTransExpectArrivaltime();
             }
             catch (Exception ex)
             {

AutoTurnOver.DB/dc_auto_turnover.cs

@@ -67,6 +67,7 @@ t4.brand as 'brand',
 t7.first_inbound_date,
 
 t3.area_name,
+ifnull(t15.count,0) as 'not_trans_count',
 
 t13.quantity_land_purchase as 'quantity_land_purchase',
 t13.quantity_ocean_purchase as 'quantity_ocean_purchase',
@@ -95,6 +96,7 @@ left join dc_base_tort as t8  on dat.bailun_sku = t8.bailun_sku
 left join dc_return_goods_not_push as t12 on dat.bailun_sku = t12.bailun_sku and dat.warehouse_code = t12.warehouse_code
 left join dc_mid_transit as t13 on dat.bailun_sku = t13.bailun_sku and dat.warehouse_code = t13.warehouse_code
 -- left join dc_auto_sales_forecast_config as t14 on dat.dc_auto_sales_forecast_config_id = t14.id 
+left join not_trans_view as t15 on dat.bailun_sku = t15.bailun_sku and dat.warehouse_code = t15.warehouse_code
 where 1=1 ";
                 }
 
@@ -134,6 +136,10 @@ from dc_auto_turnover as dat
                 {
                     sqlCount += " left join dc_auto_sales as t2 on t2.bailun_sku=dat.bailun_sku and dat.warehouse_code = t2.warehouse_code ";
                 }
+                if(m.not_trans_count_max>0 || m.not_trans_count_min > 0)
+                {
+                    sqlCount += " left join not_trans_view as t15 on dat.bailun_sku = t15.bailun_sku and dat.warehouse_code = t15.warehouse_code ";
+                }
                 sqlCount += " where 1=1 ";
 
               
@@ -289,6 +295,18 @@ from dc_auto_turnover as dat
                     sql += " and dat.quantity_inventory<=@quantity_inventory_max ";
                     sqlCount += " and dat.quantity_inventory<=@quantity_inventory_max ";
                     parameters.Add("quantity_inventory_max", m.quantity_inventory_max);
+                } 
+                if (m.not_trans_count_min != null)
+                {
+                    sql += " and t15.count>=@not_trans_count_min ";
+                    sqlCount += " and t15.count>=@not_trans_count_min ";
+                    parameters.Add("not_trans_count_min", m.not_trans_count_min);
+                }
+                if (m.not_trans_count_max != null)
+                {
+                    sql += " and t15.count<=@not_trans_count_max ";
+                    sqlCount += " and t15.count<=@not_trans_count_max ";
+                    parameters.Add("not_trans_count_max", m.not_trans_count_max);
                 }
                 if (m.quantity_out_stock_min != null)
                 {

AutoTurnOver.DB/report.cs

@@ -3562,6 +3562,12 @@ where t1.bailun_sku = t2.bailun_sku and t1.bailun_sku = t3.bailun_sku and t1.wee
             } else if (tag == "不出单数量sku占比")
             {
                 datas = datas.Where(s => s.is_order == 0).ToList();
+            }else if (tag == "出单sku库存数量占比")
+            {
+                datas = datas.Where(s => s.is_order == 1).ToList();
+            }else if (tag == "不出单sku库存数量占比")
+            {
+                datas = datas.Where(s => s.is_order == 0).ToList();
             }
             return datas;
         }
@@ -4064,7 +4070,7 @@ and t1.create_time>=@btime ",new { btime = DateTime.Now.AddMonths(-3)}).ToList()
                 {
                     foreach (var itemSku in item.AsEnumerable())
                     {
-                        itemSku.transfer_order_id = "中转仓入库，带调拨。 aims 虚拟在途";
+                        itemSku.transfer_order_id = "v - "+itemSku.purchase_id;
                         // 查询历史调拨天数
                         var tran_days = _connection.QueryFirstOrDefault<int?>(" select transfer_delivery+transfer_bale_delivery+abroad_inbound_delivery from dc_auto_turnover where bailun_sku=@bailun_sku and warehouse_code=@warehouse_code ", new { bailun_sku  = itemSku.bailun_sku , warehouse_code = itemSku.warehouse_code })??0;
                         itemSku.expectarrivaltime = DateTime.Now.AddDays(tran_days);

AutoTurnOver.Models/dc_auto_turnover.cs

@@ -287,6 +287,8 @@ namespace AutoTurnOver.Models
     public class Condition_AutoTurnOver
     {
         public string sku_label { get; set; }
+        public int? not_trans_count_min { get; set; }
+        public int? not_trans_count_max { get; set; }
         public string bailun_sku { get; set; }
 
         public string buyer_name { get; set; }
@@ -434,6 +436,10 @@ namespace AutoTurnOver.Models
 
     public class dc_auto_turnover_list_dto
     {
+        /// <summary>
+        /// 待调拨数量
+        /// </summary>
+        public int not_trans_count { get; set; }
         public string area_name { get; set; }
         public string warehouse_type { get; set; }
         public string head_transport_type { get; set; }

AutoTurnOver.Purchase.AverageTarget/Program.cs

@@ -26,7 +26,7 @@ namespace AutoTurnOver.Purchase.AverageTarget
                 //PurchaseAverageTargetServices.CalculationTransfer("942517901");
                 //report.ResetTransExpectArrivaltime();
 
-
+                report.ResetTransExpectArrivaltime();
             }
             catch (Exception ex)
             {

AutoTurnOver.Services/SkuAutoTurnServices.cs

@@ -303,7 +303,7 @@ namespace AutoTurnOver.Services
                 ,"速卖通最近7天日均销量","速卖通最近14天日均销量","速卖通最近30天日均销量"
                 ,"已发货库存","开发时间","是否侵权","停止监控时间","标签","停售","最近7天+预测销量","amazon最近7天日均销量","amazon最近14天日均销量","amazon最近30天日均销量","品牌","简易分类"
                 ,"采购陆运在途数量","采购海运在途数量","采购空运在途数量","采购铁路在途数量"
-                ,"调拨陆运在途数量","调拨海运在途数量","调拨空运在途数量","调拨铁路在途数量","首次入库时间","供应链累计销量","销量预测规则","默认头程运输方式","默认头程渠道","计算时间"
+                ,"调拨陆运在途数量","调拨海运在途数量","调拨空运在途数量","调拨铁路在途数量","首次入库时间","供应链累计销量","销量预测规则","默认头程运输方式","默认头程渠道","计算时间","待调拨数量"
             };
                 foreach (var item in cols)
                 {
@@ -316,6 +316,7 @@ namespace AutoTurnOver.Services
                     row["计算时间"] = itemData.gmt_modified.ToString("yyyy-MM-dd");
                     row["默认头程运输方式"] = itemData.head_transport_type;
                     row["默认头程渠道"] = itemData.head_transport_logistics_code;
+                    row["待调拨数量"] = itemData.not_trans_count;
 
                     row["仓库所在国家"] = itemData.area_name;
                     row["销量预测规则"] = itemData.dc_auto_sales_forecast_title;