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 @@
+
@@ -36,7 +37,7 @@
style="margin-bottom: 12px">
- 托盘:{{ task.ContainerCode }};状态:{{ task.Status }}
+ 托盘:{{ task.ContainerCode }};库位:{{ task.LocationCode || '-' }};状态:{{ task.Status }}
@@ -84,6 +85,7 @@
+
diff --git a/HHWMS.Web/Areas/System/Controllers/jobs/AddRdRecord11Job.cs b/HHWMS.Web/Areas/System/Controllers/jobs/AddRdRecord11Job.cs
new file mode 100644
index 0000000..6d17e8a
--- /dev/null
+++ b/HHWMS.Web/Areas/System/Controllers/jobs/AddRdRecord11Job.cs
@@ -0,0 +1,79 @@
+using System;
+using System.Collections.Generic;
+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
+{
+ ///
+ /// ERP 平库材料出库单上报补传(AddRdRecord11)
+ /// 同一出库单号(BillCode)的多条流水合并为一单上报,失败置 0 下一轮重试
+ ///
+ [PersistJobDataAfterExecution]
+ [DisallowConcurrentExecution]
+ public class AddRdRecord11Job : WtmJob
+ {
+ public override async Task Execute(IJobExecutionContext context)
+ {
+ try
+ {
+ var unitWork = new UnitWork(Wtm);
+ var first = unitWork.Find(x =>
+ x.Type == InventoryTranType.出库
+ && x.BillType == InventoryTransaction.ErpRdRecord11BillType
+ && x.UploadErpFlag != 1
+ && x.UploadErpFlag != null)
+ .OrderBy(x => x.ID)
+ .FirstOrDefault();
+
+ if (first != null)
+ {
+ // 按出库单号取出同组待传明细;无单号时只上报当前一条
+ List group;
+ if (string.IsNullOrWhiteSpace(first.BillCode))
+ {
+ group = new List { first };
+ }
+ else
+ {
+ group = unitWork.Find(x =>
+ x.Type == InventoryTranType.出库
+ && x.BillType == InventoryTransaction.ErpRdRecord11BillType
+ && x.BillCode == first.BillCode
+ && x.UploadErpFlag != 1
+ && x.UploadErpFlag != null)
+ .OrderBy(x => x.ID)
+ .ToList();
+ }
+
+ var vm = Wtm.CreateVM();
+ await vm.ProcessErpRdRecord11(group);
+ }
+
+ var job = unitWork.FindSingle(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,
+ "AddRdRecord11Job", request: "error", result: ex.Message);
+ }
+ }
+ }
+}
diff --git a/HHWMS.Web/Models/Inventory/InventoryTransaction.cs b/HHWMS.Web/Models/Inventory/InventoryTransaction.cs
index f6e5d62..3b1aec3 100644
--- a/HHWMS.Web/Models/Inventory/InventoryTransaction.cs
+++ b/HHWMS.Web/Models/Inventory/InventoryTransaction.cs
@@ -11,6 +11,8 @@ namespace HHWMS.Web.Models
{
public const string ErpOtherOutBillType = "AddOtherOut";
public const string ErpSaleOutBillType = "AddSaleOut";
+ /// 平库材料出库单上报(ERP AddRdRecord11)
+ public const string ErpRdRecord11BillType = "AddRdRecord11";
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
diff --git a/HHWMS.Web/Models/Request/Request/AddRdRecord11Request.cs b/HHWMS.Web/Models/Request/Request/AddRdRecord11Request.cs
new file mode 100644
index 0000000..d77df78
--- /dev/null
+++ b/HHWMS.Web/Models/Request/Request/AddRdRecord11Request.cs
@@ -0,0 +1,52 @@
+using System.Collections.Generic;
+
+namespace HHWMS.Web.Models
+{
+ ///
+ /// ERP 平库材料出库单上报请求(AddRdRecord11)
+ ///
+ public class AddRdRecord11Request
+ {
+ /// 出库单主表
+ public AddRdRecord11Main Main { get; set; }
+
+ /// 出库明细
+ public List Details { get; set; }
+ }
+
+ ///
+ /// 出库单主表
+ ///
+ public class AddRdRecord11Main
+ {
+ /// 账套号,必填,固定 003
+ public string ErpCode { get; set; }
+
+ /// 出库单号,必填,系统流水生成(CK)
+ public string BillCode { get; set; }
+
+ /// 出库日期,必填,格式 yyyy-MM-dd
+ public string BillDate { get; set; }
+
+ /// 仓库编码,必填,固定 yl
+ public string WhCode { get; set; }
+
+ /// 部门编码,非必填,本期不传
+ public string DepCode { get; set; }
+
+ /// 制单人,必填,取下任务用户
+ public string Maker { get; set; }
+ }
+
+ ///
+ /// 出库明细
+ ///
+ public class AddRdRecord11Detail
+ {
+ /// 物料号,必填
+ public string InvCode { get; set; }
+
+ /// 出库数量,必填
+ public decimal Qty { get; set; }
+ }
+}
diff --git a/HHWMS.Web/Services/Agv/AgvTaskService.cs b/HHWMS.Web/Services/Agv/AgvTaskService.cs
index ec01ae2..bad5df7 100644
--- a/HHWMS.Web/Services/Agv/AgvTaskService.cs
+++ b/HHWMS.Web/Services/Agv/AgvTaskService.cs
@@ -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(x => x.ContainerCode == task.ContainerCode).ToList();
- if (inventories.Count == 0 && details != null && details.Count > 0)
+ var newInventories = new List();
+ if (inventories.Count == 0 && isInbound && detailQtyMap.Count > 0)
{
- foreach (var d in details)
+ // 兼容改造前创建的任务:完成时再按明细补建库存
+ var materialCodes = detailQtyMap.Keys.ToList();
+ var materials = _unitWork.Find(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(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(x => x.Code == actualLocation)?.ZoneId;
var zoneCode = locZoneId.HasValue
? _unitWork.FindSingle(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(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();
- foreach (var inv in inventories)
- {
- await invVM.ProcessErpFinishIn(inv, TaskTypeEnum.入库);
- }
- }
+ // 5. ERP 通道:入库不再报工(FinishIn 已取消);需上报的出库已由流水 AddRdRecord11 交给 AddRdRecord11Job 补传
}
///
@@ -945,13 +981,107 @@ namespace HHWMS.Web.Services.Agv
}
///
- /// 判断是否需 ERP 回传(15.3-1):1 入库报工(FinishIn)、3/4 出库回传(AddOtherOut);2/5/6 不回传
+ /// 判断是否需 ERP 回传:仅「原料满托出库」需要(入库报工已取消,其余出库不上报)
///
private static bool IsErpReportBack(AgvTaskTypeEnum? taskType)
{
- return taskType == AgvTaskTypeEnum.原材料入库
- || taskType == AgvTaskTypeEnum.原料满托出库
- || taskType == AgvTaskTypeEnum.混料满桶上线;
+ return taskType == AgvTaskTypeEnum.原料满托出库;
+ }
+
+ ///
+ /// 按物料汇总明细数量(同物料多行合并),用于库存增减与 ERP 上报
+ ///
+ private static Dictionary BuildDetailQtyMap(List details)
+ {
+ if (details == null || details.Count == 0)
+ {
+ return new Dictionary();
+ }
+ return details
+ .Where(x => !string.IsNullOrWhiteSpace(x.MaterialCode))
+ .GroupBy(x => x.MaterialCode.Trim())
+ .ToDictionary(g => g.Key, g => g.Sum(x => x.Qty ?? 0));
+ }
+
+ ///
+ /// 入库任务下任务即写库存:同托盘同物料累加,不存在则按物料档案新建
+ ///
+ private void SaveInboundInventory(AgvTask task, Location fromLoc, List details)
+ {
+ var detailQtyMap = BuildDetailQtyMap(details);
+ if (detailQtyMap.Count == 0)
+ {
+ return;
+ }
+
+ var materialCodes = detailQtyMap.Keys.ToList();
+ var materials = _unitWork.Find(x => materialCodes.Contains(x.MaterialCode))
+ .ToDictionary(x => x.MaterialCode);
+ var inventories = _unitWork.Find(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
+ });
+ }
+ }
+
+ ///
+ /// 入库任务取消/失败时回滚下任务时累加的库存数量(只回滚数量,不删除记录)
+ ///
+ 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(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);
+ }
}
///