改在线算法修改

AutoTurnOver.DB/report.cs

@@ -901,6 +901,69 @@ t1.id as 'shortage_push_id',
 t1.bailun_sku,
 t1.warehouse_code,
 now() as 'push_time',
+t1.push_date,
+(case 
+when t_db.hq_type in ( '国内仓' )  then ifnull(tc1.sum_usable_stock,0)  - ifnull(tc2.sum_unshipped_quantity,0)
+else ifnull(tnc1.usable_stock,0)  - ifnull(tnc2.quantity_unshipped,0)
+end
+)  as 'stocks',
+t2.buyer_name
+from dc_auto_shortage_push as t1
+left join dc_base_sku as t2 on t1.bailun_sku = t2.bailun_sku
+left join dc_mid_transit as t3 on t1.bailun_sku = t3.bailun_sku and t1.warehouse_code = t3.warehouse_code
+left join dc_base_warehouse as t_db on t1.warehouse_code  = t_db.warehouse_code
+left join dc_base_stock as t_stock on t1.bailun_sku = t_stock.bailun_sku and t1.warehouse_code = t_stock.warehouse_code
+left join dc_auto_config_sku_warehouse as t7 on t1.bailun_sku = t7.bailun_sku and t1.warehouse_code = t7.warehouse_code
+left join (
+     select t1.bailun_sku,t2.area_id,sum(t1.usable_stock) as 'sum_usable_stock' from dc_base_stock as t1 
+    left join dc_base_warehouse as t2 on t1.warehouse_code = t2.warehouse_code
+    where t1.warehouse_code in ( 'GZBLWH', 'QYBLZZ' ) 
+    GROUP BY t1.bailun_sku,t2.area_id
+) as tc1 on t1.bailun_sku = tc1.bailun_sku and t_db.area_id = tc1.area_id
+left join (
+    select t1.bailun_sku,t2.area_id,sum(t1.quantity_unshipped) as 'sum_unshipped_quantity',sum(t1.quantity_purchase) as 'sum_quantity_purchase' from dc_mid_transit as t1 left join dc_base_warehouse as t2 on t1.warehouse_code = t2.warehouse_code
+    where t1.quantity_unshipped>0 and t1.warehouse_code in ( 'GZBLWH', 'QYBLZZ' )
+    GROUP BY t1.bailun_sku,t2.area_id
+) as tc2 on t1.bailun_sku = tc2.bailun_sku and  t_db.area_id = tc2.area_id
+left join (
+     select t1.bailun_sku,t2.area_id,sum(t1.usable_stock) as 'usable_stock' from dc_base_stock as t1 
+    left join dc_base_warehouse as t2 on t1.warehouse_code = t2.warehouse_code
+    where t1.warehouse_code in (
+		'GBYKD', 'JZHYBLGC', 'MDBLWYT', 'MXBLWYT', 'BLUSGDC', 'GBBMHBL', 'GB4PXBL', 'DEBLDG', 'USGCBL', 'USHWBL', 'US4PXBL', 'AUWYTBL', 'AU4PXBL', 'GBWYTUK', 'BLGBPX' 
+		)
+    GROUP BY t1.bailun_sku,t2.area_id
+) as tnc1 on t1.bailun_sku = tnc1.bailun_sku and t_db.area_id = tnc1.area_id
+left join (
+    select t1.bailun_sku,t2.area_id,sum(t1.quantity_unshipped) as 'quantity_unshipped' from dc_mid_transit as t1 left join dc_base_warehouse as t2 on t1.warehouse_code = t2.warehouse_code
+    where t1.quantity_unshipped>0 and t1.warehouse_code in (
+		'GBYKD', 'JZHYBLGC', 'MDBLWYT', 'MXBLWYT', 'BLUSGDC', 'GBBMHBL', 'GB4PXBL', 'DEBLDG', 'USGCBL', 'USHWBL', 'US4PXBL', 'AUWYTBL', 'AU4PXBL', 'GBWYTUK', 'BLGBPX' 
+		)
+    GROUP BY t1.bailun_sku,t2.area_id
+) as tnc2 on t1.bailun_sku = tnc2.bailun_sku and  t_db.area_id = tnc2.area_id
+
+where t1.platform=@platform and t1.has_return_goods=0
+and (case 
+when ifnull(tc2.sum_unshipped_quantity,0) < ifnull(tc1.sum_usable_stock,0)  then 1
+when ifnull(tnc2.quantity_unshipped,0) < ifnull(tnc1.usable_stock,0)  then 1
+else 0
+end
+) = 1
+";
+            shortage_list.AddRange(conn.Query<dc_return_goods_push>(sql,new { platform= platform }, commandTimeout: 0));
+
+            return shortage_list;
+
+        }
+        public static List<dc_return_goods_push> ReturnGoodsPush_bak(string platform)
+        {
+            var conn = _connection;
+            var shortage_list = new List<dc_return_goods_push>();
+            // 回货速改推送
+            string sql = @"select 
+t1.id as 'shortage_push_id',
+t1.bailun_sku,
+t1.warehouse_code,
+now() as 'push_time',
 (case 
 when t_db.warehouse_code in ( 'GZBLWH', 'QYBLZZ' ) and t2.buyer_name not in ('张莹霞','张莹霞1')   then IFNULL(t4.sum_usable_stock, 0) - IFNULL(t5.sum_unshipped_quantity, 0)
 else t_stock.usable_stock - ifnull(t3.quantity_unshipped,0)