线边操作添加ERP关联

This commit is contained in:
zhougf committed 2025-12-05 21:01:27 +08:00
1 parent 713c3528ad
commit 0e5d0247bf
19 files changed
+1467 -139

No files matched your search

@@ -42,37 +42,164 @@ namespace HHWMS.Web.Controllers
#region API Methods
/// <summary>
/// 搜索物料
/// </summary>
[HttpGet]
public async Task<IActionResult> SearchMaterials(string keyword)
{
try
{
if (string.IsNullOrWhiteSpace(keyword))
{
return Json(new { Code = 200, Data = new object[] { } });
}
// 尝试调用接口获取物料
try
{
var request = new LoadInventoryRequest
{
ErpCode = "001",
InvDefine1 = keyword,
Size = 15,
Page = 1
};
var apiResult =
await Wtm.CallAPI<LoadInventoryResponse>("ERP", "LoadInventory", HttpMethodEnum.POST, request);
if (apiResult?.Data != null && apiResult.Data.Code == 0)
{
var materialsList = new List<object>();
var newMaterials = new List<Material>();
// 获取接口返回的所有物料编码
var invCodes = apiResult.Data.Data
.Where(x => !string.IsNullOrWhiteSpace(x.InvCode))
.Select(x => x.InvCode)
.ToList();
// 一次性查询本地数据库中已存在的物料(优化性能,避免循环中多次查询)
var existingMaterials = _unitWork.Find<Material>(m => invCodes.Contains(m.MaterialCode))
.ToList();
// 遍历接口返回的物料数据
foreach (var item in apiResult.Data.Data)
{
if (string.IsNullOrWhiteSpace(item.InvCode))
continue;
// 在已查询的列表中查找物料是否存在
var existingMaterial =
existingMaterials.FirstOrDefault(m => m.MaterialCode == item.InvCode);
if (existingMaterial == null)
{
// 物料不存在,新增到数据库
var newMaterial = new Material
{
MaterialCode = item.InvCode,
MaterialName = item.InvName,
MaterialSpec = item.InvStd,
MaterialUnit = item.UnitName,
MaterialType = item.InvDefine1, // 永丰图号
SupplierCode = item.InvDefine4, // 客户图号
Qty = 0, // 默认数量为0
CreateTime = DateTime.Now,
CreateBy = Wtm.LoginUserInfo?.ITCode ?? "System"
};
newMaterials.Add(newMaterial);
// 添加到返回列表
materialsList.Add(new
{
MaterialCode = newMaterial.MaterialCode,
MaterialName = newMaterial.MaterialName,
MaterialSpec = newMaterial.MaterialSpec,
MaterialUnit = newMaterial.MaterialUnit,
MaterialType = newMaterial.MaterialType,
SupplierCode = newMaterial.SupplierCode
});
}
else
{
// 物料已存在,添加到返回列表
materialsList.Add(new
{
MaterialCode = existingMaterial.MaterialCode,
MaterialName = existingMaterial.MaterialName,
MaterialSpec = existingMaterial.MaterialSpec,
MaterialUnit = existingMaterial.MaterialUnit,
MaterialType = existingMaterial.MaterialType,
SupplierCode = existingMaterial.SupplierCode
});
}
}
// 保存新增的物料
_unitWork.BatchAdd(newMaterials);
// 返回物料列表到前端
return Json(new { Code = 200, Data = materialsList });
}
}
catch (System.Exception apiEx)
{
// 接口调用失败,记录日志
Wtm.DoLog("获取ERP物料数据", ActionLogTypesEnum.Normal, "SearchMaterials",
request: $"接口调用失败,改用本地数据库查询:{apiEx.Message}",
result: "接口调用失败,改用本地数据库查询");
}
// 接口连接失败或返回错误,从本地数据库查询
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 });
}
catch (System.Exception ex)
{
return Json(new { Code = 500, Msg = $"搜索物料失败:{ex.Message}" });
}
}
/// <summary>
/// 获取用户
/// </summary>
/// <returns></returns>
[HttpPost]
public IActionResult GetOperators()
{
var users = _unitWork.Find<FrameworkUser>(x => x.ITCode != "Admin")
.Select(x => new {x.ITCode,x.Name})
.Select(x => new
{
value = x.ITCode,
label = x.Name
})
.ToList();
return Json(new { Code = 200, Data = users});
}
[HttpPost]
public IActionResult GetProcesses()
{
try
{
var processes = _unitWork.Find<MaterialProcess>(x => x.IsActive)
.OrderBy(x => x.ProcessOrder)
.Select(x => new {
value = x.ID.ToString(),
label = x.ProcessName,
processCode = x.ProcessCode,
processName = x.ProcessName
})
.ToList();
return Json(new { Code = 200, Data = processes });
}
catch (Exception ex)
{
return Json(new { Code = 500, Msg = $"获取工序列表失败:{ex.Message}" });
}
return Json(new { Code = 200, Data = users });
}
/// <summary>
/// 获取物料的工序列表
/// </summary>
/// <param name="materialCode"></param>
/// <returns></returns>
[HttpPost]
public IActionResult GetProcessesByMaterial(string materialCode)
{
@@ -85,8 +212,9 @@ namespace HHWMS.Web.Controllers
var processes = _unitWork.Find<MaterialProcess>(x => x.MaterialCode == materialCode && x.IsActive)
.OrderBy(x => x.ProcessOrder)
.Select(x => new {
value = x.ID.ToString(),
.Select(x => new
{
value = x.ID.ToString(),
label = x.ProcessName,
processCode = x.ProcessCode,
processName = x.ProcessName
@@ -100,33 +228,37 @@ namespace HHWMS.Web.Controllers
}
}
[HttpPost]
public IActionResult GetOperatorInfo()
{
var users = _unitWork.Find<FrameworkUser>(x => x.ITCode != "Admin")
.Select(x => new {x.ITCode,x.Name})
.ToList();
return Json(new { Code = 200, Data = users});
}
/// <summary>
/// 获取物料的单据信息
/// </summary>
/// <param name="materialCode"></param>
/// <returns></returns>
[HttpPost]
public IActionResult GetOrdersByMaterial(string materialCode)
{
// TODO: 根据物料码查询相关生产订单
var orders = new List<object>
{
new { value = "1", label = "生产订单1" },
new { value = "2", label = "生产订单2" }
};
// 查询包含这个物料的入库单单号
var orders = _unitWork.Find<ReceiptDetail>(x => x.MaterialCode == materialCode)
.Select(x => new
{
value = x.Lot,
label = x.SourceCode,
})
.ToList();
return Json(new { Code = 200, Data = orders });
}
/// <summary>
/// 获取托盘类型信息
/// </summary>
/// <returns></returns>
[Public]
[HttpGet]
public IActionResult GetTrayTypes()
{
var containerconfig = _unitWork.Find<SysDictData>(x => x.DictType == "ContainerConfig"
&& x.DictLabelUs.ToLower() != "container")
&& x.DictLabelUs.ToLower() != "container")
.Select(x => new
{
value = x.ID,
@@ -136,32 +268,43 @@ namespace HHWMS.Web.Controllers
return Json(new { Code = 200, Data = containerconfig });
}
/// <summary>
/// 上架入库
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
public IActionResult SubmitReceipt([FromBody] ReceiptInModel model)
{
if (_unitWork.IsExit<TaskHeader>(x => x.ContainerCode == model.PalletCode))
{
return JsonMore(null, 500, $"库内已存在托盘编码为 {model.PalletCode} 的任务!");
}
// 获取物料信息
var material = _unitWork.FindSingle<Material>(m => m.MaterialCode == model.MaterialCode);
if (material == null)
{
return Json(new { Code = 500, Msg = "物料不存在" });
}
if (material.Qty == null || material.Qty <= 0)
{
return Json(new { Code = 500, Msg = "物料毛重没有设置,请设置后再执行入库" });
}
// 获取容器信息
var container = _unitWork.FindSingle<Container>(c => c.Code == model.PalletCode);
if (container == null)
{
return Json(new { Code = 500, Msg = "容器不存在" });
}
if (!string.IsNullOrWhiteSpace(container.LocationCode))
{
return Json(new { Code = 400, Msg = $"{container.Code} 容器状态不正确!已存在任务或者已在库内" });
}
var materialProcessList = _unitWork.Find<MaterialProcess>(m => m.MaterialCode == material.MaterialCode);
var materialProcess = _unitWork.FindSingle<MaterialProcess>(m => m.ID == model.ProcessId);
@@ -169,7 +312,7 @@ namespace HHWMS.Web.Controllers
{
return Json(new { Code = 500, Msg = "未找到此物料工序配置" });
}
// 下一道工序
var nextProcess = materialProcessList
// 筛选同一物料
@@ -180,25 +323,26 @@ namespace HHWMS.Web.Controllers
.OrderBy(p => p.ProcessOrder)
// 取第一个(下一道工序)
.FirstOrDefault();
// 从字典查询工序对应的区域
var zoneName = _unitWork.FindSingle<ProcessConfig>(x =>
var zoneName = _unitWork.FindSingle<ProcessConfig>(x =>
x.Code == nextProcess.ProcessCode)?.Zone;
if (string.IsNullOrEmpty(zoneName))
{
return Json(new { Code = 500, Msg = "未找到此工序对应区域配置" });
}
// 1. 查找可用库位信息
var locationVm = Wtm.CreateVM<LocationVM>();
var locationCode = locationVm.GetEmptyLocationFromXb(_materialZones[zoneName].BeginLine, _materialZones[zoneName].EndLine);
var locationCode =
locationVm.GetEmptyLocationFromXb(_materialZones[zoneName].BeginLine, _materialZones[zoneName].EndLine);
if (string.IsNullOrWhiteSpace(locationCode))
{
return Json(new { Code = 500, Msg = "未找到可用的空仓位" });
}
}
// 使用事务
using (var tran = DC.BeginTransaction())
{
@@ -235,13 +379,15 @@ namespace HHWMS.Web.Controllers
MaterialSpec = material.MaterialSpec,
MaterialUnit = material.MaterialUnit,
SupplierCode = material.SupplierCode,
SourceCode = model.SourceCode,
SourceCode = model.OrderId, // 单号
ReceiptDetailId = model.SourceCode, // erpdetailid 回传使用
BatchCode = materialProcess.ProcessCode, //erp回传使用 批次编码
Batch = materialProcess.ProcessName,
Lot = nextProcess?.ProcessName,
Status = model.IsQualified ? "合格" : "不合格",
TaskStatus = InventoryTaskStatusEnum.Locked,
TaskQty = model.Qty,//小托盘数量
Flag = model.Type,//小托盘类型
TaskQty = model.Qty, //小托盘数量
Flag = model.Type, //小托盘类型
CreateBy = model.OperatorId,
ReceiptCode = model.OperatorInfo, //校验员
CreateTime = DateTime.Now
@@ -257,8 +403,9 @@ namespace HHWMS.Web.Controllers
// 从数据库中重新获取库位实体,避免实体跟踪冲突
var locationToUpdate = _unitWork.FindSingle<Location>(l => l.Code == locationCode);
var resultNum = _unitWork.BatchUpdate<Location>(x => x.Code == locationCode && x.Version == locationToUpdate.Version,
var resultNum = _unitWork.BatchUpdate<Location>(
x => x.Code == locationCode && x.Version == locationToUpdate.Version,
x => new Location()
{
Status = LocationStatusEnum.锁定,
@@ -268,12 +415,12 @@ namespace HHWMS.Web.Controllers
UpdateBy = "WMS",
Version = Guid.NewGuid()
});
if (resultNum == 0)
{
//失败 回滚
tran.Rollback();
return Json(new { Code = 500, Msg = "更新仓位失败!请重新提交!"});
return Json(new { Code = 500, Msg = "更新仓位失败!请重新提交!" });
}
// 6. 调用WCS接口下发任务
@@ -288,14 +435,15 @@ namespace HHWMS.Web.Controllers
// 调用WCS任务下发接口
// tran.Commit();
// return Json(new { Code = 200, Msg = "入库成功", Data = new { TaskNo = taskNo } });
var wcsResult = Wtm.CallAPI<WCSTaskResponse>("WCSXB", "TaskAssign", HttpMethodEnum.POST, wcsTaskModel).Result.Data;
var wcsResult = Wtm
.CallAPI<WCSTaskResponse>("WCSXB", "TaskAssign", HttpMethodEnum.POST, wcsTaskModel).Result.Data;
if (wcsResult != null && wcsResult.Success)
{
// WCS任务下发成功,提交事务
taskHeader.Status = TaskStatusEnum.已下发;
_unitWork.Update(taskHeader);
tran.Commit();
return Json(new { Code = 200, Msg = "入库成功", Data = new { TaskNo = taskNo } });
}
@@ -329,16 +477,17 @@ namespace HHWMS.Web.Controllers
{
return Json(new { Code = 500, Msg = "容器不存在" });
}
// 1. 查找可用库位信息
var locationVm = Wtm.CreateVM<LocationVM>();
var locationCode = locationVm.GetEmptyLocationFromXb(_materialZones["Zone1"].BeginLine, _materialZones["Zone1"].EndLine);
var locationCode =
locationVm.GetEmptyLocationFromXb(_materialZones["Zone1"].BeginLine, _materialZones["Zone1"].EndLine);
if (string.IsNullOrWhiteSpace(locationCode))
{
return Json(new { Code = 500, Msg = "未找到可用的空仓位" });
}
}
// 使用事务
using (var tran = DC.BeginTransaction())
{
@@ -363,7 +512,7 @@ namespace HHWMS.Web.Controllers
_unitWork.Add(taskHeader);
// 5. 锁定容器和库位
container.IsLock = ContainerLockEnum.任务锁;
container.LocationCode = locationCode;
@@ -372,8 +521,9 @@ namespace HHWMS.Web.Controllers
// 从数据库中重新获取库位实体,避免实体跟踪冲突
var locationToUpdate = _unitWork.FindSingle<Location>(l => l.Code == locationCode);
var resultNum = _unitWork.BatchUpdate<Location>(x => x.Code == locationCode && x.Version == locationToUpdate.Version,
var resultNum = _unitWork.BatchUpdate<Location>(
x => x.Code == locationCode && x.Version == locationToUpdate.Version,
x => new Location()
{
Status = LocationStatusEnum.锁定,
@@ -383,12 +533,12 @@ namespace HHWMS.Web.Controllers
UpdateBy = "WMS",
Version = Guid.NewGuid()
});
if (resultNum == 0)
{
//失败 回滚
tran.Rollback();
return Json(new { Code = 500, Msg = "更新仓位失败!请重新提交!"});
return Json(new { Code = 500, Msg = "更新仓位失败!请重新提交!" });
}
// 6. 调用WCS接口下发任务
@@ -401,7 +551,8 @@ namespace HHWMS.Web.Controllers
};
// 调用WCS任务下发接口
var wcsResult = Wtm.CallAPI<WCSTaskResponse>("WCSXB", "TaskAssign", HttpMethodEnum.POST, wcsTaskModel).Result.Data;
var wcsResult = Wtm
.CallAPI<WCSTaskResponse>("WCSXB", "TaskAssign", HttpMethodEnum.POST, wcsTaskModel).Result.Data;
if (wcsResult != null && wcsResult.Success)
{
@@ -422,7 +573,8 @@ namespace HHWMS.Web.Controllers
tran.Rollback();
return Json(new { Code = 500, Msg = ex.Message });
}
}}
}
}
/// <summary>
/// 空托盘出库
@@ -436,18 +588,18 @@ namespace HHWMS.Web.Controllers
&& !string.IsNullOrEmpty(x.LocationCode));
if (container == null)
{
return Json(new { Code = 500, Msg = "库内不存在可用空容器!"} );
return Json(new { Code = 500, Msg = "库内不存在可用空容器!" });
}
//创建出库任务
var location = _unitWork.FindSingle<Location>(x => x.Code == container.LocationCode);
var outPort = _unitWork.FindSingle<ProcessConfig>(x => x.Code == "00")?.Port;
if (string.IsNullOrEmpty(outPort))
{
return Json(new { Code = 500, Msg = "未配置空托盘出库口,请配置后重新呼叫出库任务!"} );
return Json(new { Code = 500, Msg = "未配置空托盘出库口,请配置后重新呼叫出库任务!" });
}
var task = new TaskHeader()
{
ZoneId = location.ZoneId,
@@ -458,12 +610,12 @@ namespace HHWMS.Web.Controllers
ToLocation = outPort,
Status = TaskStatusEnum.新建
};
var vm = Wtm.CreateVM<LocationVM>();
var result = vm.SendWcsTask(task);
if (!result.Status)
{
return Json(new { Code = 500, Msg =result.Message});
return Json(new { Code = 500, Msg = result.Message });
}
location.Status = LocationStatusEnum.锁定;
@@ -475,38 +627,6 @@ namespace HHWMS.Web.Controllers
_unitWork.Update(container);
return Json(new { Code = 200, Msg = "提交成功" });
}
/// <summary>
/// 搜索物料
/// </summary>
[HttpPost]
public IActionResult SearchMaterials(string keyword)
{
try
{
if (string.IsNullOrWhiteSpace(keyword))
{
return Json(new { Code = 200, Data = new object[] { } });
}
var materials = _unitWork.Find<Material>
(m => m.MaterialCode.Contains(keyword) || m.MaterialName.Contains(keyword))
.Select(m => new
{
MaterialCode = m.MaterialCode,
m.MaterialType,
MaterialName = m.MaterialName
})
.Take(10)
.ToList();
return Json(new { Code = 200, Data = materials });
}
catch (System.Exception ex)
{
return Json(new { Code = 500, Msg = $"搜索物料失败:{ex.Message}" });
}
}
#endregion API Methods
}
@@ -525,7 +645,7 @@ namespace HHWMS.Web.Controllers
public bool IsQualified { get; set; }
public string OperatorInfo { get; set; }
}
public class LineRange
{
public int BeginLine { get; set; }