feature:
成品入库页面分配库存弹窗字段完善
This commit is contained in:
1 parent
c76e7bb681
commit
b6c3ef8b2c
10 files changed
+441
-56
No files matched your search
@@ -94,6 +94,14 @@ namespace HHWMS.Web.Services.Agv
|
||||
await EnsureMaterialsAsync(details);
|
||||
}
|
||||
|
||||
// 出库类任务:物料数量必须大于 0(用于扣减库存与 ERP 上报)
|
||||
if (details != null && details.Count > 0
|
||||
&& taskType.ToBillType() == AgvBillTypeEnum.Out_AGV
|
||||
&& details.Any(x => (x.Qty ?? 0) <= 0))
|
||||
{
|
||||
throw new AgvBizException("param", "出库任务物料数量必须大于 0");
|
||||
}
|
||||
|
||||
var priority = dto.Priority ?? 0;
|
||||
var taskNo = string.IsNullOrWhiteSpace(dto.SourceCode)
|
||||
? _unitWork.GetSerialNumber("AGV", 8)
|
||||
@@ -416,6 +424,12 @@ namespace HHWMS.Web.Services.Agv
|
||||
inv.TaskStatus = InventoryTaskStatusEnum.Locked;
|
||||
_unitWork.Update(inv);
|
||||
}
|
||||
|
||||
// 入库任务:下任务即把物料明细数量写入库存(同托盘同物料累加)
|
||||
if (ParseBillType(task.BillType) == AgvBillTypeEnum.In_AGV)
|
||||
{
|
||||
SaveInboundInventory(task, fromLoc, details);
|
||||
}
|
||||
}
|
||||
|
||||
#endregion
|
||||
@@ -614,6 +628,9 @@ namespace HHWMS.Web.Services.Agv
|
||||
inv.TaskStatus = InventoryTaskStatusEnum.Idle;
|
||||
_unitWork.Update(inv);
|
||||
}
|
||||
|
||||
// 入库任务取消/失败:回滚下任务时累加的库存数量
|
||||
RollbackInboundInventory(task);
|
||||
}
|
||||
|
||||
#endregion
|
||||
@@ -782,61 +799,88 @@ namespace HHWMS.Web.Services.Agv
|
||||
{
|
||||
var billType = ParseBillType(task.BillType);
|
||||
var isInbound = billType == AgvBillTypeEnum.In_AGV;
|
||||
// 是否需 ERP 回传(15.3-1):1 入库报工(FinishIn)、3/4 出库回传(AddOtherOut);2/5/6 不回传
|
||||
// 是否需 ERP 回传:仅「原料满托出库」需要(入库报工已取消)
|
||||
var reportBack = IsErpReportBack(task.AgvTaskType);
|
||||
var details = ParseDetails(task.Details);
|
||||
var sysUser = _wtm.LoginUserInfo?.ITCode ?? _option.SysUser;
|
||||
// 库存 UploadErpFlag 置位(15.3-1):入库报工类置0走 FinishInJob、不回传类置1;
|
||||
// 出库类一律置1(出库回传走流水 AddOtherOut 通道,库存不置0,防止被 FinishInJob 误当入库上送)
|
||||
var invErpFlag = isInbound ? (reportBack ? 0 : 1) : 1;
|
||||
// 库存 UploadErpFlag:入库不再报工、出库也不按库存回传,统一置 1(ERP 上报只走流水通道)
|
||||
var invErpFlag = 1;
|
||||
|
||||
// 1. 库存:只更新不删除;带 SKU 且本地无库存时补建
|
||||
// 1. 库存:入库数量已在下任务时写入,这里只更新库位/状态;出库按明细数量扣减
|
||||
var detailQtyMap = BuildDetailQtyMap(details);
|
||||
var inventories = _unitWork.Find<Inventory>(x => x.ContainerCode == task.ContainerCode).ToList();
|
||||
if (inventories.Count == 0 && details != null && details.Count > 0)
|
||||
var newInventories = new List<Inventory>();
|
||||
if (inventories.Count == 0 && isInbound && detailQtyMap.Count > 0)
|
||||
{
|
||||
foreach (var d in details)
|
||||
// 兼容改造前创建的任务:完成时再按明细补建库存
|
||||
var materialCodes = detailQtyMap.Keys.ToList();
|
||||
var materials = _unitWork.Find<Material>(x => materialCodes.Contains(x.MaterialCode))
|
||||
.ToDictionary(x => x.MaterialCode);
|
||||
foreach (var item in detailQtyMap)
|
||||
{
|
||||
inventories.Add(new Inventory
|
||||
materials.TryGetValue(item.Key, out var material);
|
||||
var detail = details.FirstOrDefault(x => x.MaterialCode != null && x.MaterialCode.Trim() == item.Key);
|
||||
var created = new Inventory
|
||||
{
|
||||
ZoneId = _unitWork.FindSingle<Location>(x => x.Code == actualLocation)?.ZoneId ?? 0,
|
||||
ContainerCode = task.ContainerCode,
|
||||
LocationCode = actualLocation,
|
||||
MaterialCode = d.MaterialCode,
|
||||
Qty = isInbound ? (d.Qty ?? 0) : 0,
|
||||
TaskQty = d.Qty,
|
||||
BatchCode = d.Batch,
|
||||
ReceiptDetailId = d.ErpDetailId,
|
||||
MaterialCode = item.Key,
|
||||
MaterialName = material?.MaterialName,
|
||||
MaterialType = material?.MaterialType,
|
||||
MaterialSpec = material?.MaterialSpec,
|
||||
MaterialUnit = material?.MaterialUnit,
|
||||
SupplierCode = material?.SupplierCode,
|
||||
Qty = item.Value,
|
||||
TaskQty = item.Value,
|
||||
BatchCode = detail?.Batch,
|
||||
ReceiptDetailId = detail?.ErpDetailId,
|
||||
TaskStatus = InventoryTaskStatusEnum.Idle,
|
||||
UploadErpFlag = invErpFlag,
|
||||
UploadErpFlag = 1,
|
||||
CreateBy = sysUser,
|
||||
CreateTime = DateTime.Now
|
||||
});
|
||||
};
|
||||
_unitWork.Add(created);
|
||||
newInventories.Add(created);
|
||||
}
|
||||
}
|
||||
foreach (var inv in inventories)
|
||||
{
|
||||
// 出库:按本次明细数量扣减库存(入库数量在下任务时已累加,不再重复加)
|
||||
if (!isInbound && detailQtyMap.TryGetValue(inv.MaterialCode ?? "", out var outQty))
|
||||
{
|
||||
inv.Qty = Math.Max(0, (inv.Qty ?? 0) - outQty);
|
||||
}
|
||||
inv.LocationCode = actualLocation;
|
||||
inv.TaskStatus = InventoryTaskStatusEnum.Idle;
|
||||
inv.UploadErpFlag = inv.UploadErpFlag ?? invErpFlag;
|
||||
_unitWork.Update(inv);
|
||||
}
|
||||
var flowInventories = inventories.Concat(newInventories).ToList();
|
||||
|
||||
// 2. 流水:入库 1 条 in / 出库 1 条 out(15.3-1 六类均为 1 条)
|
||||
if (inventories.Count > 0)
|
||||
if (flowInventories.Count > 0)
|
||||
{
|
||||
// 出库回传流水需携带库区编码,供 AddOtherOutJob 回传时按库区映射 WhCode
|
||||
var locZoneId = _unitWork.FindSingle<Location>(x => x.Code == actualLocation)?.ZoneId;
|
||||
var zoneCode = locZoneId.HasValue
|
||||
? _unitWork.FindSingle<LocationZone>(x => x.ID == locZoneId.Value)?.ZoneCode
|
||||
: null;
|
||||
foreach (var inv in inventories)
|
||||
// 需上报的平库出库:同一任务的明细共用一个出库单号
|
||||
var outBillCode = !isInbound && reportBack ? _unitWork.GetSerialNumber("CK") : null;
|
||||
foreach (var inv in flowInventories)
|
||||
{
|
||||
var tran = _mapper.Map<InventoryTransaction>(inv);
|
||||
tran.Type = isInbound ? InventoryTranType.入库 : InventoryTranType.出库;
|
||||
// 出库回传类(3/4)挂 AddOtherOut 置 0 走 AddOtherOutJob;其余用 AGV 自身流水类型且置 1 不回传
|
||||
// 仅「原料满托出库」挂 AddRdRecord11 待上报;入库与非上报出库一律置 1 不回传
|
||||
tran.BillType = isInbound ? billType.ToString()
|
||||
: (reportBack ? InventoryTransaction.ErpOtherOutBillType : billType.ToString());
|
||||
tran.UploadErpFlag = isInbound ? 1 : (reportBack ? 0 : 1);
|
||||
: (reportBack ? InventoryTransaction.ErpRdRecord11BillType : billType.ToString());
|
||||
tran.UploadErpFlag = isInbound || !reportBack ? 1 : 0;
|
||||
tran.BillCode = isInbound ? null : outBillCode;
|
||||
// 流水数量取本次明细数量(不能用扣减后的库存数量)
|
||||
tran.Qty = detailQtyMap.TryGetValue(inv.MaterialCode ?? "", out var flowQty)
|
||||
? flowQty
|
||||
: (inv.Qty ?? 0);
|
||||
tran.CreateBy = task.CreateBy;
|
||||
tran.ZoneCode = zoneCode;
|
||||
tran.CreateTime = DateTime.Now;
|
||||
_unitWork.Add(tran);
|
||||
@@ -874,15 +918,7 @@ namespace HHWMS.Web.Services.Agv
|
||||
_unitWork.Update(toLoc);
|
||||
}
|
||||
|
||||
// 5. ERP 通道:仅入库报工类(业务1)在线报工 FinishIn;出库回传类(3/4)由 AddOtherOutJob 补传;不回传类(2/5/6)跳过
|
||||
if (isInbound && reportBack && inventories.Count > 0)
|
||||
{
|
||||
var invVM = _wtm.CreateVM<InventoryVM>();
|
||||
foreach (var inv in inventories)
|
||||
{
|
||||
await invVM.ProcessErpFinishIn(inv, TaskTypeEnum.入库);
|
||||
}
|
||||
}
|
||||
// 5. ERP 通道:入库不再报工(FinishIn 已取消);需上报的出库已由流水 AddRdRecord11 交给 AddRdRecord11Job 补传
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -945,13 +981,107 @@ namespace HHWMS.Web.Services.Agv
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 判断是否需 ERP 回传(15.3-1):1 入库报工(FinishIn)、3/4 出库回传(AddOtherOut);2/5/6 不回传
|
||||
/// 判断是否需 ERP 回传:仅「原料满托出库」需要(入库报工已取消,其余出库不上报)
|
||||
/// </summary>
|
||||
private static bool IsErpReportBack(AgvTaskTypeEnum? taskType)
|
||||
{
|
||||
return taskType == AgvTaskTypeEnum.原材料入库
|
||||
|| taskType == AgvTaskTypeEnum.原料满托出库
|
||||
|| taskType == AgvTaskTypeEnum.混料满桶上线;
|
||||
return taskType == AgvTaskTypeEnum.原料满托出库;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 按物料汇总明细数量(同物料多行合并),用于库存增减与 ERP 上报
|
||||
/// </summary>
|
||||
private static Dictionary<string, decimal> BuildDetailQtyMap(List<AgvReceiveDetail> details)
|
||||
{
|
||||
if (details == null || details.Count == 0)
|
||||
{
|
||||
return new Dictionary<string, decimal>();
|
||||
}
|
||||
return details
|
||||
.Where(x => !string.IsNullOrWhiteSpace(x.MaterialCode))
|
||||
.GroupBy(x => x.MaterialCode.Trim())
|
||||
.ToDictionary(g => g.Key, g => g.Sum(x => x.Qty ?? 0));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 入库任务下任务即写库存:同托盘同物料累加,不存在则按物料档案新建
|
||||
/// </summary>
|
||||
private void SaveInboundInventory(AgvTask task, Location fromLoc, List<AgvReceiveDetail> details)
|
||||
{
|
||||
var detailQtyMap = BuildDetailQtyMap(details);
|
||||
if (detailQtyMap.Count == 0)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
var materialCodes = detailQtyMap.Keys.ToList();
|
||||
var materials = _unitWork.Find<Material>(x => materialCodes.Contains(x.MaterialCode))
|
||||
.ToDictionary(x => x.MaterialCode);
|
||||
var inventories = _unitWork.Find<Inventory>(x => x.ContainerCode == task.ContainerCode).ToList();
|
||||
|
||||
foreach (var item in detailQtyMap)
|
||||
{
|
||||
var exists = inventories.FirstOrDefault(x => x.MaterialCode == item.Key);
|
||||
if (exists != null)
|
||||
{
|
||||
exists.Qty = (exists.Qty ?? 0) + item.Value;
|
||||
exists.TaskQty = item.Value;
|
||||
exists.TaskStatus = InventoryTaskStatusEnum.Locked;
|
||||
_unitWork.Update(exists);
|
||||
continue;
|
||||
}
|
||||
|
||||
materials.TryGetValue(item.Key, out var material);
|
||||
var detail = details.FirstOrDefault(x => x.MaterialCode != null && x.MaterialCode.Trim() == item.Key);
|
||||
_unitWork.Add(new Inventory
|
||||
{
|
||||
ZoneId = fromLoc?.ZoneId ?? 0,
|
||||
ContainerCode = task.ContainerCode,
|
||||
LocationCode = fromLoc?.Code ?? task.FromLocation,
|
||||
MaterialCode = item.Key,
|
||||
MaterialName = material?.MaterialName,
|
||||
MaterialType = material?.MaterialType,
|
||||
MaterialSpec = material?.MaterialSpec,
|
||||
MaterialUnit = material?.MaterialUnit,
|
||||
SupplierCode = material?.SupplierCode,
|
||||
Qty = item.Value,
|
||||
TaskQty = item.Value,
|
||||
BatchCode = detail?.Batch,
|
||||
ReceiptDetailId = detail?.ErpDetailId,
|
||||
TaskStatus = InventoryTaskStatusEnum.Locked,
|
||||
UploadErpFlag = 1,
|
||||
CreateBy = task.CreateBy,
|
||||
CreateTime = DateTime.Now
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 入库任务取消/失败时回滚下任务时累加的库存数量(只回滚数量,不删除记录)
|
||||
/// </summary>
|
||||
private void RollbackInboundInventory(AgvTask task)
|
||||
{
|
||||
if (ParseBillType(task.BillType) != AgvBillTypeEnum.In_AGV)
|
||||
{
|
||||
return;
|
||||
}
|
||||
var detailQtyMap = BuildDetailQtyMap(ParseDetails(task.Details));
|
||||
if (detailQtyMap.Count == 0)
|
||||
{
|
||||
return;
|
||||
}
|
||||
var inventories = _unitWork.Find<Inventory>(x => x.ContainerCode == task.ContainerCode).ToList();
|
||||
foreach (var item in detailQtyMap)
|
||||
{
|
||||
var inv = inventories.FirstOrDefault(x => x.MaterialCode == item.Key);
|
||||
if (inv == null)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
inv.Qty = Math.Max(0, (inv.Qty ?? 0) - item.Value);
|
||||
inv.TaskStatus = InventoryTaskStatusEnum.Idle;
|
||||
_unitWork.Update(inv);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
Reference in new issue
Block a user