采购建议导出新增仓库类型

AutoTurnOver.DB/purchase_advise.cs

@@ -1808,6 +1808,8 @@ t5.history_sevenday_sales as 't_history_sevenday_sales',
 t5.history_fourteenday_sales as 't_history_fourteenday_sales',
 t5.history_thirtyday_sales as 't_history_thirtyday_sales',
 
+t2.hq_type,
+
 t5.abroad_inbound_config_delivery,
 
 t8.from_warehouse_code as 'transfer_warehouse_from_code',
@@ -1822,7 +1824,7 @@ left join dc_auto_purchase_advise as t4 on t1.main_id = t4.id
 left join dc_auto_turnover as t5 on t1.warehouse_code = t5.warehouse_code and t1.bailun_sku = t5.bailun_sku 
 left join dc_mid_transit as t7 on t1.bailun_sku = t7.bailun_sku and t1.warehouse_code = t7.warehouse_code
 left join dc_aims_transfer_warehouse_log as t8 on t1.bailun_sku = t8.bailun_sku and t1.warehouse_code = t8.to_warehouse_code
-where t1.status=0 ";
+where 1=1 ";
                 }
 
                 if (!string.IsNullOrWhiteSpace(m.product_inner_code))
@@ -1877,6 +1879,16 @@ where t1.status=0 ";
                     sql += " and t3.suppliers_name =@suppliers_name ";
                     parameters.Add("suppliers_name", m.supplier_name);
                 }
+                if (!string.IsNullOrWhiteSpace(m.order_no))
+                {
+                    sql += " and t4.`no` =@order_no ";
+                    parameters.Add("order_no", m.order_no);
+                }
+                if (m.is_delete>-1)
+                {
+                    sql += " and t1.`is_delete` =@is_delete ";
+                    parameters.Add("is_delete", m.is_delete);
+                }
 
                 if (!string.IsNullOrWhiteSpace(m.purchase_user))
                 {

AutoTurnOver.Models/dc_auto_purchase_advise.cs

@@ -335,6 +335,7 @@ namespace AutoTurnOver.Models
         /// <summary>
         /// 转仓来源仓
         /// </summary>
+        public string hq_type { get; set; }
         public string transfer_warehouse_from_code { get; set; }
         public string transfer_warehouse_from_name { get; set; }
         public decimal quantity_actual_push { get
@@ -466,6 +467,12 @@ namespace AutoTurnOver.Models
         /// </summary>
         public int main_id { get; set; }
 
+        [Description("建议单号")]
+        public string order_no { get; set; }
+
+        [Description("是否过期")]
+        public int is_delete { get; set; } = 0;
+
         [Description("sku")]
         public string sku { get; set; }
         [Description("仓库编码")]

AutoTurnOver.Models/dc_auto_turnover.cs

@@ -285,6 +285,11 @@ namespace AutoTurnOver.Models
         /// </summary>
         public string head_transport_logistics_code { get; set; }
 
+        /// <summary>
+        /// 采购平均下单天数
+        /// </summary>
+        public int? purchase_create_order_days { get; set; }
+
     }
 
     public class Condition_AutoTurnOver

AutoTurnOver.Purchase.AverageTarget/Program.cs

@@ -31,7 +31,7 @@ namespace AutoTurnOver.Purchase.AverageTarget
                 //PurchaseAverageTargetServices.CalculationTransfer();
                 //report.ResetTransExpectArrivaltime();
                 //dc_auto_return_goods_config_dao.NewCalculation();
-                PurchaseAverageTargetServices.Calculation("942517901", days: 360);
+                //PurchaseAverageTargetServices.Calculation("942517901", days: 360);
                 //PurchaseAverageTargetServices.CalculationTransfer("942517901", 360);
             }
             catch (Exception ex)

AutoTurnOver.Services/PurchaseAdviseServices.cs

@@ -114,7 +114,7 @@ namespace AutoTurnOver.Services
                  "内部商品编码", "商品建议采购", "商品14日日均", "商品moq", "日均加权销量", "缺货","实时缺货", "调拨在途", "调拨单在途", "调拨在途（采购临时数据）", "调拨在途（暂存）", "采购在途", "库存数",
                  "采购金额", "供应链长度", "供应商名称", "采购类型","采购员","突增关注","待发货百伦单号","7日日均","14日日均","30日日均","海外仓入库天数",
                  "采购单价" ,"历史7天日均","历史14日均","历史30日均","加权日均","安全库存","今日实际缺货","供应链累积销量","供应链到货当天的销量"
-                 ,"预测销量","累积入库数量","实际库存","moq","多备天数","多备数量","预测销量配置","实际推送下单数量","总下单金额","转仓来源仓库编码","转仓来源仓库名称"
+                 ,"预测销量","累积入库数量","实际库存","moq","多备天数","多备数量","预测销量配置","实际推送下单数量","总下单金额","转仓来源仓库编码","转仓来源仓库名称","仓库类型"
             };
             foreach (var item in cols)
             {
@@ -124,6 +124,7 @@ namespace AutoTurnOver.Services
             foreach (var itemData in list)
             {
                 DataRow row = table.NewRow();
+                row["仓库类型"] = itemData.hq_type;
                 row["转仓来源仓库编码"] = itemData.transfer_warehouse_from_code;
                 row["转仓来源仓库名称"] = itemData.transfer_warehouse_from_name;