feat: 接入ERP成品发货出库流程

This commit is contained in:
mtf 2026-07-17 21:20:21 +08:00
parent 66a1f60428
commit 7c2722c88d
25 changed files with 2547 additions and 22 deletions

View File

@ -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<TaskDetail>(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<ShipmentDetail>(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<Inventory>(x => x.ContainerCode == task.ContainerCode).ToList();
var invTrans = new List<InventoryTransaction>();
@ -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<TaskHeaderHistory>(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<TaskHeaderHistory>(task);
_unitWork.Add(taskHistory);
// 删除原任务
_unitWork.Delete(task);
}
// 提交事务
await transaction.CommitAsync();

View File

@ -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
}
}
}
}
}

View File

@ -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<ActionResult> RetryAddSaleOut(string id)
{
if (!int.TryParse(id, out var transactionId))
{
return FFResult().Alert("库存交易记录参数错误").RefreshGrid();
}
var transaction = _unitwork.FindSingle<InventoryTransaction>(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<InventoryTransaction>(x =>
x.BillType == InventoryTransaction.ErpSaleOutBillType
&& x.BillCode == transaction.BillCode
&& x.UploadErpFlag != 1)
.ToList();
var vm = Wtm.CreateVM<InventoryVM>();
var success = await vm.ProcessErpSaleOut(transactions, true);
return success
? FFResult().Alert("本批成品出库回传ERP成功").RefreshGrid()
: FFResult().Alert("本批成品出库回传ERP失败").RefreshGrid();
}
#endregion ERP成品出库补传
}
}

View File

@ -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; }
}
}

View File

