张莹霞1 计算缺货的时候不要考虑在途了

AutoGeneratePurchaseAdvise/GeneratePurchaseAdviseBackgroundService.cs

@@ -30,6 +30,10 @@ namespace AutoGeneratePurchaseAdvise
                     Console.WriteLine($"开始推送 jit采购建议 任务，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
                     PurchaseAdviseServices.AutoPushBuySys(1);
                     Console.WriteLine($"结束推送 jit采购建议 任务，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
+
+                    Console.WriteLine($"开始推送 jit采购建议 任务，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
+                    PurchaseAdviseServices.AutoPushBuySys(4);
+                    Console.WriteLine($"结束推送 jit采购建议 任务，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
                 }
 
                 //if (now.Hour == 17 && now.Minute == 29)

AutoTurnOver.DB/purchase_advise.cs

@@ -207,7 +207,7 @@ where t2.`status`=2 and t1.bailun_sku = t2.bailun_sku and quantity_final_advise=
         }
 
         /// <summary>
-        /// 导入缺货明细
+        /// 导入缺货明细 张莹霞
         /// </summary>
         /// <param name="mainID"></param>
         public static int ImportJITShortageDetailed(int mainID)
@@ -252,7 +252,7 @@ where t2.`status`=2 and t1.bailun_sku = t2.bailun_sku and quantity_final_advise=
   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 ('张莹霞','张莹霞1') and t1.warehouse_code in ('GZBLWH','GZBLYS') ) 
+	where t6.`status`=2 and  ( t6.buyer_name in ('张莹霞') and t1.warehouse_code in ('GZBLWH','GZBLYS') ) 
     and ( t5.`status`=0 or t5.`status` is null )
 	GROUP BY t1.bailun_sku
 	HAVING ( sum((case when t7.quantity_out_stock>0 then 0 else  (t1.usable_stock+t1.occupy_order) end )) + sum(t7.quantity_transfer) + sum(t7.quantity_purchase) < sum(t7.quantity_out_stock) )
@@ -263,6 +263,62 @@ where t2.`status`=2 and t1.bailun_sku = t2.bailun_sku and quantity_final_advise=
         }
 
         /// <summary>
+        /// 导入缺货明细 张莹霞1
+        /// </summary>
+        /// <param name="mainID"></param>
+        public static int ImportJITShortageDetailed1(int mainID)
+        {
+            if (mainID <= 0)
+            {
+                mainID = purchase_advise.Add(new dc_auto_purchase_advise { create_time = DateTime.Now, no = purchase_advise.GenerateOrderNo() }) ?? 0;
+            }
+            // 采购员为 张莹霞 的商品 按缺货数量下单
+            _connection.Execute(@" INSERT into dc_auto_purchase_advise_detailed(`bailun_sku`,`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`)
+(
+	select 
+	t1.bailun_sku,
+	'GZBLWH' as 'warehouse_code',
+	-1 as 'quantity_init_advise', -- 原始采购建议数量 new
+	( sum(t7.quantity_out_stock) - ( sum((case when t7.quantity_out_stock>0 then 0 else  (t1.usable_stock+t1.occupy_order) end )) )   ) 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,
+    2 as 'purchase_type_jit'
+	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 ('张莹霞1') and t1.warehouse_code in ('GZBLWH','GZBLYS') ) 
+    and ( t5.`status`=0 or t5.`status` is null )
+	GROUP BY t1.bailun_sku
+	HAVING ( sum((case when t7.quantity_out_stock>0 then 0 else  (t1.usable_stock+t1.occupy_order) end )) < sum(t7.quantity_out_stock) )
+	
+	) ", new { main_id = mainID }, commandTimeout: 0);
+
+            return mainID;
+        }
+
+        /// <summary>
         /// 导入缺货明细 (服装)
         /// </summary>
         /// <param name="mainID"></param>

AutoTurnOver.Services/PurchaseAdviseServices.cs

@@ -205,8 +205,10 @@ namespace AutoTurnOver.Services
                 else if (type == 3)
                 {
                     mainID = purchase_advise.ImportShoujiShortageDetailed(0);
+                }else if(type==4)
+                {
+                    mainID = purchase_advise.ImportJITShortageDetailed1(0); 
                 }
-
                 List<dc_auto_purchase_advise_detailed_dto> datas = new List<dc_auto_purchase_advise_detailed_dto>();
 
                 var total = 0;