fix:永丰售后修复BUG,

1,物料库存获取不到ERP:重新调整触发查询逻辑
2,工序变更导致物料无法出库:配置旧工序
3,测试出库订单ERP推送,任务下发
This commit is contained in:
sunwang committed 2026-10-29 13:12:11 +08:00
1 parent b2a9a38f38
commit c76e7bb681
69 files changed
+5510 -157

No files matched your search

@@ -95,18 +95,24 @@ namespace HHWMS.Web
}
else
{
// 框架调用ERP失败时备注只记 send,这里补一条带请求参数和错误原因的日志,便于排查
var errMsg = apiResult?.Data?.Msg ?? apiResult?.ErrorMsg ?? "未获取到订单数据";
Wtm.DoLog($"ERP接口返回失败:{errMsg}", ActionLogTypesEnum.Exception, "ERP", "MOWorkAPI",
request: $"ErpCode=003, MoCode={receiptCode ?? "(空)"}, InvCode={vm.Entity?.MaterialCode ?? "(空)"}, InvDefine1={vm.Entity?.MaterialType ?? "(空)"}, StepCode={vm.Entity?.Batch ?? "(空)"}, Size=100, Page=1",
result: errMsg);
return new ApiJsonResult<List<MoDetailItem>>()
{
Success = false,
Msg = apiResult?.Data?.Msg ?? apiResult?.ErrorMsg ?? "未获取到订单数据"
Msg = errMsg
};
}
}
catch (Exception ex)
{
Wtm.DoLog("获取ERP订单数据", ActionLogTypesEnum.Normal, "GetReceiptDetails",
request: $"入库单号:{receiptCode}",
result: $"错误:{ex.Message}");
Wtm.DoLog($"获取ERP订单数据异常:{ex.Message}", ActionLogTypesEnum.Normal, "GetReceiptDetails",
request: $"入库单号:{receiptCode ?? "(空)"},物料:{vm?.Entity?.MaterialCode ?? "(空)"},图号:{vm?.Entity?.MaterialType ?? "(空)"},批次:{vm?.Entity?.Batch ?? "(空)"}",
result: ex.ToString());
return new ApiJsonResult<List<MoDetailItem>>()
{
Success = false,
@@ -115,6 +121,59 @@ namespace HHWMS.Web
}
}
/// <summary>
/// 从 ERP 生产订单中获取工序路线并保存到物料工序表(只写工序,不创建入库单/明细)
/// </summary>
/// <param name="materialCode">物料编码(存货编码)</param>
public async Task SyncMaterialProcessFromErp(string materialCode)
{
try
{
var request = new LoadMoDetailListRequest
{
ErpCode = "003",
InvCode = materialCode,
StepCode = "32",
Size = 100,
Page = 1
};
var apiResult = await Wtm.CallAPI<LoadMoDetailListResponse>("ERP", "MOWorkAPI", HttpMethodEnum.POST, request, 5);
if (apiResult?.Data == null || apiResult.Data.Code != 0 || apiResult.Data.Data == null)
{
Wtm.DoLog($"同步物料工序失败:{apiResult?.Data?.Msg ?? apiResult?.ErrorMsg ?? "ERP未返回订单数据"}",
ActionLogTypesEnum.Exception, "ERP", "MOWorkAPI",
request: $"物料:{materialCode}, ErpCode=003, InvCode={materialCode}, StepCode=32, Size=100, Page=1",
result: apiResult?.Data?.Msg ?? apiResult?.ErrorMsg ?? "ERP未返回订单数据");
return;
}
// 同一物料只按订单中的工序路线保存一次
var items = apiResult.Data.Data
.Where(x => !string.IsNullOrWhiteSpace(x.InvCode)
&& x.ProcessRoute != null && x.ProcessRoute.Count > 0)
.GroupBy(x => x.InvCode)
.Select(g => g.First())
.ToList();
foreach (var item in items)
{
await SaveProcessRoute(_unitwork, item.InvCode, item.ProcessRoute);
}
Wtm.DoLog("同步物料工序", ActionLogTypesEnum.Normal, "SyncMaterialProcess",
request: $"物料:{materialCode}",
result: $"从ERP订单同步工序,涉及物料 {items.Count} 个");
}
catch (Exception ex)
{
Wtm.DoLog($"同步物料工序异常:{ex.Message}", ActionLogTypesEnum.Exception, "ERP", "MOWorkAPI",
request: $"物料:{materialCode}, ErpCode=003, InvCode={materialCode}, StepCode=32, Size=100, Page=1",
result: ex.ToString());
}
}
/// <summary>
/// 处理订单数据并保存到本地数据库(照搬 LoadErpOrderJob)
/// </summary>
@@ -340,6 +399,12 @@ namespace HHWMS.Web
/// </summary>
private async Task SaveProcessRoute(IUnitWork unitWork, string materialCode, List<ProcessRouteItem> processRoute)
{
// 防御:物料编码为空会插入违规数据,工序路线为空会误删该物料已有工序
if (string.IsNullOrWhiteSpace(materialCode) || processRoute == null || processRoute.Count == 0)
{
return;
}
// 查询已存在的工序路线
var existingProcesses = unitWork.Find<MaterialProcess>(p => p.MaterialCode == materialCode).ToList();