增加原料统计

Bailun.DC.SkuDailyPurchaseAndSales/Services.cs

@@ -230,14 +230,14 @@ namespace Bailun.DC.SkuDailyPurchaseAndSales
                 #region 原料
 
                 //采购
-                sql = $@"select quantity_purchase as count,sum(quantity_purchase*unit_price) as amount,bailun_sku,warehouse_from_code as warehouse_code,warehouse_from_name as warehouse_name from dc_semi_purchase_info where create_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and create_time<'{end.ToString("yyyy-MM-dd HH:mm:ss")}' and `status`>-1
+                sql = $@"select sum(quantity_purchase) as count,sum(quantity_purchase*unit_price) as amount,bailun_sku,warehouse_from_code as warehouse_code,warehouse_from_name as warehouse_name from dc_semi_purchase_info where create_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and create_time<'{end.ToString("yyyy-MM-dd HH:mm:ss")}' and `status`>-1
                         group by bailun_sku,warehouse_from_code";
                 var objSemiPurchase = cn.Query<Models.mSkuCount>(sql, null, null, true, 2 * 60).AsList();
 
 
                 //卖出
-                sql = $@"select ";
-
+                sql = $@"select sum(sku_quantity) as count,sum(sku_quantity*sku_unit_price) as amount,sku as bailun_sku,warehouse_id as warehouse_code,warehouse_name from dc_semi_order where state!=1 and create_date>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and create_date<'{end.ToString("yyyy-MM-dd HH:mm:ss")}' group by sku,warehouse_id";
+                var objSemiSales = cn.Query<Models.mSkuCount>(sql, null, null, true, 2 * 60).AsList();
 
                 //入库
                 sql = $@"select t1.sku_code as bailun_sku,t1.warehouse_id as warehouse_code,t1.warehouse_name as warehouse_name,t1.log_quantity as count,(t1.log_quantity*t2.price) amount from dc_semi_stock_log t1
@@ -283,6 +283,12 @@ namespace Bailun.DC.SkuDailyPurchaseAndSales
                     a.warehouse_name
                 }).ToList();
 
+                listSkuWarehouse.AddRange(objSemiSales.Select(a => new {
+                    a.bailun_sku,
+                    a.warehouse_code,
+                    a.warehouse_name
+                }));
+
                 listSkuWarehouse.AddRange(objSemiPutin.Select(a => new
                 {
                     a.bailun_sku,
@@ -316,11 +322,11 @@ namespace Bailun.DC.SkuDailyPurchaseAndSales
                 var listSemi = new List<dc_daily_purchase_sales>();
                 foreach (var item in tempList)
                 {
-                    sql = $@"select t1.warehouse_code,t2.warehouse_name,t1.bailun_sku,t1.usable_stock,(t1.usable_stock*t3.unit_price) as stockAmount from dc_base_stock t1 left join dc_base_warehouse t2 on t1.warehouse_code=t2.warehouse_code left join dc_base_sku t3 on t1.bailun_sku=t3.bailun_sku where t1.bailun_sku='{item.bailun_sku}' and t1.warehouse_code='{item.warehouse_code}'";
+                    sql = $@"select t1.warehouse_id as warehouse_code,t1.warehouse_name as warehouse_name,t1.sku_code as bailun_sku,t1.final_stock as usable_stock,(t1.final_stock*t2.price) as stockAmount from dc_semi_stock_log t1 join dc_semi_supplier_offer_log t2 on t1.sku_code=t2.sku_code where t1.sku_code='{item.bailun_sku}' and t1.warehouse_id='{item.warehouse_code}' order by t2.update_time desc";
                     var objStock = cn.QueryFirstOrDefault<Models.mStock>(sql, null, null, 5 * 60);
 
 
-                    sql = $@"select t1.warehouse_code,t1.bailun_sku,t1.usable_stock,(t1.usable_stock*t1.unit_price) as stockAmount from dc_daily_stock t1 where t1.record_time='{start.AddDays(-1).ToString("yyyy-MM-dd")}' and t1.bailun_sku='{item.bailun_sku}' and t1.warehouse_code='{item.warehouse_code}'";
+                    sql = $@"select t1.warehouse_id warehouse_code,t1.warehouse_name,t1.sku_code bailun_sku,t1.stock_quantity usable_stock,(t1.stock_quantity*t1.price) as stockAmount from dc_semi_daily_stock t1 where t1.day='{start.AddDays(-1).ToString("yyyy-MM-dd")}' and t1.sku_code='{item.bailun_sku}' and t1.warehouse_id='{item.warehouse_code}'";
                     var objPreStock = cn.QueryFirstOrDefault<Models.mStock>(sql, null, null, 5 * 60);
 
                     var m = new dc_daily_purchase_sales
@@ -343,7 +349,7 @@ namespace Bailun.DC.SkuDailyPurchaseAndSales
                         diff_putin_count = 0,
                         stock_start = 0,
                         stockamount_start = 0,
-                        isfinish = 1,
+                        isfinish = 0,
                     };
 
                     //期末