From 74a4dbfebd891573e916cdb3e4ce7b0c7edf0a8e Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期二, 02 十二月 2025 17:42:00 +0800
Subject: [PATCH] 代码提交
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/StockInfoService.cs | 573 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 519 insertions(+), 54 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/StockInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/StockInfoService.cs"
index 05f4ba4..ea87b9d 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/StockInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/StockInfoService.cs"
@@ -1,29 +1,74 @@
锘縰sing AngleSharp.Dom;
+using Dm;
using Mapster;
using Masuit.Tools;
+using NewLife.Reflection;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
using SqlSugar;
using System.Collections;
using System.Collections.Generic;
using System.Drawing.Printing;
using System.Linq.Expressions;
using System.Threading.Tasks;
+using System.Xml.Linq;
using WIDESEA_Cache;
using WIDESEA_Common;
using WIDESEA_Core;
+using WIDESEA_Core.Enums;
+using WIDESEA_Core.Helper;
+using WIDESEA_DTO;
+using WIDESEA_DTO.Basic;
+using WIDESEA_DTO.Order;
+using WIDESEA_DTO.Stock;
+using WIDESEA_DTO.WMS;
+using WIDESEA_IOrderRepository;
+using WIDESEA_IOrderServices;
+using WIDESEA_Model.Models;
+using WIDESEA_Model.Models.Order;
+using WIDESEA_OrderRepository;
+using WIDESEA_StorageTaskRepository;
+using JsonSerializer = System.Text.Json.JsonSerializer;
namespace WIDESEA_StorageBasicService;
public class StockInfoService : ServiceBase<DtStockInfo, IStockInfoRepository>, IStockInfoService
{
-
- private readonly ISimpleCacheService _simpleCacheService;
private readonly ILocationStatusChangeRecordRepository _locationStatusChangeRecordRepository;
- public StockInfoService(IStockInfoRepository BaseDal, ISimpleCacheService simpleCacheService, ILocationStatusChangeRecordRepository locationStatusChangeRecordRepository) : base(BaseDal)
- {
- _simpleCacheService = simpleCacheService;
- _locationStatusChangeRecordRepository = locationStatusChangeRecordRepository;
- }
+ private readonly IDt_InboundOrderRepository _inboundOrderRepository;
+ private readonly IDt_InboundOrderService _inboundOrderService;
+ private readonly IUnitOfWorkManage _unitOfWorkManage;
+ private readonly IStockInfoDetailRepository _stockInfoDetailRepository;
+ private readonly IDt_TaskService _taskService;
+ private readonly ILocationInfoRepository _locationRepository;
+ private readonly IDt_TaskRepository _taskRepository;
+ private readonly IDt_Task_HtyRepository _task_HtyRepository;
+ private readonly IDt_OrderOutDetailsRepository _outDetailsRepository;
+ public StockInfoService(IStockInfoRepository BaseDal,
+ ILocationStatusChangeRecordRepository locationStatusChangeRecordRepository,
+ IDt_InboundOrderRepository inboundOrderRepository,
+ IUnitOfWorkManage unitOfWorkManage,
+ IStockInfoDetailRepository stockInfoDetailRepository,
+ IDt_TaskService taskService,
+ ILocationInfoRepository locationRepository,
+ IDt_TaskRepository taskRepository,
+ IDt_OrderOutDetailsRepository outDetailsRepository,
+ IDt_Task_HtyRepository task_HtyRepository,
+ IDt_InboundOrderService inboundOrderService) : base(BaseDal)
+ {
+ _locationStatusChangeRecordRepository = locationStatusChangeRecordRepository;
+ _inboundOrderRepository = inboundOrderRepository;
+ _unitOfWorkManage = unitOfWorkManage;
+ _stockInfoDetailRepository = stockInfoDetailRepository;
+ _taskService = taskService;
+ _locationRepository = locationRepository;
+ _taskRepository = taskRepository;
+ _outDetailsRepository = outDetailsRepository;
+ _task_HtyRepository = task_HtyRepository;
+ _inboundOrderService = inboundOrderService;
+ }
+ #region 鏂规硶閲嶅啓
/// <summary>
/// 鍒嗛〉
/// </summary>
@@ -33,7 +78,7 @@
{
string wheres = ValidatePageOptions(options);
//鑾峰彇鎺掑簭瀛楁
- Dictionary<string, SqlSugar.OrderByType> orderbyDic = GetPageDataSort(options, TProperties);
+ Dictionary<string, OrderByType> orderbyDic = GetPageDataSort(options, TProperties);
List<OrderByModel> orderByModels = new List<OrderByModel>();
foreach (var item in orderbyDic)
{
@@ -59,21 +104,31 @@
}
Expression<Func<DtStockInfo, bool>> locationStatus = null;
- Expression<Func<DtStockInfo, bool>> roadwayNo = null;
+ Expression<Func<DtStockInfo, bool>> floor = null;
+ Expression<Func<DtStockInfo, bool>> areaId = null;
Expression<Func<DtStockInfo, bool>> materielCode = null;
+ Expression<Func<DtStockInfo, bool>> materielName = null;
foreach (var item in searchParametersList)
{
if (item.Name.Contains("locationStatus"))
{
locationStatus = x => x.LocationInfo.LocationStatus == Convert.ToInt32(item.Value);
}
- else if (item.Name.Contains("roadwayNo"))
+ else if (item.Name.Contains("floor"))
{
- roadwayNo = x => x.LocationInfo.RoadwayNo.Contains(item.Value);
+ floor = x => x.LocationInfo.Floor.Contains(item.Value);
+ }
+ else if (item.Name.Contains("areaId"))
+ {
+ areaId = x => x.LocationInfo.AreaId == Convert.ToInt32(item.Value);
}
else if (item.Name.Contains("materielCode"))
{
materielCode = x => x.StockInfoDetails.Any(d => d.MaterielCode.Contains(item.Value));
+ }
+ else if (item.Name.Contains("materielName"))
+ {
+ materielName = x => x.StockInfoDetails.Any(d => d.MaterielName.Contains(item.Value));
}
}
//.IncludesAllFirstLayer()
@@ -82,65 +137,475 @@
.Includes(x => x.LocationInfo)
.WhereIF(!wheres.IsNullOrEmpty(), wheres)
.WhereIF(locationStatus != null, locationStatus)
- .WhereIF(roadwayNo != null, roadwayNo)
+ .WhereIF(floor != null, floor)
+ .WhereIF(areaId != null, areaId)
.WhereIF(materielCode != null, materielCode)
+ .WhereIF(materielName != null, materielName)
.OrderBy(orderByModels)
.ToPageList(options.Page, options.Rows, ref totalCount);
new PageGridData<DtStockInfo>(totalCount, data);
return new PageGridData<DtStockInfo>(totalCount, data);
}
- /// <summary>
- /// 鎵归噺鍒犻櫎
- /// </summary>
- /// <param name="keys"></param>
- /// <returns></returns>
- public override WebResponseContent DeleteData(object[] keys)
+ public override WebResponseContent UpdateData(SaveModel saveModel)
{
- try
+ var remark = saveModel.MainData["remark"].ToString();
+ var palletCode = saveModel.MainData["palletCode"].ToString();
+ List<DtStockInfoDetail> details = DeserializeList<DtStockInfoDetail>(saveModel.DetailData);
+ if (remark == "璋冩嫧鍑哄簱")
{
- List<DtStockInfo_Hty> stockInfos = new List<DtStockInfo_Hty>();
- List<DtLocationInfo> locationInfos = new List<DtLocationInfo>();
-
- foreach (var item in keys)
- {
- var stock = BaseDal.QueryFirstNavAsync(x => x.Id == item.ObjToInt()).Result;
- var stockHty = stock.Adapt<DtStockInfo_Hty>();
- stockInfos.Add(stockHty);
-
- var location = SqlSugarHelper.DbWMS.Queryable<DtLocationInfo>().FirstAsync(x => x.Id == stock.LocationId).Result;
- var lastStatus = location.LocationStatus;
- location.LocationStatus = (int)LocationEnum.Free;
- locationInfos.Add(location);
- _locationStatusChangeRecordRepository.AddLocationStatusChangeRecord(location, lastStatus, (int)StatusChangeTypeEnum.ManualOperation, 0);
- }
- var hty = BaseDal.Db.InsertNav(stockInfos)
- .Include(x => x.StockInfoDetails)
- .ExecuteCommand();
-
- var locationd = SqlSugarHelper.DbWMS.Updateable(locationInfos).ExecuteCommandHasChange();
- return base.DeleteData(keys);
+ return _taskService.HandAllocateOutBoundTaskAsync(details).Result;
}
- catch (Exception ex)
+ else if (remark == "鍏朵粬鍑哄簱")
{
- return WebResponseContent.Instance.Error(ex.Message);
+ return _taskService.OtherOutBoundTaskAsync(details).Result;
+ }
+ else
+ {
+ return WebResponseContent.Instance.Error("绯荤粺寮傚父");
}
}
-
- // 鏍规嵁浼犲叆搴撳瓨绫诲瀷鑾峰彇涓嶅悓宸烽亾鐨勫簱瀛�
- public async Task<Dictionary<string, int>> GetLocationByStockType(bool stockType, string areaCode)
+ public List<T> DeserializeList<T>(List<Dictionary<string, object>> rawData)
{
- var stockInfos = await BaseDal.Db.Queryable<DtStockInfo>().Where(x => x.IsFull == stockType && x.AreaCode == areaCode)
- .Includes(x => x.LocationInfo).ToListAsync();
+ if (rawData == null) return new List<T>();
+ var processedData = rawData.Select(dict =>
+ {
+ var newDict = new Dictionary<string, object>();
+ foreach (var kvp in dict)
+ {
+ var newKey = char.ToUpper(kvp.Key[0]) + kvp.Key.Substring(1);
+ newDict[newKey] = kvp.Value;
+ }
+ return newDict;
+ }).ToList();
+ var json = JsonSerializer.Serialize(processedData);
+ return JsonSerializer.Deserialize<List<T>>(json);
+ }
- var result = stockInfos
- .GroupBy(x => x.LocationInfo.RoadwayNo)
- .ToDictionary(x => x.Key, x => x.Count());
+ public List<DtLocationInfo> GetStockLocations(List<DtLocationInfo>? locations)
+ {
+ List<DtLocationInfo> locationsNew = new List<DtLocationInfo>();
+ foreach (var item in locations)
+ {
+ if (item.AreaId == 1)
+ {
+ if (item.Depth == 2)
+ {
+ var locationLateral = _locationRepository.QueryFirst(x => x.Row == 1 && x.Column == item.Column && x.Layer == item.Layer);
+
+ if (locationLateral.LocationStatus == (int)LocationEnum.Lock && locationLateral.EnalbeStatus == 1)
+ {
+ locationsNew.Remove(item);
+ continue;
+ }
+ }
+ locationsNew.Add(item);
+ }
+ else if (item.AreaId == 2 || item.AreaId == 7)
+ {
+ var locationLateral = _locationRepository.QueryData(x => x.Row == item.Row && x.Column > item.Column && x.Remark == item.Remark);
+
+ foreach (var Lateral in locationLateral)
+ {
+ if (Lateral.LocationStatus == (int)LocationEnum.Lock && Lateral.EnalbeStatus == 1)
+ {
+ locationsNew.Remove(item);
+ continue;
+ }
+ locationsNew.Add(item);
+ }
+ }
+
+ else if (item.AreaId == 5 || item.AreaId == 6)
+ {
+ var locationLateral = _locationRepository.QueryData(x => x.Row == item.Row && x.Column < item.Column && x.Remark == item.Remark);
+
+ foreach (var lateral in locationLateral)
+ {
+ if (lateral.LocationStatus == (int)LocationEnum.Lock && lateral.EnalbeStatus == 1)
+ {
+ locationsNew.Remove(item);
+ continue;
+ }
+ locationsNew.Add(item);
+ }
+ }
+ }
+ return locationsNew;
+ }
+
+ #endregion
+
+ #region 搴撳瓨瑙嗗浘
+ public List<StockSelectViewDTO> GetStockSelectViews(GetStockSelectViewDto viewDto)
+ {
+ var stocks = BaseDal.Db.Queryable<DtStockInfo>()
+ .Includes(x => x.StockInfoDetails)
+ .Includes(x => x.LocationInfo)
+ .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable)
+ .Where(x => x.StockInfoDetails.Any(d => d.MaterielCode == viewDto.materielCode && d.Quantity > 0 && d.Quantity > d.OutboundQuantity)).ToList().OrderBy(x => x.CreateDate);
+
+ List<DtLocationInfo> locationInfos = new List<DtLocationInfo>();
+ List<DtStockInfo> stockNew = new List<DtStockInfo>();
+ if (stocks != null || stocks.Count() > 0)
+ {
+ var locations = stocks.Select(s => s.LocationInfo).ToList();
+ locationInfos = GetStockLocations(locations).Distinct().ToList();
+ stockNew = stocks.Where(s => s.LocationInfo != null && locationInfos.Contains(s.LocationInfo)).ToList();
+ }
+
+ var result = stockNew.Select(s => new StockSelectViewDTO
+ {
+ MaterielCode = s.StockInfoDetails
+ .FirstOrDefault(d => d.MaterielCode == viewDto.materielCode)?.MaterielCode ?? string.Empty,
+
+ MaterielName = s.StockInfoDetails
+ .FirstOrDefault(d => d.MaterielCode == viewDto.materielCode)?.MaterielName ?? string.Empty,
+
+ UseableQuantity = s.StockInfoDetails
+ .Where(d => d.MaterielCode == viewDto.materielCode && d.Quantity > 0 && d.Quantity > d.OutboundQuantity)
+ .Sum(d => (decimal?)d.Quantity - d.OutboundQuantity) ?? 0, // 澶勭悊绌哄�兼儏鍐�
+
+ PalletCode = s.PalletCode ?? string.Empty,
+ LocationCode = s.LocationInfo?.LocationCode ?? string.Empty
+ }).ToList();
+
return result;
}
- //public override WebResponseContent UpdateData(DtStockInfo entity)
- //{
- // return base.UpdateData(entity);
- //}
+ public WebResponseContent GetStockView(GetStockSelectViewDto viewDto)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ Expression<Func<DtStockInfoDetail, bool>> expressionOrder = x => true;
+ if (!string.IsNullOrEmpty(viewDto.materielCode))
+ {
+ expressionOrder = x => x.MaterielCode.Contains(viewDto.materielCode);
+ }
+ int count = 0;
+ count = BaseDal.Db.Queryable<DtStockInfo>()
+ .Includes(x => x.StockInfoDetails)
+ .Includes(x => x.LocationInfo)
+ .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable)
+ .WhereIF(!viewDto.materielCode.IsNullOrEmpty(), x => x.StockInfoDetails.Any(d => d.MaterielCode == viewDto.materielCode && d.Quantity > 0)).ToList().OrderBy(x => x.CreateDate).Count();
+
+
+ int maxPage = Convert.ToInt32(Math.Ceiling(count / 10.0));
+ if (viewDto.pageNo <= maxPage)
+ {
+ var stocks = BaseDal.Db.Queryable<DtStockInfo>()
+ .Includes(x => x.StockInfoDetails)
+ .Includes(x => x.LocationInfo)
+ .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock
+ && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable)
+ .WhereIF(!viewDto.materielCode.IsNullOrEmpty(),
+ x => x.StockInfoDetails.Any(d => d.MaterielCode == viewDto.materielCode && d.Quantity > 0))
+ .Select(x => new DtStockInfo
+ {
+ Id = x.Id,
+ PalletCode = x.PalletCode,
+ LocationCode = x.LocationCode,
+ StockInfoDetails = x.StockInfoDetails
+ .OrderByDescending(d => d.CreateDate)
+ .Take(1)
+ .ToList(),
+ LocationInfo = x.LocationInfo
+ })
+ .OrderBy(x => x.CreateDate)
+ .ToList();
+
+ List<DtLocationInfo> locationInfos = new List<DtLocationInfo>();
+ List<DtStockInfo> stockNew = new List<DtStockInfo>();
+ if (stocks != null || stocks.Count() > 0)
+ {
+ var locations = stocks.Select(s => s.LocationInfo).ToList();
+ locationInfos = GetStockLocations(locations).Distinct().ToList();
+ stockNew = stocks.Where(s => s.LocationInfo != null && locationInfos.Contains(s.LocationInfo)).ToList();
+ }
+
+ var result = stockNew.Skip((maxPage - 1) * 10).Take(10).Select(s => new StockSelectViewDTO
+ {
+ Id = s.Id,
+
+ MaterielCode = s.StockInfoDetails
+ .FirstOrDefault()?.MaterielCode ?? string.Empty,
+
+ MaterielName = s.StockInfoDetails
+ .FirstOrDefault()?.MaterielName ?? string.Empty,
+
+ Quantity = s.StockInfoDetails
+ .FirstOrDefault()?.Quantity ?? 0, // 澶勭悊绌哄�兼儏鍐�
+
+ PalletCode = s.PalletCode ?? string.Empty,
+
+ LocationCode = s.LocationInfo?.LocationCode ?? string.Empty
+ }).ToList();
+
+ content = WebResponseContent.Instance.OK(data: result);
+ }
+ else
+ {
+ var stocks = BaseDal.Db.Queryable<DtStockInfo>()
+ .Includes(x => x.StockInfoDetails)
+ .Includes(x => x.LocationInfo)
+ .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock
+ && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable)
+ .WhereIF(!viewDto.materielCode.IsNullOrEmpty(),
+ x => x.StockInfoDetails.Any(d => d.MaterielCode == viewDto.materielCode && d.Quantity > 0))
+ .Select(x => new DtStockInfo
+ {
+ Id = x.Id,
+ PalletCode = x.PalletCode,
+ LocationCode = x.LocationCode,
+ StockInfoDetails = x.StockInfoDetails
+ .OrderByDescending(d => d.CreateDate)
+ .Take(1)
+ .ToList(),
+ LocationInfo = x.LocationInfo
+ })
+ .OrderBy(x => x.CreateDate)
+ .ToList();
+
+ List<DtLocationInfo> locationInfos = new List<DtLocationInfo>();
+ List<DtStockInfo> stockNew = new List<DtStockInfo>();
+ if (stocks != null || stocks.Count() > 0)
+ {
+ var locations = stocks.Select(s => s.LocationInfo).ToList();
+ locationInfos = GetStockLocations(locations).Distinct().ToList();
+ stockNew = stocks.Where(s => s.LocationInfo != null && locationInfos.Contains(s.LocationInfo)).ToList();
+ }
+
+ var result = stockNew.Skip(0 * 10).Take(10).Select(s => new StockSelectViewDTO
+ {
+ Id = s.Id,
+
+ MaterielCode = s.StockInfoDetails
+ .FirstOrDefault()?.MaterielCode ?? string.Empty,
+
+ MaterielName = s.StockInfoDetails
+ .FirstOrDefault()?.MaterielName ?? string.Empty,
+
+ Quantity = s.StockInfoDetails
+ .FirstOrDefault()?.Quantity ?? 0, // 澶勭悊绌哄�兼儏鍐�
+
+ PalletCode = s.PalletCode ?? string.Empty,
+
+ LocationCode = s.LocationInfo?.LocationCode ?? string.Empty
+ }).ToList();
+
+ content = WebResponseContent.Instance.OK(data: result);
+ }
+ }
+ catch (Exception ex)
+ {
+ content = WebResponseContent.Instance.Error($"鏌ヨ鍑哄簱鍗曟嵁閿欒,閿欒淇℃伅:{ex.Message}");
+ }
+ return content;
+ }
+
+ #endregion
+
+ #region 鍏朵粬鍑哄簱瑙嗗浘
+ public List<StockSelectViewDTO> GetOtherOutBoundView(int id)
+ {
+ DtStockInfo stock = BaseDal.Db.Queryable<DtStockInfo>()
+ .Includes(x => x.StockInfoDetails)
+ .Includes(x => x.LocationInfo)
+ .Where(x => x.Id == id)
+ .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable).First();
+
+ List<DtLocationInfo> locationInfos = new List<DtLocationInfo>();
+ List<DtStockInfo> stockNew = new List<DtStockInfo>();
+ if (stock != null)
+ {
+ if (_taskService.LocationIsOutBound(stock.LocationInfo))
+ {
+ return null;
+ }
+ }
+
+ var result = stock.StockInfoDetails.Select(s => new StockSelectViewDTO
+ {
+ MaterielCode = s.MaterielCode ?? string.Empty,
+
+ MaterielName = s.MaterielName ?? string.Empty,
+
+ Quantity = s.Quantity, // 澶勭悊绌哄�兼儏鍐�
+
+ PalletCode = stock.PalletCode ?? string.Empty,
+
+ LocationCode = stock.LocationCode ?? string.Empty
+ }).ToList();
+
+ return result;
+ }
+
+ #endregion
+
+ #region 搴撳瓨鏁版嵁灞曠ず
+
+ public async Task<WebResponseContent> GetStockData()
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var stocks = await _stockInfoDetailRepository.QueryDataAsync(x => true);
+ var orderdetail = SqlSugarHelper.DbWMS.Queryable<Dt_OrderOutDetails_Hty>().Where(x => true).ToList();
+ var task = _taskRepository.QueryData(x => true).ToList();
+
+ // 鑾峰彇UTC褰撳墠鏃堕棿
+ DateTime utcNow = DateTime.UtcNow;
+
+ // 璁＄畻褰撴湀鏃堕棿鑼冨洿
+ DateTime firstDayOfMonth = new DateTime(utcNow.Year, utcNow.Month, 1);
+ DateTime lastDayOfMonth = firstDayOfMonth.AddMonths(1).AddSeconds(-1);
+
+ // 璁＄畻涓婃湀鏃堕棿鑼冨洿
+ DateTime firstDayOfLastMonth = new DateTime(utcNow.Year, utcNow.Month, 1).AddMonths(-1);
+ DateTime lastDayOfLastMonth = firstDayOfLastMonth.AddMonths(1).AddSeconds(-1);
+
+ // 璁＄畻褰撳ぉ鏃堕棿鑼冨洿
+ DateTime todayStart = utcNow.Date;
+ DateTime todayEnd = todayStart.AddDays(1).AddTicks(-1);
+
+ // 璁＄畻鏄ㄦ棩鏃堕棿鑼冨洿
+ DateTime startOfPreviousDay = utcNow.AddDays(-1).Date; // 鍓嶄竴澶╃殑 00:00:00
+ DateTime endOfPreviousDay = startOfPreviousDay.AddDays(1).AddSeconds(-1);
+
+ // 鏌ヨ褰撴湀鏁版嵁
+ var currentMonthInStocks = stocks.Where(x => x.CreateDate >= firstDayOfMonth && x.CreateDate <= lastDayOfMonth).Sum(x => x.Quantity);
+ var currentMonthOutStocks = orderdetail.Where(x => x.CreateDate >= firstDayOfMonth && x.CreateDate <= lastDayOfMonth).Sum(x => x.OutboundQuantity);
+
+ //鏌ヨ涓婃湀鏁版嵁
+ var currentMonthInStocksLastMonth = stocks.Where(x => x.CreateDate >= firstDayOfLastMonth && x.CreateDate <= lastDayOfLastMonth).Sum(x => x.Quantity);
+ var currentMonthOutStocksLastMonth = orderdetail.Where(x => x.CreateDate >= firstDayOfLastMonth && x.CreateDate <= lastDayOfLastMonth).Sum(x => x.OutboundQuantity);
+
+ // 鏌ヨ浠婃棩鏁版嵁
+ var currentDayInStocks = stocks.Where(x => x.CreateDate >= todayStart && x.CreateDate <= todayEnd).Sum(x => x.Quantity);
+ var currentDayOutStocks = orderdetail.Where(x => x.CreateDate >= todayStart && x.CreateDate <= todayEnd).Sum(x => x.OutboundQuantity);
+
+ // 鏌ヨ鏄ㄥぉ鏃ユ暟鎹�
+ var currentDayInStocksLast = stocks.Where(x => x.CreateDate >= startOfPreviousDay && x.CreateDate <= endOfPreviousDay).Sum(x => x.Quantity);
+ var currentDayOutStocksLast = orderdetail.Where(x => x.CreateDate >= startOfPreviousDay && x.CreateDate <= endOfPreviousDay).Sum(x => x.OutboundQuantity);
+
+ // 鐢熸垚鏈�杩�7澶╃殑鍑哄叆搴撴暟鎹�
+ var last7Days = Enumerable.Range(0, 7)
+ .Select(i => utcNow.Date.AddDays(-i))
+ .OrderBy(x => x)
+ .ToList();
+
+ var monthDays = Enumerable.Range(1, DateTime.DaysInMonth(utcNow.Year, utcNow.Month))
+ .Select(day => new DateTime(utcNow.Year, utcNow.Month, day))
+ .Where(date => date <= utcNow.Date) // 鍙寘鍚埌浠婂ぉ涓烘鐨勬棩鏈�
+ .ToList();
+
+ var inboundData = last7Days.Select(date => new
+ {
+ Date = date.ToString("MM-dd"),
+ Value = stocks.Where(x => x.CreateDate.Date == date).Sum(x => x.Quantity),
+ }).ToList();
+
+ var outboundData = last7Days.Select(date => new
+ {
+ Date = date.ToString("MM-dd"),
+ Value = orderdetail.Where(x => x.CreateDate.Date == date).Sum(x => x.OutboundQuantity)
+ }).ToList();
+
+ var MonthSumData = monthDays.Select(date => new
+ {
+ Date = date.ToString("MM-dd"),
+ InValue = stocks.Where(x => x.CreateDate.Date == date).Sum(x => x.Quantity),
+ OutValue = orderdetail.Where(x => x.CreateDate.Date == date).Sum(x => x.OutboundQuantity)
+ }).ToList();
+
+ object obj = new
+ {
+ metrics = new List<object>{
+ new {
+ name = "浠婃棩杩涘簱閲�",
+ value = currentDayInStocks,
+ compare =currentDayInStocks-currentDayInStocksLast,
+ },
+ new {
+ name = "浠婃棩鍑哄簱閲�",
+ value = currentDayOutStocks,
+ compare =currentDayOutStocks-currentDayOutStocksLast,
+ },
+ new {
+ name = "鏈湀杩涘簱閲�",
+ value = currentMonthInStocks,
+ compare =currentMonthInStocks-currentMonthInStocksLastMonth,
+ },
+ new {
+ name = "鏈湀鍑哄簱閲�",
+ value = currentMonthOutStocks,
+ compare = currentMonthOutStocks - currentMonthOutStocksLastMonth,
+ },
+ new {
+ name = "搴撳瓨鎬婚噺",
+ value = stocks.Sum(x => x.Quantity)
+ }
+ },
+ outbound = new
+ {
+ dates = outboundData.Select(x => x.Date).ToArray(),
+ values = outboundData.Select(x => x.Value).ToArray()
+ },
+ inbound = new
+ {
+ dates = inboundData.Select(x => x.Date).ToArray(),
+ values = inboundData.Select(x => x.Value).ToArray()
+ },
+ monthData = new
+ {
+ dates = MonthSumData.Select(x => x.Date).ToArray(),
+ inValue = MonthSumData.Select(x => x.InValue).ToArray(),
+ outValue = MonthSumData.Select(x => x.OutValue).ToArray(),
+ },
+ newTask = task.Select(x => new
+ {
+ x.PalletCode,
+ x.Roadway,
+ x.SourceAddress,
+ x.TargetAddress,
+ x.ErrorMessage,
+ x.CreateDate,
+ TaskType = EnumHelper.GetDescriptionFromEnums(x.TaskType, typeof(TaskOutboundTypeEnum), typeof(TaskInboundTypeEnum), typeof(TaskAcrossFloorTypeEnum), typeof(TaskRelocationTypeEnum), typeof(TaskAGVCarryTypeEnum)),
+ TaskState = EnumHelper.GetDescriptionFromEnums(x.TaskState, typeof(TaskInStatusEnum), typeof(TaskOutStatusEnum), typeof(TaskAcrossFloorStatusEnum), typeof(TaskRelocationStatusEnum), typeof(TaskAGVCarryStatusEnum))
+ }).ToList()
+ };
+ return content.OK(data: obj);
+ }
+ catch (Exception ex)
+ {
+ return content.Error("绯荤粺閿欒锛岃鑱旂郴绠＄悊鍛�");
+ }
+ }
+ #endregion
+
+ #region 鎵撳嵃搴撳瓨鍗曚釜鐗╂枡浜岀淮鐮�
+ public async Task<WebResponseContent> PrintOrder(object[] key)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ List<Dt_InboundOrder> inboundOrders = new List<Dt_InboundOrder>();
+ foreach (var item in key)
+ {
+ var order = _inboundOrderRepository.QueryFirst(x => x.OrderNo == item.ToString());
+ if (order != null)
+ {
+ inboundOrders.Add(order);
+ }
+ }
+ return _inboundOrderService.PrintInbound(inboundOrders); ;
+ }
+ catch (Exception ex)
+ {
+ return content.Error("鏈煡閿欒锛岃鑱旂郴绠＄悊鍛�");
+ }
+ }
+
+ #endregion
}
\ No newline at end of file
--
Gitblit v1.9.3