修改缺货数据，国内仓计算规则

AutoTurnOver.DB/report.cs

@@ -772,7 +772,7 @@ INSERT into china_warehouse_stock_temp(`bailun_sku`,`sum_usable_stock`,`warehous
 FROM
 	( `dc_base_stock` `t1` LEFT JOIN `dc_base_warehouse` `t2` ON ( ( `t1`.`warehouse_code` = `t2`.`warehouse_code` ) ) ) 
 WHERE
-	( ( `t2`.`hq_type` = '国内仓' ) AND ( `t1`.`warehouse_code` NOT IN ( 'GZBLZZG', 'QYBLZZC', 'SZBLZZC' ) ) ) 
+	( ( `t2`.`hq_type` = '国内仓' ) AND ( `t1`.`warehouse_code` IN ( 'GZBLWH', 'QYBLZZ' ) ) ) 
 GROUP BY
 	`t1`.`bailun_sku`
 );
@@ -781,7 +781,7 @@ alter table china_warehouse_stock_temp rename china_warehouse_stock;
 alter table china_warehouse_stockTemp rename china_warehouse_stock_temp; 
 truncate table china_warehouse_stock_temp; ", commandTimeout: 0);
 
-                _connection.Execute(@" -- 刷新缺货明细表
+                _connection.Execute(@" -- 刷新国内仓未发货
 set session transaction isolation level read uncommitted;
 start transaction;
 
@@ -795,7 +795,7 @@ 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 not in('GZBLZZG','QYBLZZC','SZBLZZC')   
+	 `t2`.`hq_type` = '国内仓' and t1.warehouse_code IN ( 'GZBLWH', 'QYBLZZ' )   
 	 GROUP BY
 	`t1`.`bailun_sku`
 );
@@ -848,20 +848,20 @@ alter table dc_not_stock_goods_sales_temp rename dc_not_stock_goods_sales;
 alter table dc_not_stock_goods_salesTemp rename dc_not_stock_goods_sales_temp; 
 truncate table dc_not_stock_goods_sales_temp; ", commandTimeout: 0);
 
-                _connection.Execute(@" -- 记录历史缺货
-set session transaction isolation level read uncommitted;
-start transaction;
-
-insert ignore into dc_outofstock_history(`bailun_sku`,`warehouse_code`,`date`) (
-	select 
-	t1.bailun_sku,t1.warehouse_code,now() as '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
-) ");
+//                _connection.Execute(@" -- 记录历史缺货
+//set session transaction isolation level read uncommitted;
+//start transaction;
+
+//insert ignore into dc_outofstock_history(`bailun_sku`,`warehouse_code`,`date`) (
+//	select 
+//	t1.bailun_sku,t1.warehouse_code,now() as '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
+//) ");
                 _connection.Execute(@" -- 刷新在途
 set session transaction isolation level read uncommitted;
 start transaction;