力阔入库修改,添加物料绑定

This commit is contained in:
zhougf committed 2025-05-25 21:48:11 +08:00
1 parent a3e91357ee
commit 38c126c7b7
11 files changed
+895 -184

No files matched your search

@@ -30,124 +30,369 @@ namespace HHWMS.Web.Controllers
#endregion Index
[HttpPost]
public ActionResult TaskIn(string containerCode, bool inv, bool agv)
[HttpGet]
public ActionResult SearchMaterials(string keyword)
{
if (Wtm == null)
if (string.IsNullOrEmpty(keyword))
{
Wtm = _context;
}
// 判断containerCode是否为空
if (string.IsNullOrEmpty(containerCode))
{
return JsonMore(null, 500, "容器编码为空!请检查后重新提交!");
}
// 查询container表code为containercode的值
var container = _unitWork.FindSingle<Container>(u => u.Code == containerCode);
if (container == null)
{
return JsonMore(null, 500, $"库内没有编码为 {containerCode} 的容器!");
}
// 如果 container的库位不为空,或者islock为true,则返回错误信息
if (!string.IsNullOrEmpty(container.LocationCode) || container.IsLock == ContainerLockEnum.任务锁)
{
return JsonMore(null, 500, $"容器 {containerCode} 已被锁定或已在库内!");
return JsonMore(new { Data = new object[] { } });
}
container.IsLock = ContainerLockEnum.任务锁;
container.UpdateTime = DateTime.Now;
container.UpdateBy = Wtm?.LoginUserInfo?.ITCode??"WMS";
// _unitWork.Update(container);
var materials = _unitWork.Find<Material>(x =>
x.MaterialCode.Contains(keyword) ||
x.MaterialName.Contains(keyword))
.Take(10)
.Select(x => new {
MaterialCode = x.MaterialCode,
MaterialName = x.MaterialName,
MaterialSpec = x.MaterialSpec,
MaterialUnit = x.MaterialUnit
})
.ToList();
//查找仓位
var location = _unitWork.Find<Location>(u => u.Status == LocationStatus.空仓位
&& u.Type == container.Type
&& !u.IsStop)
.OrderByDescending(x => x.Layer)
.ThenByDescending(x => x.Line)
.FirstOrDefault();
// 判断location是否为空
if (location == null)
return JsonMore( materials );
}
[HttpPost]
public ActionResult AddInventory(string containerCode, string materialCode, decimal qty)
{
try
{
return JsonMore(null, 500, "库内没有空闲仓位!");
}
location.Status = LocationStatus.任务锁;
location.UpdateTime = DateTime.Now;
location.UpdateBy = Wtm?.LoginUserInfo?.ITCode??"WMS";
_unitWork.Update(location);
if (string.IsNullOrEmpty(containerCode))
{
return JsonMore(null, 500, "容器编码为空!");
}
if (string.IsNullOrEmpty(materialCode))
{
return JsonMore(null, 500, "物料编码为空!");
}
if (qty <= 0)
{
return JsonMore(null, 500, "数量必须大于0!");
}
if (inv) //有货
{
_unitWork.Add<Inventory>(new Inventory()
// 查询容器
var container = _unitWork.FindSingle<Container>(u => u.Code == containerCode);
if (container == null)
{
return JsonMore(null, 500, $"库内没有编码为 {containerCode} 的容器!");
}
// 查询物料信息
var material = _unitWork.FindSingle<Material>(x => x.MaterialCode == materialCode);
if (material == null)
{
return JsonMore(null, 500, $"未找到物料编码为 {materialCode} 的物料信息!");
}
// 创建库存记录
var inventory = new Inventory()
{
ZoneCode = ZoneCodeEnum.立库,
ContainerCode = containerCode,
LocationCode = location.Code,
MaterialCode = "123456",
MaterialName = "矿泉水",
Qty = 1,
MaterialCode = material.MaterialCode,
MaterialName = material.MaterialName,
MaterialType = material.MaterialType,
MaterialSpec = material.MaterialSpec,
MaterialUnit = material.MaterialUnit,
Qty = qty,
TaskStatus = InventoryTaskStatus.任务中,
CreateTime = DateTime.Now
});
}
_unitWork.Update(container);
//创建容器编码为containercode的任务
var task = new TaskHeader
{
ZoneCode = ZoneCodeEnum.立库,
TaskNo = _unitWork.GetSerialNumber("In"),
TaskType = TaskTypeEnum.立库入库,
ContainerCode = containerCode,
FromLocation = "",
ToLocation = location.Code,
Status = TaskStatusEnum.待下发,
CreateBy = Wtm?.LoginUserInfo?.ITCode??"WMS",
CreateTime = DateTime.Now
};
_unitWork.Add(task);
};
_unitWork.Add(inventory);
// 下发任务到wcs
var postData = new
{
TaskNo = task.TaskNo,
PalletNo = task.ContainerCode,
FromLocation = task.FromLocation,
ToLocation = task.ToLocation
};
try
{
var res = Wtm.CallAPI<ApiJsonResult<dynamic>>("WCS", "TaskAssign", HttpMethodEnum.POST, postData)
.Result.Data;
// 创建入库交易记录
var transaction = new InventoryTransaction
{
BillType = InventoryTranType.入库,
MaterialCode = material.MaterialCode,
MaterialName = material.MaterialName,
MaterialUnit = material.MaterialUnit,
ContainerCode = containerCode,
Qty = qty,
CreateTime = DateTime.Now,
CreateBy = "WMS",
UpdateTime = DateTime.Now,
UpdateBy = "WMS"
};
_unitWork.Add(transaction);
if (res.Success)
{
task.Status = TaskStatusEnum.已下发;
}
else
{
task.ErrorMsg = res.Msg;
}
return JsonMore(new { Id = inventory.ID });
}
catch (Exception ex)
{
task.ErrorMsg = ex.Message;
return JsonMore(null, 500, ex.Message);
}
task.UpdateTime = DateTime.Now;
task.UpdateBy = "WMS";
_unitWork.Update(task);
}
if (agv)
[HttpPost]
public ActionResult TaskIn(string containerCode)
{
try
{
// 调用AGV接口
var task_id = Wtm.ConfigInfo.AppSettings
.FirstOrDefault(x => x.Key == "OutIn").Value;
var res2 = Wtm.CallAPI<ShipOutController.agvResult>("ACS", "task_mould_do", HttpMethodEnum.POST, new
if (string.IsNullOrEmpty(containerCode))
{
task_id = task_id
return JsonMore(null, 500, "容器编码为空!");
}
// 查询容器
var container = _unitWork.FindSingle<Container>(u => u.Code == containerCode);
if (container == null)
{
return JsonMore(null, 500, $"库内没有编码为 {containerCode} 的容器!");
}
// 查询容器的库存
var inventories = _unitWork.Find<Inventory>(x => x.ContainerCode == containerCode).ToList();
// 根据库存情况设置容器状态
if (inventories.Any())
{
container.Status = ContainerStatus.有;
}
else
{
container.Status = ContainerStatus.空;
}
// 查找仓位
var location = _unitWork.Find<Location>(u => u.Status == LocationStatus.空仓位
&& u.Type == container.Type
&& !u.IsStop)
.OrderBy(x => x.Layer)
.ThenBy(x => x.Line)
.FirstOrDefault();
// 判断location是否为空
if (location == null)
{
return JsonMore(null, 500, "库内没有空闲仓位!");
}
// 更新容器状态
container.IsLock = ContainerLockEnum.任务锁;
container.UpdateTime = DateTime.Now;
container.UpdateBy = Wtm?.LoginUserInfo?.ITCode ?? "WMS";
// _unitWork.Update(container);
// 更新仓位状态
location.Status = LocationStatus.任务锁;
location.UpdateTime = DateTime.Now;
location.UpdateBy = Wtm?.LoginUserInfo?.ITCode ?? "WMS";
// _unitWork.Update(location);
// 更新库存记录
// foreach (var inventory in inventories)
// {
// inventory.LocationCode = location.Code;
// _unitWork.Update(inventory);
// }
// 创建入库任务
var task = new TaskHeader
{
ZoneCode = ZoneCodeEnum.立库,
TaskNo = _unitWork.GetSerialNumber("In"),
TaskType = TaskTypeEnum.立库入库,
ContainerCode = containerCode,
FromLocation = "",
ToLocation = location.Code,
Status = TaskStatusEnum.待下发,
CreateTime = DateTime.Now,
CreateBy = Wtm?.LoginUserInfo?.ITCode??"WMS",
};
// _unitWork.Add(task);
// 下发任务到wcs
var postData = new
{
TaskNo = task.TaskNo,
PalletNo = task.ContainerCode,
FromLocation = task.FromLocation,
ToLocation = task.ToLocation
};
try
{
var res = Wtm.CallAPI<ApiJsonResult<dynamic>>("WCS", "TaskAssign", HttpMethodEnum.POST, postData)
.Result?.Data;
if (res.Success)
{
task.Status = TaskStatusEnum.已下发;
task.UpdateTime = DateTime.Now;
task.UpdateBy = "WMS";
_unitWork.Add(task);
_unitWork.Update(container);
_unitWork.Update(location);
}
else
{
task.ErrorMsg = res.Msg;
return JsonMore(null, 500, res.Msg);
}
}
catch (Exception ex)
{
task.ErrorMsg = ex.Message;
return JsonMore(null, 500, "任务下发失败!");
}
return JsonMore(null);
}
catch (Exception ex)
{
return JsonMore(null, 500, ex.Message);
}
}
[HttpPost]
public ActionResult DeleteInventory(int id)
{
try
{
// 查询库存记录
var inventory = _unitWork.Find<Inventory>(x => x.ID == id).FirstOrDefault();
if (inventory == null)
{
return JsonMore(null, 500, "未找到对应的库存记录!");
}
// 创建出库交易记录
var transaction = new InventoryTransaction
{
BillType = InventoryTranType.出库,
MaterialCode = inventory.MaterialCode,
MaterialName = inventory.MaterialName,
MaterialUnit = inventory.MaterialUnit,
ContainerCode = inventory.ContainerCode,
Qty = inventory.Qty,
CreateTime = DateTime.Now,
CreateBy = "WMS",
UpdateTime = DateTime.Now,
UpdateBy = "WMS"
};
_unitWork.Add(transaction);
// 删除库存记录
_unitWork.Delete(inventory);
return JsonMore(null);
}
catch (Exception ex)
{
return JsonMore(null, 500, ex.Message);
}
}
[HttpPost]
public ActionResult UpdateInventory(int id, decimal qty)
{
try
{
if (qty <= 0)
{
return JsonMore(null, 500, "数量必须大于0!");
}
// 查询库存记录
var inventory = _unitWork.Find<Inventory>(x => x.ID == id).FirstOrDefault();
if (inventory == null)
{
return JsonMore(null, 500, "未找到对应的库存记录!");
}
// 创建出库交易记录(原数量)
var outTransaction = new InventoryTransaction
{
BillType = InventoryTranType.出库,
MaterialCode = inventory.MaterialCode,
MaterialName = inventory.MaterialName,
MaterialUnit = inventory.MaterialUnit,
ContainerCode = inventory.ContainerCode,
Qty = inventory.Qty,
CreateTime = DateTime.Now,
CreateBy = "WMS",
UpdateTime = DateTime.Now,
UpdateBy = "WMS"
};
_unitWork.Add(outTransaction);
// 创建入库交易记录(新数量)
var inTransaction = new InventoryTransaction
{
BillType = InventoryTranType.入库,
MaterialCode = inventory.MaterialCode,
MaterialName = inventory.MaterialName,
MaterialUnit = inventory.MaterialUnit,
ContainerCode = inventory.ContainerCode,
Qty = qty,
CreateTime = DateTime.Now,
CreateBy = "WMS",
UpdateTime = DateTime.Now,
UpdateBy = "WMS"
};
_unitWork.Add(inTransaction);
// 更新库存数量
inventory.Qty = qty;
inventory.UpdateTime = DateTime.Now;
inventory.UpdateBy = Wtm?.LoginUserInfo?.ITCode ?? "WMS";
_unitWork.Update(inventory);
return JsonMore(null);
}
catch (Exception ex)
{
return JsonMore(null, 500, ex.Message);
}
}
[HttpGet]
public JsonResult ValidateContainer(string containerCode)
{
try
{
if (string.IsNullOrEmpty(containerCode))
{
return Json(new { Code = 400, Msg = "容器编码不能为空" });
}
var container = _unitWork.FindSingle<Container>(u => u.Code == containerCode);
if (container == null)
{
return Json(new { Code = 400, Msg = "容器不存在" });
}
if (!string.IsNullOrWhiteSpace(container.LocationCode))
{
return Json(new { Code = 400, Msg = $"{containerCode} 容器状态不正确!已存在任务或者已在库内" });
}
// 获取容器内的物料信息
var inventories = _unitWork.Find<Inventory>(x => x.ContainerCode == containerCode)
.Select(x => new {
Id = x.ID,
ContainerCode = x.ContainerCode,
MaterialCode = x.MaterialCode,
MaterialName = x.MaterialName,
Qty = x.Qty
})
.ToList();
return Json(new {
Code = 200,
Msg = "验证成功",
Data = inventories
});
}
return JsonMore(null);
catch (Exception ex)
{
return Json(new { Code = 500, Msg = ex.Message });
}
}
}
}