新增独立站缺货订单的推送

AutoGeneratePurchaseAdvise/GeneratePurchaseAdviseBackgroundService.cs

@@ -72,6 +72,10 @@ namespace AutoGeneratePurchaseAdvise
                         Console.WriteLine($"开始推送 义乌无库仓采购建议任务，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
                         PurchaseAdviseServices.AutoPushBuySys(6);
                         Console.WriteLine($"结束推送 义乌无库仓采购建议任务，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
+
+                        Console.WriteLine($"开始推送 独立站采购建议任务，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
+                        PurchaseAdviseServices.AutoPushBuySys(7);
+                        Console.WriteLine($"结束推送 独立站采购建议任务，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
                     }
                     
                 }

AutoTurnOver.DB/purchase_advise.cs

@@ -456,6 +456,68 @@ t7.bailun_order_ids
         }
 
         /// <summary>
+        /// 赵美聪 独立站
+        /// 推送到广州01仓
+        /// </summary>
+        /// <param name="mainID"></param>
+        /// <returns></returns>
+        public static int ImportDuLiShortageDetailed(int mainID)
+        {
+            var now = DateTime.Now;
+
+            // 计算之前先刷新一遍缺货，一面产生间隙（8点56进系统的单，没有算到缺货里面，下午1点那波也不会算上他）
+            //ResetShortageField();
+
+            if (mainID <= 0)
+            {
+                mainID = purchase_advise.Add(new dc_auto_purchase_advise { create_time = now, no = purchase_advise.GenerateOrderNo(), type = 0 }) ?? 0;
+            }
+            _connection.Execute(@" INSERT into dc_auto_purchase_advise_detailed(`bailun_sku`,`source_warehouse_code`,`warehouse_code`,`quantity_init_advise`,`quantity_final_advise`,
+`product_inner_code`,`goods_quantity_init_advise`,`goods_moq`,`good_sku_codes`,`goods_history_fourteenday_sales`,`history_fourteenday_sales`,
+`quantity_actual`,`main_id`,
+`forecast_formula`,`fit_forecast_formula`,`turnover_days`,`supplier_delivery`,`inspection_delivery`,`transfer_delivery`,`sales_upper_limit`,`ispush`,`type`,`suppliers_id`,`quantity_out_stock`,`purchase_type_jit`,`bailun_order_ids`)
+(
+	select 
+	t1.bailun_sku,
+	t1.warehouse_code as 'source_warehouse_code',
+    'GZBLWH' as 'warehouse_code',
+	-1 as 'quantity_init_advise', -- 原始采购建议数量 new
+	( (t7.quantity_out_stock) - ( ((case when t7.quantity_out_stock>0 then 0 else  (t1.usable_stock+t1.occupy_order) end )) + (t1.quantity_transfer) + (t7.quantity_purchase) )   ) as 'quantity_final_advise', -- 计算moq之后的数量 new
+	t6.product_inner_code as 'product_inner_code', -- 内部商品编码 new
+	0 as 'goods_quantity_init_advise', -- 商品本次的建议下单数量 new
+	0 as 'goods_moq', -- 商品的moq new
+	0 as 'good_sku_codes', -- 商品涉及的下单所有sku new
+	0 as 'goods_history_fourteenday_sales', -- 商品的最近14日总日均销量
+	-1 as 'history_fourteenday_sales', -- sku的最近14日日均
+	0 as 'quantity_actual', -- 真实下单数量
+	@main_id as 'main_id',
+	t2.forecast_formula as 'forecast_formula',
+	t2.fit_forecast_formula as 'fit_forecast_formula',
+	0 as 'turnover_days',
+	0 as 'supplier_delivery',
+	0 as inspection_delivery,
+	0 as transfer_delivery,
+  0 as sales_upper_limit,
+   0 as 'ispush',
+   2 as 'type',
+   t6.suppliers_id,
+    t7.quantity_out_stock,
+0 as 'purchase_type_jit',
+t7.bailun_order_ids
+	from dc_base_stock as t1
+	left join dc_auto_sales as t2 on t1.bailun_sku = t2.bailun_sku and t1.warehouse_code = t2.warehouse_code
+  left join dc_auto_config_sku_warehouse as t5 on t1.bailun_sku = t5.bailun_sku and t1.warehouse_code = t5.warehouse_code
+	left join dc_base_sku as t6 on t1.bailun_sku = t6.bailun_sku
+	left join dc_mid_transit as t7 on t1.bailun_sku = t7.bailun_sku and t1.warehouse_code = t7.warehouse_code
+	where t6.`status`=2 and  ( t6.buyer_name in ('赵美聪_独立站') ) 
+    and ( t5.`status`=0 or t5.`status` is null )
+	and ((case when t7.quantity_out_stock>0 then 0 else  (t1.usable_stock+t1.occupy_order) end ) + t7.quantity_transfer + t7.quantity_purchase < t7.quantity_out_stock)
+	
+	) ", new { main_id = mainID }, commandTimeout: 0);
+            return mainID;
+        }
+
+        /// <summary>
         /// 刷新缺货字段
         /// </summary>
         public static void ResetShortageField()

AutoTurnOver.Services/PurchaseAdviseServices.cs

@@ -262,6 +262,10 @@ namespace AutoTurnOver.Services
                 {
                     mainID = purchase_advise.ImportYiWuShortageDetailed(0);
                 }
+                else if (type == 7)
+                {
+                    mainID = purchase_advise.ImportDuLiShortageDetailed(0);
+                }
                 List<dc_auto_purchase_advise_detailed_dto> datas = new List<dc_auto_purchase_advise_detailed_dto>();
 
                 var total = 0;