入库记录范围修改

AutoTurnOver.DB/daily.cs

@@ -344,7 +344,7 @@ left join dc_auto_sales as t8 on t1.bailun_sku=t8.bailun_sku and t1.warehouse_co
 ";
 
                 var storage_quantity_sql = @" left join (
-select bailun_sku_warehouse_code,sum(quantity_stock) as 'storage_quantity' from dc_base_stock_record where 1=1 ";
+select bailun_sku_warehouse_code,sum(quantity_stock) as 'storage_quantity' from dc_base_stock_record_effective where 1=1 ";
 
                 if(start_date != null && end_date != null)
                 {
@@ -398,8 +398,8 @@ left join dc_base_warehouse as dbw on t1.warehouse_code = dbw.warehouse_code
             }
             if (start_date != null && end_date != null)
             {
-                sql += "  and t1.bailun_sku_warehouse_code  in (select t_re.bailun_sku_warehouse_code from dc_base_stock_record as t_re where t_re.stock_time >=@start_date and t_re.stock_time <=@end_date ) ";
-                countSql += "  and t1.bailun_sku_warehouse_code  in (select t_re.bailun_sku_warehouse_code from dc_base_stock_record as t_re where t_re.stock_time >=@start_date and t_re.stock_time <=@end_date ) ";
+                sql += "  and t1.bailun_sku_warehouse_code  in (select t_re.bailun_sku_warehouse_code from dc_base_stock_record_effective as t_re where t_re.stock_time >=@start_date and t_re.stock_time <=@end_date ) ";
+                countSql += "  and t1.bailun_sku_warehouse_code  in (select t_re.bailun_sku_warehouse_code from dc_base_stock_record_effective as t_re where t_re.stock_time >=@start_date and t_re.stock_time <=@end_date ) ";
                 parameters.Add("start_date", start_date.Value.ToString("yyyy-MM-dd 00:00:00"));
                 parameters.Add("end_date", end_date.Value.ToString("yyyy-MM-dd 23:59:59"));
             }

AutoTurnOver.DB/report.cs

@@ -1617,10 +1617,39 @@ alter table dc_base_full_stock_temp rename dc_base_full_stock;
 alter table dc_base_full_stockTemp rename dc_base_full_stock_temp; 
 truncate table dc_base_full_stock_temp;  ", commandTimeout: 0);
 
+                _connection.Execute(@" -- 刷新 全量有效入库记录
+set session transaction isolation level read uncommitted;
+start transaction;
+
+-- 清空视图表的数据
+Truncate table dc_base_stock_record_effective_temp;
+
+INSERT into dc_base_stock_record_effective_temp(`gmt_create`,`gmt_modified`,`bailun_sku`,`warehouse_code`,`warehouse_name`,`quantity_stock`,`stock_time`,`has_transfer`,`bailun_sku_warehouse_code`) 
+(
+select t1.gmt_create,
+  t1.gmt_modified,
+  t1.bailun_sku,
+  t1.warehouse_code,
+  t1.warehouse_name ,
+  t1.quantity_stock ,
+  t1.stock_time,
+  t1.has_transfer,
+  t1.bailun_sku_warehouse_code 
+	from dc_base_stock_record as t1
+left join dc_base_warehouse as t2 on t1.warehouse_code = t2.warehouse_code
+where t1.has_transfer=1 or t2.hq_type = '国内仓'
+);
+
+alter table dc_base_stock_record_effective rename dc_base_stock_record_effectiveTemp; 
+alter table dc_base_stock_record_effective_temp rename dc_base_stock_record_effective; 
+alter table dc_base_stock_record_effectiveTemp rename dc_base_stock_record_effective_temp; 
+truncate table dc_base_stock_record_effective_temp;  ", commandTimeout: 0);
+
                 _connection.Execute(@" -- 刷新 库存表的索引字段
 update dc_base_stock set bailun_sku_warehouse_code=concat(bailun_sku,warehouse_code);
 update dc_base_stock_record set bailun_sku_warehouse_code=concat(bailun_sku,warehouse_code);  
-update dc_base_stock as t1,
(select bailun_sku_warehouse_code,min(stock_time) as 'min_time' from dc_base_stock_record GROUP BY bailun_sku_warehouse_code) as t2
+update dc_base_stock_record_effective set bailun_sku_warehouse_code=concat(bailun_sku,warehouse_code);  
+update dc_base_stock as t1,
(select bailun_sku_warehouse_code,min(stock_time) as 'min_time' from dc_base_stock_record_effective GROUP BY bailun_sku_warehouse_code) as t2
 set t1.first_inbound_date = t2.min_time
 where t1.bailun_sku_warehouse_code = t2.bailun_sku_warehouse_code;", commandTimeout: 0);
             }