@ -225,5 +225,139 @@ namespace HHWMS.Web
}
return success;
}
/// <summary>
/// 回传ERP成品出库。同一BillCode代表同一次人工确认、同一张ERP发货通知单。
/// 补传时按既定规则重新生成CK单号,但不会再次扣减WMS库存。
/// </summary>
public async Task<bool> ProcessErpSaleOut(List<InventoryTransaction> 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<ShipmentDetail>(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<FrameworkUser>(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<FinishInResponse>("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<int> shipmentHeaderIds)
{
foreach (var headerId in shipmentHeaderIds)
{
var header = unitWork.FindSingle<ShipmentHeader>(x => x.ID == headerId);
if (header == null)
{
continue;
}
var details = unitWork.Find<ShipmentDetail>(x => x.HeaderId == headerId).ToList();
var detailIds = details.Select(x => x.ID).ToList();
var hasPendingUpload = unitWork.IsExit<InventoryTransaction>(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);
}
}
}
}
}

View File

@ -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<TaskHeader>(x =>
x.ContainerCode == containerCode
&& x.TaskType == TaskTypeEnum.出库
&& x.Status == TaskStatusEnum.到站台);
if (task == null)
{
return false;
}
var taskDetails = _unitWork.Find<TaskDetail>(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<Inventory>(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<ShipmentDetail>(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<ShipmentHeader>(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<ActionResult> ConfirmShipment([FromBody] ShipmentConfirmRequest request)
{
if (request == null || string.IsNullOrWhiteSpace(request.ContainerCode)
|| request.Rows == null)
{
return JsonMore(null, 500, "确认发货参数不完整");
}
var erpGroups = new Dictionary<int, List<InventoryTransaction>>();
using (var transaction = DC.BeginTransaction())
{
try
{
// 锁定到站任务,避免重复点击或多实例同时确认造成库存重复扣减。
var task = DC.Set<TaskHeader>()
.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<TaskDetail>(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<Inventory>();
foreach (var inventoryId in inventoryIds.OrderBy(x => x))
{
var inventory = DC.Set<Inventory>()
.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<int, ShipmentDetail>();
foreach (var shipmentDetailId in shipmentDetailIds.OrderBy(x => x))
{
var shipmentDetail = DC.Set<ShipmentDetail>()
.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<TaskDetail>(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<ShipmentHeader>(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<InventoryTransaction>(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<InventoryTransaction>();
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<TaskDetailHistory>(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<Inventory>(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<TaskDetail>(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<Container>(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<TaskHeaderHistory>(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<InventoryVM>();
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<ShipmentHeader>(x => x.ID == shipmentHeaderId);
if (header == null)
{
return;
}
UpdateShipmentHeaderStatus(header);
}
private void UpdateShipmentHeaderStatus(ShipmentHeader header)
{
var details = _unitWork.Find<ShipmentDetail>(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<ShipmentConfirmRow> Rows { get; set; }
}
public class ShipmentConfirmRow
{
public int TaskDetailId { get; set; }
public decimal ActualQty { get; set; }
}
}

View File

@ -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<TaskHeader>(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)

View File

@ -72,13 +72,20 @@
<a-button @@click="handleClick" :loading="loading1" type="primary">入库</a-button>
<a-button @@click="emptyIn" :loading="loading1" type="success">空托入库</a-button>
<a-button @@click="outClick" :loading="loading1" type="primary">呼叫出库</a-button>
<a-button v-if="isShipment" @@click="confirmShipment" :loading="shipmentLoading"
type="primary" status="success">确认发货</a-button>
</a-space>
</a-form-item>
</a-form>
<a-table :data="bindList" :columns="columns" :pagination="false">
<a-alert v-if="isShipment" type="warning">
当前托盘来自ERP发货任务。请逐条填写实际出库数量(可以为0),确认后系统一次完成库存扣减、释放分配并回传ERP。
</a-alert>
<a-table :data="bindList" :columns="displayColumns" :pagination="false"
:row-key="record => isShipment ? record.TaskDetailId : record.Id">
<template #operations="{ record }">
<a-space>
<a-space v-if="!isShipment">
<a-button type="text" status="danger" @@click="handleDelete(record)">删除</a-button>
@* <a-button type="text" @@click="handleEdit(record)">修改</a-button> *@
<a-button type="text" @@click="handleDeduct(record)">扣料</a-button>
@ -87,6 +94,10 @@
<template #qty="{ record }">
{{ Math.floor(record.Qty) }}
</template>
<template #actualQty="{ record }">
<a-input-number v-if="isShipment" v-model="record.ActualQty" :min="0"
:precision="4" style="width: 130px" />
</template>
</a-table>
<a-modal v-model:visible="editModalVisible" title="修改数量" @@ok="handleEditConfirm" @@cancel="handleEditCancel">
@ -131,6 +142,8 @@
data() {
return {
loading1: false,
shipmentLoading: false,
isShipment: false,
materialOptions: [],
orderOptions: [],
searchTimer: null,
@ -197,10 +210,41 @@
dataIndex: 'CompanyCode',
},
{
title: '数量',
title: 'ERP发货单',
dataIndex: 'ShipmentCode',
shipmentOnly: true,
width: 150
},
{
title: '需求数量',
dataIndex: 'RequiredQty',
shipmentOnly: true,
width: 100
},
{
title: '已出库',
dataIndex: 'CompletedQty',
shipmentOnly: true,
width: 100
},
{
title: '本托分配',
dataIndex: 'AllocatedQty',
shipmentOnly: true,
width: 100
},
{
title: '当前库存',
dataIndex: 'Qty',
slotName: 'Qty'
},
{
title: '实际出库',
dataIndex: 'ActualQty',
slotName: 'actualQty',
shipmentOnly: true,
width: 150
},
{
title: '操作',
slotName: 'operations',
@ -232,6 +276,9 @@
this.history.batch = JSON.parse(localStorage.getItem('batchHistory') || '[]');
},
computed: {
displayColumns() {
return this.columns.filter(column => !column.shipmentOnly || this.isShipment);
},
// 部件名称提示列表
batchTips() {
return this.getFilteredTips('batch', this.formData.batch);
@ -465,6 +512,10 @@
},
handleClick() {
if (this.isShipment) {
this.$notification.error('请先确认当前ERP发货,确认后才能将余料回库!');
return;
}
if (!this.formData.containerCode) {
this.$notification.error('请扫描箱号!');
return;
@ -510,6 +561,7 @@
const json = response.data;
if (json.Code == 200) {
this.$message.success("容器验证成功");
this.isShipment = json.IsShipment === true;
// 更新绑定列表
this.bindList = json.Data;
// 验证成功后,将焦点设置到物料编码输入框
@ -520,6 +572,7 @@
this.$message.error(json.Msg || "容器验证失败");
this.formData.containerCode = '';
this.bindList = [];
this.isShipment = false;
}
})
.catch((error) => {
@ -527,9 +580,48 @@
this.$message.error("容器验证失败: " + (error.message || '网络错误'));
this.formData.containerCode = '';
this.bindList = [];
this.isShipment = false;
});
},
confirmShipment() {
if (!this.isShipment || !this.formData.containerCode) {
this.$notification.error('当前没有待确认的ERP发货托盘!');
return;
}
if (this.bindList.some(item => item.ActualQty === null || item.ActualQty === undefined || Number(item.ActualQty) < 0)) {
this.$notification.error('请填写全部实际出库数量,数量可以为0但不能小于0!');
return;
}
this.shipmentLoading = true;
axios.post('/receipt/SimpleReceiptIn/ConfirmShipment', {
ContainerCode: this.formData.containerCode,
Rows: this.bindList.map(item => ({
TaskDetailId: item.TaskDetailId,
ActualQty: Number(item.ActualQty)
}))
}).then(response => {
const json = response.data;
if (Number(json.Code) === 200) {
const message = json.Data?.Message || '发货确认完成';
if (json.Data?.ErpSuccess === false) {
this.$notification.warning({ content: message, duration: 8000, closable: true });
} else {
this.$notification.success(message);
}
this.isShipment = false;
this.validateContainer();
} else {
this.$notification.error({ content: json.Msg || '确认发货失败', duration: 8000, closable: true });
}
}).catch(error => {
this.$notification.error({ content: error.message || '确认发货失败', duration: 8000, closable: true });
}).finally(() => {
this.shipmentLoading = false;
});
},
handleDelete(record) {
if (!record || !record.Id) {
this.$message.error("无效的记录");

View File

@ -0,0 +1,944 @@
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;
using WalkingTec.Mvvm.Mvc;
namespace HHWMS.Web.Controllers
{
public partial class ShipmentHeaderController
{
private static readonly string[] FinishedGoodsOutPorts =
{
"EnterExit_P1001",
"EnterExit_P1004",
"EnterExit_P1007",
"EnterExit_P1008",
"EnterExit_P1009",
"EnterExit_P1010"
};
[ActionDescription("获取ERP发货通知单")]
public ActionResult GetShipmentDetails()
{
return PartialView(Wtm.CreateVM<ShipmentHeaderVM>());
}
[HttpPost]
[ActionDescription("获取ERP发货通知单")]
public async Task<IActionResult> GetShipmentDetails(ShipmentHeaderVM vm)
{
var dispatchCode = vm?.Entity?.SourceCode?.Trim();
if (string.IsNullOrWhiteSpace(dispatchCode))
{
return FFResult().Alert("请输入ERP发货通知单号");
}
var result = await LoadDispatch(dispatchCode);
return result.Success
? FFResult().CloseDialog().RefreshGrid().Alert($"拉取成功,共处理 {result.Data} 条明细")
: FFResult().Alert($"拉取失败:{result.Msg}");
}
[ActionDescription("分配库存")]
public ActionResult Allocate(string id)
{
if (!int.TryParse(id, out var headerId))
{
return FFResult().Alert("出库单参数错误").RefreshGrid();
}
var vm = Wtm.CreateVM<ShipmentHeaderVM>(headerId);
if (vm.Entity == null || vm.Entity.ID == 0)
{
return FFResult().Alert("出库单不存在").RefreshGrid();
}
if (!_unitwork.IsExit<ShipmentDetail>(x => x.HeaderId == headerId && x.DLsID.HasValue))
{
return FFResult().Alert("只有ERP发货通知单允许使用分配/下发").RefreshGrid();
}
return PartialView(vm);
}
[HttpGet]
public ActionResult GetAllocationData(int headerId)
{
var header = _unitwork.FindSingle<ShipmentHeader>(x => x.ID == headerId);
if (header == null)
{
return JsonMore(null, 500, "出库单不存在");
}
if (!_unitwork.IsExit<ShipmentDetail>(x => x.HeaderId == headerId && x.DLsID.HasValue))
{
return JsonMore(null, 500, "只有ERP发货通知单允许使用分配/下发");
}
var details = _unitwork.Find<ShipmentDetail>(x => x.HeaderId == headerId && x.DLsID.HasValue)
.OrderBy(x => x.ID)
.Select(x => new
{
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()
})
.ToList();
var detailIds = details.Select(x => x.ID).ToList();
var relatedTaskIds = _unitwork.Find<TaskDetail>(x =>
x.OrderDetailId.HasValue
&& detailIds.Contains(x.OrderDetailId.Value)
&& x.Status != TaskStatusEnum.完成)
.Select(x => x.HeaderId)
.Distinct()
.ToList();
var taskHeaders = _unitwork.Find<TaskHeader>(x => relatedTaskIds.Contains(x.ID))
.OrderBy(x => x.ID)
.ToList();
var allTaskDetails = _unitwork.Find<TaskDetail>(x =>
relatedTaskIds.Contains(x.HeaderId)
&& x.Status != TaskStatusEnum.完成)
.OrderBy(x => x.ID)
.ToList();
var allShipmentDetailIds = allTaskDetails
.Where(x => x.OrderDetailId.HasValue)
.Select(x => x.OrderDetailId.Value)
.Distinct()
.ToList();
var shipmentDetails = _unitwork.Find<ShipmentDetail>(x => allShipmentDetailIds.Contains(x.ID))
.ToDictionary(x => x.ID);
var shipmentHeaderIds = shipmentDetails.Values.Select(x => x.HeaderId).Distinct().ToList();
var shipmentHeaders = _unitwork.Find<ShipmentHeader>(x => shipmentHeaderIds.Contains(x.ID))
.ToDictionary(x => x.ID);
var tasks = taskHeaders.Select(task => new
{
task.ID,
task.TaskNo,
task.ContainerCode,
task.FromLocation,
task.ToLocation,
Status = task.Status.ToString(),
CanDispatch = task.Status == TaskStatusEnum.待下发,
CanCancel = task.Status == TaskStatusEnum.待下发,
Details = allTaskDetails.Where(x => x.HeaderId == task.ID).Select(x =>
{
shipmentDetails.TryGetValue(x.OrderDetailId ?? 0, out var shipmentDetail);
ShipmentHeader shipmentHeader = null;
if (shipmentDetail != null)
{
shipmentHeaders.TryGetValue(shipmentDetail.HeaderId, out shipmentHeader);
}
return new
{
x.ID,
x.InventoryId,
x.MaterialCode,
x.ContainerCode,
Qty = x.Qty ?? 0,
ShipmentCode = shipmentHeader?.SourceCode ?? shipmentHeader?.Code,
ShipmentDetailId = shipmentDetail?.ID,
Status = x.Status.ToString(),
CanCancel = task.Status == TaskStatusEnum.待下发
};
}).ToList()
}).ToList();
return JsonMore(new
{
Header = new
{
header.ID,
header.Code,
header.SourceCode,
Status = header.FirstStatus.ToString()
},
Details = details,
Tasks = tasks,
OutPorts = FinishedGoodsOutPorts.Select((x, index) => new
{
Label = $"拣货口{index + 1}",
Value = x
})
});
}
[HttpGet]
public ActionResult GetAvailableInventories(int detailId)
{
var detail = _unitwork.FindSingle<ShipmentDetail>(x => x.ID == detailId);
if (detail == null || !detail.DLsID.HasValue)
{
return JsonMore(null, 500, "ERP出库明细不存在");
}
var inventories = _unitwork.Find<Inventory>(x =>
x.ZoneId == 1028
&& x.MaterialCode == detail.MaterialCode
&& x.Qty > 0
&& !string.IsNullOrEmpty(x.LocationCode))
.OrderBy(x => x.ExpirationDate)
.ThenBy(x => x.ID)
.ToList();
var inventoryIds = inventories.Select(x => x.ID).ToList();
var containerCodes = inventories.Select(x => x.ContainerCode).Distinct().ToList();
var allocations = _unitwork.Find<TaskDetail>(x =>
x.InventoryId.HasValue
&& inventoryIds.Contains(x.InventoryId.Value)
&& x.Status != TaskStatusEnum.完成)
.ToList()
.GroupBy(x => x.InventoryId.Value)
.ToDictionary(x => x.Key, x => x.Sum(y => y.Qty ?? 0));
var activeTasks = _unitwork.Find<TaskHeader>(x => containerCodes.Contains(x.ContainerCode))
.ToList();
var activeTaskIds = activeTasks.Select(x => x.ID).ToList();
var activeTaskDetails = _unitwork.Find<TaskDetail>(x =>
activeTaskIds.Contains(x.HeaderId) && x.OrderDetailId.HasValue)
.ToList();
var activeOrderDetailIds = activeTaskDetails.Select(x => x.OrderDetailId.Value)
.Distinct()
.ToList();
var erpShipmentDetailIds = _unitwork.Find<ShipmentDetail>(x =>
activeOrderDetailIds.Contains(x.ID) && x.DLsID.HasValue)
.Select(x => x.ID)
.ToHashSet();
var shipmentTaskIds = activeTaskDetails
.Where(x => erpShipmentDetailIds.Contains(x.OrderDetailId.Value))
.Select(x => x.HeaderId)
.Distinct()
.ToHashSet();
var containers = _unitwork.Find<Container>(x => containerCodes.Contains(x.Code))
.ToDictionary(x => x.Code);
var locationCodes = inventories.Select(x => x.LocationCode).Distinct().ToList();
var locations = _unitwork.Find<Location>(x => locationCodes.Contains(x.Code))
.ToDictionary(x => x.Code);
var result = inventories.Select(inventory =>
{
allocations.TryGetValue(inventory.ID, out var allocatedQty);
var task = activeTasks.FirstOrDefault(x => x.ContainerCode == inventory.ContainerCode);
containers.TryGetValue(inventory.ContainerCode, out var container);
locations.TryGetValue(inventory.LocationCode, out var location);
var isPendingShipmentTask = task != null
&& task.Status == TaskStatusEnum.待下发
&& shipmentTaskIds.Contains(task.ID);
var isFree = task == null
&& inventory.TaskStatus == InventoryTaskStatusEnum.Idle
&& container?.IsLock != ContainerLockEnum.任务锁
&& location?.Status != LocationStatusEnum.锁定;
var availableQty = (inventory.Qty ?? 0) - allocatedQty;
return new
{
inventory.ID,
inventory.ContainerCode,
inventory.LocationCode,
inventory.MaterialCode,
inventory.MaterialName,
inventory.MaterialType,
inventory.Batch,
inventory.Lot,
Qty = inventory.Qty ?? 0,
AllocatedQty = allocatedQty,
AvailableQty = availableQty,
CanSelect = availableQty > 0 && (isFree || isPendingShipmentTask)
};
})
.Where(x => x.CanSelect)
.ToList();
return JsonMore(result);
}
[HttpPost]
public async Task<ActionResult> AllocateInventories([FromBody] ShipmentAllocationRequest request)
{
if (request?.Rows == null || request.Rows.Count == 0)
{
return JsonMore(null, 500, "请选择库存并填写分配数量");
}
if (request.Rows.Any(x => x.Qty <= 0)
|| request.Rows.GroupBy(x => x.InventoryId).Any(x => x.Count() > 1))
{
return JsonMore(null, 500, "分配数量必须大于0,且库存不能重复提交");
}
using (var transaction = DC.BeginTransaction())
{
try
{
// 锁定当前明细,避免两名操作员同时分配时都按旧的剩余数量通过校验。
var detail = DC.Set<ShipmentDetail>()
.FromSqlRaw("SELECT * FROM `ShipmentDetail` WHERE `ID` = {0} FOR UPDATE", request.DetailId)
.AsNoTracking()
.SingleOrDefault();
if (detail == null)
{
return JsonMore(null, 500, "出库明细不存在");
}
if (!detail.DLsID.HasValue)
{
return JsonMore(null, 500, "只有ERP发货明细允许分配库存");
}
var header = _unitwork.FindSingle<ShipmentHeader>(x => x.ID == detail.HeaderId);
var inventoryIds = request.Rows.Select(x => x.InventoryId).Distinct().ToList();
// 按固定顺序锁定所选库存,兼容多实例部署并降低交叉分配时的死锁概率。
var inventories = new List<Inventory>();
foreach (var inventoryId in inventoryIds.OrderBy(x => x))
{
var inventory = DC.Set<Inventory>()
.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, "部分库存已不存在,请刷新后重试");
}
if (inventories.Any(x => x.MaterialCode != detail.MaterialCode))
{
return JsonMore(null, 500, "所选库存物料与出库明细不一致");
}
if (inventories.Any(x => x.ZoneId != 1028))
{
return JsonMore(null, 500, "只能选择成品库库存");
}
detail.DividedQty = _unitwork.Find<TaskDetail>(x =>
x.OrderDetailId == detail.ID
&& x.Status != TaskStatusEnum.完成)
.Sum(x => x.Qty) ?? 0;
var detailRemaining = (detail.Qty ?? 0) - (detail.CompletedQty ?? 0) - (detail.DividedQty ?? 0);
if (request.Rows.Sum(x => x.Qty) > detailRemaining)
{
return JsonMore(null, 500, $"本次分配数量超过明细剩余可分配数量 {detailRemaining}");
}
var activeAllocations = _unitwork.Find<TaskDetail>(x =>
x.InventoryId.HasValue
&& inventoryIds.Contains(x.InventoryId.Value)
&& x.Status != TaskStatusEnum.完成)
.ToList()
.GroupBy(x => x.InventoryId.Value)
.ToDictionary(x => x.Key, x => x.Sum(y => y.Qty ?? 0));
foreach (var row in request.Rows)
{
var inventory = inventories.First(x => x.ID == row.InventoryId);
activeAllocations.TryGetValue(inventory.ID, out var allocatedQty);
if (allocatedQty + row.Qty > (inventory.Qty ?? 0))
{
return JsonMore(null, 500,
$"库存 {inventory.ID} 的累计分配数量不能超过当前库存 {(inventory.Qty ?? 0)}");
}
}
var now = DateTime.Now;
var operatorCode = Wtm.LoginUserInfo?.ITCode ?? "WMS";
foreach (var containerGroup in inventories.GroupBy(x => x.ContainerCode))
{
var containerCode = containerGroup.Key;
// 锁定托盘的活动任务范围,保证同一托盘只会生成一个待下发任务。
var activeTasks = DC.Set<TaskHeader>()
.FromSqlRaw("SELECT * FROM `TaskHeader` WHERE `ContainerCode` = {0} FOR UPDATE", containerCode)
.AsNoTracking()
.ToList();
if (activeTasks.Count > 1)
{
return JsonMore(null, 500, $"托盘 {containerCode} 存在多个活动任务,请先排查");
}
var task = activeTasks.SingleOrDefault();
if (task != null)
{
var taskOrderDetailIds = _unitwork.Find<TaskDetail>(x =>
x.HeaderId == task.ID && x.OrderDetailId.HasValue)
.Select(x => x.OrderDetailId.Value)
.Distinct()
.ToList();
var isPendingShipmentTask = task.Status == TaskStatusEnum.待下发
&& _unitwork.IsExit<ShipmentDetail>(x =>
taskOrderDetailIds.Contains(x.ID) && x.DLsID.HasValue);
if (!isPendingShipmentTask)
{
return JsonMore(null, 500, $"托盘 {containerCode} 已有任务,不能重复分配");
}
}
else
{
var firstInventory = containerGroup.First();
var container = _unitwork.FindSingle<Container>(x => x.Code == containerCode);
var location = _unitwork.FindSingle<Location>(x => x.Code == firstInventory.LocationCode);
if (container == null || location == null)
{
return JsonMore(null, 500, $"托盘 {containerCode} 的容器或库位数据不存在");
}
if (container.IsLock == ContainerLockEnum.任务锁
|| location.Status == LocationStatusEnum.锁定)
{
return JsonMore(null, 500, $"托盘 {containerCode} 已被其他任务锁定");
}
task = new TaskHeader
{
TaskNo = _unitwork.GetSerialNumber("Out", 6),
ZoneId = firstInventory.ZoneId,
TaskType = TaskTypeEnum.出库,
FromLocation = firstInventory.LocationCode,
ToLocation = "",
ContainerCode = containerCode,
RoadWay = 2,
Status = TaskStatusEnum.待下发,
CreateBy = operatorCode,
CreateTime = now
};
_unitwork.Add(task);
container.IsLock = ContainerLockEnum.任务锁;
container.UpdateBy = operatorCode;
container.UpdateTime = now;
_unitwork.Update(container);
location.Status = LocationStatusEnum.锁定;
location.UpdateBy = operatorCode;
location.UpdateTime = now;
_unitwork.Update(location);
}
var allPalletInventories = _unitwork.Find<Inventory>(x => x.ContainerCode == containerCode).ToList();
foreach (var palletInventory in allPalletInventories)
{
palletInventory.TaskStatus = InventoryTaskStatusEnum.Locked;
palletInventory.UpdateBy = operatorCode;
palletInventory.UpdateTime = now;
}
_unitwork.BatchUpdate(allPalletInventories);
foreach (var inventory in containerGroup)
{
var row = request.Rows.First(x => x.InventoryId == inventory.ID);
var taskDetail = _unitwork.FindSingle<TaskDetail>(x =>
x.HeaderId == task.ID
&& x.OrderDetailId == detail.ID
&& x.InventoryId == inventory.ID
&& x.Status == TaskStatusEnum.待下发);
if (taskDetail == null)
{
taskDetail = new TaskDetail
{
HeaderId = task.ID,
OrderCode = header.Code,
OrderDetailId = detail.ID,
MaterialCode = inventory.MaterialCode,
MaterialName = inventory.MaterialName,
MaterialSpec = inventory.MaterialSpec,
MaterialUnit = inventory.MaterialUnit,
Batch = inventory.Batch,
Lot = inventory.Lot,
ContainerCode = inventory.ContainerCode,
Qty = row.Qty,
InventoryId = inventory.ID,
FromLocation = task.FromLocation,
ToLocation = task.ToLocation,
Status = TaskStatusEnum.待下发,
CreateBy = operatorCode,
CreateTime = now
};
_unitwork.Add(taskDetail);
}
else
{
taskDetail.Qty = (taskDetail.Qty ?? 0) + row.Qty;
taskDetail.UpdateBy = operatorCode;
taskDetail.UpdateTime = now;
_unitwork.Update(taskDetail);
}
}
}
RecalculateShipmentDetail(detail);
RecalculateShipmentHeader(header);
await transaction.CommitAsync();
return JsonMore(null);
}
catch (Exception ex)
{
await transaction.RollbackAsync();
return JsonMore(null, 500, ex.InnerException?.Message ?? ex.Message);
}
}
}
[HttpPost]
public async Task<ActionResult> CancelAllocation(int id)
{
using (var transaction = DC.BeginTransaction())
{
try
{
var snapshot = _unitwork.FindSingle<TaskDetail>(x => x.ID == id);
if (snapshot == null)
{
return JsonMore(null, 500, "分配记录不存在");
}
// 与任务下发使用相同的任务行锁,避免取消和下发同时通过状态校验。
var task = DC.Set<TaskHeader>()
.FromSqlRaw("SELECT * FROM `TaskHeader` WHERE `ID` = {0} FOR UPDATE", snapshot.HeaderId)
.AsNoTracking()
.SingleOrDefault();
var taskDetail = DC.Set<TaskDetail>()
.FromSqlRaw("SELECT * FROM `TaskDetail` WHERE `ID` = {0} FOR UPDATE", id)
.AsNoTracking()
.SingleOrDefault();
if (task == null || taskDetail == null || taskDetail.HeaderId != task.ID
|| task.Status != TaskStatusEnum.待下发
|| taskDetail.Status != TaskStatusEnum.待下发)
{
return JsonMore(null, 500, "只有尚未下发WCS的分配允许取消");
}
var shipmentDetailId = taskDetail.OrderDetailId;
_unitwork.Delete(taskDetail);
if (!_unitwork.IsExit<TaskDetail>(x => x.HeaderId == task.ID))
{
ReleasePendingPallet(task);
_unitwork.Delete(task);
}
if (shipmentDetailId.HasValue)
{
var shipmentDetail = _unitwork.FindSingle<ShipmentDetail>(x => x.ID == shipmentDetailId.Value);
if (shipmentDetail != null)
{
RecalculateShipmentDetail(shipmentDetail);
RecalculateShipmentHeader(shipmentDetail.HeaderId);
}
}
await transaction.CommitAsync();
Wtm.DoLog("取消成品出库分配", ActionLogTypesEnum.Normal, "CancelAllocation",
request: id.ToString(), result: "取消成功");
return JsonMore(null);
}
catch (Exception ex)
{
await transaction.RollbackAsync();
return JsonMore(null, 500, ex.InnerException?.Message ?? ex.Message);
}
}
}
[HttpPost]
public async Task<ActionResult> CancelPendingTask(int id)
{
using (var transaction = DC.BeginTransaction())
{
try
{
var task = DC.Set<TaskHeader>()
.FromSqlRaw("SELECT * FROM `TaskHeader` WHERE `ID` = {0} FOR UPDATE", id)
.AsNoTracking()
.SingleOrDefault();
if (task == null || task.Status != TaskStatusEnum.待下发)
{
return JsonMore(null, 500, "只有尚未下发WCS的托盘任务允许取消");
}
var taskDetails = _unitwork.Find<TaskDetail>(x => x.HeaderId == task.ID).ToList();
var shipmentDetailIds = taskDetails.Where(x => x.OrderDetailId.HasValue)
.Select(x => x.OrderDetailId.Value)
.Distinct()
.ToList();
_unitwork.BatchDelete(taskDetails);
ReleasePendingPallet(task);
_unitwork.Delete(task);
foreach (var shipmentDetailId in shipmentDetailIds)
{
RecalculateShipmentDetail(shipmentDetailId);
}
var shipmentHeaderIds = _unitwork.Find<ShipmentDetail>(x => shipmentDetailIds.Contains(x.ID))
.Select(x => x.HeaderId)
.Distinct()
.ToList();
foreach (var shipmentHeaderId in shipmentHeaderIds)
{
RecalculateShipmentHeader(shipmentHeaderId);
}
await transaction.CommitAsync();
Wtm.DoLog("取消成品出库托盘任务", ActionLogTypesEnum.Normal, "CancelPendingTask",
request: id.ToString(), result: "取消成功");
return JsonMore(null);
}
catch (Exception ex)
{
await transaction.RollbackAsync();
return JsonMore(null, 500, ex.InnerException?.Message ?? ex.Message);
}
}
}
[HttpPost]
public ActionResult DispatchPendingTask(int id, string outPort)
{
if (!FinishedGoodsOutPorts.Contains(outPort))
{
return JsonMore(null, 500, "请选择有效的成品库出库口");
}
using (var transaction = DC.BeginTransaction())
{
try
{
// 持有任务行锁直到WCS响应,避免重复点击向WCS下发两次同一任务。
var task = DC.Set<TaskHeader>()
.FromSqlRaw("SELECT * FROM `TaskHeader` WHERE `ID` = {0} FOR UPDATE", id)
.AsNoTracking()
.SingleOrDefault();
if (task == null || task.Status != TaskStatusEnum.待下发)
{
return JsonMore(null, 500, "任务不存在或已下发,请刷新后重试");
}
var taskDetails = _unitwork.Find<TaskDetail>(x => x.HeaderId == task.ID).ToList();
if (!taskDetails.Any())
{
return JsonMore(null, 500, "任务没有分配明细,不能下发");
}
task.ToLocation = outPort;
task.ErrorMsg = null;
var locationVm = Wtm.CreateVM<LocationVM>();
var result = locationVm.SendWcsTask(task);
if (!result.Status)
{
task.Status = TaskStatusEnum.待下发;
_unitwork.Update(task);
transaction.Commit();
return JsonMore(null, 500, result.Message ?? "WCS任务下发失败");
}
foreach (var taskDetail in taskDetails)
{
taskDetail.ToLocation = outPort;
taskDetail.Status = TaskStatusEnum.已下发;
taskDetail.UpdateBy = Wtm.LoginUserInfo?.ITCode ?? "WMS";
taskDetail.UpdateTime = DateTime.Now;
}
_unitwork.BatchUpdate(taskDetails);
transaction.Commit();
return JsonMore(null);
}
catch (Exception ex)
{
transaction.Rollback();
return JsonMore(null, 500, ex.InnerException?.Message ?? ex.Message);
}
}
}
private async Task<ApiJsonResult<int>> LoadDispatch(string dispatchCode)
{
try
{
var items = new List<DispatchItem>();
const int pageSize = 100;
var page = 1;
var total = 0;
do
{
var request = new LoadDispatchRequest
{
ErpCode = "003",
BReturnFlag = 0,
DLCode = dispatchCode,
Size = pageSize,
Page = page
};
var apiResult = await Wtm.CallAPI<LoadDispatchResponse>("ERP", "LoadDispatch",
HttpMethodEnum.POST, request);
if (apiResult?.Data == null || apiResult.Data.Code != 0)
{
return new ApiJsonResult<int>
{
Success = false,
Msg = apiResult?.Data?.Msg ?? apiResult?.ErrorMsg ?? "ERP未返回有效数据"
};
}
total = apiResult.Data.Count;
if (apiResult.Data.Data != null)
{
items.AddRange(apiResult.Data.Data.Where(x => x.BReturnFlag == 0));
}
page++;
} while (items.Count < total && page <= 100);
if (!items.Any())
{
return new ApiJsonResult<int> { Success = false, Msg = "未查询到发货通知单" };
}
using (var transaction = DC.BeginTransaction())
{
try
{
ProcessDispatchItems(items);
await transaction.CommitAsync();
}
catch
{
await transaction.RollbackAsync();
throw;
}
}
return new ApiJsonResult<int> { Success = true, Data = items.Count };
}
catch (Exception ex)
{
Wtm.DoLog("获取ERP发货通知单失败", ActionLogTypesEnum.Normal, "LoadDispatch",
request: dispatchCode, result: ex.Message);
return new ApiJsonResult<int> { Success = false, Msg = ex.InnerException?.Message ?? ex.Message };
}
}
private void ProcessDispatchItems(List<DispatchItem> items)
{
var now = DateTime.Now;
var operatorCode = Wtm.LoginUserInfo?.ITCode ?? "WMS";
foreach (var group in items.Where(x => !string.IsNullOrWhiteSpace(x.DLCode) && x.DLsID > 0)
.GroupBy(x => x.DLCode))
{
var header = _unitwork.FindSingle<ShipmentHeader>(x => x.SourceCode == group.Key);
if (header == null)
{
header = new ShipmentHeader
{
SourceCode = group.Key,
Code = _unitwork.GetSerialNumber("SO"),
BillType = "sout",
CompanyCode = group.First().CusCode,
SupplierCode = group.First().CusCode,
TotalQty = group.Sum(x => x.DeliveryQty),
TotalLines = group.Select(x => x.DLsID).Distinct().Count(),
FirstStatus = ShipStatusEnum.新建,
LastStatus = ShipStatusEnum.新建,
Remark = group.First().CusName,
UpdateVersion = 1,
CreateBy = operatorCode,
CreateTime = now
};
_unitwork.Add(header);
}
else
{
header.CompanyCode = group.First().CusCode;
header.SupplierCode = group.First().CusCode;
header.Remark = group.First().CusName;
header.UpdateVersion++;
header.UpdateBy = operatorCode;
header.UpdateTime = now;
_unitwork.Update(header);
}
foreach (var item in group.GroupBy(x => x.DLsID).Select(x => x.First()))
{
var detail = _unitwork.FindSingle<ShipmentDetail>(x => x.DLsID == item.DLsID);
if (detail == null)
{
detail = new ShipmentDetail
{
HeaderId = header.ID,
DLsID = item.DLsID,
ZoneCode = "cp",
MaterialCode = item.InvCode,
MaterialName = item.InvName,
MaterialType = item.InvDefine1,
Qty = item.DeliveryQty,
CompletedQty = 0,
DividedQty = 0,
Status = ShipStatusEnum.新建,
UpdateVersion = 1,
CreateBy = operatorCode,
CreateTime = now
};
_unitwork.Add(detail);
}
else
{
detail.HeaderId = header.ID;
detail.MaterialCode = item.InvCode;
detail.MaterialName = item.InvName;
detail.MaterialType = item.InvDefine1;
if ((detail.CompletedQty ?? 0) == 0 && (detail.DividedQty ?? 0) == 0)
{
// ERP累计出库数量存在回写延迟,WMS执行量只使用发货通知数量和本地记录。
detail.Qty = item.DeliveryQty;
}
detail.UpdateVersion++;
detail.UpdateBy = operatorCode;
detail.UpdateTime = now;
_unitwork.Update(detail);
}
}
var localDetails = _unitwork.Find<ShipmentDetail>(x => x.HeaderId == header.ID).ToList();
header.TotalQty = localDetails.Sum(x => x.Qty ?? 0);
header.TotalLines = localDetails.Count;
_unitwork.Update(header);
}
}
private void ReleasePendingPallet(TaskHeader task)
{
var operatorCode = Wtm.LoginUserInfo?.ITCode ?? "WMS";
var now = DateTime.Now;
var inventories = _unitwork.Find<Inventory>(x => x.ContainerCode == task.ContainerCode).ToList();
foreach (var inventory in inventories)
{
inventory.TaskStatus = InventoryTaskStatusEnum.Idle;
inventory.UpdateBy = operatorCode;
inventory.UpdateTime = now;
}
_unitwork.BatchUpdate(inventories);
var container = _unitwork.FindSingle<Container>(x => x.Code == task.ContainerCode);
if (container != null)
{
container.IsLock = ContainerLockEnum.未锁;
container.UpdateBy = operatorCode;
container.UpdateTime = now;
_unitwork.Update(container);
}
var location = _unitwork.FindSingle<Location>(x => x.Code == task.FromLocation);
if (location != null && location.ContainerCode == task.ContainerCode)
{
location.Status = LocationStatusEnum.未锁;
location.UpdateBy = operatorCode;
location.UpdateTime = now;
_unitwork.Update(location);
}
}
private void RecalculateShipmentDetail(int shipmentDetailId)
{
var detail = _unitwork.FindSingle<ShipmentDetail>(x => x.ID == shipmentDetailId);
if (detail == null)
{
return;
}
RecalculateShipmentDetail(detail);
}
private void RecalculateShipmentDetail(ShipmentDetail detail)
{
detail.DividedQty = _unitwork.Find<TaskDetail>(x =>
x.OrderDetailId == detail.ID
&& x.Status != TaskStatusEnum.完成)
.Sum(x => x.Qty) ?? 0;
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.新建;
detail.UpdateTime = DateTime.Now;
detail.UpdateBy = Wtm.LoginUserInfo?.ITCode ?? "WMS";
_unitwork.Update(detail);
}
private void RecalculateShipmentHeader(int shipmentHeaderId)
{
var header = _unitwork.FindSingle<ShipmentHeader>(x => x.ID == shipmentHeaderId);
if (header == null)
{
return;
}
RecalculateShipmentHeader(header);
}
private void RecalculateShipmentHeader(ShipmentHeader header)
{
var details = _unitwork.Find<ShipmentDetail>(x => x.HeaderId == header.ID).ToList();
ShipStatusEnum status;
if (details.Any() && details.All(x => (x.CompletedQty ?? 0) >= (x.Qty ?? 0)))
{
status = ShipStatusEnum.拣货完成;
}
else if (details.Any(x => (x.CompletedQty ?? 0) > 0))
{
status = ShipStatusEnum.拣货中;
}
else if (details.Any() && details.All(x =>
(x.CompletedQty ?? 0) + (x.DividedQty ?? 0) >= (x.Qty ?? 0)))
{
status = ShipStatusEnum.分配完成;
}
else if (details.Any(x => (x.DividedQty ?? 0) > 0))
{
status = ShipStatusEnum.分配中;
}
else
{
status = ShipStatusEnum.新建;
}
header.FirstStatus = status;
header.LastStatus = status;
header.UpdateTime = DateTime.Now;
header.UpdateBy = Wtm.LoginUserInfo?.ITCode ?? "WMS";
_unitwork.Update(header);
}
}
public class ShipmentAllocationRequest
{
public int DetailId { get; set; }
public List<ShipmentAllocationRow> Rows { get; set; }
}
public class ShipmentAllocationRow
{
public int InventoryId { get; set; }
public decimal Qty { get; set; }
}
}

View File

@ -241,6 +241,11 @@ namespace HHWMS.Web.Controllers
public ActionResult StartOut(int id)
{
var data = _unitwork.FindById<ShipmentHeader>(id);
if (data != null && _unitwork.IsExit<ShipmentDetail>(x => x.HeaderId == id && x.DLsID.HasValue))
{
return FFResult().Alert("ERP发货通知单请使用分配/下发").RefreshGrid();
}
if (data != null)
{
data.FirstStatus = ShipStatusEnum.分配中;

View File

@ -44,6 +44,8 @@ namespace HHWMS.Web
this.MakeGridHeader(x => x.MaterialCode),
this.MakeGridHeader(x => x.Batch),
this.MakeGridHeader(x => x.Qty),
this.MakeGridHeader(x => x.DividedQty),
this.MakeGridHeader(x => x.CompletedQty),
this.MakeGridHeader(x => x.Status)
};
}
@ -59,6 +61,7 @@ namespace HHWMS.Web
else
return new List<GridColumn<ShipmentDetail_View>>{
this.MakeGridHeader(x => x.Code_view),
this.MakeGridHeader(x => x.DLsID),
this.MakeGridHeader(x => x.ZoneCode),
this.MakeGridHeader(x => x.MaterialCode),
this.MakeGridHeader(x => x.MaterialType),
@ -115,6 +118,7 @@ namespace HHWMS.Web
.Select(x => new ShipmentDetail_View
{
ID = x.ID,
DLsID = x.DLsID,
Code_view = x.HeaderId.ToString(),
ZoneCode = x.ZoneCode,
MaterialCode = x.MaterialCode,

View File

@ -18,8 +18,16 @@ namespace HHWMS.Web
{
return new List<GridAction>
{
this.MakeAction("ShipmentHeader","StartOut",Localizer["ShipmentHeader.StartOut"],"",GridActionParameterTypesEnum.SingleId,"shipment"),
this.MakeAction("ShipmentHeader", "GetShipmentDetails", "获取ERP发货通知单", "",
GridActionParameterTypesEnum.NoId, "shipment")
.SetSize(500, 260),
this.MakeAction("ShipmentHeader", "Allocate", "分配/下发", "",
GridActionParameterTypesEnum.SingleId, "shipment")
.SetSize(1250, 820)
.SetBindVisiableColName(nameof(ShipmentHeader_View.CanAllocateErp)),
this.MakeAction("ShipmentHeader", "StartOut", Localizer["ShipmentHeader.StartOut"], "",
GridActionParameterTypesEnum.SingleId, "shipment")
.SetBindVisiableColName(nameof(ShipmentHeader_View.CanStartLegacyOut)),
this.MakeStandardAction("ShipmentHeader", GridActionStandardTypesEnum.Create, Localizer["Sys.Create"],"shipment", dialogWidth: 800),
this.MakeStandardAction("ShipmentHeader", GridActionStandardTypesEnum.Edit, Localizer["Sys.Edit"], "shipment", dialogWidth: 800),
this.MakeStandardAction("ShipmentHeader", GridActionStandardTypesEnum.Delete, Localizer["Sys.Delete"], "shipment", dialogWidth: 800),
@ -37,6 +45,7 @@ namespace HHWMS.Web
return new List<GridColumn<ShipmentHeader_View>>{
//this.MakeGridHeader(x => x.SourceCode),
this.MakeGridHeader(x => x.Code),
this.MakeGridHeader(x => x.SourceCode),
this.MakeGridHeader(x => x.BillType)
.SetFormat((a, b) =>
{
@ -50,12 +59,17 @@ namespace HHWMS.Web
this.MakeGridHeader(x => x.FirstStatus),
//this.MakeGridHeader(x => x.LastStatus),
this.MakeGridHeader(x => x.Remark),
this.MakeGridHeaderAction(width: 300)
this.MakeGridHeader(x => x.CanAllocateErp).SetHide(),
this.MakeGridHeader(x => x.CanStartLegacyOut).SetHide(),
this.MakeGridHeaderAction(width: 360)
};
}
public override IOrderedQueryable<ShipmentHeader_View> GetSearchQuery()
{
var erpHeaderIds = DC.Set<ShipmentDetail>()
.Where(x => x.DLsID.HasValue)
.Select(x => x.HeaderId);
var query = DC.Set<ShipmentHeader>()
.CheckContain(Searcher.SourceCode, x => x.SourceCode)
.CheckContain(Searcher.Code, x => x.Code)
@ -74,6 +88,8 @@ namespace HHWMS.Web
FirstStatus = x.FirstStatus,
LastStatus = x.LastStatus,
Remark = x.Remark,
CanAllocateErp = erpHeaderIds.Contains(x.ID) ? "true" : "false",
CanStartLegacyOut = erpHeaderIds.Contains(x.ID) ? "false" : "true",
})
.OrderByDescending(x => x.ID);
return query;
@ -82,5 +98,8 @@ namespace HHWMS.Web
public class ShipmentHeader_View : ShipmentHeader
{
public string CanAllocateErp { get; set; }
public string CanStartLegacyOut { get; set; }
}
}

View File

@ -0,0 +1,257 @@
@model HHWMS.Web.ShipmentHeaderVM
<div id="shipment-allocate-@Model.Entity.ID">
<a-space direction="vertical" fill size="large">
<a-alert type="info">
ERP单号:{{ header.SourceCode || '-' }};WMS单号:{{ header.Code || '-' }}。
分配只保存人员填写的数量,同一托盘下发一个WCS任务。
</a-alert>
<a-card title="出库明细">
<template #extra>
<a-button type="text" @@click="loadData">刷新</a-button>
</template>
<a-table :data="details" :pagination="false" row-key="ID">
<template #columns>
<a-table-column title="物料编码" data-index="MaterialCode"></a-table-column>
<a-table-column title="物料名称" data-index="MaterialName"></a-table-column>
<a-table-column title="需求数量" data-index="Qty"></a-table-column>
<a-table-column title="已分配" data-index="DividedQty"></a-table-column>
<a-table-column title="已出库" data-index="CompletedQty"></a-table-column>
<a-table-column title="可分配" data-index="RemainingQty"></a-table-column>
<a-table-column title="状态" data-index="Status"></a-table-column>
<a-table-column title="操作" :width="110">
<template #cell="{ record }">
<a-button type="primary" size="small" :disabled="record.RemainingQty <= 0"
@@click="openInventory(record)">选择库存</a-button>
</template>
</a-table-column>
</template>
</a-table>
</a-card>
<a-card title="托盘任务">
<a-empty v-if="tasks.length === 0" description="尚未分配库存"></a-empty>
<a-card v-for="task in tasks" :key="task.ID" :title="task.TaskNo" size="small"
style="margin-bottom: 12px">
<template #extra>
<a-space>
<span>托盘:{{ task.ContainerCode }};状态:{{ task.Status }}</span>
<a-select v-if="task.CanDispatch" v-model="task.SelectedOutPort"
placeholder="选择出库口" style="width: 150px">
<a-option v-for="port in outPorts" :key="port.Value" :value="port.Value">
{{ port.Label }}
</a-option>
</a-select>
<a-button v-if="task.CanDispatch" type="primary" :loading="task.Loading"
@@click="dispatchTask(task)">下发任务</a-button>
<a-button v-if="task.CanCancel" status="danger" :disabled="task.Loading"
@@click="cancelTask(task)">取消整托分配</a-button>
</a-space>
</template>
<a-table :data="task.Details" :pagination="false" row-key="ID" size="small">
<template #columns>
<a-table-column title="ERP单号" data-index="ShipmentCode"></a-table-column>
<a-table-column title="库存ID" data-index="InventoryId"></a-table-column>
<a-table-column title="物料编码" data-index="MaterialCode"></a-table-column>
<a-table-column title="分配数量" data-index="Qty"></a-table-column>
<a-table-column title="状态" data-index="Status"></a-table-column>
<a-table-column title="操作" :width="100">
<template #cell="{ record }">
<a-button v-if="record.CanCancel" type="text" status="danger"
@@click="cancelAllocation(record)">取消分配</a-button>
</template>
</a-table-column>
</template>
</a-table>
</a-card>
</a-card>
<a-modal v-model:visible="inventoryVisible" title="选择库存并填写分配数量"
width="1000px" :ok-loading="saving" @@before-ok="saveAllocation">
<a-alert type="warning" style="margin-bottom: 12px">
本明细剩余可分配 {{ currentDetail.RemainingQty || 0 }}。同一库存可以分给多个明细,但累计不能超过库存数量。
</a-alert>
<a-table :data="inventories" :pagination="{ pageSize: 10 }" row-key="ID">
<template #columns>
<a-table-column title="选择" :width="65">
<template #cell="{ record }">
<a-checkbox v-model="record.Selected"></a-checkbox>
</template>
</a-table-column>
<a-table-column title="库存ID" data-index="ID" :width="90"></a-table-column>
<a-table-column title="托盘" data-index="ContainerCode"></a-table-column>
<a-table-column title="库位" data-index="LocationCode"></a-table-column>
<a-table-column title="批次" data-index="Batch"></a-table-column>
<a-table-column title="库存数量" data-index="Qty"></a-table-column>
<a-table-column title="已被分配" data-index="AllocatedQty"></a-table-column>
<a-table-column title="可用数量" data-index="AvailableQty"></a-table-column>
<a-table-column title="本次分配" :width="150">
<template #cell="{ record }">
<a-input-number v-model="record.AllocationQty" :min="0"
:max="record.AvailableQty" :precision="4"
:disabled="!record.Selected" style="width: 125px"></a-input-number>
</template>
</a-table-column>
</template>
</a-table>
</a-modal>
</a-space>
</div>
<script>
(() => {
const allocationApp = Vue.createApp({
data() {
return {
headerId: @Model.Entity.ID,
header: {},
details: [],
tasks: [],
outPorts: [],
inventoryVisible: false,
inventories: [],
currentDetail: {},
saving: false
};
},
mounted() {
this.loadData();
},
methods: {
notifyError(message) {
this.$notification.error({ content: message || '操作失败', duration: 5000, closable: true });
},
loadData() {
axios.get('/shipment/ShipmentHeader/GetAllocationData', { params: { headerId: this.headerId } })
.then(response => {
const json = response.data;
if (Number(json.Code) !== 200) {
this.notifyError(json.Msg);
return;
}
this.header = json.Data.Header || {};
this.details = json.Data.Details || [];
this.tasks = (json.Data.Tasks || []).map(task => ({
...task,
SelectedOutPort: task.ToLocation || '',
Loading: false
}));
this.outPorts = json.Data.OutPorts || [];
})
.catch(error => this.notifyError(error.message));
},
openInventory(detail) {
this.currentDetail = detail;
axios.get('/shipment/ShipmentHeader/GetAvailableInventories', { params: { detailId: detail.ID } })
.then(response => {
const json = response.data;
if (Number(json.Code) !== 200) {
this.notifyError(json.Msg);
return;
}
this.inventories = (json.Data || []).map(item => ({
...item,
Selected: false,
AllocationQty: 0
}));
this.inventoryVisible = true;
})
.catch(error => this.notifyError(error.message));
},
saveAllocation(done) {
const rows = this.inventories
.filter(item => item.Selected && Number(item.AllocationQty) > 0)
.map(item => ({ InventoryId: item.ID, Qty: item.AllocationQty }));
if (rows.length === 0) {
this.notifyError('请选择库存并填写大于0的分配数量');
if (done) done(false);
return;
}
const total = rows.reduce((sum, item) => sum + Number(item.Qty), 0);
if (total > Number(this.currentDetail.RemainingQty)) {
this.notifyError('本次分配总数不能超过明细剩余可分配数量');
if (done) done(false);
return;
}
this.saving = true;
axios.post('/shipment/ShipmentHeader/AllocateInventories', {
DetailId: this.currentDetail.ID,
Rows: rows
}).then(response => {
const json = response.data;
if (Number(json.Code) === 200) {
this.$message.success('分配成功');
this.inventoryVisible = false;
this.loadData();
if (done) done(true);
} else {
this.notifyError(json.Msg);
if (done) done(false);
}
}).catch(error => {
this.notifyError(error.message);
if (done) done(false);
}).finally(() => {
this.saving = false;
});
},
postForm(url, values) {
const data = new URLSearchParams();
Object.keys(values).forEach(key => data.append(key, values[key]));
return axios.post(url, data);
},
cancelAllocation(record) {
if (!window.confirm(`确认取消库存 ${record.InventoryId} 的分配吗?`)) return;
this.postForm('/shipment/ShipmentHeader/CancelAllocation', { id: record.ID })
.then(response => {
const json = response.data;
if (Number(json.Code) === 200) {
this.$message.success('取消分配成功');
this.loadData();
} else {
this.notifyError(json.Msg);
}
}).catch(error => this.notifyError(error.message));
},
cancelTask(task) {
if (!window.confirm(`确认取消托盘 ${task.ContainerCode} 的全部待下发分配吗?`)) return;
task.Loading = true;
this.postForm('/shipment/ShipmentHeader/CancelPendingTask', { id: task.ID })
.then(response => {
const json = response.data;
if (Number(json.Code) === 200) {
this.$message.success('整托分配已取消');
this.loadData();
} else {
this.notifyError(json.Msg);
}
}).catch(error => this.notifyError(error.message))
.finally(() => { task.Loading = false; });
},
dispatchTask(task) {
if (!task.SelectedOutPort) {
this.notifyError('请先选择出库口');
return;
}
task.Loading = true;
this.postForm('/shipment/ShipmentHeader/DispatchPendingTask', {
id: task.ID,
outPort: task.SelectedOutPort
}).then(response => {
const json = response.data;
if (Number(json.Code) === 200) {
this.$message.success('WCS任务下发成功');
this.loadData();
} else {
this.notifyError(json.Msg);
}
}).catch(error => this.notifyError(error.message))
.finally(() => { task.Loading = false; });
}
}
});
allocationApp.use(ArcoVue);
allocationApp.mount('#shipment-allocate-@Model.Entity.ID');
})();
</script>

View File

@ -0,0 +1,11 @@
@model HHWMS.Web.ShipmentHeaderVM
<wt:form vm="@Model">
<wt:row items-per-row="ItemsPerRowEnum.One">
<wt:textbox field="Entity.SourceCode" label-text="ERP发货通知单号" />
</wt:row>
<wt:row align="AlignEnum.Right">
<wt:submitbutton text="获取ERP发货通知单" />
<wt:closebutton />
</wt:row>
</wt:form>

View File

@ -0,0 +1,62 @@
using System;
using System.Linq;
using System.Threading.Tasks;
using HHWMS.Web.Models;
using Quartz;
using WalkingTec.Mvvm.Core;
using WalkingTec.Mvvm.Core.Support.Quartz;
namespace HHWMS.Web
{
[PersistJobDataAfterExecution]
[DisallowConcurrentExecution]
public class AddSaleOutJob : WtmJob
{
public override async Task Execute(IJobExecutionContext context)
{
try
{
var unitWork = new UnitWork(Wtm);
var first = unitWork.Find<InventoryTransaction>(x =>
x.Type == InventoryTranType.出库
&& x.BillType == InventoryTransaction.ErpSaleOutBillType
&& x.UploadErpFlag != 1
&& x.UploadErpFlag != null)
.OrderBy(x => x.ID)
.FirstOrDefault();
if (first != null)
{
var transactions = unitWork.Find<InventoryTransaction>(x =>
x.Type == InventoryTranType.出库
&& x.BillType == InventoryTransaction.ErpSaleOutBillType
&& x.BillCode == first.BillCode
&& x.UploadErpFlag != 1)
.ToList();
var vm = Wtm.CreateVM<InventoryVM>();
await vm.ProcessErpSaleOut(transactions, true);
}
var job = unitWork.FindSingle<SysJob>(x => x.JobName == context.JobDetail.Key.Name);
if (job != null)
{
job.LastFireTime = TimeZoneInfo.ConvertTimeFromUtc(
context.FireTimeUtc.DateTime,
TimeZoneInfo.Local);
if (context.NextFireTimeUtc != null)
{
job.NextFireTime = TimeZoneInfo.ConvertTimeFromUtc(
context.NextFireTimeUtc.Value.DateTime,
TimeZoneInfo.Local);
}
unitWork.Update(job);
}
}
catch (Exception ex)
{
Wtm.DoLog("ERP成品出库补传失败", ActionLogTypesEnum.Job,
"AddSaleOutJob", request: "error", result: ex.Message);
}
}
}
}

View File

@ -10,6 +10,7 @@ namespace HHWMS.Web.Models
public class InventoryTransaction : BasePoco
{
public const string ErpOtherOutBillType = "AddOtherOut";
public const string ErpSaleOutBillType = "AddSaleOut";
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]

View File

@ -0,0 +1,34 @@
using System.Collections.Generic;
namespace HHWMS.Web.Models
{
/// <summary>
/// ERP成品出库请求
/// </summary>
public class AddSaleOutRequest
{
public AddSaleOutMain Main { get; set; }
public List<AddSaleOutDetail> Details { get; set; }
}
public class AddSaleOutMain
{
public string ErpCode { get; set; }
public string OutCode { get; set; }
public string WhCode { get; set; }
public string Maker { get; set; }
}
public class AddSaleOutDetail
{
public long DLsID { get; set; }
public string InvCode { get; set; }
public decimal OutQty { get; set; }
}
}

View File

@ -0,0 +1,34 @@
namespace HHWMS.Web.Models
{
/// <summary>
/// ERP发货通知单查询请求
/// </summary>
public class LoadDispatchRequest
{
public string ErpCode { get; set; }
public int BReturnFlag { get; set; }
public string DLCode { get; set; }
public string InvCode { get; set; }
public string InvName { get; set; }
public string InvDefine1 { get; set; }
public string InvDefine4 { get; set; }
public string CusCode { get; set; }
public string CusName { get; set; }
public string BeginCreateDate { get; set; }
public string EndCreateDate { get; set; }
public int Size { get; set; }
public int Page { get; set; }
}
}

View File

@ -0,0 +1,56 @@
using System;
using System.Collections.Generic;
namespace HHWMS.Web.Models
{
/// <summary>
/// ERP发货通知单查询响应
/// </summary>
public class LoadDispatchResponse
{
public List<DispatchItem> Data { get; set; }
public int Count { get; set; }
public int Code { get; set; }
public string Msg { get; set; }
}
public class DispatchItem
{
public string DLCode { get; set; }
public int BReturnFlag { get; set; }
public DateTime? CreateDate { get; set; }
public string ErpCode { get; set; }
public string ExchName { get; set; }
public decimal? ExchRate { get; set; }
public string CusCode { get; set; }
public string CusName { get; set; }
public string InvCode { get; set; }
public string InvName { get; set; }
public decimal DeliveryQty { get; set; }
public decimal FOutQuantity { get; set; }
public decimal? TaxUnitPrice { get; set; }
public decimal? DeliveryMoney { get; set; }
public string InvDefine1 { get; set; }
public string InvDefine4 { get; set; }
public long DLsID { get; set; }
}
}

View File

@ -16,6 +16,9 @@ namespace HHWMS.Web.Models
[Display(Name = "Ship.ShipmentCode")]
public int HeaderId { get; set; }
[Display(Name = "ERP发货明细ID", Description = "ERP发货通知单表体明细ID")]
public long? DLsID { get; set; }
[Display(Name = "Task.ZoneCode", Description = "库区")]
[StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")]
public string ZoneCode { get; set; }

View File

@ -0,0 +1,129 @@
# ERP事项二:成品发货接口联动——实施方案
## 1. 设计目标
- 通过按钮按ERP发货通知单号拉取出库单,不做无条件批量同步。
- ERP拉单按整批数据库事务保存;任一明细写入失败时整批回滚,避免留下半张单或孤立主单。
- 人员选择库存并填写计划分配数量;系统不自动替人分配。
- WCS继续整托搬运,一个托盘只生成一个活动任务。
- 到站后人员确认每条分配关系的实际出库数量,再扣库存并回传ERP。
- 余料托盘继续使用原回库流程。
- 复用 `ShipmentHeader`、`ShipmentDetail`、`TaskHeader`、`TaskDetail` 和库存交易表,不新增业务表。
## 2. 最终操作流程
```text
出库单页面点击“获取ERP发货通知单”并输入DLCode
→ WMS保存主单和明细
→ 在明细页面点击“分配/下发”
→ 勾选库存并填写计划数量
→ 同一托盘的多物料/多明细合并为一个待下发任务
→ 选择6个成品出库口之一并一键下发
→ WCS整托搬到出库口,任务状态变为“到站台”
→ 成品出入库页面扫描托盘,只显示已分配关系
→ 人员修改实际数量并点击“确认发货”
→ 一次事务扣库存、更新出库数量、完成任务
→ 按ERP主单调用AddSaleOut;失败进入补传
→ 余料托盘按原流程回库
```
6个允许出库口:`EnterExit_P1001`、`P1004`、`P1007`、`P1008`、`P1009`、`P1010`。原 `StartOut` 入口保留给旧出库单;ERP发货单只显示“分配/下发”,服务端也会拦截旧入口,避免两套流程串用。
## 3. ERP通知单规则
- 请求:`POST LoadDispatch`,参数 `DLCode`。
- `ShipmentHeader.SourceCode = DLCode`。
- `ShipmentDetail.DLsID` 保存ERP表体明细ID并建立唯一索引,保证重复拉取幂等。
- 本地需求数量首次取 `DeliveryQty`。
- `fOutQuantity` 完全不参与WMS计划数量和剩余数量;它在WMS回传后才由ERP更新,不能作为拉取时的已出库依据。
- 已发生分配或出库的明细再次拉取时,不覆盖本地计划数量。
- 只接收 `bReturnFlag=0` 的正常发货数据。
- 同一次拉取在一个数据库事务中完成;`DLsID` 唯一索引负责并发重复拉取的最终防重。
## 4. 分配模型与数量规则
| 字段/实体 | 含义 |
| --- | --- |
| `TaskHeader` | 托盘级活动WCS任务 |
| `TaskDetail.OrderDetailId` | 出库明细ID |
| `TaskDetail.InventoryId` | 人员选择的库存ID |
| `TaskDetail.Qty` | 该明细分配给该库存的计划数量 |
| `ShipmentDetail.DividedQty` | 当前所有活动分配数量合计 |
| `ShipmentDetail.CompletedQty` | 已人工确认的实际出库数量 |
允许一条明细选择多个库存,也允许同一库存由人员分别分配给多个明细。约束为:
```text
同一库存全部活动TaskDetail.Qty之和 <= Inventory.Qty
明细CompletedQty + DividedQty <= 明细Qty
```
库存候选和服务端提交校验都限定 `Inventory.ZoneId=1028`,不会把同一数据库中的模具库库存(`1025`)分配给成品发货单。
选中托盘内任一库存后,物理上锁定整个托盘、库位和托盘内全部库存;业务关系只记录人员实际勾选的库存。数据库使用行锁和 `TaskHeader.ContainerCode` 唯一索引,避免双击、双用户或多实例并发生成重复托盘任务。
## 5. 到站实际数量规则
必须提交当前托盘的全部分配关系。实际数量允许为0,也允许高于原计划分配数量,但必须同时满足:
```text
同一库存本次全部实际数量合计 <= 当前库存数量
当前明细本次实际数量 <= 明细需求 - 已出库 - 其他托盘活动分配
```
确认事务同时锁定任务、库存和出库明细;任一校验失败整次回滚。成功后:
1. 库存只扣实际数量;数量为0不扣库存。
2. `CompletedQty` 增加实际数量。
3. 当前托盘分配全部释放,`DividedQty` 按其他活动任务重新计算。
4. 任务及明细转历史,托盘和剩余库存解锁并留在出库口。
5. 同一ERP主单的有效交易聚合为一次 `AddSaleOut` 请求。
## 6. 取消、失败与补传
- 未下发:可取消单条分配或整托任务;取消最后一条时删除空任务并释放全部锁。单条取消与下发共用任务行锁,避免两个操作并发通过状态校验。
- 已下发:不允许直接取消,防止WMS与WCS不一致;到站后可全部填0确认。
- WCS下发失败:任务保持待下发,可排查后重试。
- WCS重复完成:到站任务直接返回等待确认,不重复迁移库存。
- ERP失败:WMS实物出库不回滚,交易保持 `UploadErpFlag=0`。
- 人工补传/`AddSaleOutJob`:按同一 `BillCode` 整批补传,每次生成新的CK,不再次扣库存。
- 旧出库任务:只有关联带 `DLsID` 的ERP明细才进入新到站确认流程。
## 7. AddSaleOut字段
| ERP字段 | WMS取值 |
| --- | --- |
| `ErpCode` | `003` |
| `OutCode` | 每次首次回传或补传生成新的 `CK` |
| `WhCode` | `cp` |
| `Maker` | 当前确认人姓名/账号 |
| `DLsID` | ERP发货通知单表体明细ID |
| `InvCode` | 实际出库物料号 |
| `OutQty` | 人工确认的实际数量 |
接口文档未给出响应模型,按已确认方案复用 `FinishInResponse`。
## 8. 数据库与发布SQL
执行顺序:
1. 在 `default` 和 `cp` 两库分别执行 [20260717_add_sale_out.sql](../sql/20260717_add_sale_out.sql),只增加共享字段 `ShipmentDetail.DLsID`。
2. 只在 `cp` 成品库执行 [20260717_add_sale_out_cp.sql](../sql/20260717_add_sale_out_cp.sql),先检查重复数据,再创建 `IX_ShipmentDetail_DLsID` 和 `IX_TaskHeader_ContainerCode` 两个唯一索引。
3. 只在 `cp` 成品库执行 [20260717_add_sale_out_job.sql](../sql/20260717_add_sale_out_job.sql),新增默认暂停的 `AddSaleOutJob`。
4. 脚本均可重复执行。唯一索引不在线边库创建,避免事项二扩大到线边库任务规则。
共享模型字段必须两库同步,否则同一套代码访问线边库的原出库明细页面也可能因缺列报错。数据库连接名和生产库名不在本次代码中修改。
## 9. 主要代码影响
- 新增ERP请求/响应模型和 `ShipmentHeaderController.Erp` 业务入口,拉单保存使用整批事务。
- 出库单列表增加拉取、分配/下发入口及两个数量列;ERP和旧出库入口互斥显示并做服务端校验。
- 分配页增加库存选择、取消和下发;确认按钮使用异步 `before-ok`,成功后才关闭弹窗。
- `IWCSController` 识别ERP发货任务并保留到站任务。
- `SimpleReceiptInController` 增加到站发货确认。
- `InventoryVM`、库存交易页面和 `AddSaleOutJob` 增加ERP首次回传及补传。
- 原出库、回库、库存和WCS模型均保留,没有新增业务表。
## 10. 回退
先暂停 `AddSaleOutJob` 并停止新任务下发。确保没有“待下发/已下发/到站台”的ERP发货任务后再回退代码。新增可空字段和成品库索引可保留;如必须删除,应在所有新代码实例停止后进行,且先备份 `DLsID` 和失败补传交易。

View File

@ -0,0 +1,109 @@
# ERP事项二:成品发货接口联动——测试报告
## 1. 测试信息
- 日期:2026-07-17
- 数据库:本地 `wms_yongfeng_cp`,并检查 `wms_yongfeng_xb` 共享模型兼容
- 外部接口:本机ERP/WCS Mock
- 账号:`admin`、`101001`(并发测试)
- 测试通知单:`CODEX-SHIP-20260717`
ERP Mock返回3条明细:D1物料3000374数量30、D2物料3000374数量40、D3物料3000362数量15;三条 `fOutQuantity` 均故意设为999。测试托盘含I1物料3000374数量50、I2物料3000362数量50。
## 2. 构建和SQL
| 编号 | 场景 | 结果 |
| --- | --- | --- |
| T01 | 最终代码构建 | 通过;0错误,15个现有编译警告(含.NET 6停止支持提示) |
| T02 | 共享字段SQL在两库各连续执行2次 | 通过;两库 `DLsID` 字段各1个,线边库未创建事项二唯一索引 |
| T03 | 成品库约束SQL和Job SQL各连续执行2次 | 通过;成品库两个唯一索引各1个,只有1个 `AddSaleOutJob`,`Status=0` |
| T04 | 线边库出库明细列表和Search | 通过;HTTP 200,无 `DLsID` 缺列错误 |
| T05 | 分配页服务端渲染 | 通过;HTTP 200,确认事件为 `before-ok`,不存在旧 `ok` 绑定 |
## 3. 业务测试
| 编号 | 场景 | 实际结果 |
| --- | --- | --- |
| T06 | 按DLCode拉取 | 通过;生成1张主单、3条明细,`DLsID`正确 |
| T07 | `fOutQuantity=999` | 通过;WMS需求仍为30/40/15,只使用 `DeliveryQty` |
| T08 | 重复拉取同一DLCode | 通过;仍为3条,不重复、不覆盖本地执行量 |
| T09 | 同库存跨明细分配 | 通过;I1给D1分20、给D2分30,分别记录数量 |
| T10 | 同托盘多物料 | 通过;I2给D3分10,仍只有1个托盘任务 |
| T11 | 明细超分 | 通过;D1剩余10时再分11被拒绝 |
| T12 | 库存累计超分 | 通过;I1已累计50时再分1被拒绝 |
| T13 | 取消整托待下发任务 | 通过;任务删除,`DividedQty`清零,托盘/库位/库存解锁 |
| T14 | 两账号同时给同一明细和库存各分20 | 通过;1个成功、1个因剩余不足失败,数据库只有1个任务和20数量 |
| T15 | 一键下发 | 通过;WCS收到 `TaskNo`、托盘、起点和出库口 |
| T16 | 同一任务重复下发 | 通过;第二次返回“任务不存在或已下发” |
| T17 | WCS State=100 | 通过;整托移至 `EnterExit_P1001`,库存未扣,任务状态50等待人工确认 |
| T18 | WCS重复完成回调 | 通过;返回等待人工确认,不重复移动 |
| T19 | 站口扫描 | 通过;只返回3条已选分配,默认实际量20/20/10 |
| T20 | I1实际40+20=60,超过库存50 | 通过;整次返回失败,库存、任务、单据和交易均未变化 |
| T21 | 实际量25/20/10 | 通过;D1允许高于计划20但不超明细30 |
| T22 | 库存扣减 | 通过;I1 50→5,I2 50→40 |
| T23 | 单据和任务 | 通过;CompletedQty=25/20/10,DividedQty=0,活动任务删除并写历史 |
| T24 | ERP首次回传 | 通过;3条按同一主单一次回传,同一CK,状态均为1 |
| T25 | 重复确认发货 | 通过;返回“未找到待确认任务”,不重复扣库存 |
| T26 | 人工补传 | 通过;整批生成新CK,状态恢复1,不再次扣库存 |
| T27 | Job补传 | 通过;再次生成另一个新CK,Job仍保持暂停状态 |
| T28 | 库存交易列表补传按钮 | 通过;临时失败 `AddSaleOut` 行只显示成品补传,未显示领料补传;测试记录已清理为0条 |
## 4. 报文与数据库证据
首次 `AddSaleOut` Mock实际收到:
```text
Main: ErpCode=003, WhCode=cp, OutCode=CK202607170004, Maker=Admin
Details:
DLsID=990000001, InvCode=3000374, OutQty=25
DLsID=990000002, InvCode=3000374, OutQty=20
DLsID=990000003, InvCode=3000362, OutQty=10
```
人工和Job补传分别生成 `CK202607170005`、`CK202607170006`,证明每次补传新建CK。有效确认后的数据库快照:
```text
Inventory.Qty = 5 / 40
ShipmentDetail.CompletedQty = 25 / 20 / 10
ShipmentDetail.DividedQty = 0 / 0 / 0
InventoryTransaction.Qty = 25 / 20 / 10
InventoryTransaction.BillType = AddSaleOut
InventoryTransaction.UploadErpFlag = 1 / 1 / 1
TaskHeader active count = 0
TaskHeaderHistory.Status = 100
```
## 5. 最终修复复核
测试后针对上线风险做了以下最小修复:
1. 分配弹窗从 `ok` 改为 `before-ok`,异步成功后才关闭。
2. 分配、取消、下发和确认增加数据库行锁;确认同时锁任务、库存、出库明细。
3. 只在成品库增加活动任务托盘唯一索引,数据库级阻止同托盘重复活动任务,不改变线边库任务规则。
4. 库存交易列表按交易类型、单据类型和回传状态控制补传按钮,避免普通出入库误操作。
5. 库存选择限定 `ZoneId=1028`,ERP/旧出库入口互斥,并将ERP拉单保存改为整批事务。
修复后的最终代码已重新构建通过,并在完整WTM管理页面完成获取ERP通知单、分配页源码绑定及库存交易补传按钮冒烟验证;未发现新增页面脚本错误。
## 6. 2026-07-18上线前复查
| 编号 | 场景 | 实际结果 |
| --- | --- | --- |
| T29 | 成品库库存库区基线 | 数据库同时存在 `1025=3587` 条、`1028=1635` 条库存,722个物料编码跨库区重叠,证明必须限制库区 |
| T30 | ERP明细查询物料3000053可用库存 | 只返回成品库库存ID 5011;模具库同物料库存ID 238未返回 |
| T31 | 绕过页面提交模具库存ID 238 | 服务端返回“只能选择成品库库存”,未生成任务、未修改库存 |
| T32 | ERP单与旧出库单入口 | ERP行 `CanAllocateErp=true/CanStartLegacyOut=false`;旧单相反;旧单打开分配页被拦截 |
| T33 | 直接调用旧 `StartOut` | ERP单被拦截并提示使用“分配/下发”;普通旧单仍可正常启动 |
| T34 | 待下发单条分配取消 | 返回成功;任务头/明细删除,库存、托盘、库位解锁,`DividedQty`归零 |
| T35 | 调整后的SQL连续执行2次 | 两库共享字段正常;唯一索引仅在成品库;两个Job仍各自在对应数据库且 `Status=0` |
| T36 | 调整后最终构建 | 通过;0错误,未引入新的编译警告 |
本轮使用的 `CODEX-AUDIT-*` 主单、明细、任务、库存、托盘和库位均已精确删除,复查剩余0条。本轮只使用本地数据库和本地WMS实例,未调用真实ERP/WCS。
## 7. 数据清理与结论
- 测试出库单、明细、库存、托盘、库位、交易、活动任务和任务历史均已精确删除,复查剩余0条。
- 两库 `DLsID` 字段、成品库唯一索引和默认暂停的 `AddSaleOutJob` 保留,属于正式变更。
- SO/Out/CK流水号保留正常间隔,不回退序列,避免后续单号冲突。
本地接口、数据库事务、并发保护、WCS流程、ERP首次回传及两种补传均达到发布条件。真实ERP响应模型和真实WCS地址仍需在发布窗口做外部联调;Job应在联调成功后启用。

View File

@ -0,0 +1,22 @@
-- ERP事项二:成品发货接口联动
-- 执行范围:default(线边库)和 cp(成品库)都执行。
-- 原因:ShipmentDetail 是两套数据库共用的实体模型;线边库必须同步字段以兼容原页面。
-- 脚本可重复执行。
SET @column_exists = (
SELECT COUNT(*)
FROM information_schema.COLUMNS
WHERE TABLE_SCHEMA = DATABASE()
AND TABLE_NAME = 'ShipmentDetail'
AND COLUMN_NAME = 'DLsID'
);
SET @ddl = IF(
@column_exists = 0,
'ALTER TABLE `ShipmentDetail` ADD COLUMN `DLsID` BIGINT NULL COMMENT ''ERP发货通知单表体明细ID''',
'SELECT ''ShipmentDetail.DLsID already exists'' AS Message'
);
PREPARE stmt FROM @ddl;
EXECUTE stmt;
DEALLOCATE PREPARE stmt;

View File

@ -0,0 +1,53 @@
-- ERP事项二:成品库幂等与并发约束
-- 执行范围:仅 cp(成品库)执行。
-- 执行前先查看下面两组检查结果;有返回行时先排查重复数据,不要继续创建唯一索引。
-- 脚本可重复执行。
SELECT `DLsID`, COUNT(*) AS DuplicateCount
FROM `ShipmentDetail`
WHERE `DLsID` IS NOT NULL
GROUP BY `DLsID`
HAVING COUNT(*) > 1;
SELECT `ContainerCode`, COUNT(*) AS DuplicateCount
FROM `TaskHeader`
WHERE `ContainerCode` IS NOT NULL AND `ContainerCode` <> ''
GROUP BY `ContainerCode`
HAVING COUNT(*) > 1;
SET @detail_index_exists = (
SELECT COUNT(*)
FROM information_schema.STATISTICS
WHERE TABLE_SCHEMA = DATABASE()
AND TABLE_NAME = 'ShipmentDetail'
AND INDEX_NAME = 'IX_ShipmentDetail_DLsID'
);
SET @ddl = IF(
@detail_index_exists = 0,
'CREATE UNIQUE INDEX `IX_ShipmentDetail_DLsID` ON `ShipmentDetail` (`DLsID`)',
'SELECT ''IX_ShipmentDetail_DLsID already exists'' AS Message'
);
PREPARE stmt FROM @ddl;
EXECUTE stmt;
DEALLOCATE PREPARE stmt;
-- TaskHeader只保存活动任务;同一托盘在任意时刻只能存在一个活动任务。
SET @task_index_exists = (
SELECT COUNT(*)
FROM information_schema.STATISTICS
WHERE TABLE_SCHEMA = DATABASE()
AND TABLE_NAME = 'TaskHeader'
AND INDEX_NAME = 'IX_TaskHeader_ContainerCode'
);
SET @ddl = IF(
@task_index_exists = 0,
'CREATE UNIQUE INDEX `IX_TaskHeader_ContainerCode` ON `TaskHeader` (`ContainerCode`)',
'SELECT ''IX_TaskHeader_ContainerCode already exists'' AS Message'
);
PREPARE stmt FROM @ddl;
EXECUTE stmt;
DEALLOCATE PREPARE stmt;

View File

@ -0,0 +1,16 @@
-- ERP事项二:成品出库失败自动补传Job
-- 执行范围:仅 cp(成品库)执行。
-- 默认暂停;真实ERP联调通过后再启用。
-- 脚本可重复执行。
INSERT INTO `SysJob`
(`JobName`, `JobGroup`, `MethodName`, `MethodParams`, `CronExpression`,
`LastFireTime`, `NextFireTime`, `MisfirePolicy`, `Status`, `Remark`,
`CreateTime`, `CreateBy`, `UpdateTime`, `UpdateBy`)
SELECT
'AddSaleOutJob', 'AddSaleOutJob', NULL, NULL, '0 */1 * * * ?',
NULL, NULL, NULL, 0, 'ERP成品出库失败自动补传',
NOW(), 'system', NULL, NULL
WHERE NOT EXISTS (
SELECT 1 FROM `SysJob` WHERE `JobName` = 'AddSaleOutJob'
);