缺货计算，内购订单不算在内

AutoTurnOver.DB/report.cs

@@ -184,7 +184,7 @@ t3.sum_usable_stock,
 t4.sum_unshipped_quantity,
 t3.warehouse_codes,
 (ifnull(t4.sum_unshipped_quantity,0) - ifnull(t3.sum_usable_stock,0)) as 'sum_quantity_out_stock',
-(case when t_db.hq_type!='国内仓' then '非国内仓' when ifnull(t3.sum_usable_stock,0) < ifnull(t4.sum_unshipped_quantity,0) then '缺货' else '未缺货' end) as 'is_sum_quantity_out_stock',
+(case when t_db.hq_type!='国内仓' or t6.buyer_name not in ('张莹霞','张莹霞1') then '非国内共享仓' when ifnull(t3.sum_usable_stock,0) < ifnull(t4.sum_unshipped_quantity,0) then '缺货' else '未缺货' end) as 'is_sum_quantity_out_stock',
 t6.buyer_name,
 (GREATEST(t3.sum_usable_stock - t5.usable_stock,0)) as 'other_stock', -- 其他仓库存
 t1.bailun_require_logistics,
@@ -197,8 +197,8 @@ t9.items
 from dc_base_oms_sku_outofstock as t1 
 left join dc_mid_transit as t2 on t1.bailun_sku = t2.bailun_sku and t1.warehouse_code = t2.warehouse_code
 left join dc_base_warehouse as t_db on t1.warehouse_code = t_db.warehouse_code
-left join china_warehouse_stock as t3 on t1.bailun_sku = t3.bailun_sku and t_db.hq_type='国内仓'
-left join china_warehouse_unshipped as t4 on t1.bailun_sku = t4.bailun_sku and t_db.hq_type='国内仓'
+left join china_warehouse_stock as t3 on t1.bailun_sku = t3.bailun_sku and t_db.warehouse_code in ( 'GZBLWH', 'QYBLZZ' )
+left join china_warehouse_unshipped as t4 on t1.bailun_sku = t4.bailun_sku and t_db.warehouse_code in ( 'GZBLWH', 'QYBLZZ' )
 left join dc_base_stock 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_auto_config_sku_warehouse as t7 on t1.bailun_sku = t7.bailun_sku and t1.warehouse_code = t7.warehouse_code
@@ -462,9 +462,11 @@ now() as 'push_date',
 from dc_mid_transit as t1
 left join dc_base_sku as t2 on t1.bailun_sku = t2.bailun_sku
 left join dc_base_warehouse as t_db on t1.warehouse_code = t_db.warehouse_code
-left join china_warehouse_stock as t3 on t1.bailun_sku = t3.bailun_sku and t_db.hq_type='国内仓'
-left join china_warehouse_unshipped as t4 on t1.bailun_sku = t4.bailun_sku and t_db.hq_type='国内仓'
-where ( t_db.hq_type!='国内仓' or t2.buyer_name not in ('张莹霞','张莹霞1') ) and t_db.hq_type!='fba仓' and (case when t_db.hq_type='国内仓' then (ifnull(t4.sum_unshipped_quantity,0) - ifnull(t3.sum_usable_stock,0)) else t1.quantity_out_stock end )>0
+left join china_warehouse_stock as t3 on t1.bailun_sku = t3.bailun_sku and t_db.warehouse_code in ( 'GZBLWH', 'QYBLZZ' ) 
+left join china_warehouse_unshipped as t4 on t1.bailun_sku = t4.bailun_sku and t_db.warehouse_code in ( 'GZBLWH', 'QYBLZZ' ) 
+where ( t_db.hq_type!='国内仓' or t2.buyer_name not in ('张莹霞','张莹霞1') ) 
+and t_db.hq_type!='fba仓' 
+and (case when t_db.warehouse_code in ( 'GZBLWH', 'QYBLZZ' ) and t2.buyer_name not in ('张莹霞','张莹霞1') then (ifnull(t4.sum_unshipped_quantity,0) - ifnull(t3.sum_usable_stock,0)) else t1.quantity_out_stock end )>0
 and not exists ( select * from dc_auto_shortage_push where dc_auto_shortage_push.warehouse_code = t1.warehouse_code and dc_auto_shortage_push.bailun_sku = t1.bailun_sku )";
             shortage_list.AddRange(conn.Query<dc_auto_shortage_push>(sql,commandTimeout: 0));
 
