diff --git a/HHWMS.Web/Areas/Agv/Views/AgvTask/Create.cshtml b/HHWMS.Web/Areas/Agv/Views/AgvTask/Create.cshtml index 3a27027..ad93b25 100644 --- a/HHWMS.Web/Areas/Agv/Views/AgvTask/Create.cshtml +++ b/HHWMS.Web/Areas/Agv/Views/AgvTask/Create.cshtml @@ -178,6 +178,11 @@ const validDetails = form.details .filter(d => d.materialCode && d.materialCode.trim()) .map(d => ({ MaterialCode: d.materialCode.trim(), Qty: d.qty || 0, Batch: d.batch || "", ErpDetailId: d.erpDetailId || "" })); + // 有物料明细时数量必须大于 0(用于库存增减与 ERP 上报) + if (validDetails.some(d => !d.Qty || d.Qty <= 0)) { + Message.warning("物料数量必须大于 0"); + return; + } const { data } = await axios.post("/agv/AgvTask/Create", { TaskType: form.taskType, FromLocation: form.fromLocation.trim(), diff --git a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryVM.cs b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryVM.cs index 08bf72c..744f127 100644 --- a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryVM.cs +++ b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryVM.cs @@ -343,6 +343,79 @@ namespace HHWMS.Web } } + /// 平库材料出库上报的仓库编码,固定值 + private const string RdRecord11WhCode = "yl"; + + /// + /// 回传 ERP 平库材料出库单(AddRdRecord11):同一 BillCode 的多条流水合并为一张出库单 + /// + public async Task ProcessErpRdRecord11(List transactions) + { + transactions = transactions? + .Where(x => x.Type == InventoryTranType.出库 + && x.BillType == InventoryTransaction.ErpRdRecord11BillType) + .ToList(); + if (transactions == null || transactions.Count == 0) + { + return false; + } + + var first = transactions.OrderBy(x => x.ID).First(); + var maker = unitWork.FindSingle(x => x.ITCode == first.CreateBy)?.Name + ?? first.CreateBy + ?? "WMS"; + var request = new AddRdRecord11Request + { + Main = new AddRdRecord11Main + { + ErpCode = "003", + BillCode = first.BillCode, + BillDate = (first.CreateTime ?? DateTime.Now).ToString("yyyy-MM-dd"), + WhCode = RdRecord11WhCode, + DepCode = null, + Maker = maker + }, + Details = transactions + .GroupBy(x => x.MaterialCode) + .Select(g => new AddRdRecord11Detail + { + InvCode = g.Key, + Qty = g.Sum(x => x.Qty ?? 0) + }) + .ToList() + }; + + try + { + var apiResult = await Wtm.CallAPI("ERP", "AddRdRecord11", + 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) + { + Wtm.DoLog("ERP平库出库上报失败", ActionLogTypesEnum.Normal, "AddRdRecord11", + request: $"{request.Main.BillCode}|{string.Join(",", request.Details.Select(d => $"{d.InvCode}:{d.Qty}"))}", + 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, "AddRdRecord11", + request: first.BillCode, result: ex.Message); + return false; + } + } + private void UpdateSaleOutShipmentStatus(List shipmentHeaderIds) { foreach (var headerId in shipmentHeaderIds) diff --git a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs index 00654e3..b70c96d 100644 --- a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs +++ b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs @@ -343,12 +343,6 @@ namespace HHWMS.Web.Controllers return Json(new { Code = 500, Msg = "物料不存在" }); } - // 生产单号必填:入库时必须选择由订单列表带出的生产单号 - if (string.IsNullOrWhiteSpace(model.SourceCode)) - { - return Json(new { Code = 500, Msg = "请选择生产单号" }); - } - if (material.Qty == null || material.Qty <= 0) { return Json(new { Code = 500, Msg = "物料毛重没有设置,请设置后再执行入库" }); diff --git a/HHWMS.Web/Areas/Receipt/Views/ReceiptIn/Index.cshtml b/HHWMS.Web/Areas/Receipt/Views/ReceiptIn/Index.cshtml index 660816a..03d17c8 100644 --- a/HHWMS.Web/Areas/Receipt/Views/ReceiptIn/Index.cshtml +++ b/HHWMS.Web/Areas/Receipt/Views/ReceiptIn/Index.cshtml @@ -168,9 +168,9 @@ type: [ { required: true, message: '请选择托盘类型', trigger: ['change', 'blur'] } ], - sourceCode: [ - { required: true, message: '请选择生产单号', trigger: ['change', 'blur'] } - ], + //sourceCode: [ + //{ required: true, message: '请选择生产单号', trigger: ['change', 'blur'] } + //], //billCode: [ //{ required: true, message: '请输入客户单据', trigger: ['change', 'blur'] } //], diff --git a/HHWMS.Web/Areas/Shipment/Controllers/ShipmentHeaderController.Erp.cs b/HHWMS.Web/Areas/Shipment/Controllers/ShipmentHeaderController.Erp.cs index da4eadd..88eee5a 100644 --- a/HHWMS.Web/Areas/Shipment/Controllers/ShipmentHeaderController.Erp.cs +++ b/HHWMS.Web/Areas/Shipment/Controllers/ShipmentHeaderController.Erp.cs @@ -81,20 +81,37 @@ namespace HHWMS.Web.Controllers return JsonMore(null, 500, "只有ERP发货通知单允许使用分配/下发"); } - var details = _unitwork.Find(x => x.HeaderId == headerId && x.DLsID.HasValue) + // 明细的图号/物料名称可能因 ERP 未返回或历史数据为空,展示时用物料表兜底(不修改库内数据) + var detailList = _unitwork.Find(x => x.HeaderId == headerId && x.DLsID.HasValue) .OrderBy(x => x.ID) - .Select(x => new + .ToList(); + var detailMaterialCodes = detailList + .Where(x => !string.IsNullOrWhiteSpace(x.MaterialCode)) + .Select(x => x.MaterialCode) + .Distinct() + .ToList(); + var detailMaterials = detailMaterialCodes.Count > 0 + ? _unitwork.Find(x => detailMaterialCodes.Contains(x.MaterialCode)) + .ToDictionary(x => x.MaterialCode) + : new Dictionary(); + + // 图号/物料名称统一从物料表取(物料表取不到时再退回明细自带的值) + var details = detailList.Select(x => { - x.ID, - x.DLsID, - x.MaterialCode, - x.MaterialName, - x.MaterialType, - Qty = x.Qty ?? 0, - CompletedQty = x.CompletedQty ?? 0, - DividedQty = x.DividedQty ?? 0, - RemainingQty = (x.Qty ?? 0) - (x.CompletedQty ?? 0) - (x.DividedQty ?? 0), - Status = x.Status.ToString() + detailMaterials.TryGetValue(x.MaterialCode ?? "", out var material); + return new + { + x.ID, + x.DLsID, + x.MaterialCode, + MaterialName = material?.MaterialName ?? x.MaterialName, + MaterialType = material?.MaterialType ?? x.MaterialType, + Qty = x.Qty ?? 0, + CompletedQty = x.CompletedQty ?? 0, + DividedQty = x.DividedQty ?? 0, + RemainingQty = (x.Qty ?? 0) - (x.CompletedQty ?? 0) - (x.DividedQty ?? 0), + Status = x.Status.ToString() + }; }) .ToList(); @@ -126,11 +143,32 @@ namespace HHWMS.Web.Controllers var shipmentHeaders = _unitwork.Find(x => shipmentHeaderIds.Contains(x.ID)) .ToDictionary(x => x.ID); + // 托盘任务 → 库位:按任务明细里的库存ID取库存所在库位(同一托盘的库存库位一致),取不到时退回任务起点库位 + var taskInventoryIds = allTaskDetails + .Where(x => x.InventoryId.HasValue) + .Select(x => x.InventoryId.Value) + .Distinct() + .ToList(); + var inventoryLocations = taskInventoryIds.Count > 0 + ? _unitwork.Find(x => taskInventoryIds.Contains(x.ID)) + .ToDictionary(x => x.ID, x => x.LocationCode) + : new Dictionary(); + var taskLocations = new Dictionary(); + foreach (var task in taskHeaders) + { + var locationCode = allTaskDetails + .Where(x => x.HeaderId == task.ID && x.InventoryId.HasValue) + .Select(x => inventoryLocations.TryGetValue(x.InventoryId.Value, out var loc) ? loc : null) + .FirstOrDefault(l => !string.IsNullOrWhiteSpace(l)); + taskLocations[task.ID] = string.IsNullOrWhiteSpace(locationCode) ? task.FromLocation : locationCode; + } + var tasks = taskHeaders.Select(task => new { task.ID, task.TaskNo, task.ContainerCode, + LocationCode = taskLocations[task.ID], task.FromLocation, task.ToLocation, Status = task.Status.ToString(), @@ -228,6 +266,13 @@ namespace HHWMS.Web.Controllers var locationCodes = inventories.Select(x => x.LocationCode).Distinct().ToList(); var locations = _unitwork.Find(x => locationCodes.Contains(x.Code)) .ToDictionary(x => x.Code); + // 公司名称从本地客商表(Customer)取,取不到则回退显示公司编码 + var companyCodes = inventories.Select(x => x.CompanyCode) + .Where(x => !string.IsNullOrWhiteSpace(x)) + .Distinct() + .ToList(); + var customers = _unitwork.Find(x => companyCodes.Contains(x.Code)) + .ToDictionary(x => x.Code, x => x.Name); var result = inventories.Select(inventory => { @@ -235,6 +280,7 @@ namespace HHWMS.Web.Controllers var task = activeTasks.FirstOrDefault(x => x.ContainerCode == inventory.ContainerCode); containers.TryGetValue(inventory.ContainerCode, out var container); locations.TryGetValue(inventory.LocationCode, out var location); + customers.TryGetValue(inventory.CompanyCode ?? "", out var companyName); var isPendingShipmentTask = task != null && task.Status == TaskStatusEnum.待下发 && shipmentTaskIds.Contains(task.ID); @@ -248,6 +294,8 @@ namespace HHWMS.Web.Controllers inventory.ID, inventory.ContainerCode, inventory.LocationCode, + inventory.CompanyCode, + CompanyName = string.IsNullOrWhiteSpace(companyName) ? inventory.CompanyCode : companyName, inventory.MaterialCode, inventory.MaterialName, inventory.MaterialType, diff --git a/HHWMS.Web/Areas/Shipment/Views/ShipmentHeader/Allocate.cshtml b/HHWMS.Web/Areas/Shipment/Views/ShipmentHeader/Allocate.cshtml index ae0a208..db595a7 100644 --- a/HHWMS.Web/Areas/Shipment/Views/ShipmentHeader/Allocate.cshtml +++ b/HHWMS.Web/Areas/Shipment/Views/ShipmentHeader/Allocate.cshtml @@ -14,6 +14,7 @@