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
@@ -55,21 +55,48 @@ namespace HHWMS.Web.Controllers
|
||||
return Json(new { Code = 200, Data = new object[] { } });
|
||||
}
|
||||
|
||||
// 尝试调用接口获取物料
|
||||
keyword = keyword.Trim();
|
||||
|
||||
// 先查本地物料表:物料编码或图号模糊匹配(名称也一起匹配),和标准入库页面一致
|
||||
var dbMaterials = _unitWork.Find<Material>(m => m.MaterialCode.Contains(keyword)
|
||||
|| m.MaterialType.Contains(keyword)
|
||||
|| m.MaterialName.Contains(keyword))
|
||||
.Select(m => new
|
||||
{
|
||||
MaterialCode = m.MaterialCode,
|
||||
MaterialName = m.MaterialName,
|
||||
MaterialSpec = m.MaterialSpec,
|
||||
MaterialUnit = m.MaterialUnit,
|
||||
MaterialType = m.MaterialType,
|
||||
SupplierCode = m.SupplierCode
|
||||
})
|
||||
.Take(15)
|
||||
.ToList();
|
||||
// 本地查到就返回,不再因为图号为空丢弃记录
|
||||
if (dbMaterials.Count > 0)
|
||||
{
|
||||
return Json(new { Code = 200, Data = dbMaterials });
|
||||
}
|
||||
|
||||
// 本地没有则调 ERP LoadInventory(按物料编码 InvCode 查询)并自动建档
|
||||
try
|
||||
{
|
||||
var request = new LoadInventoryRequest
|
||||
{
|
||||
ErpCode = "003",
|
||||
InvDefine1 = keyword,
|
||||
InvCode = keyword,
|
||||
Size = 15,
|
||||
Page = 1
|
||||
};
|
||||
|
||||
Wtm.DoLog($"ERP物料查询: 入库页面搜索触发", ActionLogTypesEnum.Normal,
|
||||
"物料", $"keyword={keyword}, ErpCode=003");
|
||||
var apiResult =
|
||||
await Wtm.CallAPI<LoadInventoryResponse>("ERP", "LoadInventory", HttpMethodEnum.POST, request,3);
|
||||
|
||||
if (apiResult?.Data != null && apiResult.Data.Code == 0)
|
||||
// ERP 有数据才用 ERP 结果;返回成功但 0 条时继续往下走本地兜底,避免页面变成空列表
|
||||
if (apiResult?.Data != null && apiResult.Data.Code == 0
|
||||
&& apiResult.Data.Data != null && apiResult.Data.Data.Count > 0)
|
||||
{
|
||||
var materialsList = new List<object>();
|
||||
var oldMaterials = new List<object>();
|
||||
@@ -81,6 +108,9 @@ namespace HHWMS.Web.Controllers
|
||||
.Select(x => x.InvCode)
|
||||
.ToList();
|
||||
|
||||
Wtm.DoLog($"ERP物料查询: ERP返回{apiResult.Data.Data.Count}条", ActionLogTypesEnum.Normal,
|
||||
"物料", $"keyword={keyword}, codes=[{string.Join(",", invCodes)}]");
|
||||
|
||||
// 一次性查询本地数据库中已存在的物料(优化性能,避免循环中多次查询)
|
||||
var existingMaterials = _unitWork.Find<Material>(m => invCodes.Contains(m.MaterialCode))
|
||||
.ToList();
|
||||
@@ -155,36 +185,28 @@ namespace HHWMS.Web.Controllers
|
||||
_unitWork.BatchAdd(newMaterials);
|
||||
_unitWork.BatchUpdate(oldMaterials);
|
||||
|
||||
Wtm.DoLog($"ERP物料查询: 本地同步完成", ActionLogTypesEnum.Normal,
|
||||
"物料", $"keyword={keyword}, 新增={newMaterials.Count}, 更新={oldMaterials.Count}");
|
||||
|
||||
// 返回物料列表到前端
|
||||
return Json(new { Code = 200, Data = materialsList });
|
||||
}
|
||||
else
|
||||
{
|
||||
Wtm.DoLog($"ERP物料查询: ERP返回异常", ActionLogTypesEnum.Normal,
|
||||
"物料", $"keyword={keyword}, Code={apiResult?.Data?.Code}, Msg={apiResult?.Data?.Msg}");
|
||||
}
|
||||
}
|
||||
catch (System.Exception apiEx)
|
||||
{
|
||||
// 接口调用失败,记录日志
|
||||
Wtm.DoLog("获取ERP物料数据", ActionLogTypesEnum.Normal, "SearchMaterials",
|
||||
request: $"接口调用失败,改用本地数据库查询:{apiEx.Message}",
|
||||
result: "接口调用失败,改用本地数据库查询");
|
||||
Wtm.DoLog($"ERP物料查询: 接口调用失败", ActionLogTypesEnum.Normal, "物料",
|
||||
request: $"keyword={keyword}, 改用本地数据库查询",
|
||||
result: apiEx.Message);
|
||||
}
|
||||
|
||||
// 接口连接失败或返回错误,从本地数据库查询
|
||||
var localMaterials = _unitWork.Find<Material>
|
||||
(m => m.MaterialCode.Contains(keyword)
|
||||
|| m.MaterialName.Contains(keyword)
|
||||
|| m.MaterialType.Contains(keyword))
|
||||
.Select(m => new
|
||||
{
|
||||
MaterialCode = m.MaterialCode,
|
||||
MaterialName = m.MaterialName,
|
||||
MaterialSpec = m.MaterialSpec,
|
||||
MaterialUnit = m.MaterialUnit,
|
||||
MaterialType = m.MaterialType,
|
||||
SupplierCode = m.SupplierCode
|
||||
})
|
||||
.Take(15)
|
||||
.ToList();
|
||||
|
||||
return Json(new { Code = 200, Data = localMaterials });
|
||||
// ERP 返回成功但没有数据,或调用失败:直接返回本地已查到的记录(本地有数据时不能给页面返回空)
|
||||
return Json(new { Code = 200, Data = dbMaterials });
|
||||
}
|
||||
catch (System.Exception ex)
|
||||
{
|
||||
@@ -211,51 +233,43 @@ namespace HHWMS.Web.Controllers
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取物料的工序列表
|
||||
/// 获取工序列表:默认展示全部工序配置
|
||||
/// 具体使用哪道工序由生产订单决定,物料工序表在查到订单后再按订单内容更新
|
||||
/// </summary>
|
||||
/// <param name="materialCode"></param>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
public IActionResult GetProcessesByMaterial(string materialCode)
|
||||
public IActionResult GetProcessesByMaterial()
|
||||
{
|
||||
try
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(materialCode))
|
||||
var configs = LoadAllProcessConfigs();
|
||||
return Json(new
|
||||
{
|
||||
return Json(new { Code = 200, Data = new object[] { } });
|
||||
}
|
||||
|
||||
var processes = _unitWork.Find<MaterialProcess>(x => x.MaterialCode == materialCode && x.IsActive)
|
||||
.OrderBy(x => x.ProcessOrder)
|
||||
.Select(x => new
|
||||
Code = 200,
|
||||
Data = configs.Select(x => new
|
||||
{
|
||||
value = x.ID.ToString(),
|
||||
label = x.ProcessName,
|
||||
processCode = x.ProcessCode,
|
||||
processName = x.ProcessName
|
||||
})
|
||||
.ToList();
|
||||
if (processes.Count == 0)
|
||||
{
|
||||
processes = _unitWork.Find<ProcessConfig>(x => x.ID > 0)
|
||||
.OrderBy(x => x.Code)
|
||||
.Select(x => new
|
||||
{
|
||||
value = x.ID.ToString(),
|
||||
label = x.Name,
|
||||
processCode = x.Code,
|
||||
processName = x.Name
|
||||
})
|
||||
.ToList();
|
||||
}
|
||||
return Json(new { Code = 200, Data = processes });
|
||||
label = x.Name,
|
||||
processCode = x.Code,
|
||||
processName = x.Name
|
||||
}).ToList()
|
||||
});
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return Json(new { Code = 500, Msg = $"获取物料工序失败:{ex.Message}" });
|
||||
return Json(new { Code = 500, Msg = $"获取工序列表失败:{ex.Message}" });
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 查询全部工序配置
|
||||
/// </summary>
|
||||
private List<ProcessConfig> LoadAllProcessConfigs()
|
||||
{
|
||||
return _unitWork.Find<ProcessConfig>(x => x.ID > 0)
|
||||
.OrderBy(x => x.Code)
|
||||
.ToList();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取物料的单据信息
|
||||
/// </summary>
|
||||
@@ -329,6 +343,12 @@ 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 = "物料毛重没有设置,请设置后再执行入库" });
|
||||
@@ -348,33 +368,39 @@ namespace HHWMS.Web.Controllers
|
||||
|
||||
var materialProcessList = _unitWork.Find<MaterialProcess>(m => m.MaterialCode == material.MaterialCode);
|
||||
|
||||
var materialProcess = _unitWork.FindSingle<MaterialProcess>(m => m.ID == model.ProcessId);
|
||||
if (materialProcess == null)
|
||||
// 页面工序下拉来自工序配置表(ProcessConfig),优先按工序编码取,编码为空时退回按 ID 取
|
||||
ProcessConfig currentProcessConfig = null;
|
||||
if (!string.IsNullOrWhiteSpace(model.ProcessCode))
|
||||
{
|
||||
return Json(new { Code = 500, Msg = "未找到此物料工序配置" });
|
||||
currentProcessConfig = _unitWork.FindSingle<ProcessConfig>(x => x.Code == model.ProcessCode);
|
||||
}
|
||||
if (currentProcessConfig == null)
|
||||
{
|
||||
currentProcessConfig = _unitWork.FindSingle<ProcessConfig>(x => x.ID == model.ProcessId);
|
||||
}
|
||||
if (currentProcessConfig == null)
|
||||
{
|
||||
return Json(new { Code = 500, Msg = "未找到所选工序配置,请重新选择工序" });
|
||||
}
|
||||
|
||||
// 下一道工序
|
||||
var nextProcess = materialProcessList
|
||||
// 筛选同一物料
|
||||
.Where(p => p.MaterialCode == material.MaterialCode)
|
||||
// 筛选顺序大于当前工序的工序
|
||||
.Where(p => p.ProcessOrder > materialProcess.ProcessOrder)
|
||||
// 按工序顺序升序排列(取最小的一个,即下一道)
|
||||
.OrderBy(p => p.ProcessOrder)
|
||||
// 取第一个(下一道工序)
|
||||
.FirstOrDefault();
|
||||
if (nextProcess == null)
|
||||
{
|
||||
// 没有下一道工序的话,默认下一道工序为99
|
||||
nextProcess = new MaterialProcess()
|
||||
{
|
||||
ProcessCode = "99"
|
||||
};
|
||||
}
|
||||
// 从字典查询工序对应的区域
|
||||
// 当前工序在物料工序表中的记录(用于定位下一道工序),没有则视为最后一道
|
||||
var currentMaterialProcess = materialProcessList
|
||||
.FirstOrDefault(p => p.ProcessCode == currentProcessConfig.Code);
|
||||
|
||||
// 下一道工序:物料工序表中顺序大于当前工序的最小一条;不存在则默认 99(工序结束)
|
||||
var nextProcess = currentMaterialProcess == null
|
||||
? null
|
||||
: materialProcessList
|
||||
// 筛选顺序大于当前工序的工序
|
||||
.Where(p => p.ProcessOrder > currentMaterialProcess.ProcessOrder)
|
||||
// 按工序顺序升序排列(取最小的一个,即下一道)
|
||||
.OrderBy(p => p.ProcessOrder)
|
||||
// 取第一个(下一道工序)
|
||||
.FirstOrDefault();
|
||||
|
||||
// 从字典查询下一道工序对应的区域
|
||||
var nextProcessConfig = _unitWork.FindSingle<ProcessConfig>(x =>
|
||||
x.Code == nextProcess.ProcessCode);
|
||||
x.Code == (nextProcess == null ? "99" : nextProcess.ProcessCode));
|
||||
var zoneName = nextProcessConfig?.Zone;
|
||||
|
||||
if (string.IsNullOrEmpty(zoneName))
|
||||
@@ -431,8 +457,8 @@ namespace HHWMS.Web.Controllers
|
||||
SourceCode = model.BillCode,//客户订单号
|
||||
ProduceCode = model.OrderId, // 单号
|
||||
ReceiptDetailId = model.SourceCode, // erpdetailid 回传使用
|
||||
BatchCode = materialProcess.ProcessCode, //erp回传使用 批次编码
|
||||
Batch = materialProcess.ProcessName,
|
||||
BatchCode = currentProcessConfig.Code, //erp回传使用 批次编码
|
||||
Batch = currentProcessConfig.Name,
|
||||
Lot = nextProcessConfig?.Name,
|
||||
Status = model.IsQualified ? "合格" : "不合格",
|
||||
TaskStatus = InventoryTaskStatusEnum.Locked,
|
||||
@@ -693,6 +719,8 @@ namespace HHWMS.Web.Controllers
|
||||
public string OrderId { get; set; }
|
||||
public string OperatorId { get; set; }
|
||||
public int ProcessId { get; set; }
|
||||
/// <summary>工序编码(页面工序下拉来自工序配置表 ProcessConfig)</summary>
|
||||
public string ProcessCode { get; set; }
|
||||
public string ProcessName { get; set; }
|
||||
public int Type { get; set; }
|
||||
public int Qty { get; set; }
|
||||
|
||||
Reference in new issue
Block a user