fix

AutoTurnOver.DB/report.cs

@@ -1756,22 +1756,22 @@ truncate table dc_base_sku_sum_temp;
 
 ", commandTimeout: 0);
 
-                _connection.Execute(@" -- 刷新 数据特性
+                _connection.Execute(@" -- 刷新sku汇总
 set session transaction isolation level read uncommitted;
 start transaction;
 
 -- 清空视图表的数据
 Truncate table dc_base_data_character_temp;
 
-insert into dc_base_data_character_temp(`character`,  `bailun_sku`,  `warehouse_code`)
-select '无库' as 'character',bailun_sku,warehouse_code from dc_base_stock where warehouse_code in ('BLGZ03','YWWH01');
+insert into dc_base_data_character_temp(`character`,  `bailun_sku`,  `warehouse_code`,`bailun_sku_warehouse_code`)
+select '无库' as 'character',bailun_sku,warehouse_code,CONCAT(bailun_sku,warehouse_code) as 'bailun_sku_warehouse_code' from dc_base_stock where warehouse_code in ('BLGZ03','YWWH01');
 
 	
-insert into dc_base_data_character_temp(`character`,  `bailun_sku`,  `warehouse_code`)
-select '自产' as 'character',t1.bailun_sku,t1.warehouse_code from dc_base_stock as t1 left join dc_base_sku as t2 on t1.bailun_sku  =t2.bailun_sku where t2.buyer_name in ('张莹霞','张莹霞1');
+insert into dc_base_data_character_temp(`character`,  `bailun_sku`,  `warehouse_code`,`bailun_sku_warehouse_code`)
+select '自产' as 'character',t1.bailun_sku,t1.warehouse_code,CONCAT(t1.bailun_sku,t1.warehouse_code) as 'bailun_sku_warehouse_code' from dc_base_stock as t1 left join dc_base_sku as t2 on t1.bailun_sku  =t2.bailun_sku where t2.buyer_name in ('张莹霞','张莹霞1');
 	
-insert into dc_base_data_character_temp(`character`,  `bailun_sku`,  `warehouse_code`)
-select '海外仓' as 'character',t1.bailun_sku,t1.warehouse_code from dc_base_stock as t1 left join dc_base_warehouse as t2 on t1.warehouse_code = t2.warehouse_code where t2.hq_type not in ('国内仓');
+insert into dc_base_data_character_temp(`character`,  `bailun_sku`,  `warehouse_code`,`bailun_sku_warehouse_code`)
+select '海外仓' as 'character',t1.bailun_sku,t1.warehouse_code,CONCAT(t1.bailun_sku,t1.warehouse_code) as 'bailun_sku_warehouse_code' from dc_base_stock as t1 left join dc_base_warehouse as t2 on t1.warehouse_code = t2.warehouse_code where t2.hq_type not in ('国内仓');
 
 	
 alter table dc_base_data_character rename dc_base_data_characterTemp; 
@@ -1784,7 +1784,8 @@ update dc_base_stock as t1,
 select bailun_sku,warehouse_code,GROUP_CONCAT(`character`) as 'character' from dc_base_data_character GROUP BY bailun_sku,warehouse_code
 ) as t2
 set t1.`character` = t2.`character`
-where t1.bailun_sku = t2.bailun_sku and t1.warehouse_code = t2.warehouse_code
+where t1.bailun_sku = t2.bailun_sku and t1.warehouse_code = t2.warehouse_code;
+
 
 
 ", commandTimeout: 0);