力阔现场出入库流程
agv任务下发 修改部分实体类错误和页面字段等 layout 添加条码库 添加容器逻辑修改
This commit is contained in:
1 parent
345b5a3d5b
commit
b4632cfc33
29 files changed
+618
-849
No files matched your search
@@ -10,7 +10,7 @@ using WalkingTec.Mvvm.Core;
|
||||
namespace HHWMS.Web
|
||||
{
|
||||
/// <summary>
|
||||
/// WCS接口
|
||||
/// 提供WCS调用接口
|
||||
/// 调用方向 WCS --> WMS
|
||||
/// </summary>
|
||||
[Public]
|
||||
@@ -19,65 +19,15 @@ namespace HHWMS.Web
|
||||
[Route("api/[controller]/[action]"), ApiExplorerSettings(GroupName = "User")]
|
||||
public class IWCSController : ApiController
|
||||
{
|
||||
private readonly IUnitWork _unitwork;
|
||||
private readonly IUnitWork _unitWork;
|
||||
private readonly IMapper _mapper;
|
||||
|
||||
public IWCSController(IUnitWork unitwork, IMapper mapper)
|
||||
public IWCSController(IUnitWork unitWork, IMapper mapper)
|
||||
{
|
||||
_unitwork = unitwork;
|
||||
_unitWork = unitWork;
|
||||
_mapper = mapper;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 请求入库
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
public IActionResult RequestIn(WcsRequest request)
|
||||
{
|
||||
//var inv = new List<Inventory>();
|
||||
//for (int i = 0; i < 10; i++)
|
||||
// inv.Add(new Inventory
|
||||
// {
|
||||
// ContainerCode = "test" + i
|
||||
// });
|
||||
//_unitwork.BatchAdd<Inventory>(inv);
|
||||
//_unitwork.DeleteById<Inventory>(1441);
|
||||
//_unitwork.BatchUpdate<Inventory>(x => x.ID > 1030, x=>new Inventory { Batch = "test"});
|
||||
|
||||
// 测试 删除数据 保存到历史表 主子表数据
|
||||
/*var receipt = _unitwork.Find<ReceiptHeader>(x => x.ID == 3)
|
||||
.FirstOrDefault();
|
||||
|
||||
var details = _unitwork.Find<ReceiptDetail>(x => x.HeaderId == 3)
|
||||
.ToArray();
|
||||
var his = _mapper.Map<ReceiptHeaderHistory>(receipt);
|
||||
var his2 = _mapper.Map<ReceiptDetail[], IEnumerable<ReceiptDetailHistory>>(details);
|
||||
_unitwork.Add(his);
|
||||
_unitwork.BatchAdd(his2);*/
|
||||
|
||||
/*var receipt = _unitwork.Find<ShipmentHeader>(x => x.ID == 3)
|
||||
.FirstOrDefault();
|
||||
|
||||
var details = _unitwork.Find<ShipmentDetail>(x => x.HeaderId == 3)
|
||||
.ToArray();
|
||||
var his = _mapper.Map<ShipmentHeaderHistory>(receipt);
|
||||
var his2 = _mapper.Map<ShipmentDetail[], IEnumerable<ShipmentDetailHistory>>(details);
|
||||
_unitwork.Add(his);
|
||||
_unitwork.BatchAdd(his2);*/
|
||||
|
||||
var receipt = _unitwork.Find<TaskHeader>(x => 1==1)
|
||||
.FirstOrDefault();
|
||||
|
||||
var details = _unitwork.Find<TaskDetail>(x => x.HeaderId == receipt.ID)
|
||||
.ToArray();
|
||||
var his = _mapper.Map<TaskHeaderHistory>(receipt);
|
||||
var his2 = _mapper.Map<TaskDetail[], IEnumerable<TaskDetailHistory>>(details);
|
||||
_unitwork.Add(his);
|
||||
_unitwork.BatchAdd(his2);
|
||||
return ApiResult();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 状态返回
|
||||
/// </summary>
|
||||
@@ -92,7 +42,7 @@ namespace HHWMS.Web
|
||||
}
|
||||
|
||||
// 判断任务是否合理
|
||||
var task = _unitwork.FindSingle<TaskHeader>(x => x.TaskNo.Equals(request.TaskNo));
|
||||
var task = _unitWork.FindSingle<TaskHeader>(x => x.TaskNo.Equals(request.TaskNo));
|
||||
if(task == null)
|
||||
{
|
||||
return ApiResultError(msg: $"任务不存在, 任务号 {request.TaskNo} , 请检查后重新请求!");
|
||||
@@ -103,37 +53,139 @@ namespace HHWMS.Web
|
||||
{
|
||||
case TaskTypeEnum.立库入库:
|
||||
// 1.更新库存
|
||||
_unitwork.BatchUpdate<Inventory>(x => x.ContainerCode.Equals(task.ContainerCode), x => new Inventory
|
||||
_unitWork.BatchUpdate<Inventory>(x => x.ContainerCode.Equals(task.ContainerCode), x => new Inventory
|
||||
{
|
||||
UpdateTime = DateTime.Now,
|
||||
UpdateBy = "WMS",
|
||||
TaskStatus = InventoryTaskStatus.无任务
|
||||
});
|
||||
// 2.更新容器
|
||||
_unitwork.BatchUpdate<Container>(x => x.Code.Equals(task.ContainerCode), x => new Container
|
||||
_unitWork.BatchUpdate<Container>(x => x.Code.Equals(task.ContainerCode), x => new Container
|
||||
{
|
||||
UpdateTime = DateTime.Now,
|
||||
UpdateBy = "WMS",
|
||||
Status = ContainerStatus.有,
|
||||
IsLock = ContainerLockEnum.未锁,
|
||||
LocationCode = task.ToLocation
|
||||
});
|
||||
// 3.更新库位
|
||||
_unitwork.BatchUpdate<Location>(x => x.Code.Equals(task.ToLocation), x => new Location
|
||||
_unitWork.BatchUpdate<Location>(x => x.Code.Equals(task.ToLocation), x => new Location
|
||||
{
|
||||
UpdateTime = DateTime.Now,
|
||||
UpdateBy = "WMS",
|
||||
Status = LocationStatus.有货,
|
||||
Status = LocationStatus.空容器,
|
||||
ContainerCode = task.ContainerCode
|
||||
});
|
||||
// 4.插入库存交易
|
||||
// 1.将任务容器的库存查出来
|
||||
var inventoryList = _unitWork.Find<Inventory>(x => x.ContainerCode.Equals(task.ContainerCode)).ToList();
|
||||
if (inventoryList.Count > 0)
|
||||
{
|
||||
// 2.根据库存生成库存交易出库信息
|
||||
var inventoryTransactions = inventoryList.Select(inventory => new InventoryTransaction
|
||||
{
|
||||
BillType = InventoryTranType.入库,
|
||||
MaterialCode = inventory.MaterialCode,
|
||||
MaterialName = inventory.MaterialName,
|
||||
MaterialUnit = inventory.MaterialUnit,
|
||||
Batch = inventory.Batch,
|
||||
Lot = inventory.Lot,
|
||||
LocationCode = inventory.LocationCode,
|
||||
ContainerCode = inventory.ContainerCode,
|
||||
Qty = inventory.Qty,
|
||||
CreateTime = DateTime.Now,
|
||||
CreateBy = "WMS",
|
||||
UpdateTime = DateTime.Now,
|
||||
UpdateBy = "WMS"
|
||||
}).ToList();
|
||||
|
||||
// 3.批量插入库存交易
|
||||
_unitWork.BatchAdd(inventoryTransactions);
|
||||
}
|
||||
|
||||
break;
|
||||
case TaskTypeEnum.立库出库:
|
||||
|
||||
_unitWork.BatchUpdate<Container>(x => x.Code.Equals(task.ContainerCode), x => new Container
|
||||
{
|
||||
UpdateTime = DateTime.Now,
|
||||
UpdateBy = "WMS",
|
||||
IsLock = ContainerLockEnum.未锁,
|
||||
LocationCode = ""
|
||||
});
|
||||
_unitWork.BatchUpdate<Location>(x => x.Code.Equals(task.FromLocation), x => new Location
|
||||
{
|
||||
UpdateTime = DateTime.Now,
|
||||
UpdateBy = "WMS",
|
||||
Status = LocationStatus.空仓位,
|
||||
ContainerCode = ""
|
||||
});
|
||||
// 1.将任务容器的库存查出来
|
||||
var inventoryList2 = _unitWork.Find<Inventory>(x => x.ContainerCode.Equals(task.ContainerCode)).ToList();
|
||||
if (inventoryList2.Count > 0)
|
||||
{
|
||||
// 2.根据库存生成库存交易出库信息
|
||||
var inventoryTransactions2 = inventoryList2.Select(inventory => new InventoryTransaction
|
||||
{
|
||||
BillType = InventoryTranType.出库,
|
||||
MaterialCode = inventory.MaterialCode,
|
||||
MaterialName = inventory.MaterialName,
|
||||
MaterialUnit = inventory.MaterialUnit,
|
||||
Batch = inventory.Batch,
|
||||
Lot = inventory.Lot,
|
||||
LocationCode = inventory.LocationCode,
|
||||
ContainerCode = inventory.ContainerCode,
|
||||
Qty = inventory.Qty,
|
||||
CreateTime = DateTime.Now,
|
||||
CreateBy = "WMS",
|
||||
UpdateTime = DateTime.Now,
|
||||
UpdateBy = "WMS"
|
||||
}).ToList();
|
||||
|
||||
// 3.批量插入库存交易
|
||||
_unitWork.BatchAdd(inventoryTransactions2);
|
||||
|
||||
_unitWork.BatchDelete<Inventory>(x => x.ContainerCode.Equals(task.ContainerCode));
|
||||
}
|
||||
// 下发AGV到出库口的任务
|
||||
// 如果对接 执行下方任务,否则不执行
|
||||
var interfaceAgv = _unitWork.FindSingle<SysCount>(x => x.Prefix == "interfaceAGV")?.Value;
|
||||
if (interfaceAgv == 1)
|
||||
{
|
||||
|
||||
var postAgv = new
|
||||
{
|
||||
task_id = "123456"
|
||||
};
|
||||
|
||||
var res = Wtm.CallAPI<dynamic>("ACS", "task_mould_do", HttpMethodEnum.POST, postAgv);
|
||||
// if (res.Result.Data.ack == 0)
|
||||
// {
|
||||
//
|
||||
// }
|
||||
}
|
||||
|
||||
break;
|
||||
default:
|
||||
return ApiResultError(msg:$"任务类型不正确!任务号{request.TaskNo}");
|
||||
}
|
||||
|
||||
task.Status = TaskStatusEnum.完成;
|
||||
// 插到历史表,或者接下来流程
|
||||
|
||||
_unitWork.Add(new TaskHeaderHistory
|
||||
{
|
||||
TaskNo = task.TaskNo,
|
||||
TaskType = task.TaskType,
|
||||
FromLocation = task.FromLocation,
|
||||
ToLocation = task.ToLocation,
|
||||
ContainerCode = task.ContainerCode,
|
||||
Status = task.Status,
|
||||
CreateTime = DateTime.Now,
|
||||
CreateBy = "WMS"
|
||||
});
|
||||
|
||||
_unitWork.Delete(task);
|
||||
|
||||
return ApiResult();
|
||||
}
|
||||
|
||||
@@ -144,9 +196,29 @@ namespace HHWMS.Web
|
||||
[HttpPost]
|
||||
public IActionResult FullIn(WcsRequest request)
|
||||
{
|
||||
return ApiResult();
|
||||
}
|
||||
var task = _unitWork.FindSingle<TaskHeader>(x => x.TaskNo.Equals(request.TaskNo));
|
||||
if (task == null)
|
||||
{
|
||||
return ApiResultError(msg: $"任务不存在, 任务号 {request.TaskNo} , 请检查后重新请求!");
|
||||
}
|
||||
|
||||
var location = _unitWork.FindSingle<Location>(x => x.Status == LocationStatus.空仓位);
|
||||
if(location == null)
|
||||
{
|
||||
return ApiResultError(msg: "没有空仓位");
|
||||
}
|
||||
|
||||
task.ToLocation = location.Code;
|
||||
_unitWork.Update(task);
|
||||
|
||||
location.Status = LocationStatus.任务锁;
|
||||
_unitWork.Update(location);
|
||||
|
||||
return ApiResult(new
|
||||
{
|
||||
locationCode = location.Code
|
||||
});
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 空出
|
||||
@@ -155,7 +227,27 @@ namespace HHWMS.Web
|
||||
[HttpPost]
|
||||
public IActionResult EmptyOut(WcsRequest request)
|
||||
{
|
||||
var task = _unitWork.FindSingle<TaskHeader>(x => x.TaskNo.Equals(request.TaskNo));
|
||||
if(task == null)
|
||||
{
|
||||
return ApiResultError(msg: $"任务不存在, 任务号 {request.TaskNo} , 请检查后重新请求!");
|
||||
}
|
||||
|
||||
_unitWork.Add(new TaskHeaderHistory
|
||||
{
|
||||
TaskNo = task.TaskNo,
|
||||
TaskType = task.TaskType,
|
||||
FromLocation = task.FromLocation,
|
||||
ToLocation = task.ToLocation,
|
||||
ContainerCode = task.ContainerCode,
|
||||
Status = task.Status,
|
||||
CreateTime = DateTime.Now,
|
||||
CreateBy = "WMS"
|
||||
});
|
||||
|
||||
_unitWork.Delete(task);
|
||||
return ApiResult();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user