@@ -518,8 +520,8 @@ select 
count(1)
 from dc_auto_shortage_push as t1
 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 china_warehouse_stock as t4 on t1.bailun_sku = t4.bailun_sku and t_db.hq_type='国内仓'
-left join china_warehouse_unshipped as t5 on t1.bailun_sku = t5.bailun_sku and t_db.hq_type='国内仓'
+left join china_warehouse_stock as t4 on t1.bailun_sku = t4.bailun_sku and t_db.warehouse_code in ( 'GZBLWH', 'QYBLZZ' )
+left join china_warehouse_unshipped as t5 on t1.bailun_sku = t5.bailun_sku and t_db.warehouse_code in ( 'GZBLWH', 'QYBLZZ' )
 left join dc_base_stock as t_stock on t1.bailun_sku = t_stock.bailun_sku and t1.warehouse_code = t_stock.warehouse_code
 where 1=1
 ";
@@ -543,8 +545,8 @@ 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 china_warehouse_stock as t4 on t1.bailun_sku = t4.bailun_sku and t_db.hq_type='国内仓'
- left join china_warehouse_unshipped as t5 on t1.bailun_sku = t5.bailun_sku and t_db.hq_type='国内仓'
+ left join china_warehouse_stock as t4 on t1.bailun_sku = t4.bailun_sku and t_db.warehouse_code in ( 'GZBLWH', 'QYBLZZ' )
+ left join china_warehouse_unshipped as t5 on t1.bailun_sku = t5.bailun_sku and t_db.warehouse_code in ( 'GZBLWH', 'QYBLZZ' )
 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 (
@@ -579,13 +581,13 @@ where 1=1
                 if (m.has_available_stock != null)
                 {
                     sql += @"  and (case 
-when t_db.hq_type = '国内仓' and(ifnull(t4.sum_usable_stock, 0) - ifnull(t5.sum_unshipped_quantity, 0) > 0)  then 1
+when t_db.warehouse_code in ( 'GZBLWH', 'QYBLZZ' ) and t2.buyer_name not in ('张莹霞','张莹霞1') and(ifnull(t4.sum_usable_stock, 0) - ifnull(t5.sum_unshipped_quantity, 0) > 0)  then 1
 when(t3.quantity_out_stock is null or t3.quantity_out_stock <= 0) and ifnull(t_stock.usable_stock,0)> ifnull(t3.quantity_unshipped, 0) then 1
 else 0
 end
 ) = @has_available_stock ";
                     countSql += @"  and (case 
-when t_db.hq_type = '国内仓' and(ifnull(t4.sum_usable_stock, 0) - ifnull(t5.sum_unshipped_quantity, 0) > 0)  then 1
+when t_db.warehouse_code in ( 'GZBLWH', 'QYBLZZ' ) and t2.buyer_name not in ('张莹霞','张莹霞1') and(ifnull(t4.sum_usable_stock, 0) - ifnull(t5.sum_unshipped_quantity, 0) > 0)  then 1
 when(t3.quantity_out_stock is null or t3.quantity_out_stock <= 0) and ifnull(t_stock.usable_stock,0)> ifnull(t3.quantity_unshipped, 0) then 1
 else 0
 end
@@ -667,13 +669,13 @@ 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 china_warehouse_stock as t4 on t1.bailun_sku = t4.bailun_sku and t_db.hq_type='国内仓'
- left join china_warehouse_unshipped as t5 on t1.bailun_sku = t5.bailun_sku and t_db.hq_type='国内仓'
+ left join china_warehouse_stock as t4 on t1.bailun_sku = t4.bailun_sku and t_db.warehouse_code in ( 'GZBLWH', 'QYBLZZ' )
+ left join china_warehouse_unshipped as t5 on t1.bailun_sku = t5.bailun_sku and t_db.warehouse_code in ( 'GZBLWH', 'QYBLZZ' )
 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
 where 1=1 
 and (case 
-when t_db.hq_type = '国内仓' and(ifnull(t4.sum_usable_stock, 0) - ifnull(t5.sum_unshipped_quantity, 0) > 0)  then 1
+when t_db.warehouse_code in ( 'GZBLWH', 'QYBLZZ' ) and t2.buyer_name not in ('张莹霞','张莹霞1') and(ifnull(t4.sum_usable_stock, 0) - ifnull(t5.sum_unshipped_quantity, 0) > 0)  then 1
 when(t3.quantity_out_stock is null or t3.quantity_out_stock <= 0) and ifnull(t_stock.usable_stock,0)> ifnull(t3.quantity_unshipped, 0) then 1
 else 0
 end
@@ -727,7 +729,7 @@ Truncate table dc_base_oms_bailun_no_map_items_temp;
 
 INSERT into dc_base_oms_bailun_no_map_items_temp(`bailun_order_id`,`items`) (
 	select t1.bailun_order_id,GROUP_CONCAT(DISTINCT t1.item_id) as 'items' from dc_base_oms_platform_sku as t1
-where t1.create_time>'2019-03-01 12:00:00' and t1.bailun_order_status = 'Handling' and t1.has_delete=0 and t1.has_scalp=0 and t1.bailun_interception_status not in ('Success','Part') and t1.platform_type!='FBA'
+where t1.has_innersale=0 and t1.create_time>'2019-03-01 12:00:00' and t1.bailun_order_status = 'Handling' and t1.has_delete=0 and t1.has_scalp=0 and t1.bailun_interception_status not in ('Success','Part') and t1.platform_type!='FBA'
 GROUP BY t1.bailun_order_id
 );
 
@@ -749,7 +751,7 @@ t1.*,( CASE WHEN ( `t1`.`warehouse_code` IN ( 'QYBLZZ', 'GZBLWH' ) ) THEN 'QYBLZ
 from dc_base_oms_sku as t1 
 left join dc_base_warehouse as t_db on t1.warehouse_code = t_db.warehouse_code
 left join dc_base_sku as t6 on t1.bailun_sku = t6.bailun_sku
-where t1.create_time>'2019-03-01 12:00:00' and t1.bailun_picking_status!='TotalPicked' and t1.bailun_order_status = 'Handling' and t1.has_delete=0 and t1.has_scalp=0 and t1.bailun_interception_status not in ('Success','Part') and t1.platform_type!='FBA'
+where t1.has_innersale and t1.create_time>'2019-03-01 12:00:00' and t1.bailun_picking_status!='TotalPicked' and t1.bailun_order_status = 'Handling' and t1.has_delete=0 and t1.has_scalp=0 and t1.bailun_interception_status not in ('Success','Part') and t1.platform_type!='FBA'
 );
 
 alter table dc_base_oms_sku_outofstock rename dc_base_oms_sku_outofstockTemp; 
@@ -795,7 +797,8 @@ INSERT into china_warehouse_unshipped_temp(`bailun_sku`,`sum_unshipped_quantity`
 FROM
 	( `dc_base_oms_sku_outofstock` `t1` LEFT JOIN `dc_base_warehouse` `t2` ON ( ( `t1`.`warehouse_code` = `t2`.`warehouse_code` ) ) ) 
 WHERE
-	 `t2`.`hq_type` = '国内仓' and t1.warehouse_code IN ( 'GZBLWH', 'QYBLZZ' )   
+    t1.has_innersale=0 
+	 and `t2`.`hq_type` = '国内仓' and t1.warehouse_code IN ( 'GZBLWH', 'QYBLZZ' )   
 	 GROUP BY
 	`t1`.`bailun_sku`
 );