fix:永丰售后修复BUG,
1,物料库存获取不到ERP:重新调整触发查询逻辑 2,工序变更导致物料无法出库:配置旧工序 3,测试出库订单ERP推送,任务下发
This commit is contained in:
1 parent
b2a9a38f38
commit
c76e7bb681
69 files changed
+5510
-157
No files matched your search
@@ -0,0 +1,179 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using WalkingTec.Mvvm.Core;
|
||||
using WalkingTec.Mvvm.Core.Extensions;
|
||||
using HHWMS.Web.Models;
|
||||
|
||||
namespace HHWMS.Web.Services.Erp
|
||||
{
|
||||
/// <summary>
|
||||
/// 物料查询服务:本地物料表优先,查不到再调用 ERP LoadInventory,并把 ERP 结果回写本地
|
||||
/// 物料编码对应 ERP 字段 InvCode,图号对应 ERP 字段 InvDefine1
|
||||
/// </summary>
|
||||
public class ErpMaterialService
|
||||
{
|
||||
private const string ErpCode = "003";
|
||||
private const int ErpSize = 50;
|
||||
private const int ErpTimeoutSeconds = 15;
|
||||
|
||||
private readonly IUnitWork _unitWork;
|
||||
private readonly WTMContext _wtm;
|
||||
|
||||
public ErpMaterialService(IUnitWork unitWork, WTMContext wtm)
|
||||
{
|
||||
_unitWork = unitWork;
|
||||
_wtm = wtm;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 本地是否有可用物料:物料编码命中且物料编码、图号都不为空/空格(否则视为没查到,需要调 ERP 补全)
|
||||
/// </summary>
|
||||
public bool ExistsLocalByCode(string keyword)
|
||||
{
|
||||
keyword = keyword?.Trim();
|
||||
return !string.IsNullOrWhiteSpace(keyword)
|
||||
&& _unitWork.Find<Material>(x => x.MaterialCode.Contains(keyword)
|
||||
&& x.MaterialCode != null && x.MaterialCode.Trim() != ""
|
||||
&& x.MaterialType != null && x.MaterialType.Trim() != "")
|
||||
.Any();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 本地是否有可用物料:图号命中且图号、物料编码都不为空/空格(否则视为没查到,需要调 ERP 补全)
|
||||
/// </summary>
|
||||
public bool ExistsLocalByType(string keyword)
|
||||
{
|
||||
keyword = keyword?.Trim();
|
||||
return !string.IsNullOrWhiteSpace(keyword)
|
||||
&& _unitWork.Find<Material>(x => x.MaterialType.Contains(keyword)
|
||||
&& x.MaterialType != null && x.MaterialType.Trim() != ""
|
||||
&& x.MaterialCode != null && x.MaterialCode.Trim() != "")
|
||||
.Any();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 列表搜索前置同步:物料编码本地查不到时才调 ERP(InvCode)并回写,不返回数据,列表随后统一查询
|
||||
/// </summary>
|
||||
public async Task EnsureByCodeAsync(string keyword)
|
||||
{
|
||||
keyword = keyword?.Trim();
|
||||
if (string.IsNullOrWhiteSpace(keyword) || ExistsLocalByCode(keyword))
|
||||
{
|
||||
return;
|
||||
}
|
||||
SaveItems(await QueryErpByCodeAsync(keyword));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 列表搜索前置同步:图号本地查不到时才调 ERP(InvDefine1)并回写
|
||||
/// </summary>
|
||||
public async Task EnsureByTypeAsync(string keyword)
|
||||
{
|
||||
keyword = keyword?.Trim();
|
||||
if (string.IsNullOrWhiteSpace(keyword) || ExistsLocalByType(keyword))
|
||||
{
|
||||
return;
|
||||
}
|
||||
SaveItems(await QueryErpByTypeAsync(keyword));
|
||||
}
|
||||
|
||||
/// <summary>按物料编码调 ERP(InvCode)</summary>
|
||||
private Task<List<InventoryItem>> QueryErpByCodeAsync(string keyword)
|
||||
{
|
||||
return QueryErpAsync(new LoadInventoryRequest { InvCode = keyword });
|
||||
}
|
||||
|
||||
/// <summary>按图号调 ERP(InvDefine1)</summary>
|
||||
private Task<List<InventoryItem>> QueryErpByTypeAsync(string keyword)
|
||||
{
|
||||
return QueryErpAsync(new LoadInventoryRequest { InvDefine1 = keyword });
|
||||
}
|
||||
|
||||
/// <summary>调用 ERP LoadInventory;异常或返回非成功时返回空列表,不影响页面搜索</summary>
|
||||
private async Task<List<InventoryItem>> QueryErpAsync(LoadInventoryRequest request)
|
||||
{
|
||||
request.ErpCode = ErpCode;
|
||||
request.Size = ErpSize;
|
||||
request.Page = 1;
|
||||
try
|
||||
{
|
||||
var apiResult = await _wtm.CallAPI<LoadInventoryResponse>("ERP", "LoadInventory",
|
||||
HttpMethodEnum.POST, request, ErpTimeoutSeconds);
|
||||
var data = apiResult?.Data;
|
||||
if (data == null || data.Code != 0)
|
||||
{
|
||||
_wtm.DoLog("ERP物料查询: 返回异常", ActionLogTypesEnum.Normal, "物料",
|
||||
request: $"InvCode={request.InvCode}, InvDefine1={request.InvDefine1}",
|
||||
result: $"Code={data?.Code}, Msg={data?.Msg ?? apiResult?.ErrorMsg}");
|
||||
return new List<InventoryItem>();
|
||||
}
|
||||
|
||||
return data.Data?.Where(x => !string.IsNullOrWhiteSpace(x.InvCode)).ToList()
|
||||
?? new List<InventoryItem>();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_wtm.DoLog("ERP物料查询: 调用失败", ActionLogTypesEnum.Normal, "物料",
|
||||
request: $"InvCode={request.InvCode}, InvDefine1={request.InvDefine1}",
|
||||
result: ex.Message);
|
||||
return new List<InventoryItem>();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>将 ERP 物料回写本地:按物料编码更新,没有则新增</summary>
|
||||
private void SaveItems(List<InventoryItem> items)
|
||||
{
|
||||
if (items == null || items.Count == 0)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
var codes = items.Select(x => x.InvCode).ToList();
|
||||
var existing = _unitWork.Find<Material>(x => codes.Contains(x.MaterialCode)).ToList();
|
||||
var adds = new List<Material>();
|
||||
var updates = new List<Material>();
|
||||
var operatorCode = _wtm.LoginUserInfo?.ITCode ?? "System";
|
||||
|
||||
foreach (var item in items)
|
||||
{
|
||||
var local = existing.FirstOrDefault(x => x.MaterialCode == item.InvCode);
|
||||
if (local == null)
|
||||
{
|
||||
adds.Add(new Material
|
||||
{
|
||||
MaterialCode = item.InvCode,
|
||||
MaterialName = item.InvName,
|
||||
MaterialSpec = item.InvStd,
|
||||
MaterialUnit = item.UnitName,
|
||||
MaterialType = item.InvDefine1,
|
||||
SupplierCode = item.InvDefine4,
|
||||
Qty = 0,
|
||||
CreateTime = DateTime.Now,
|
||||
CreateBy = operatorCode
|
||||
});
|
||||
continue;
|
||||
}
|
||||
|
||||
local.MaterialName = item.InvName;
|
||||
local.MaterialSpec = item.InvStd;
|
||||
local.MaterialUnit = item.UnitName;
|
||||
local.MaterialType = item.InvDefine1;
|
||||
local.SupplierCode = item.InvDefine4;
|
||||
local.UpdateTime = DateTime.Now;
|
||||
local.UpdateBy = operatorCode;
|
||||
updates.Add(local);
|
||||
}
|
||||
|
||||
if (adds.Count > 0)
|
||||
{
|
||||
_unitWork.BatchAdd(adds);
|
||||
}
|
||||
if (updates.Count > 0)
|
||||
{
|
||||
_unitWork.BatchUpdate(updates);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user