From 3cba19da98f62ac623eda65d9960e9cfc925ccbf Mon Sep 17 00:00:00 2001 From: zhougf Date: Wed, 1 Oct 2025 03:22:33 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E4=BB=AA=E8=A1=A8=E7=9B=98):=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=BB=BB=E5=8A=A1=E5=8E=86=E5=8F=B2=E3=80=81=E5=BA=93?= =?UTF-8?q?=E4=BD=8D=E7=8A=B6=E6=80=81=E5=92=8C=E5=BD=93=E5=89=8D=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E7=BB=9F=E8=AE=A1=E5=9B=BE=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit refactor(库存交易): 使用AutoMapper简化库存交易记录创建逻辑 --- HHWMS.Web/Areas/Api/IWCSController.cs | 64 +-- .../Controllers/SimpleReceiptInController.cs | 104 +--- HHWMS.Web/Controllers/HomeController.cs | 142 +++++- HHWMS.Web/Support/Profiles/MapToHisProfile.cs | 10 + HHWMS.Web/Views/Home/FrontPage.cshtml | 446 +++++++++++++++--- 5 files changed, 563 insertions(+), 203 deletions(-) diff --git a/HHWMS.Web/Areas/Api/IWCSController.cs b/HHWMS.Web/Areas/Api/IWCSController.cs index becc378..4d16f84 100644 --- a/HHWMS.Web/Areas/Api/IWCSController.cs +++ b/HHWMS.Web/Areas/Api/IWCSController.cs @@ -394,61 +394,25 @@ namespace HHWMS.Web if (task.TaskType != TaskTypeEnum.移库) { // 创建库存交易记录 放到任务完成,计算数量信息 - var invTransaction = new InventoryTransaction - { - Type = task.TaskType == TaskTypeEnum.入库 - ? InventoryTranType.入库 - : InventoryTranType.出库, - ContainerCode = task.ContainerCode, - LocationCode = task.ToLocation, - MaterialCode = inventory.MaterialCode, - MaterialType = inventory.MaterialType, - MaterialName = inventory.MaterialName, - MaterialSpec = inventory.MaterialSpec, - MaterialUnit = inventory.MaterialUnit, - Batch = inventory.Batch, - Qty = inventory.Qty, - Status = inventory.Status, - CreateTime = DateTime.Now - }; - invTrans.Add(invTransaction); + var invTran = _mapper.Map(inventory); + invTran.Type = task.TaskType == TaskTypeEnum.入库 + ? InventoryTranType.入库 + : InventoryTranType.出库; + + invTrans.Add(invTran); } else { // 创建库存交易记录 放到任务完成,计算数量信息 - var invTransaction = new InventoryTransaction - { - Type = InventoryTranType.入库, - ContainerCode = task.ContainerCode, - LocationCode = task.ToLocation, - MaterialCode = inventory.MaterialCode, - MaterialName = inventory.MaterialName, - MaterialSpec = inventory.MaterialSpec, - MaterialUnit = inventory.MaterialUnit, - MaterialType = inventory.MaterialType, - Batch = inventory.Batch, - Qty = inventory.Qty, - Status = inventory.Status, - CreateTime = DateTime.Now - }; - invTrans.Add(invTransaction); + var invTran = _mapper.Map(inventory); + invTran.Type = InventoryTranType.入库; - var invTransaction2 = new InventoryTransaction - { - Type = InventoryTranType.出库, - ContainerCode = task.ContainerCode, - LocationCode = task.ToLocation, - MaterialCode = inventory.MaterialCode, - MaterialName = inventory.MaterialName, - MaterialSpec = inventory.MaterialSpec, - MaterialUnit = inventory.MaterialUnit, - MaterialType = inventory.MaterialType, - Batch = inventory.Batch, - Qty = inventory.Qty, - Status = inventory.Status, - CreateTime = DateTime.Now - }; - invTrans.Add(invTransaction2); + invTrans.Add(invTran); + + var invTran2 = _mapper.Map(inventory); + invTran2.Type = InventoryTranType.出库; + + invTrans.Add(invTran2); } } diff --git a/HHWMS.Web/Areas/Receipt/Controllers/SimpleReceiptInController.cs b/HHWMS.Web/Areas/Receipt/Controllers/SimpleReceiptInController.cs index a2beda7..4bc308c 100644 --- a/HHWMS.Web/Areas/Receipt/Controllers/SimpleReceiptInController.cs +++ b/HHWMS.Web/Areas/Receipt/Controllers/SimpleReceiptInController.cs @@ -1,8 +1,10 @@ using System; using System.Linq; +using AutoMapper; using HHWMS.Web.Models; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Caching.Memory; using WalkingTec.Mvvm.Core; using WalkingTec.Mvvm.Mvc; @@ -14,11 +16,13 @@ namespace HHWMS.Web.Controllers { private readonly IUnitWork _unitWork; private readonly WTMContext _context; + private readonly IMapper _mapper; - public SimpleReceiptInController(IUnitWork unitWork, WTMContext wtmContext) + public SimpleReceiptInController(IUnitWork unitWork, WTMContext wtmContext,IMapper mapper) { _unitWork = unitWork; _context = wtmContext; + _mapper = mapper; } #region Index @@ -96,9 +100,9 @@ namespace HHWMS.Web.Controllers var materials = _unitWork.Find(x => x.MaterialCode.Contains(keyword) || x.MaterialType.Contains(keyword)) - .Take(10) + .Take(50) .Select(x => new { - x.MaterialCode, + x.MaterialCode, x.MaterialName, x.MaterialSpec, x.MaterialUnit, @@ -123,7 +127,7 @@ namespace HHWMS.Web.Controllers CompanyCode = x.Code, CompanyName = x.Name }) - .Take(10) + .Take(50) .ToList(); return Json(new { Code = 200, Data = companies }); } @@ -184,27 +188,10 @@ namespace HHWMS.Web.Controllers _unitWork.Add(inventory); // 创建入库交易记录 - var transaction = new InventoryTransaction - { - ZoneCode = zone.ZoneCode, - BillType = InventoryTranType.入库, - MaterialCode = material.MaterialCode, - MaterialType = inventory.MaterialType, - MaterialName = material.MaterialName, - MaterialSpec = inventory.MaterialSpec, - MaterialUnit = material.MaterialUnit, - ContainerCode = container.Code, - CompanyCode = inventory.CompanyCode, - SourceCode = inventory.SourceCode, - SupplierCode = inventory.SupplierCode, - Batch = batch, - Qty = qty, - CreateTime = DateTime.Now, - CreateBy = "WMS", - UpdateTime = DateTime.Now, - UpdateBy = "WMS" - }; - _unitWork.Add(transaction); + var invTran = _mapper.Map(inventory); + invTran.Type = InventoryTranType.入库; + + _unitWork.Add(invTran); return JsonMore(new { Id = inventory.ID }); } @@ -328,24 +315,10 @@ namespace HHWMS.Web.Controllers } // 创建出库交易记录 - var transaction = new InventoryTransaction - { - BillType = InventoryTranType.出库, - MaterialCode = inventory.MaterialCode, - MaterialName = inventory.MaterialName, - MaterialUnit = inventory.MaterialUnit, - ContainerCode = inventory.ContainerCode, - CompanyCode = inventory.CompanyCode, - SourceCode = inventory.SourceCode, - SupplierCode = inventory.SupplierCode, - Batch = inventory.Batch, - Qty = inventory.Qty, - CreateTime = DateTime.Now, - CreateBy = "WMS", - UpdateTime = DateTime.Now, - UpdateBy = "WMS" - }; - _unitWork.Add(transaction); + var invTran = _mapper.Map(inventory); + invTran.Type = InventoryTranType.出库; + + _unitWork.Add(invTran); // 删除库存记录 _unitWork.Delete(inventory); @@ -377,44 +350,17 @@ namespace HHWMS.Web.Controllers } // 创建出库交易记录(原数量) - var outTransaction = new InventoryTransaction - { - BillType = InventoryTranType.出库, - MaterialCode = inventory.MaterialCode, - MaterialName = inventory.MaterialName, - MaterialUnit = inventory.MaterialUnit, - ContainerCode = inventory.ContainerCode, - CompanyCode = inventory.CompanyCode, - SourceCode = inventory.SourceCode, - SupplierCode = inventory.SupplierCode, - Batch = inventory.Batch, - Qty = inventory.Qty, - CreateTime = DateTime.Now, - CreateBy = "WMS", - UpdateTime = DateTime.Now, - UpdateBy = "WMS" - }; - _unitWork.Add(outTransaction); + var invOutTran = _mapper.Map(inventory); + invOutTran.Type = InventoryTranType.出库; + + _unitWork.Add(invOutTran); // 创建入库交易记录(新数量) - var inTransaction = new InventoryTransaction - { - BillType = InventoryTranType.入库, - MaterialCode = inventory.MaterialCode, - MaterialName = inventory.MaterialName, - MaterialUnit = inventory.MaterialUnit, - ContainerCode = inventory.ContainerCode, - CompanyCode = inventory.CompanyCode, - SourceCode = inventory.SourceCode, - SupplierCode = inventory.SupplierCode, - Batch = inventory.Batch, - Qty = qty, - CreateTime = DateTime.Now, - CreateBy = "WMS", - UpdateTime = DateTime.Now, - UpdateBy = "WMS" - }; - _unitWork.Add(inTransaction); + var invInTran = _mapper.Map(inventory); + invInTran.Qty = qty; + invInTran.Type = InventoryTranType.入库; + + _unitWork.Add(invInTran); // 更新库存数量 inventory.Qty = qty; diff --git a/HHWMS.Web/Controllers/HomeController.cs b/HHWMS.Web/Controllers/HomeController.cs index 70a2212..f65d395 100644 --- a/HHWMS.Web/Controllers/HomeController.cs +++ b/HHWMS.Web/Controllers/HomeController.cs @@ -131,17 +131,30 @@ namespace HHWMS.Web.Controllers [AllowAnonymous] public IActionResult GetLocationChart() { + var statusMap = new Dictionary // 如果是字符串类型,键改为string + { + { LocationStatus.有货, "有货" }, + { LocationStatus.空仓位, "空仓位" }, + { LocationStatus.空容器, "空容器" }, + { LocationStatus.任务锁, "任务锁" }, + // 补充其他状态的映射关系 + }; + var data = new List(); - var locations = Wtm.DC.Set().AsEnumerable() - .GroupBy(x => x.Status).ToList() - .Select(x => new { status = x.Key, count = x.Count() }); + var locations = Wtm.DC.Set() + .DPWhere(Wtm,x => x.ZoneId) + .AsEnumerable() + .GroupBy(x => x.ContainerStatus).ToList() + .Select(x => new { status = statusMap.TryGetValue(x.Key, out var chineseName) + ? chineseName + : x.Key.ToString(), count = x.Count() }); foreach (var item in locations) { data.Add(new ChartData { Value = item.count, Category = item.status.ToString(), - Series = "locations" + Series = "库位状态" }); } @@ -189,6 +202,127 @@ namespace HHWMS.Web.Controllers { return JsonMore(UserSessionManager.AllSignined().ToList()); } + + [AllowAnonymous] + public IActionResult GetTaskHistoryChart() + { + var data = new List(); + // 获取一周内的日期 + var today = DateTime.Today; + var weekStart = today.AddDays(-6); + + // 查询一周内的出入库任务历史 + var taskHis = Wtm.DC.Set() + .DPWhere(Wtm,x => x.ZoneId) + .Where(x => x.CreateTime >= weekStart && x.CreateTime <= today.AddDays(1)) + .Select(x => new + { + TaskType = x.TaskType, + Date = x.CreateTime.ToString(), + }) + .ToList(); + var taskHistory = taskHis + .GroupBy(x => new { Date = x.Date.Substring(0,10), Type = x.TaskType }) + .Select(g => new { Date = g.Key.Date, Type = g.Key.Type, Count = g.Count() }) + .ToList(); + + // 生成每天的数据 + for (var date = weekStart; date <= today; date = date.AddDays(1)) + { + // 入库任务 + var inCount = taskHistory + .Where(x => x.Date == date.ToString("yyyy-MM-dd") && x.Type == TaskTypeEnum.入库) + .Sum(x => x.Count); + + data.Add(new ChartData + { + Category = date.ToString("MM-dd"), + Value = inCount, + Series = "入库任务" + }); + + // 出库任务 + var outCount = taskHistory + .Where(x => x.Date == date.ToString("yyyy-MM-dd") && x.Type == TaskTypeEnum.出库) + .Sum(x => x.Count); + + data.Add(new ChartData + { + Category = date.ToString("MM-dd"), + Value = outCount, + Series = "出库任务" + }); + + // 移库任务 + var moveCount = taskHistory + .Where(x => x.Date == date.ToString("yyyy-MM-dd") && x.Type == TaskTypeEnum.移库) + .Sum(x => x.Count); + + data.Add(new ChartData + { + Category = date.ToString("MM-dd"), + Value = moveCount, + Series = "移库任务" + }); + } + + var rv = data.ToChartData(); + return Json(rv); + } + + [AllowAnonymous] + public IActionResult GetContainerChart() + { + var data = new List(); + + // 查询不同类型的容器数量 + var containers = Wtm.DC.Set() + .DPWhere(Wtm,x => x.ZoneId) + .AsEnumerable() + .GroupBy(x => x.Type) + .Select(g => new { Type = g.Key, Count = g.Count() }) + .ToList(); + + foreach (var container in containers) + { + data.Add(new ChartData + { + Category = container.Type, + Value = container.Count, + Series = "容器类型" + }); + } + + var rv = data.ToChartData(); + return Json(rv); + } + + [AllowAnonymous] + public IActionResult GetCurrentTaskChart() + { + var data = new List(); + + // 查询当前任务状态 + var tasks = Wtm.DC.Set() + .DPWhere(Wtm,x => x.ZoneId) + .AsEnumerable() + .GroupBy(x => x.TaskType) + .Select(g => new { Type = g.Key, Count = g.Count() }) + .ToList(); + + foreach (var task in tasks) + { + data.Add(new ChartData + { + Category = task.Type.ToString(), + Value = task.Count, + Series = "当前任务" + }); + } + + var rv = data.ToChartData(); + return Json(rv); + } } } diff --git a/HHWMS.Web/Support/Profiles/MapToHisProfile.cs b/HHWMS.Web/Support/Profiles/MapToHisProfile.cs index ca2f78b..297dc25 100644 --- a/HHWMS.Web/Support/Profiles/MapToHisProfile.cs +++ b/HHWMS.Web/Support/Profiles/MapToHisProfile.cs @@ -1,3 +1,4 @@ +using System; using AutoMapper; using HHWMS.Web.Models; @@ -19,6 +20,15 @@ namespace HHWMS.Web.Support.Profiles CreateMap(); CreateMap(); + CreateMap() + .ForMember( + dest => dest.ZoneCode, + src => src.MapFrom(x => x.ZoneId)) + .ForMember( + dest => dest.CreateTime, + src => src.MapFrom(x => DateTime.Now)) + ; + // 任务明细 --> 库存交易 CreateMap() .ForMember( diff --git a/HHWMS.Web/Views/Home/FrontPage.cshtml b/HHWMS.Web/Views/Home/FrontPage.cshtml index fef9b14..ace6602 100644 --- a/HHWMS.Web/Views/Home/FrontPage.cshtml +++ b/HHWMS.Web/Views/Home/FrontPage.cshtml @@ -4,96 +4,44 @@
+
-
ShortCut
+
一周内出入库任务统计
- + +
-
Controllers
+
库内库位统计
- +
+ +
-
Models
+
未完成任务统计
- -
-
-
-
-
-
Mock data
-
- - +
+
+