From 7c2722c88d83279985a257e1b0a910e9ae8442d7 Mon Sep 17 00:00:00 2001 From: mtf Date: Fri, 17 Jul 2026 21:20:21 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8E=A5=E5=85=A5ERP=E6=88=90=E5=93=81?= =?UTF-8?q?=E5=8F=91=E8=B4=A7=E5=87=BA=E5=BA=93=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HHWMS.Web/Areas/Api/IWCSController.cs | 74 +- .../ViewModels/LocationVMs/LocationVM.cs | 11 +- .../InventoryTransactionController.cs | 42 + .../InventoryTransactionListVM.cs | 22 +- .../ViewModels/InventoryVMs/InventoryVM.cs | 134 +++ .../SimpleReceiptInController.Shipment.cs | 409 ++++++++ .../Controllers/SimpleReceiptInController.cs | 14 +- .../Views/SimpleReceiptIn/Index.cshtml | 98 +- .../ShipmentHeaderController.Erp.cs | 944 ++++++++++++++++++ .../Controllers/ShipmentHeaderController.cs | 5 + .../ShipmentDetailVMs/ShipmentDetailListVM.cs | 4 + .../ShipmentHeaderVMs/ShipmentHeaderListVM.cs | 25 +- .../Views/ShipmentHeader/Allocate.cshtml | 257 +++++ .../ShipmentHeader/GetShipmentDetails.cshtml | 11 + .../System/Controllers/jobs/AddSaleOutJob.cs | 62 ++ .../Models/Inventory/InventoryTransaction.cs | 1 + .../Request/Request/AddSaleOutRequest.cs | 34 + .../Request/Request/LoadDispatchRequest.cs | 34 + .../Request/Response/LoadDispatchResponse.cs | 56 ++ HHWMS.Web/Models/Shipment/ShipmentDetail.cs | 3 + docs/ERP事项二-成品发货接口联动-方案记录.md | 129 +++ docs/ERP事项二-成品发货接口联动-测试报告.md | 109 ++ sql/20260717_add_sale_out.sql | 22 + sql/20260717_add_sale_out_cp.sql | 53 + sql/20260717_add_sale_out_job.sql | 16 + 25 files changed, 2547 insertions(+), 22 deletions(-) create mode 100644 HHWMS.Web/Areas/Receipt/Controllers/SimpleReceiptInController.Shipment.cs create mode 100644 HHWMS.Web/Areas/Shipment/Controllers/ShipmentHeaderController.Erp.cs create mode 100644 HHWMS.Web/Areas/Shipment/Views/ShipmentHeader/Allocate.cshtml create mode 100644 HHWMS.Web/Areas/Shipment/Views/ShipmentHeader/GetShipmentDetails.cshtml create mode 100644 HHWMS.Web/Areas/System/Controllers/jobs/AddSaleOutJob.cs create mode 100644 HHWMS.Web/Models/Request/Request/AddSaleOutRequest.cs create mode 100644 HHWMS.Web/Models/Request/Request/LoadDispatchRequest.cs create mode 100644 HHWMS.Web/Models/Request/Response/LoadDispatchResponse.cs create mode 100644 docs/ERP事项二-成品发货接口联动-方案记录.md create mode 100644 docs/ERP事项二-成品发货接口联动-测试报告.md create mode 100644 sql/20260717_add_sale_out.sql create mode 100644 sql/20260717_add_sale_out_cp.sql create mode 100644 sql/20260717_add_sale_out_job.sql diff --git a/HHWMS.Web/Areas/Api/IWCSController.cs b/HHWMS.Web/Areas/Api/IWCSController.cs index 7acebef..d2df276 100644 --- a/HHWMS.Web/Areas/Api/IWCSController.cs +++ b/HHWMS.Web/Areas/Api/IWCSController.cs @@ -277,6 +277,13 @@ namespace HHWMS.Web return ApiResultError("未找到对应的任务"); } + // ERP成品发货任务到站后保留在任务表,等待人工确认实际出库数量。 + // WCS重复回调时直接返回成功,避免再次执行库位和库存迁移。 + if (task.Status == TaskStatusEnum.到站台) + { + return ApiResult(new { Message = "任务已到站台,等待人工确认发货" }); + } + /* 根据任务的巷道号来判断 * 1.线边库1号巷道只有任务完成,任务下发的时候已经分配仓位 * 2.成品库2号巷道有任务请求(10)和任务完成(100) @@ -373,6 +380,30 @@ namespace HHWMS.Web { try { + var candidateShipmentTaskDetails = _unitWork.Find(x => + x.HeaderId == task.ID + && x.OrderDetailId.HasValue + && x.Status != TaskStatusEnum.完成) + .ToList(); + var candidateShipmentDetailIds = candidateShipmentTaskDetails + .Select(x => x.OrderDetailId.Value) + .Distinct() + .ToList(); + var erpShipmentDetailIds = _unitWork.Find(x => + candidateShipmentDetailIds.Contains(x.ID) && x.DLsID.HasValue) + .Select(x => x.ID) + .ToHashSet(); + var shipmentTaskDetails = candidateShipmentTaskDetails + .Where(x => erpShipmentDetailIds.Contains(x.OrderDetailId.Value)) + .ToList(); + var isShipmentTask = task.TaskType == TaskTypeEnum.出库 + && task.ZoneId != 1027 + && shipmentTaskDetails.Any(); + var selectedInventoryIds = shipmentTaskDetails + .Where(x => x.InventoryId.HasValue) + .Select(x => x.InventoryId.Value) + .ToHashSet(); + // 更新库存 var inventories = _unitWork.Find(x => x.ContainerCode == task.ContainerCode).ToList(); var invTrans = new List(); @@ -433,7 +464,9 @@ namespace HHWMS.Web } } - inventory.TaskStatus = InventoryTaskStatusEnum.Idle; + inventory.TaskStatus = isShipmentTask && selectedInventoryIds.Contains(inventory.ID) + ? InventoryTaskStatusEnum.Locked + : InventoryTaskStatusEnum.Idle; } if (invTrans.Any()) @@ -456,7 +489,9 @@ namespace HHWMS.Web if (container != null) { container.LocationCode = task.TaskType == TaskTypeEnum.出库 ? "" : task.ToLocation; - container.IsLock = ContainerLockEnum.未锁; + container.IsLock = isShipmentTask + ? ContainerLockEnum.任务锁 + : ContainerLockEnum.未锁; container.UpdateTime = DateTime.Now; _unitWork.Update(container); @@ -525,15 +560,36 @@ namespace HHWMS.Web throw new ArgumentOutOfRangeException($"未处理的任务类型:{task.TaskType}"); } - // 更新任务状态为完成 - task.Status = TaskStatusEnum.完成; + if (isShipmentTask) + { + // WCS只负责把整托送到站口。库存扣减、出库单数量及ERP回传 + // 必须等操作员确认实际拿走的数量后再处理。 + task.Status = TaskStatusEnum.到站台; + task.UpdateBy = "WCS"; + task.UpdateTime = DateTime.Now; + _unitWork.Update(task); - // 将任务复制到历史任务表 - var taskHistory = _mapper.Map(task); - _unitWork.Add(taskHistory); + foreach (var taskDetail in shipmentTaskDetails) + { + taskDetail.ToLocation = task.ToLocation; + taskDetail.Status = TaskStatusEnum.到站台; + taskDetail.UpdateBy = "WCS"; + taskDetail.UpdateTime = DateTime.Now; + } + _unitWork.BatchUpdate(shipmentTaskDetails); + } + else + { + // 更新任务状态为完成 + task.Status = TaskStatusEnum.完成; - // 删除原任务 - _unitWork.Delete(task); + // 将任务复制到历史任务表 + var taskHistory = _mapper.Map(task); + _unitWork.Add(taskHistory); + + // 删除原任务 + _unitWork.Delete(task); + } // 提交事务 await transaction.CommitAsync(); diff --git a/HHWMS.Web/Areas/Configs/ViewModels/LocationVMs/LocationVM.cs b/HHWMS.Web/Areas/Configs/ViewModels/LocationVMs/LocationVM.cs index 0bda273..a4e4a1b 100644 --- a/HHWMS.Web/Areas/Configs/ViewModels/LocationVMs/LocationVM.cs +++ b/HHWMS.Web/Areas/Configs/ViewModels/LocationVMs/LocationVM.cs @@ -490,7 +490,14 @@ namespace HHWMS.Web task.Status = TaskStatusEnum.已下发; task.UpdateTime = DateTime.Now; task.UpdateBy = "WMS"; - _unitWork.Add(task); + if (task.ID == 0) + { + _unitWork.Add(task); + } + else + { + _unitWork.Update(task); + } } else { @@ -572,4 +579,4 @@ namespace HHWMS.Web } } } -} \ No newline at end of file +} diff --git a/HHWMS.Web/Areas/Inventory/Controllers/InventoryTransactionController.cs b/HHWMS.Web/Areas/Inventory/Controllers/InventoryTransactionController.cs index e50e690..cc9a5c0 100644 --- a/HHWMS.Web/Areas/Inventory/Controllers/InventoryTransactionController.cs +++ b/HHWMS.Web/Areas/Inventory/Controllers/InventoryTransactionController.cs @@ -1,5 +1,6 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using System.Linq; using WalkingTec.Mvvm.Core; using WalkingTec.Mvvm.Core.Extensions; using WalkingTec.Mvvm.Mvc; @@ -278,5 +279,46 @@ namespace HHWMS.Web.Controllers } #endregion ERP领料出库补传 + + #region ERP成品出库补传 + + [ActionDescription("补传ERP成品出库")] + public async Task RetryAddSaleOut(string id) + { + if (!int.TryParse(id, out var transactionId)) + { + return FFResult().Alert("库存交易记录参数错误").RefreshGrid(); + } + + var transaction = _unitwork.FindSingle(x => x.ID == transactionId); + if (transaction == null) + { + return FFResult().Alert("库存交易记录不存在").RefreshGrid(); + } + + if (transaction.Type != InventoryTranType.出库 + || transaction.BillType != InventoryTransaction.ErpSaleOutBillType) + { + return FFResult().Alert("只有成品发货出库记录允许执行此补传").RefreshGrid(); + } + + if (transaction.UploadErpFlag == 1) + { + return FFResult().Alert("该批次已成功回传ERP,无需重复操作").RefreshGrid(); + } + + var transactions = _unitwork.Find(x => + x.BillType == InventoryTransaction.ErpSaleOutBillType + && x.BillCode == transaction.BillCode + && x.UploadErpFlag != 1) + .ToList(); + var vm = Wtm.CreateVM(); + var success = await vm.ProcessErpSaleOut(transactions, true); + return success + ? FFResult().Alert("本批成品出库回传ERP成功").RefreshGrid() + : FFResult().Alert("本批成品出库回传ERP失败").RefreshGrid(); + } + + #endregion ERP成品出库补传 } } diff --git a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryTransactionVMs/InventoryTransactionListVM.cs b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryTransactionVMs/InventoryTransactionListVM.cs index 56fed41..6336ed6 100644 --- a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryTransactionVMs/InventoryTransactionListVM.cs +++ b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryTransactionVMs/InventoryTransactionListVM.cs @@ -40,6 +40,9 @@ namespace HHWMS.Web this.MakeAction("InventoryTransaction", "RetryAddOtherOut", "补传ERP领料出库", "", GridActionParameterTypesEnum.SingleId, "inventory") .SetShowDialog(false).SetShowInRow(true).SetHideOnToolBar() .SetBindVisiableColName(nameof(InventoryTransaction_View.CanRetryOtherOut)), + this.MakeAction("InventoryTransaction", "RetryAddSaleOut", "补传ERP成品出库", "", GridActionParameterTypesEnum.SingleId, "inventory") + .SetShowDialog(false).SetShowInRow(true).SetHideOnToolBar() + .SetBindVisiableColName(nameof(InventoryTransaction_View.CanRetrySaleOut)), }; } @@ -75,17 +78,24 @@ namespace HHWMS.Web this.MakeGridHeader(x => x.ExpirationDate).SetHide(), this.MakeGridHeader(x => x.CompanyCode), this.MakeGridHeader(x => x.SupplierCode), - this.MakeGridHeader(x => x.BillType).SetHide(), - this.MakeGridHeader(x => x.SourceCode).SetHide(), - this.MakeGridHeader(x => x.BillCode).SetHide(), + this.MakeGridHeader(x => x.BillType) + .SetFormat((a, b) => a.BillType == InventoryTransaction.ErpOtherOutBillType + ? "ERP领料出库" + : a.BillType == InventoryTransaction.ErpSaleOutBillType + ? "ERP成品出库" + : a.BillType), + this.MakeGridHeader(x => x.SourceCode), + this.MakeGridHeader(x => x.BillCode), this.MakeGridHeader(x => x.BillDetailId).SetHide(), this.MakeGridHeader(x => x.Status).SetHide(), this.MakeGridHeader(x => x.UploadErpFlag) .SetFormat((a, b) => a.BillType != InventoryTransaction.ErpOtherOutBillType + && a.BillType != InventoryTransaction.ErpSaleOutBillType ? "无需回传" : a.UploadErpFlag == 1 ? "成功" : "失败"), this.MakeGridHeader(x => x.CanRetryOtherOut).SetHide(), - this.MakeGridHeaderAction(width: 200) + this.MakeGridHeader(x => x.CanRetrySaleOut).SetHide(), + this.MakeGridHeaderAction(width: 260) }; } @@ -136,6 +146,9 @@ namespace HHWMS.Web CanRetryOtherOut = x.Type == InventoryTranType.出库 && x.BillType == InventoryTransaction.ErpOtherOutBillType && x.UploadErpFlag != 1 ? "true" : "false", + CanRetrySaleOut = x.Type == InventoryTranType.出库 + && x.BillType == InventoryTransaction.ErpSaleOutBillType + && x.UploadErpFlag != 1 ? "true" : "false", CreateTime = x.CreateTime, }) .OrderBy(x => x.ID); @@ -146,5 +159,6 @@ namespace HHWMS.Web public class InventoryTransaction_View : InventoryTransaction { public string CanRetryOtherOut { get; set; } + public string CanRetrySaleOut { get; set; } } } diff --git a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryVM.cs b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryVM.cs index 9228ea2..b89f597 100644 --- a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryVM.cs +++ b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryVM.cs @@ -225,5 +225,139 @@ namespace HHWMS.Web } return success; } + + /// + /// 回传ERP成品出库。同一BillCode代表同一次人工确认、同一张ERP发货通知单。 + /// 补传时按既定规则重新生成CK单号,但不会再次扣减WMS库存。 + /// + public async Task ProcessErpSaleOut(List transactions, + bool regenerateOutCode = true) + { + transactions = transactions? + .Where(x => x.Type == InventoryTranType.出库 + && x.BillType == InventoryTransaction.ErpSaleOutBillType) + .ToList(); + if (transactions == null || transactions.Count == 0) + { + return false; + } + + try + { + var detailIds = transactions.Where(x => x.BillDetailId.HasValue) + .Select(x => x.BillDetailId.Value) + .Distinct() + .ToList(); + var shipmentDetails = unitWork.Find(x => detailIds.Contains(x.ID)) + .ToDictionary(x => x.ID); + if (shipmentDetails.Count != detailIds.Count + || shipmentDetails.Values.Any(x => !x.DLsID.HasValue)) + { + throw new InvalidOperationException("成品出库交易缺少ERP发货明细ID"); + } + + var createBy = transactions.First().CreateBy; + var maker = unitWork.FindSingle(x => x.ITCode == createBy)?.Name + ?? createBy + ?? "WMS"; + var outCode = transactions.First().BillCode; + if (regenerateOutCode || string.IsNullOrWhiteSpace(outCode) + || outCode.StartsWith("SALE-", StringComparison.OrdinalIgnoreCase)) + { + outCode = unitWork.GetSerialNumber("CK"); + } + + foreach (var transaction in transactions) + { + transaction.BillCode = outCode; + unitWork.Update(transaction); + } + + var request = new AddSaleOutRequest + { + Main = new AddSaleOutMain + { + ErpCode = "003", + OutCode = outCode, + WhCode = "cp", + Maker = maker + }, + Details = transactions + .GroupBy(x => new + { + x.BillDetailId, + x.MaterialCode + }) + .Select(group => new AddSaleOutDetail + { + DLsID = shipmentDetails[group.Key.BillDetailId.Value].DLsID.Value, + InvCode = group.Key.MaterialCode, + OutQty = group.Sum(x => x.Qty ?? 0) + }) + .ToList() + }; + + var apiResult = await Wtm.CallAPI("ERP", "AddSaleOut", + HttpMethodEnum.POST, request); + var success = apiResult?.Data != null && apiResult.Data.Result; + foreach (var transaction in transactions) + { + transaction.UploadErpFlag = success ? 1 : 0; + unitWork.Update(transaction); + } + + if (success) + { + UpdateSaleOutShipmentStatus(shipmentDetails.Values.Select(x => x.HeaderId).Distinct().ToList()); + } + else + { + Wtm.DoLog("ERP成品出库回传失败", ActionLogTypesEnum.Normal, "AddSaleOut", + request: outCode, result: apiResult?.Data?.Message ?? apiResult?.ErrorMsg ?? "ERP返回失败"); + } + return success; + } + catch (Exception ex) + { + foreach (var transaction in transactions) + { + transaction.UploadErpFlag = 0; + unitWork.Update(transaction); + } + Wtm.DoLog("ERP成品出库回传异常", ActionLogTypesEnum.Normal, "AddSaleOut", + request: transactions.First().BillCode, result: ex.Message); + return false; + } + } + + private void UpdateSaleOutShipmentStatus(List shipmentHeaderIds) + { + foreach (var headerId in shipmentHeaderIds) + { + var header = unitWork.FindSingle(x => x.ID == headerId); + if (header == null) + { + continue; + } + + var details = unitWork.Find(x => x.HeaderId == headerId).ToList(); + var detailIds = details.Select(x => x.ID).ToList(); + var hasPendingUpload = unitWork.IsExit(x => + x.BillType == InventoryTransaction.ErpSaleOutBillType + && x.BillDetailId.HasValue + && detailIds.Contains(x.BillDetailId.Value) + && x.UploadErpFlag != 1); + if (details.Any() + && details.All(x => (x.CompletedQty ?? 0) >= (x.Qty ?? 0)) + && !hasPendingUpload) + { + header.FirstStatus = ShipStatusEnum.回传; + header.LastStatus = ShipStatusEnum.回传; + header.UpdateBy = "ERP"; + header.UpdateTime = DateTime.Now; + unitWork.Update(header); + } + } + } } } diff --git a/HHWMS.Web/Areas/Receipt/Controllers/SimpleReceiptInController.Shipment.cs b/HHWMS.Web/Areas/Receipt/Controllers/SimpleReceiptInController.Shipment.cs new file mode 100644 index 0000000..e74c175 --- /dev/null +++ b/HHWMS.Web/Areas/Receipt/Controllers/SimpleReceiptInController.Shipment.cs @@ -0,0 +1,409 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using HHWMS.Web.Models; +using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; +using WalkingTec.Mvvm.Core; +using WalkingTec.Mvvm.Core.Extensions; + +namespace HHWMS.Web.Controllers +{ + public partial class SimpleReceiptInController + { + private bool TryGetShipmentContainerData(string containerCode, out object rows) + { + rows = null; + var task = _unitWork.FindSingle(x => + x.ContainerCode == containerCode + && x.TaskType == TaskTypeEnum.出库 + && x.Status == TaskStatusEnum.到站台); + if (task == null) + { + return false; + } + + var taskDetails = _unitWork.Find(x => + x.HeaderId == task.ID + && x.Status == TaskStatusEnum.到站台) + .OrderBy(x => x.ID) + .ToList(); + if (!taskDetails.Any()) + { + return false; + } + + var inventoryIds = taskDetails.Where(x => x.InventoryId.HasValue) + .Select(x => x.InventoryId.Value) + .Distinct() + .ToList(); + var inventories = _unitWork.Find(x => inventoryIds.Contains(x.ID)) + .ToDictionary(x => x.ID); + var shipmentDetailIds = taskDetails.Where(x => x.OrderDetailId.HasValue) + .Select(x => x.OrderDetailId.Value) + .Distinct() + .ToList(); + var shipmentDetails = _unitWork.Find(x => shipmentDetailIds.Contains(x.ID)) + .ToDictionary(x => x.ID); + if (shipmentDetails.Count != shipmentDetailIds.Count + || shipmentDetails.Values.Any(x => !x.DLsID.HasValue)) + { + return false; + } + var shipmentHeaderIds = shipmentDetails.Values.Select(x => x.HeaderId).Distinct().ToList(); + var shipmentHeaders = _unitWork.Find(x => shipmentHeaderIds.Contains(x.ID)) + .ToDictionary(x => x.ID); + + rows = taskDetails.Select(taskDetail => + { + inventories.TryGetValue(taskDetail.InventoryId ?? 0, out var inventory); + shipmentDetails.TryGetValue(taskDetail.OrderDetailId ?? 0, out var shipmentDetail); + ShipmentHeader shipmentHeader = null; + if (shipmentDetail != null) + { + shipmentHeaders.TryGetValue(shipmentDetail.HeaderId, out shipmentHeader); + } + + return new + { + TaskDetailId = taskDetail.ID, + Id = inventory?.ID ?? taskDetail.InventoryId, + taskDetail.ContainerCode, + taskDetail.MaterialCode, + MaterialName = inventory?.MaterialType ?? taskDetail.MaterialName, + MaterialSpec = inventory?.MaterialSpec ?? taskDetail.MaterialSpec, + Batch = inventory?.Batch ?? taskDetail.Batch, + CompanyCode = inventory?.CompanyCode, + SourceCode = shipmentHeader?.SourceCode, + ShipmentCode = shipmentHeader?.SourceCode ?? shipmentHeader?.Code, + ShipmentDetailId = shipmentDetail?.ID, + RequiredQty = shipmentDetail?.Qty ?? 0, + CompletedQty = shipmentDetail?.CompletedQty ?? 0, + AllocatedQty = taskDetail.Qty ?? 0, + Qty = inventory?.Qty ?? 0, + ActualQty = taskDetail.Qty ?? 0 + }; + }).ToList(); + return true; + } + + [HttpPost] + public async Task ConfirmShipment([FromBody] ShipmentConfirmRequest request) + { + if (request == null || string.IsNullOrWhiteSpace(request.ContainerCode) + || request.Rows == null) + { + return JsonMore(null, 500, "确认发货参数不完整"); + } + + var erpGroups = new Dictionary>(); + using (var transaction = DC.BeginTransaction()) + { + try + { + // 锁定到站任务,避免重复点击或多实例同时确认造成库存重复扣减。 + var task = DC.Set() + .FromSqlRaw( + "SELECT * FROM `TaskHeader` WHERE `ContainerCode` = {0} AND `TaskType` = {1} AND `Status` = {2} FOR UPDATE", + request.ContainerCode, TaskTypeEnum.出库, TaskStatusEnum.到站台) + .AsNoTracking() + .FirstOrDefault(); + if (task == null) + { + return JsonMore(null, 500, "未找到待确认的ERP发货托盘任务"); + } + + var taskDetails = _unitWork.Find(x => + x.HeaderId == task.ID + && x.Status == TaskStatusEnum.到站台) + .ToList(); + if (!taskDetails.Any()) + { + return JsonMore(null, 500, "托盘没有待确认的发货分配"); + } + + if (request.Rows.Any(x => x.ActualQty < 0) + || request.Rows.GroupBy(x => x.TaskDetailId).Any(x => x.Count() > 1) + || request.Rows.Select(x => x.TaskDetailId).OrderBy(x => x) + .SequenceEqual(taskDetails.Select(x => x.ID).OrderBy(x => x)) == false) + { + return JsonMore(null, 500, "必须逐条提交当前托盘全部分配,实际数量不能小于0"); + } + + var inventoryIds = taskDetails.Where(x => x.InventoryId.HasValue) + .Select(x => x.InventoryId.Value) + .Distinct() + .ToList(); + var inventories = new List(); + foreach (var inventoryId in inventoryIds.OrderBy(x => x)) + { + var inventory = DC.Set() + .FromSqlRaw("SELECT * FROM `Inventory` WHERE `ID` = {0} FOR UPDATE", inventoryId) + .AsNoTracking() + .SingleOrDefault(); + if (inventory != null) + { + inventories.Add(inventory); + } + } + if (inventories.Count != inventoryIds.Count) + { + return JsonMore(null, 500, "部分已分配库存不存在,请先排查数据,系统未做扣减"); + } + + foreach (var inventoryGroup in taskDetails.GroupBy(x => x.InventoryId.Value)) + { + var inventory = inventories.First(x => x.ID == inventoryGroup.Key); + var actualQty = inventoryGroup.Sum(x => + request.Rows.First(y => y.TaskDetailId == x.ID).ActualQty); + if (actualQty > (inventory.Qty ?? 0)) + { + return JsonMore(null, 500, + $"库存 {inventory.ID} 的本次实际出库合计 {actualQty} 超过当前库存 {inventory.Qty ?? 0}"); + } + } + + var shipmentDetailIds = taskDetails.Where(x => x.OrderDetailId.HasValue) + .Select(x => x.OrderDetailId.Value) + .Distinct() + .ToList(); + var shipmentDetails = new Dictionary(); + foreach (var shipmentDetailId in shipmentDetailIds.OrderBy(x => x)) + { + var shipmentDetail = DC.Set() + .FromSqlRaw("SELECT * FROM `ShipmentDetail` WHERE `ID` = {0} FOR UPDATE", shipmentDetailId) + .AsNoTracking() + .SingleOrDefault(); + if (shipmentDetail != null) + { + shipmentDetails.Add(shipmentDetail.ID, shipmentDetail); + } + } + if (shipmentDetails.Count != shipmentDetailIds.Count + || shipmentDetails.Values.Any(x => !x.DLsID.HasValue)) + { + return JsonMore(null, 500, "部分出库明细不存在,请先排查数据,系统未做扣减"); + } + + foreach (var shipmentDetailId in shipmentDetailIds) + { + var shipmentDetail = shipmentDetails[shipmentDetailId]; + var currentActualQty = taskDetails.Where(x => x.OrderDetailId == shipmentDetailId) + .Sum(x => request.Rows.First(y => y.TaskDetailId == x.ID).ActualQty); + var otherAllocatedQty = _unitWork.Find(x => + x.OrderDetailId == shipmentDetailId + && x.HeaderId != task.ID + && x.Status != TaskStatusEnum.完成) + .Sum(x => x.Qty) ?? 0; + var maxCurrentQty = (shipmentDetail.Qty ?? 0) + - (shipmentDetail.CompletedQty ?? 0) + - otherAllocatedQty; + if (currentActualQty > maxCurrentQty) + { + return JsonMore(null, 500, + $"出库明细 {shipmentDetailId} 的本次实际数量最多为 {maxCurrentQty},其他托盘分配已保留"); + } + } + + var shipmentHeaderIds = shipmentDetails.Values.Select(x => x.HeaderId).Distinct().ToList(); + var shipmentHeaders = _unitWork.Find(x => shipmentHeaderIds.Contains(x.ID)) + .ToDictionary(x => x.ID); + var groupCodes = shipmentHeaderIds.ToDictionary(x => x, x => $"SALE-{Guid.NewGuid():N}"); + var now = DateTime.Now; + var operatorCode = Wtm.LoginUserInfo?.ITCode ?? "WMS"; + + foreach (var taskDetail in taskDetails) + { + var actualQty = request.Rows.First(x => x.TaskDetailId == taskDetail.ID).ActualQty; + var shipmentDetail = shipmentDetails[taskDetail.OrderDetailId.Value]; + var shipmentHeader = shipmentHeaders[shipmentDetail.HeaderId]; + var inventory = inventories.First(x => x.ID == taskDetail.InventoryId.Value); + if (actualQty > 0) + { + var inventoryTransaction = _mapper.Map(inventory); + inventoryTransaction.Type = InventoryTranType.出库; + inventoryTransaction.Qty = actualQty; + inventoryTransaction.BillType = InventoryTransaction.ErpSaleOutBillType; + inventoryTransaction.SourceCode = shipmentHeader.SourceCode; + inventoryTransaction.BillCode = groupCodes[shipmentHeader.ID]; + inventoryTransaction.BillDetailId = shipmentDetail.ID; + inventoryTransaction.UploadErpFlag = 0; + inventoryTransaction.CreateBy = operatorCode; + inventoryTransaction.CreateTime = now; + _unitWork.Add(inventoryTransaction); + + if (!erpGroups.TryGetValue(shipmentHeader.ID, out var groupTransactions)) + { + groupTransactions = new List(); + erpGroups[shipmentHeader.ID] = groupTransactions; + } + groupTransactions.Add(inventoryTransaction); + } + + shipmentDetail.CompletedQty = (shipmentDetail.CompletedQty ?? 0) + actualQty; + shipmentDetail.UpdateVersion++; + shipmentDetail.UpdateBy = operatorCode; + shipmentDetail.UpdateTime = now; + + taskDetail.Status = TaskStatusEnum.完成; + taskDetail.UpdateBy = operatorCode; + taskDetail.UpdateTime = now; + var taskDetailHistory = _mapper.Map(taskDetail); + _unitWork.Add(taskDetailHistory); + _unitWork.Delete(taskDetail); + } + + foreach (var inventoryGroup in taskDetails.GroupBy(x => x.InventoryId.Value)) + { + var inventory = inventories.First(x => x.ID == inventoryGroup.Key); + var actualQty = inventoryGroup.Sum(x => + request.Rows.First(y => y.TaskDetailId == x.ID).ActualQty); + inventory.Qty = (inventory.Qty ?? 0) - actualQty; + inventory.TaskStatus = InventoryTaskStatusEnum.Idle; + inventory.UpdateBy = operatorCode; + inventory.UpdateTime = now; + if (inventory.Qty <= 0) + { + _unitWork.Delete(inventory); + } + else + { + _unitWork.Update(inventory); + } + } + + var remainingInventories = _unitWork.Find(x => x.ContainerCode == task.ContainerCode) + .ToList(); + foreach (var inventory in remainingInventories) + { + inventory.TaskStatus = InventoryTaskStatusEnum.Idle; + inventory.UpdateBy = operatorCode; + inventory.UpdateTime = now; + } + _unitWork.BatchUpdate(remainingInventories); + + foreach (var shipmentDetail in shipmentDetails.Values) + { + shipmentDetail.DividedQty = _unitWork.Find(x => + x.OrderDetailId == shipmentDetail.ID + && x.Status != TaskStatusEnum.完成) + .Sum(x => x.Qty) ?? 0; + UpdateShipmentDetailStatus(shipmentDetail); + _unitWork.Update(shipmentDetail); + } + foreach (var shipmentHeaderId in shipmentHeaderIds) + { + UpdateShipmentHeaderStatus(shipmentHeaders[shipmentHeaderId]); + } + + var container = _unitWork.FindSingle(x => x.Code == task.ContainerCode); + if (container != null) + { + container.IsLock = ContainerLockEnum.未锁; + container.UpdateBy = operatorCode; + container.UpdateTime = now; + _unitWork.Update(container); + } + + task.Status = TaskStatusEnum.完成; + task.UpdateBy = operatorCode; + task.UpdateTime = now; + var taskHistory = _mapper.Map(task); + _unitWork.Add(taskHistory); + _unitWork.Delete(task); + + await transaction.CommitAsync(); + } + catch (Exception ex) + { + await transaction.RollbackAsync(); + return JsonMore(null, 500, ex.InnerException?.Message ?? ex.Message); + } + } + + var erpSuccess = true; + var inventoryVm = Wtm.CreateVM(); + foreach (var group in erpGroups.Values) + { + if (!await inventoryVm.ProcessErpSaleOut(group, false)) + { + erpSuccess = false; + } + } + + var resultMessage = erpGroups.Count == 0 + ? "发货确认完成,本次实际出库数量为0,无需回传ERP" + : erpSuccess + ? "发货确认完成,ERP回传成功" + : "实物出库已完成,ERP回传失败,已进入补传队列"; + return JsonMore(new + { + ErpSuccess = erpSuccess, + Message = resultMessage + }); + } + + private void UpdateShipmentDetailStatus(ShipmentDetail detail) + { + var qty = detail.Qty ?? 0; + var completedQty = detail.CompletedQty ?? 0; + var dividedQty = detail.DividedQty ?? 0; + detail.Status = completedQty >= qty + ? ShipStatusEnum.拣货完成 + : completedQty > 0 + ? ShipStatusEnum.拣货中 + : dividedQty >= qty && qty > 0 + ? ShipStatusEnum.分配完成 + : dividedQty > 0 + ? ShipStatusEnum.分配中 + : ShipStatusEnum.新建; + } + + private void UpdateShipmentHeaderStatus(int shipmentHeaderId) + { + var header = _unitWork.FindSingle(x => x.ID == shipmentHeaderId); + if (header == null) + { + return; + } + + UpdateShipmentHeaderStatus(header); + } + + private void UpdateShipmentHeaderStatus(ShipmentHeader header) + { + + var details = _unitWork.Find(x => x.HeaderId == header.ID).ToList(); + var status = details.Any() && details.All(x => (x.CompletedQty ?? 0) >= (x.Qty ?? 0)) + ? ShipStatusEnum.拣货完成 + : details.Any(x => (x.CompletedQty ?? 0) > 0) + ? ShipStatusEnum.拣货中 + : details.Any() && details.All(x => + (x.CompletedQty ?? 0) + (x.DividedQty ?? 0) >= (x.Qty ?? 0)) + ? ShipStatusEnum.分配完成 + : details.Any(x => (x.DividedQty ?? 0) > 0) + ? ShipStatusEnum.分配中 + : ShipStatusEnum.新建; + header.FirstStatus = status; + header.LastStatus = status; + header.UpdateBy = Wtm.LoginUserInfo?.ITCode ?? "WMS"; + header.UpdateTime = DateTime.Now; + _unitWork.Update(header); + } + } + + public class ShipmentConfirmRequest + { + public string ContainerCode { get; set; } + + public List Rows { get; set; } + } + + public class ShipmentConfirmRow + { + public int TaskDetailId { get; set; } + + public decimal ActualQty { get; set; } + } +} diff --git a/HHWMS.Web/Areas/Receipt/Controllers/SimpleReceiptInController.cs b/HHWMS.Web/Areas/Receipt/Controllers/SimpleReceiptInController.cs index f927a03..9eb0d3a 100644 --- a/HHWMS.Web/Areas/Receipt/Controllers/SimpleReceiptInController.cs +++ b/HHWMS.Web/Areas/Receipt/Controllers/SimpleReceiptInController.cs @@ -57,6 +57,17 @@ namespace HHWMS.Web.Controllers return Json(new { Code = 400, Msg = $"{containerCode} 容器状态不正确!已存在任务或者已在库内" }); } + if (TryGetShipmentContainerData(containerCode, out var shipmentRows)) + { + return Json(new + { + Code = 200, + Msg = "已加载ERP发货分配,请确认实际出库数量", + Data = shipmentRows, + IsShipment = true + }); + } + // var task = _unitWork.FindSingle(u => u.ContainerCode == containerCode); // if (task != null && !string.IsNullOrWhiteSpace(task.ToLocation)) // { @@ -82,7 +93,8 @@ namespace HHWMS.Web.Controllers return Json(new { Code = 200, Msg = "验证成功", - Data = inventories + Data = inventories, + IsShipment = false }); } catch (Exception ex) diff --git a/HHWMS.Web/Areas/Receipt/Views/SimpleReceiptIn/Index.cshtml b/HHWMS.Web/Areas/Receipt/Views/SimpleReceiptIn/Index.cshtml index 9577fc0..715eb4e 100644 --- a/HHWMS.Web/Areas/Receipt/Views/SimpleReceiptIn/Index.cshtml +++ b/HHWMS.Web/Areas/Receipt/Views/SimpleReceiptIn/Index.cshtml @@ -72,13 +72,20 @@ 入库 空托入库 呼叫出库 + 确认发货 - + + 当前托盘来自ERP发货任务。请逐条填写实际出库数量(可以为0),确认后系统一次完成库存扣减、释放分配并回传ERP。 + + +