盘料出库1对多工位出库

This commit is contained in:
zgf committed 2023-11-21 23:37:55 +08:00
1 parent 30f1e69664
commit 2cae99cb34
12 files changed
+308 -59

No files matched your search

@@ -264,7 +264,7 @@ namespace HHWMS.Web
}
else
{
task.ErrorMsg = "库内没有符合条件的盘料箱";
task.ErrorMsg = "库内没有符合条件的盘料箱或站台被占用";
_unitwork.Update(task);
}
}
@@ -438,7 +438,7 @@ namespace HHWMS.Web
break;
case TaskTypeEnum.盘料出库:
foreach (var item in task.TaskDetails)
foreach (var item in task.TaskDetails.Where(x => x.Status == TaskStatusEnum.待下发))
{
taskInfoList.Add(new TaskInfo
{
@@ -88,8 +88,15 @@ namespace HHWMS.Web
}
//出库库存通过托盘号分组
var lockInvs = _unitwork.Find<Inventory>(x => x.TaskStatus == InventoryTaskStatus.任务中).ToList();
var lockInvs = _unitwork.Find<Inventory>(x => x.TaskStatus == InventoryTaskStatus.任务中
&& !"L01,L02".Contains(x.ContainerCode))
.ToList();
shiInventorys.AddRange(lockInvs);
//已生成任务的库存不再生成任务
var taskUniques = _unitwork.Find<TaskDetail>(x => x.Status > TaskStatusEnum.新建)
.Select(x => x.UniqueCode).ToList();
var taskInvs = _unitwork.Find<Inventory>(x => taskUniques.Contains(x.UniqueCode)).ToList();
shiInventorys.Except(lockInvs);
shiInventorys.DistinctBy(x => x.UniqueCode);
var inventoryList = shiInventorys.GroupBy(x => x.ContainerCode)
.ToList();
@@ -166,26 +173,41 @@ namespace HHWMS.Web
row = 1;
}
// 查找工位 G1
var gLoc = _unitwork.Find<Location>(x => string.IsNullOrEmpty(x.ContainerCode)
var gLoc = _unitwork.Find<Location>(x => x.ContainerCode == item.Key
&& x.Row == location.Row
&& x.Type.Equals(LocationTypeEnum.堆垛机工位)).FirstOrDefault();
// 新建盘料盒出库任务
if (gLoc != null)
{
var pTask = new TaskHeader
//盘料箱已在堆垛机工位,直接生成盘料出库任务
}
else
{
// 盘料箱在库内,工位为空,先生成料盘箱出库任务
gLoc = _unitwork.Find<Location>(x => string.IsNullOrEmpty(x.ContainerCode)
&& x.Row == location.Row
&& x.Type.Equals(LocationTypeEnum.堆垛机工位)).FirstOrDefault();
if (gLoc != null)
{
ZoneCode = ZoneCodeEnum.盘料库,
TaskNo = _unitwork.GetSerialNumber("Out"),
TaskType = TaskTypeEnum.盘料盒出库,
ContainerCode = item.Key,
FromLocation = location.ContainerCode,
ToLocation = gLoc.Code,
Status = TaskStatusEnum.待下发,
Priority = 0,
CreateTime = DateTime.Now,
CreateBy = "wmsjob"
};
//_unitwork.Add(pTask);
var pTask = new TaskHeader
{
ZoneCode = ZoneCodeEnum.盘料库,
TaskNo = _unitwork.GetSerialNumber("Out"),
TaskType = TaskTypeEnum.盘料盒出库,
ContainerCode = item.Key,
FromLocation = location.ContainerCode,
ToLocation = gLoc.Code,
Status = TaskStatusEnum.待下发,
Priority = 0,
CreateTime = DateTime.Now,
CreateBy = "wmsjob"
};
_unitwork.Add(pTask);
}
}
if (gLoc != null)
{
//查找料塔工位 T
var tLoc = _unitwork.Find<Location>(x => string.IsNullOrEmpty(x.ContainerCode)
&& x.Row == row
@@ -210,23 +232,48 @@ namespace HHWMS.Web
{
if (tLoc.Height < tLoc.Length)
{
var detail = new TaskDetail
// 库存不在已建任务明细中,新增任务明细
if (!containerTask.TaskDetails.Any(x => x.UniqueCode.Equals(inventory.UniqueCode)))
{
UniqueCode = inventory.UniqueCode,
Lot = $"{Convert.ToInt32(location.Length)}-{tLoc.Code}",
FromLocation = inventory.Lot,
ToLocation = (Convert.ToInt32(tLoc.Height) + 1).ToString(),
Status = TaskStatusEnum.新建,
ContainerCode = inventory.ContainerCode,
CreateTime = DateTime.Now
};
tLoc.Height += 1;
containerTask.TaskDetails.Add(new TaskDetail
{
UniqueCode = inventory.UniqueCode,
Lot = $"{Convert.ToInt32(location.Length)}-{tLoc.Code}",
FromLocation = inventory.Lot,
ToLocation = (Convert.ToInt32(tLoc.Height) + 1).ToString(),
Status = TaskStatusEnum.待下发,
ContainerCode = inventory.ContainerCode,
CreateTime = DateTime.Now
});
tLoc.Height += 1;
}
//存在
else
{
foreach (var i in containerTask.TaskDetails.Where(x => x.Status == TaskStatusEnum.新建))
{
i.Lot = $"{Convert.ToInt32(location.Length)}-{tLoc.Code}";
i.ToLocation = (Convert.ToInt32(tLoc.Height) + 1).ToString();
i.Status = TaskStatusEnum.待下发;
tLoc.Height += 1;
}
}
containerTask.Status = TaskStatusEnum.待下发;
containerTask.TaskDetails.Add(detail);
}
else
{
break;
// 库存不在已建任务明细中,新增任务明细
if (!containerTask.TaskDetails.Any(x => x.UniqueCode.Equals(inventory.UniqueCode)))
{
containerTask.TaskDetails.Add(new TaskDetail
{
UniqueCode = inventory.UniqueCode,
FromLocation = inventory.Lot,
Status = TaskStatusEnum.新建,
ContainerCode = inventory.ContainerCode,
CreateTime = DateTime.Now
});
}
}
}
_unitwork.Update(tLoc);
@@ -237,8 +284,7 @@ namespace HHWMS.Web
continue;
}
}
else
if (tLoc != null)
else if (tLoc != null)
{
task.ZoneCode = ZoneCodeEnum.盘料库;
task.TaskNo = _unitwork.GetSerialNumber("pout", 4);
@@ -247,7 +293,7 @@ namespace HHWMS.Web
task.ContainerCode = item.Key;
task.Priority = 100;
task.FromLocation = _unitwork
.FindSingle<Location>(x => x.ContiguousCode == pTask.ToLocation)?.Code;
.FindSingle<Location>(x => x.ContiguousCode == gLoc.Code)?.Code;
task.ToLocation = tLoc.Code;
task.CreateTime = DateTime.Now;
task.CreateBy = "wmsjob";
@@ -273,7 +319,6 @@ namespace HHWMS.Web
break;
}
}
_unitwork.Add(pTask);
_unitwork.Add(task);
//更新库位状态
var container = _unitwork.Find<Location>(x => x.ContainerCode == item.Key)
@@ -323,5 +368,181 @@ namespace HHWMS.Web
catch { }
return Task.CompletedTask;
}
// 根据库存明细,生成盘料出库任务
public void GenPlcTask(List<Inventory> invs, UnitWork _unitwork)
{
// 按盘料箱分组
var inventoryList = invs.GroupBy(x => x.ContainerCode)
.ToList();
foreach (var item in inventoryList)
{
var task = new TaskHeader();
task.TaskDetails = new List<TaskDetail>();
var inv = item.FirstOrDefault();
var location = _unitwork.Find<Location>(x => x.ContainerCode == item.Key
&& x.Status != LocationStatus.空仓位
&& x.Status != LocationStatus.空容器).FirstOrDefault();
//查询仓位表是否符合
if (location != null)
{
var row = 1;
if (inv.Flag == 8)
{
row = 3;
}
else if (inv.Flag == 24 || inv.Flag == 16 || inv.Flag == 10)
{
row = 1;
}
// 查找工位 G1
var gLoc = _unitwork.Find<Location>(x => x.ContainerCode == item.Key
&& x.Row == location.Row
&& x.Type.Equals(LocationTypeEnum.堆垛机工位))
.FirstOrDefault();
// gLoc != null 盘料箱已在堆垛机工位,直接生成盘料出库任务
if (gLoc == null)
{
// 盘料箱不在工位,先生成料盘箱出库任务
gLoc = _unitwork.Find<Location>(x => string.IsNullOrEmpty(x.ContainerCode)
&& x.Row == location.Row
&& x.Type.Equals(LocationTypeEnum.堆垛机工位))
.FirstOrDefault();
if (gLoc != null)
{
var pTask = new TaskHeader
{
ZoneCode = ZoneCodeEnum.盘料库,
TaskNo = _unitwork.GetSerialNumber("Out"),
TaskType = TaskTypeEnum.盘料盒出库,
ContainerCode = item.Key,
FromLocation = location.ContainerCode,
ToLocation = gLoc.Code,
Status = TaskStatusEnum.待下发,
Priority = 0,
CreateTime = DateTime.Now,
CreateBy = "wmsjob"
};
_unitwork.Add(pTask);
}
else
{
// 找不到工位,直接跳出
return;
}
}
// 新建盘料盒出库任务
if (gLoc != null)
{
//查找料塔工位 T
var tLoc = _unitwork.Find<Location>(x => string.IsNullOrEmpty(x.ContainerCode)
&& x.Row == row
&& x.Type.Equals(LocationTypeEnum.料塔))
.FirstOrDefault();
//查询料塔是否为空
if (tLoc == null)
{
//判断是否存在此托盘的出库任务
var containerTask = _unitwork.Find<TaskHeader>(x => x.Status < TaskStatusEnum.已下发
&& x.ContainerCode == item.Key
&& x.TaskType == TaskTypeEnum.盘料出库)
.Include(x => x.TaskDetails)
.FirstOrDefault();
if (containerTask != null)
{
tLoc = _unitwork.Find<Location>(x => x.Code == containerTask.ToLocation
&& x.Type.Equals(LocationTypeEnum.料塔))
.FirstOrDefault();
foreach (var inventory in item)
{
if (tLoc.Height < tLoc.Length)
{
var detail = new TaskDetail
{
UniqueCode = inventory.UniqueCode,
Lot = $"{Convert.ToInt32(location.Length)}-{tLoc.Code}",
FromLocation = inventory.Lot,
ToLocation = (Convert.ToInt32(tLoc.Height) + 1).ToString(),
Status = TaskStatusEnum.新建,
ContainerCode = inventory.ContainerCode,
CreateTime = DateTime.Now
};
tLoc.Height += 1;
containerTask.Status = TaskStatusEnum.待下发;
containerTask.TaskDetails.Add(detail);
}
else
{
break;
}
}
_unitwork.Update(tLoc);
_unitwork.Update(containerTask);
}
else
{
continue;
}
}
else if (tLoc != null)
{
task.ZoneCode = ZoneCodeEnum.盘料库;
task.TaskNo = _unitwork.GetSerialNumber("pout", 4);
task.TaskType = TaskTypeEnum.盘料出库;
task.Status = TaskStatusEnum.待下发;
task.ContainerCode = item.Key;
task.Priority = 100;
task.FromLocation = _unitwork
.FindSingle<Location>(x => x.ContiguousCode == gLoc.Code)?.Code;
task.ToLocation = tLoc.Code;
task.CreateTime = DateTime.Now;
task.CreateBy = "wmsjob";
foreach (var inventory in item)
{
if (tLoc.Height < tLoc.Length)
{
var detail = new TaskDetail
{
UniqueCode = inventory.UniqueCode,
Lot = $"{Convert.ToInt32(location.Length)}-{tLoc.Code}",
FromLocation = inventory.Lot,
ToLocation = (Convert.ToInt32(tLoc.Height) + 1).ToString(),
Status = TaskStatusEnum.新建,
ContainerCode = inventory.ContainerCode,
CreateTime = DateTime.Now
};
task.TaskDetails.Add(detail);
tLoc.Height += 1;
}
else
{
break;
}
}
_unitwork.Add(task);
//更新库位状态
var container = _unitwork.Find<Location>(x => x.ContainerCode == item.Key)
.FirstOrDefault();
if (container != null)
{
container.Status = LocationStatus.任务锁;
container.UpdateTime = DateTime.Now;
container.UpdateBy = "wmsjob";
_unitwork.Update(container);
}
tLoc.ContainerCode = tLoc.Code;
tLoc.UpdateBy = "wmsjob";
tLoc.UpdateTime = DateTime.Now;
_unitwork.Update(tLoc);
}
}
}
}
}
}
}