优化缺货算法 （真实库存 = 可配+占用）

AutoTurnOver.DB/dc_auto_turnover.cs

@@ -52,7 +52,8 @@ where 1=1 ";
                     sql = @"select dat.*,t2.oneday_sales,t2.forecast_oneday_sales as 'forecast_oneday_sales2',
 t4.bailun_category_name,
 ( case when t5.`status`=0 or t5.`status` is null then 0 else 1 end ) as 'monitor_status',t4.suppliers_link,
-(t4.supplier_delivery - t6.virtual_delivery_days) as 'delivery_days_error',t4.weight,t4.unit_price,t7.usable_stock,t7.shipped_stock
+(t4.supplier_delivery - t6.virtual_delivery_days) as 'delivery_days_error',t4.weight,t4.unit_price,t7.usable_stock,t7.shipped_stock,
+t4.develop_time
 from dc_auto_turnover as dat
 left join dc_auto_sales as t2 on t2.bailun_sku=dat.bailun_sku and dat.warehouse_code = t2.warehouse_code
 left join dc_base_warehouse as t3 on dat.warehouse_code = t3.warehouse_code

AutoTurnOver.DB/report.cs

@@ -674,7 +674,7 @@ Truncate table china_warehouse_stock_temp;
 INSERT into china_warehouse_stock_temp(`bailun_sku`,`sum_usable_stock`,`warehouse_codes`) (
 	SELECT
 	`t1`.`bailun_sku` AS `bailun_sku`,
-	sum( `t1`.`usable_stock` ) AS `sum_usable_stock`,
+	sum( `t1`.`usable_stock` + t1.occupy_stock ) AS `sum_usable_stock`,
 	group_concat( ( CASE WHEN ( `t1`.`usable_stock` > 0 ) THEN `t1`.`warehouse_code` ELSE '' END ) SEPARATOR ' | ' ) AS `warehouse_codes` 
 FROM
 	( `dc_base_stock` `t1` LEFT JOIN `dc_base_warehouse` `t2` ON ( ( `t1`.`warehouse_code` = `t2`.`warehouse_code` ) ) ) 

AutoTurnOver.Models/dc_auto_turnover.cs

@@ -401,5 +401,7 @@ namespace AutoTurnOver.Models
         /// 供应链链接
         /// </summary>
         public string suppliers_link { get; set; }
+
+        public DateTime? develop_time { get; set; }
     }
 }

AutoTurnOver.Models/out_stock_dto.cs

@@ -25,6 +25,7 @@ namespace AutoTurnOver.Models
         public string ebay_bailun_require_logistics { get; set; }
 
         public string ebay_logistics_method_name { get; set; }
+
     }
 
     public class out_stock_search_dto

AutoTurnOver/Controllers/ReportsController.cs

@@ -301,7 +301,7 @@ namespace AutoTurnOver.Controllers
             var list = services.QuantityOutStockDetailList(m, 0, int.MaxValue, ref total, order: order, sort: sort);
             // Detail
             DataTable table = new DataTable();
-            string[] cols = new string[] { "缺货统计时间", "平台订单号", "平台类型", "百伦订单号", "付款交易号", "站点", "付款时间", "销售账号","国家","sku",
+            string[] cols = new string[] { "缺货统计时间", "平台订单号", "平台类型", "百伦订单号", "付款交易号", "站点", "付款时间", "销售账号","国家","sku","订单所有itemid",
                 "产品名称", "订单sku销量", "发货仓库编码","发货仓库", "是否缺货", "仓库总缺货", "国内仓总缺货", "其他有库存仓库", "其他仓库库存数","国内仓是否缺货","采购员",
                  "平台物流方式", "发货物流方式", "sku监控状态", "销售状态", "总在途库存数", "最先到货采购单","最快到货时间","采购单供应商","采购单阿里巴巴单号","采购单物流单号"
             };
@@ -324,6 +324,7 @@ namespace AutoTurnOver.Controllers
                 row["销售账号"] = itemData.seller_account;
                 row["国家"] = itemData.receipt_country;
                 row["sku"] = itemData.bailun_sku;
+                row["订单所有itemid"] = itemData.items;
                 row["产品名称"] = itemData.sku_name;
                 row["订单sku销量"] = itemData.bailun_sku_quantity_ordered;
                 row["发货仓库编码"] = itemData.warehouse_code;

AutoTurnOver/Controllers/SkuAutoTurnController.cs

@@ -88,7 +88,8 @@ namespace AutoTurnOver.Controllers
                 p.history_thirtyday_sales_ebay,
                 p.shipped_stock,
                 p.suppliers_link,
-                p.buyer_name
+                p.buyer_name,
+                p.develop_time
 
             });
 
@@ -193,14 +194,15 @@ namespace AutoTurnOver.Controllers
                 p.history_sevenday_sales_ebay,
                 p.history_fourteenday_sales_ebay,
                 p.history_thirtyday_sales_ebay,
-                p.shipped_stock
+                p.shipped_stock,
+                p.develop_time
             });
 
             DataTable table = new DataTable();
             string[] cols = new string[] { "Sku","商品编码", "内部编码", "sku标题", "仓库编码", "仓库名称", "MOQ",
                 "采购在途", "调拨在途", "昨日销量", "明日销量", "未来7天日均", "未来14天日均", "建议采购数", "活动促销数量",
                 "实际库存", "安全库存", "周转天数", "供应商交期", "质检入库天数", "调拨头程天数", "预测是否断货", "缺货数量","监控状态","供应商","采购员","交期异常",
-                "过去7天日均","过去14天日均","过去30天日均","重量","单价","实时库存","ebay最近7天日均销量","ebay最近14天日均销量","ebay最近30天日均销量","已发货库存"
+                "过去7天日均","过去14天日均","过去30天日均","重量","单价","实时库存","ebay最近7天日均销量","ebay最近14天日均销量","ebay最近30天日均销量","已发货库存","开发时间"
             };
             foreach (var item in cols)
             {
@@ -248,6 +250,7 @@ namespace AutoTurnOver.Controllers
                 row["ebay最近14天日均销量"] = itemData.history_fourteenday_sales_ebay;
                 row["ebay最近30天日均销量"] = itemData.history_thirtyday_sales_ebay;
                 row["已发货库存"] = itemData.shipped_stock;
+                row["开发时间"] = itemData.develop_time;
                 table.Rows.Add(row);
             }