feat(入库流程): 实现完整的入库流程逻辑
1. 在IUnitWork接口和实现中添加Save方法用于保存更改 2. 完善WCS任务状态处理逻辑,区分线边库和成品库的不同处理流程 3. 实现入库控制器SubmitReceipt方法,包含库位分配、任务创建、库存记录等完整流程 4. 修改LocationTypeEnum枚举值定义,将L改为C表示成品库位 5. 优化库位查询逻辑,增加高度和类型过滤条件 6. 修改容器类型从枚举改为静态类定义 7. 修复LocationController中库位编码生成格式 8. 在WcsRequest中添加LocationType字段用于库位类型区分
This commit is contained in:
1 parent
2b01cc7584
commit
42c26b2800
9 files changed
+322
-32
No files matched your search
@@ -13,6 +13,7 @@ using Microsoft.EntityFrameworkCore;
|
||||
using WalkingTec.Mvvm.Core;
|
||||
using Microsoft.Extensions.Caching.Memory;
|
||||
using HslCommunication.Core;
|
||||
using WalkingTec.Mvvm.Core.Extensions;
|
||||
|
||||
namespace HHWMS.Web
|
||||
{
|
||||
@@ -120,9 +121,150 @@ namespace HHWMS.Web
|
||||
return Task.FromResult<IActionResult>(ApiResultError("请求参数无效"));
|
||||
}
|
||||
|
||||
return WithDebounce($"TaskStatus_{request.PalletNo}", () => Task.FromResult<IActionResult>(ApiResult()));
|
||||
return WithDebounce($"TaskStatus_{request.PalletNo}", async () =>
|
||||
{
|
||||
return await ProcessTaskStatusResult(request);
|
||||
});
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 处理任务状态结果的具体业务逻辑
|
||||
/// </summary>
|
||||
private async Task<IActionResult> ProcessTaskStatusResult(WcsRequest request)
|
||||
{
|
||||
// 1. 根据托盘号查找对应的任务
|
||||
var task = _unitWork.FindSingle<TaskHeader>(x => x.ContainerCode == request.PalletNo
|
||||
&& x.Status != TaskStatusEnum.完成);
|
||||
|
||||
if (task == null)
|
||||
{
|
||||
return ApiResultError("未找到对应的任务");
|
||||
}
|
||||
|
||||
/* 根据任务的巷道号来判断
|
||||
* 1.线边库1号巷道只有任务完成,任务下发的时候已经分配仓位
|
||||
* 2.成品库2号巷道有任务请求(10)和任务完成(100)
|
||||
* 判断请求的state,来执行不同的逻辑
|
||||
* 任务请求(10):根据请求的高度,分配仓位
|
||||
* 任务完成(100):完成任务,更新库存,更新容器状态,更新库位状态,更新任务状态(线边库需要根据重量计算库存的数量),更新对应的工单
|
||||
* 任务完成后,删除任务并放到历史任务中
|
||||
*/
|
||||
|
||||
// 根据任务的巷道号和状态来执行不同的逻辑
|
||||
if (task.RoadWay == 1) // 线边库1号巷道
|
||||
{
|
||||
// 线边库1号巷道只处理任务完成状态
|
||||
if (request.State == 100) // 任务完成
|
||||
{
|
||||
await ProcessTaskCompletion(task, request);
|
||||
}
|
||||
}
|
||||
else if (task.RoadWay == 2) // 成品库2号巷道
|
||||
{
|
||||
if (request.State == 10) // 任务请求,需要分配仓位
|
||||
{
|
||||
// 根据请求的高度,分配仓位
|
||||
var locationVm = Wtm.CreateVM<LocationVM>();
|
||||
request.RoadWay = 2;
|
||||
var container = _unitWork.FindSingle<Container>(x => x.Code == request.PalletNo);
|
||||
if (container != null)
|
||||
{
|
||||
request.LocationType = container.Type switch
|
||||
{
|
||||
ContainerTypeEnum.成品库 => LocationTypeEnum.C,
|
||||
ContainerTypeEnum.模具库 => LocationTypeEnum.M,
|
||||
ContainerTypeEnum.线边库 => LocationTypeEnum.X,
|
||||
_ => request.LocationType
|
||||
};
|
||||
}
|
||||
var location = await locationVm.GetLocation(request).Data;
|
||||
if (location != null)
|
||||
{
|
||||
// 更新任务的目标仓位
|
||||
task.ToLocation = location.LocationCode;
|
||||
_unitWork.Update(task);
|
||||
}
|
||||
else
|
||||
{
|
||||
return ApiResultError("未找到合适的仓位");
|
||||
}
|
||||
}
|
||||
else if (request.State == 100) // 任务完成
|
||||
{
|
||||
await ProcessTaskCompletion(task, request);
|
||||
}
|
||||
}
|
||||
|
||||
return ApiResult(new { Message = "任务状态更新成功" });
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 处理任务完成的逻辑
|
||||
/// </summary>
|
||||
private async Task ProcessTaskCompletion(TaskHeader task, WcsRequest request)
|
||||
{
|
||||
// 开启事务
|
||||
using (var transaction = DC.BeginTransaction())
|
||||
{
|
||||
try
|
||||
{
|
||||
// 1. 更新库存
|
||||
var inventories = _unitWork.Find<Inventory>(x => x.ContainerCode == request.PalletNo);
|
||||
foreach (var inventory in inventories)
|
||||
{
|
||||
// 更新库存的库位编码
|
||||
inventory.LocationCode = task.ToLocation;
|
||||
// 更新库存任务状态为空闲
|
||||
inventory.TaskStatus = InventoryTaskStatusEnum.Idle;
|
||||
}
|
||||
|
||||
// 2. 更新容器状态
|
||||
var container = _unitWork.FindSingle<Container>(x => x.Code == request.PalletNo);
|
||||
if (container != null)
|
||||
{
|
||||
// 更新容器的库位编码
|
||||
container.LocationCode = task.ToLocation;
|
||||
// 更新容器状态为有货
|
||||
container.Status = ContainerStatus.有;
|
||||
// 解除容器的任务锁
|
||||
container.IsLock = ContainerLockEnum.未锁;
|
||||
}
|
||||
|
||||
// 3. 更新库位状态
|
||||
var location = _unitWork.FindSingle<Location>(x => x.Code == task.ToLocation);
|
||||
if (location != null)
|
||||
{
|
||||
// 更新库位的容器编码
|
||||
location.ContainerCode = request.PalletNo;
|
||||
// 更新库位状态为有货
|
||||
location.Status = LocationStatusEnum.Some;
|
||||
}
|
||||
|
||||
// 4. 更新任务状态为完成
|
||||
task.Status = TaskStatusEnum.完成;
|
||||
|
||||
// 5. 保存所有更改
|
||||
_unitWork.Save();
|
||||
|
||||
// 6. 将任务复制到历史任务表
|
||||
var taskHistory = _mapper.Map<TaskHeaderHistory>(task);
|
||||
_unitWork.Add(taskHistory);
|
||||
|
||||
// 7. 删除原任务
|
||||
_unitWork.Delete(task);
|
||||
|
||||
// 8. 提交事务
|
||||
await transaction.CommitAsync();
|
||||
}
|
||||
catch (System.Exception ex)
|
||||
{
|
||||
await transaction.RollbackAsync();
|
||||
throw new Exception($"处理任务完成失败: {ex.Message}");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 请求空闲库位(带防抖)
|
||||
/// </summary>
|
||||
|
||||
@@ -259,7 +259,7 @@ namespace HHWMS.Web.Controllers
|
||||
{
|
||||
locationList.Add(new Location
|
||||
{
|
||||
Code = $"{vm.Entity.Type}{vm.Entity.RoadWay.ToString().PadLeft(2, '0')}-{row.ToString().PadLeft(2, '0')}-{line.ToString().PadLeft(2, '0')}-{layer.ToString().PadLeft(2, '0')}",
|
||||
Code = $"{vm.Entity.Type}-{vm.Entity.RoadWay.ToString().PadLeft(2, '0')}-{row.ToString().PadLeft(2, '0')}-{line.ToString().PadLeft(2, '0')}-{layer.ToString().PadLeft(2, '0')}",
|
||||
ZoneId = vm.Entity.ZoneId,
|
||||
Type = vm.Entity.Type,
|
||||
RoadWay = vm.Entity.RoadWay,
|
||||
|
||||
@@ -6,6 +6,7 @@ using System.ComponentModel.DataAnnotations;
|
||||
using WalkingTec.Mvvm.Core;
|
||||
using WalkingTec.Mvvm.Core.Extensions;
|
||||
using HHWMS.Web.Models;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
|
||||
|
||||
namespace HHWMS.Web
|
||||
@@ -45,6 +46,8 @@ namespace HHWMS.Web
|
||||
|
||||
}
|
||||
|
||||
#region base
|
||||
|
||||
public override void DoAdd()
|
||||
{
|
||||
base.DoAdd();
|
||||
@@ -59,7 +62,8 @@ namespace HHWMS.Web
|
||||
{
|
||||
base.DoDelete();
|
||||
}
|
||||
|
||||
#endregion base
|
||||
|
||||
/// <summary>
|
||||
/// 查找单伸位巷道的空仓位
|
||||
/// </summary>
|
||||
@@ -67,10 +71,12 @@ namespace HHWMS.Web
|
||||
{
|
||||
var locations = DC.Set<Location>()
|
||||
.Where(l => l.RoadWay == roadway
|
||||
&& l.Status == LocationStatusEnum.Empty
|
||||
&& l.RowFlag == 0) // 单伸位只查找外仓位
|
||||
&& !l.IsStop
|
||||
&& l.Status == LocationStatusEnum.Empty
|
||||
&& l.RowFlag == 0) // 单伸位只查找外仓位
|
||||
.OrderBy(l => l.Layer)
|
||||
.ThenBy(l => l.Line)
|
||||
.AsNoTracking()
|
||||
.FirstOrDefault();
|
||||
|
||||
return locations?.Code;
|
||||
@@ -79,20 +85,25 @@ namespace HHWMS.Web
|
||||
/// <summary>
|
||||
/// 查找双伸位巷道的空仓位
|
||||
/// </summary>
|
||||
private string GetEmptyLocationByDouble(int roadway)
|
||||
private string GetEmptyLocationByDouble(int roadway,LocationTypeEnum locationType, decimal? height = 0)
|
||||
{
|
||||
// 一次性获取所需的所有数据,避免多次查询数据库
|
||||
var locationPairs = DC.Set<Location>()
|
||||
.Where(l => l.RoadWay == roadway)
|
||||
.Where(l => l.RoadWay == roadway
|
||||
&& l.Type == locationType
|
||||
&& !l.IsStop
|
||||
&& l.Height >= height)
|
||||
.Select(l => new
|
||||
{
|
||||
l.Code,
|
||||
l.ContiguousCode,
|
||||
l.Status,
|
||||
l.RowFlag,
|
||||
l.Height,
|
||||
l.Layer,
|
||||
l.Line
|
||||
})
|
||||
.AsNoTracking()
|
||||
.ToDictionary(l => l.Code);
|
||||
|
||||
// 1. 优先查找里外仓位都为空的里仓位
|
||||
@@ -101,7 +112,8 @@ namespace HHWMS.Web
|
||||
&& l.Status == LocationStatusEnum.Empty
|
||||
&& locationPairs.TryGetValue(l.ContiguousCode, out var outer)
|
||||
&& outer.Status == LocationStatusEnum.Empty)
|
||||
.OrderBy(l => l.Layer)
|
||||
.OrderBy(l => l.Height)
|
||||
.ThenBy(l => l.Layer)
|
||||
.ThenBy(l => l.Line)
|
||||
.FirstOrDefault();
|
||||
|
||||
@@ -116,7 +128,8 @@ namespace HHWMS.Web
|
||||
&& l.Status == LocationStatusEnum.Empty
|
||||
&& locationPairs.TryGetValue(l.ContiguousCode, out var inner)
|
||||
&& inner.Status == LocationStatusEnum.Some)
|
||||
.OrderBy(l => l.Layer)
|
||||
.OrderBy(l => l.Height)
|
||||
.ThenBy(l => l.Layer)
|
||||
.ThenBy(l => l.Line)
|
||||
.FirstOrDefault();
|
||||
|
||||
@@ -148,13 +161,13 @@ namespace HHWMS.Web
|
||||
locationCode = GetEmptyLocationBySingle(request.RoadWay.Value);
|
||||
break;
|
||||
case 4: // 双伸位
|
||||
locationCode = GetEmptyLocationByDouble(request.RoadWay.Value);
|
||||
locationCode = GetEmptyLocationByDouble(request.RoadWay.Value, request.LocationType, request.Height);
|
||||
break;
|
||||
default:
|
||||
return ResponseResult<dynamic>.Error("未知的巷道类型");
|
||||
}
|
||||
|
||||
if (locationCode == null)
|
||||
if (string.IsNullOrWhiteSpace(locationCode))
|
||||
{
|
||||
return ResponseResult<dynamic>.Error("未找到可用的空仓位");
|
||||
}
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
using System;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using WalkingTec.Mvvm.Core;
|
||||
using WalkingTec.Mvvm.Mvc;
|
||||
@@ -6,8 +7,9 @@ using HHWMS.Web.Models;
|
||||
using System.Threading.Tasks;
|
||||
using System.Linq;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using WalkingTec.Mvvm.Core.Extensions;
|
||||
|
||||
namespace HHWMS.Web.Areas.Receipt.Controllers
|
||||
namespace HHWMS.Web.Controllers
|
||||
{
|
||||
[Area("receipt")]
|
||||
[ActionDescription("入库操作")]
|
||||
@@ -78,14 +80,143 @@ namespace HHWMS.Web.Areas.Receipt.Controllers
|
||||
[HttpPost]
|
||||
public IActionResult SubmitReceipt([FromBody] ReceiptInModel model)
|
||||
{
|
||||
try
|
||||
// 1. 查找可用库位信息 - 使用LocationVM的GetLocation方法
|
||||
var locationVM = Wtm.CreateVM<LocationVM>();
|
||||
|
||||
// 创建WcsRequest对象,设置巷道号为1
|
||||
var wcsRequest = new WcsRequest { RoadWay = 1 };
|
||||
|
||||
// 调用GetLocation方法获取可用库位
|
||||
var locationResult = locationVM.GetLocation(wcsRequest);
|
||||
|
||||
if (!locationResult.Status)
|
||||
{
|
||||
// TODO: 实现入库逻辑
|
||||
return Json(new { Code = 200, Msg = "入库成功" });
|
||||
return Json(new { Code = 500, Msg = locationResult.Message });
|
||||
}
|
||||
catch (System.Exception ex)
|
||||
|
||||
// 获取返回的库位编码
|
||||
string locationCode = locationResult.Data.LocationCode;
|
||||
|
||||
// 根据库位编码获取完整的库位信息,使用AsNoTracking()避免实体跟踪冲突
|
||||
// var availableLocation = DC.Set<Location>().AsNoTracking().FirstOrDefault(l => l.Code == locationCode);
|
||||
//
|
||||
// if (availableLocation == null)
|
||||
// {
|
||||
// return Json(new { Code = 500, Msg = "没有可用库位" });
|
||||
// }
|
||||
|
||||
// 获取物料信息
|
||||
var material = _unitWork.FindSingle<Material>(m => m.MaterialCode == model.MaterialCode);
|
||||
if (material == null)
|
||||
{
|
||||
return Json(new { Code = 500, Msg = ex.Message });
|
||||
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 = "容器不存在" });
|
||||
}
|
||||
|
||||
// 使用事务
|
||||
using (var tran = DC.BeginTransaction())
|
||||
{
|
||||
try
|
||||
{
|
||||
// 2. 生成入库任务
|
||||
var taskNo = _unitWork.GetSerialNumber("In", 6);
|
||||
var taskHeader = new TaskHeader
|
||||
{
|
||||
TaskNo = taskNo,
|
||||
TaskType = TaskTypeEnum.入库,
|
||||
FromLocation = "",
|
||||
ToLocation = locationCode,
|
||||
ContainerCode = model.PalletCode,
|
||||
RoadWay = 1,
|
||||
Status = TaskStatusEnum.新建,
|
||||
CreateBy = model.OperatorId,
|
||||
CreateTime = DateTime.Now
|
||||
};
|
||||
|
||||
_unitWork.Add(taskHeader);
|
||||
|
||||
// 3. 创建库存信息
|
||||
var inventory = new Inventory
|
||||
{
|
||||
ContainerCode = model.PalletCode,
|
||||
LocationCode = locationCode,
|
||||
MaterialCode = model.MaterialCode,
|
||||
MaterialName = material.MaterialName,
|
||||
MaterialSpec = material.MaterialSpec,
|
||||
MaterialUnit = material.MaterialUnit,
|
||||
Qty = model.Quantity,
|
||||
TaskStatus = InventoryTaskStatusEnum.Locked,
|
||||
CreateBy = model.OperatorId,
|
||||
CreateTime = DateTime.Now
|
||||
};
|
||||
|
||||
_unitWork.Add(inventory);
|
||||
|
||||
// 4. 创建库存交易记录
|
||||
var transaction = new InventoryTransaction
|
||||
{
|
||||
Type = InventoryTranType.入库,
|
||||
ContainerCode = model.PalletCode,
|
||||
LocationCode = locationCode,
|
||||
MaterialCode = model.MaterialCode,
|
||||
MaterialName = material.MaterialName,
|
||||
MaterialSpec = material.MaterialSpec,
|
||||
MaterialUnit = material.MaterialUnit,
|
||||
Qty = model.Quantity,
|
||||
CreateBy = model.OperatorId,
|
||||
CreateTime = DateTime.Now
|
||||
};
|
||||
|
||||
_unitWork.Add(transaction);
|
||||
|
||||
// 5. 锁定容器和库位
|
||||
container.IsLock = ContainerLockEnum.任务锁;
|
||||
container.LocationCode = locationCode;
|
||||
_unitWork.Update(container);
|
||||
|
||||
// 从数据库中重新获取库位实体,避免实体跟踪冲突
|
||||
var locationToUpdate = _unitWork.FindSingle<Location>(l => l.Code == locationCode);
|
||||
locationToUpdate.Status = LocationStatusEnum.Locked;
|
||||
locationToUpdate.ContainerCode = model.PalletCode;
|
||||
_unitWork.Update(locationToUpdate);
|
||||
|
||||
// 6. 调用WCS接口下发任务
|
||||
var wcsTaskModel = new WCSTaskModel
|
||||
{
|
||||
TaskNo = taskNo,
|
||||
PalletNo = model.PalletCode,
|
||||
FromLocation = "", // 入库任务起始位置为空
|
||||
ToLocation = locationCode,
|
||||
};
|
||||
|
||||
// 调用WCS任务下发接口
|
||||
var wcsResult = Wtm.CallAPI<WCSTaskResponse>("WCS", "TaskAssign", HttpMethodEnum.POST, wcsTaskModel).Result.Data;
|
||||
|
||||
if (wcsResult != null && wcsResult.Success)
|
||||
{
|
||||
// WCS任务下发成功,提交事务
|
||||
tran.Commit();
|
||||
return Json(new { Code = 200, Msg = "入库成功", Data = new { TaskNo = taskNo } });
|
||||
}
|
||||
else
|
||||
{
|
||||
// WCS任务下发失败,回滚事务
|
||||
tran.Rollback();
|
||||
return Json(new { Code = 500, Msg = wcsResult?.Msg ?? "WCS任务下发失败" });
|
||||
}
|
||||
}
|
||||
catch (System.Exception ex)
|
||||
{
|
||||
// 发生异常,回滚事务
|
||||
tran.Rollback();
|
||||
return Json(new { Code = 500, Msg = ex.Message });
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -73,19 +73,19 @@ public class Location : BasePoco
|
||||
public enum LocationTypeEnum : short
|
||||
{
|
||||
/// <summary>
|
||||
/// 立库
|
||||
/// 成品库位
|
||||
/// </summary>
|
||||
[Display(Name = "LocationTypeEnum.L")]
|
||||
L = 0,
|
||||
C = 0,
|
||||
|
||||
/// <summary>
|
||||
/// 模具库
|
||||
/// 模具库位
|
||||
/// </summary>
|
||||
[Display(Name = "LocationTypeEnum.M")]
|
||||
M = 1,
|
||||
|
||||
/// <summary>
|
||||
/// 线边库
|
||||
/// 线边库位
|
||||
/// </summary>
|
||||
[Display(Name = "LocationTypeEnum.X")]
|
||||
X = 2
|
||||
|
||||
@@ -29,13 +29,13 @@ namespace HHWMS.Web.Models
|
||||
/// 入库任务
|
||||
/// </summary>
|
||||
[Display(Name = "TaskType.In")]
|
||||
盘料盒入库 = 1,
|
||||
入库 = 1,
|
||||
|
||||
/// <summary>
|
||||
/// 出库任务
|
||||
/// </summary>
|
||||
[Display(Name = "TaskType.Out")]
|
||||
盘料盒出库 = 2,
|
||||
出库 = 2,
|
||||
|
||||
/// <summary>
|
||||
/// 盘料入库
|
||||
@@ -104,16 +104,11 @@ namespace HHWMS.Web.Models
|
||||
/// <summary>
|
||||
/// 容器类型
|
||||
/// </summary>
|
||||
public enum ContainerTypeEnum : int
|
||||
public static class ContainerTypeEnum
|
||||
{
|
||||
//// 11:23格料盒; 12:13格料盒; 13:16格料盒; 14:19格料盒
|
||||
格料盒23 = 11,
|
||||
|
||||
格料盒13 = 12,
|
||||
|
||||
格料盒16 = 13,
|
||||
|
||||
格料盒19 = 14,
|
||||
public const string 线边库 = "X";
|
||||
public const string 成品库 = "L";
|
||||
public const string 模具库 = "M";
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
using HHWMS.Web.Models;
|
||||
|
||||
namespace HHWMS.Web
|
||||
{
|
||||
public class WcsRequest
|
||||
@@ -10,5 +12,6 @@ namespace HHWMS.Web
|
||||
public decimal? Length { get; set; }
|
||||
public decimal? Width { get; set; }
|
||||
public decimal? Height { get; set; }
|
||||
public LocationTypeEnum LocationType { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -60,6 +60,7 @@ namespace HHWMS.Web
|
||||
|
||||
int BatchDelete<T>(IEnumerable<T> entities) where T : class;
|
||||
|
||||
int Save();
|
||||
string GetSerialNumber(string prefix, int length = 4);
|
||||
}
|
||||
}
|
||||
@@ -166,6 +166,11 @@ namespace HHWMS.Web
|
||||
|
||||
}
|
||||
|
||||
public int Save()
|
||||
{
|
||||
return _data.SaveChanges();
|
||||
}
|
||||
|
||||
public int BatchDelete<T>(Expression<Func<T, bool>> where) where T : class
|
||||
{
|
||||
return _data.Set<T>().Where(where).Delete();
|
||||
|
||||
Reference in new issue
Block a user