重新调整原料出库的数据统计

Bailun.DC.Services/FinanceReportServices.cs

@@ -2625,7 +2625,13 @@ group by currency";
 
                         foreach (var item in objRefundIssued_n)
                         {
+                            var listShippingStatusCurrency = listShippingStatus.Where(a => a.currency == item.currency);
+
                             //主营业务收入 - 销售折扣与折让
+                            //退款金额小于等于发货金额，冲营业收入
+                            var amount_incoming = listShippingStatusCurrency.Where(a => a.sales_amount_sku >= a.amount_return).Sum(a => a.amount_return);
+                            //退款金额大于发货金额，发货金额冲预收
+                            var amount
 
 
                             //预收账款

Bailun.DC.SkuDailyPurchaseAndSales/Program.cs

@@ -7,28 +7,28 @@ namespace Bailun.DC.SkuDailyPurchaseAndSales
 {
     class Program
     {
-        //static async Task Main(string[] args)
-        //{
-        //    Console.WriteLine("进入保存每日采购数和售出数");
-        //    var builder = new HostBuilder().ConfigureServices((hostContext, services) =>
-        //    {
-        //        services.AddHostedService<Services>();
-        //    });
-
-        //    await builder.RunConsoleAsync();
-        //}
-
-        static void Main(string[] args)
+        static async Task Main(string[] args)
         {
-            var start = DateTime.Parse("2019-09-01");
-            while (start < DateTime.Now)
+            Console.WriteLine("进入保存每日采购数和售出数");
+            var builder = new HostBuilder().ConfigureServices((hostContext, services) =>
             {
-                Console.WriteLine(start.ToString("yyyy-MM-dd"));
-                new Services().Init(start, start.AddDays(1));
-                start = start.AddDays(1);
-            }
+                services.AddHostedService<Services>();
+            });
 
+            await builder.RunConsoleAsync();
         }
 
+        //static void Main(string[] args)
+        //{
+        //    var start = DateTime.Parse("2019-09-01");
+        //    while (start < DateTime.Now)
+        //    {
+        //        Console.WriteLine(start.ToString("yyyy-MM-dd"));
+        //        new Services().Init(start, start.AddDays(1));
+        //        start = start.AddDays(1);
+        //    }
+
+        //}
+
     }
 }

Bailun.DC.SkuDailyPurchaseAndSales/Services.cs

@@ -258,16 +258,12 @@ namespace Bailun.DC.SkuDailyPurchaseAndSales
                 var objSemiPutin = 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
-                        left join (select t1.sku_code,t1.price from dc_semi_supplier_offer_log t1
-                        inner join (select sku_code,max(update_time) update_time from dc_semi_supplier_offer_log where  sku_code in (select sku_code from dc_semi_stock_log where update_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and update_time<'{end.ToString("yyyy-MM-dd HH:mm:ss")}' and log_type_id=3) group by sku_code,update_time) t2 on t1.sku_code=t2.sku_code and t1.update_time=t2.update_time) t2 on t1.sku_code=t2.sku_code
-                        where t1.update_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and t1.update_time<'{end.ToString("yyyy-MM-dd HH:mm:ss")}' and log_type_id=3";
+                sql = $@"select t1.material_code as bailun_sku,t1.warehouse_name as warehouse_code,t1.warehouse_name as warehouse_name,t1.stock as count,(t1.stock*t1.new_price) amount from dc_semi_stock_report t1 
+                        where t1.stock_type=3 and t1.create_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and t1.create_time<'{end.ToString("yyyy-MM-dd HH:mm:ss")}'";
                 var objSemiProduction = 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
-                        left join (select t1.sku_code,t1.price from dc_semi_supplier_offer_log t1
-                        inner join (select sku_code,max(update_time) update_time from dc_semi_supplier_offer_log where  sku_code in (select sku_code from dc_semi_stock_log where update_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and update_time<'{end.ToString("yyyy-MM-dd HH:mm:ss")}' and log_type_id=5) group by sku_code,update_time) t2 on t1.sku_code=t2.sku_code and t1.update_time=t2.update_time) t2 on t1.sku_code=t2.sku_code
-                        where t1.update_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and t1.update_time<'{end.ToString("yyyy-MM-dd HH:mm:ss")}' and log_type_id=5";
+                sql = $@"select t1.material_code as bailun_sku,t1.warehouse_name as warehouse_code,t1.warehouse_name as warehouse_name,t1.stock as count,(t1.stock*t1.new_price) amount from dc_semi_stock_report t1 
+                        where t1.stock_type=5 and t1.create_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and t1.create_time<'{end.ToString("yyyy-MM-dd HH:mm:ss")}'";
                 var objSemiCancelProduction = cn.Query<Models.mSkuCount>(sql, null, null, true, 2 * 60).AsList();  //取消生产
 
                 //生产消耗-取消生产