明细

Bailun.DC.Services/WebApiService/FinanceService.cs

@@ -1183,8 +1183,11 @@ AND financecategoryname LIKE '{financecategory.Replace("产品", "")}%' ";
                 sumData = SimpleCRUD.Query<MonthPlatformProfitDto>(sqlSum, paramSum, GlobalConfig.ConnectionString_DW).FirstOrDefault();
             }));
             Task.WaitAll(tasks.ToArray());
-            sumData.Currency = "合计";
-            pageData.Add(sumData);
+            if (pageData.Count > 0)
+            {
+                sumData.Currency = "合计";
+                pageData.Add(sumData);
+            }
             result = result.ToPageResult(query.PageIndex, sumData.Total, pageData);
             return new CommonApiResponseDto<PageResult<List<MonthPlatformProfitDto>>> { Data = result };
         }
@@ -2155,6 +2158,42 @@ AND platform_type = '{item.platform_type}' AND financecategoryname = '{item.fina
                 return data;
             }
         }
+        public object GetMonthStockWeightingDetail(string sku, string month)
+        {
+            var sqlPurchase = @"SELECT t1.purchase_id,t1.sku_name,t1.bailun_sku, t1.count,t2.price,t1.create_time,(t1.count*t2.price) total_price FROM dc_base_purchase_inbound AS t1
+                         INNER JOIN dc_base_purchase AS t2 ON t2.purchase_id = t1.purchase_id AND t2.bailun_sku = t1.bailun_sku
+                         WHERE t1.bailun_sku = @sku AND DATE(t1.create_time)>= @start AND DATE(t1.create_time)< @end
+                          AND t1.`status` = 1";
+            var sqlStock = @"SELECT temp.bailun_sku,
+                          CASE WHEN stock_flow.on_hand_stock*temp.price>0 THEN stock_flow.on_hand_stock*temp.price ELSE 0 END AS total_price,
+                          CASE WHEN stock_flow.on_hand_stock>0 THEN stock_flow.on_hand_stock ELSE 0 END AS on_hand_stock  
+                          FROM(SELECT t1.bailun_sku,t1.count,t2.price FROM dc_base_purchase_inbound AS t1
+                          INNER JOIN dc_base_purchase AS t2 ON t2.purchase_id = t1.purchase_id AND t2.bailun_sku = t1.bailun_sku
+                          WHERE DATE(t1.create_time)= @purchaseTime AND t1.`status` = 1 AND t1.bailun_sku = @sku ) AS temp
+                          LEFT JOIN(
+                          SELECT bailun_sku, SUM(on_hand_stock) on_hand_stock  FROM(
+                              SELECT bailun_sku, on_hand_stock
+                              FROM dc_base_wms_stock_flow WHERE 1 = 1 AND DATE(order_creation_time) = @stockTime AND warehouse_code IN('GZBLZZG', 'GZBLWH')
+                              and bailun_sku = 'N-8ML-G1341'
+                              ORDER BY order_creation_time DESC limit 1 )AS temp 
+                          )AS stock_flow ON stock_flow.bailun_sku = temp.bailun_sku";
+            var sqlPurchaseParam = new DynamicParameters();
+            var sqlStockParam = new DynamicParameters();
+            sqlPurchaseParam.Add("sku", sku);
+            sqlStockParam.Add("sku", sku);
+            var time = Convert.ToDateTime(month);
+            var timeEnd = time.AddMonths(1);
+            var timeLast = time.AddDays(-1);
+            sqlPurchaseParam.Add("start", time);
+            sqlPurchaseParam.Add("end", timeEnd);
+
+            sqlStockParam.Add("purchaseTime", timeLast);
+            sqlStockParam.Add("stockTime", timeLast);
+            var purchase = SimpleCRUD.Query<dynamic>(sqlPurchase, sqlPurchaseParam, GlobalConfig.ConnectionString).ToList();
+            var stock = SimpleCRUD.Query<GetMonthStockWeightingSummaryDto>(sqlStock, sqlStockParam, GlobalConfig.ConnectionString).ToList();
+            //var stock = GetMonthEndInventory(new List<string> { sku }, timeLast);
+            return (purchase, stock.Count > 0 ? new List<GetMonthStockWeightingSummaryDto> { stock.FirstOrDefault() } : new List<GetMonthStockWeightingSummaryDto>());
+        }
         #endregion
     }
 }

Bailun.DC.WebApi/Controllers/FinanceController.cs

@@ -668,6 +668,9 @@ namespace Bailun.DC.WebApi.Controllers
             return File(ms, "text/csv", "存货计价.csv");
 
         }
+        [HttpGet("getMonthStockWeightingDetail")]
+        public object GetMonthStockWeightingDetail(string sku, string month)
+            => new FinanceService().GetMonthStockWeightingDetail(sku, month);
         #endregion
     }
 }