解决半成品进销存统计数据有误差的问题

Bailun.DC.DailySemiPurchaseSellStock/Services.cs

@@ -47,7 +47,7 @@ namespace Bailun.DC.DailySemiPurchaseSellStock
 
 
         public void Init(DateTime day, int count = 0)
-        {
+         {
             try
             {
                 var sql = "";
@@ -123,10 +123,10 @@ namespace Bailun.DC.DailySemiPurchaseSellStock
                     }
                     Console.WriteLine("在途库存done," + DateTime.Now);
 
-                    temparr.AddRange(objPreStock.Select(p => new Tuple<string, string, string>(p.bailun_sku.ToUpper(), p.warehouse_code.ToUpper(), p.warehouse_name)));
-                    temparr.AddRange(objStock.Select(p => new Tuple<string, string, string>(p.bailun_sku.ToUpper(), p.warehouse_code.ToUpper(), p.warehouse_name)));
-                    temparr.AddRange(objPreOnWay.Select(p => new Tuple<string, string, string>(p.bailun_sku.ToUpper(), p.warehouse_code.ToUpper(), p.warehouse_name)));
-                    temparr.AddRange(objOnWay.Select(p => new Tuple<string, string, string>(p.bailun_sku.ToUpper(), p.warehouse_code.ToUpper(), p.warehouse_name)));
+                    temparr.AddRange(objPreStock.Select(p => new Tuple<string, string, string>(p.bailun_sku.ToUpper(), p.warehouse_code, p.warehouse_name)));
+                    temparr.AddRange(objStock.Select(p => new Tuple<string, string, string>(p.bailun_sku.ToUpper(), p.warehouse_code, p.warehouse_name)));
+                    temparr.AddRange(objPreOnWay.Select(p => new Tuple<string, string, string>(p.bailun_sku.ToUpper(), p.warehouse_code, p.warehouse_name)));
+                    temparr.AddRange(objOnWay.Select(p => new Tuple<string, string, string>(p.bailun_sku.ToUpper(), p.warehouse_code, p.warehouse_name)));
 
                     temparr = temparr.Distinct().ToList();
                 }
@@ -151,32 +151,32 @@ namespace Bailun.DC.DailySemiPurchaseSellStock
                         start_stock_count = 0,
                     };
 
-                    var p = objPreStock.Where(a => a.bailun_sku.ToUpper() == item.Item1 && a.warehouse_code.ToUpper() == item.Item2).FirstOrDefault();
-                    if (p != null)
+                    var p = objPreStock.Where(a => a.bailun_sku.ToUpper() == item.Item1 && a.warehouse_name == item.Item3);
+                    if (p.Count()>0)
                     {
-                        m.start_stock_count = p.count;
-                        m.start_stock_amount = p.amount;
+                        m.start_stock_count = p.Sum(a=>a.count);
+                        m.start_stock_amount = p.Sum(a=>a.amount);
                     }
 
-                    p = objStock.Where(a => a.bailun_sku.ToUpper() == item.Item1 && a.warehouse_code.ToUpper() == item.Item2).FirstOrDefault();
-                    if (p != null)
+                    p = objStock.Where(a => a.bailun_sku.ToUpper() == item.Item1 && a.warehouse_name == item.Item3);
+                    if (p.Count()>0)
                     {
-                        m.end_stock_count = p.count;
-                        m.end_stock_amount = p.amount;
+                        m.end_stock_count = p.Sum(a=>a.count);
+                        m.end_stock_amount = p.Sum(a=>a.amount);
                     }
 
-                    p = objPreOnWay.Where(a => a.bailun_sku.ToUpper() == item.Item1 && a.warehouse_code.ToUpper() == item.Item2).FirstOrDefault();
-                    if (p != null)
+                    p = objPreOnWay.Where(a => a.bailun_sku.ToUpper() == item.Item1 && a.warehouse_name == item.Item3);
+                    if (p.Count()>0)
                     {
-                        m.start_onway_count = p.count;
-                        m.start_onway_amount = p.amount;
+                        m.start_onway_count = p.Sum(a=>a.count);
+                        m.start_onway_amount = p.Sum(a=>a.amount);
                     }
 
-                    p = objOnWay.Where(a => a.bailun_sku.ToUpper() == item.Item1 && a.warehouse_code.ToUpper() == item.Item2).FirstOrDefault();
-                    if (p != null)
+                    p = objOnWay.Where(a => a.bailun_sku.ToUpper() == item.Item1 && a.warehouse_name == item.Item3);
+                    if (p.Count()>0)
                     {
-                        m.end_onway_count = p.count;
-                        m.end_onway_amount = p.amount;
+                        m.end_onway_count = p.Sum(a=>a.count);
+                        m.end_onway_amount = p.Sum(a=>a.amount);
                     }
 
                     list.Add(m);
@@ -251,7 +251,7 @@ namespace Bailun.DC.DailySemiPurchaseSellStock
         /// <summary>
         /// 数量
         /// </summary>
-        public int count { get; set; }
+        public decimal count { get; set; }
 
         /// <summary>
         /// 金额

Bailun.DC.Models/dc_semi_daily_purchase_sell_stock.cs

@@ -43,7 +43,7 @@ namespace Bailun.DC.Models
         /// <summary>
         /// 期初库存数
         /// </summary>
-        public int start_stock_count { get; set; }
+        public decimal start_stock_count { get; set; }
 
         /// <summary>
         /// 期初库存金额
@@ -53,7 +53,7 @@ namespace Bailun.DC.Models
         /// <summary>
         /// 期初在途数量
         /// </summary>
-        public int start_onway_count { get; set; }
+        public decimal start_onway_count { get; set; }
 
         /// <summary>
         /// 期初在途金额
@@ -63,7 +63,7 @@ namespace Bailun.DC.Models
         /// <summary>
         /// 期末库存数量
         /// </summary>
-        public int end_stock_count { get; set; }
+        public decimal end_stock_count { get; set; }
 
         /// <summary>
         /// 期末库存金额
@@ -73,7 +73,7 @@ namespace Bailun.DC.Models
         /// <summary>
         /// 期末在途数
         /// </summary>
-        public int end_onway_count { get; set; }
+        public decimal end_onway_count { get; set; }
 
         /// <summary>
         /// 期末在途金额
@@ -88,7 +88,7 @@ namespace Bailun.DC.Models
         /// <summary>
         /// 在库差异数量
         /// </summary>
-        public int? diff_stock_count { get; set; }
+        public decimal? diff_stock_count { get; set; }
 
         /// <summary>
         /// 在库差异金额
@@ -98,7 +98,7 @@ namespace Bailun.DC.Models
         /// <summary>
         /// 在途差异数量
         /// </summary>
-        public int? diff_onway_count { get; set; }
+        public decimal? diff_onway_count { get; set; }
 
         /// <summary>
         /// 在途差异金额
@@ -108,12 +108,12 @@ namespace Bailun.DC.Models
         /// <summary>
         /// 总数量
         /// </summary>
-        public int count { get; set; }
+        public decimal count { get; set; }
 
         /// <summary>
         /// 总金额
         /// </summary>
-        public int amount { get; set; }
+        public decimal amount { get; set; }
 
     }
 }