This commit is contained in:
霍尔 committed 2023-10-16 20:33:44 +08:00
1 parent c494b7b1ef
commit 523dee5e38
15 files changed
+304 -128

No files matched your search

@@ -24,7 +24,7 @@ namespace HHWMS.Web
{
var _unitwork = new UnitWork(Wtm);
var tasks = _unitwork.Find<TaskHeader>(x =>x.Status > TaskStatusEnum.新建 && x.Status <= TaskStatusEnum.已下发)
var tasks = _unitwork.Find<TaskHeader>(x =>x.Status > TaskStatusEnum.新建 && x.Status < TaskStatusEnum.已下发)
.Include(x => x.TaskDetails)
.ToList();
foreach (var task in tasks)
@@ -32,19 +32,33 @@ namespace HHWMS.Web
if (task != null)
{
var count = 0;
var Count = 0;
if (task.TaskType == TaskTypeEnum.盘料入库)
{
GenTask(task, _unitwork);
//子任务为新建的盘料入库任务不需要下发给WCS
count = task.TaskDetails.Where(x => x.Status == TaskStatusEnum.新建).Count();
//子任务部分完成,需要下发部分子任务
Count = task.TaskDetails.Where(x => x.Status == TaskStatusEnum.待下发).Count();
}
if (task.TaskType == TaskTypeEnum.盘料出库)
else if (task.TaskType == TaskTypeEnum.盘料出库)
{
OutGenTask(task, _unitwork);
//子任务为新建的盘料入库任务不需要下发给WCS
count = task.TaskDetails.Where(x => x.Status == TaskStatusEnum.新建).Count();
}
if (count == 0)
else if (task.TaskType == TaskTypeEnum.散料盒出库)
{
//判断出库站台是否被占用
Location endStation = _unitwork.Find<Location>(x => x.Code == task.ToLocation
&& x.Status == LocationStatus.空仓位
&& string.IsNullOrEmpty(x.ContainerCode)).FirstOrDefault();
if (endStation == null)
{
continue;
}
}
if (count == 0 || Count > 0)
{
var taskList = CreateWCSTask(task, _unitwork);
foreach (var item in taskList)
@@ -53,10 +67,10 @@ namespace HHWMS.Web
// 调用wcs任务下发接口
try
{
var res = Wtm.CallAPI<ApiJsonResult<dynamic>>("WCS", "TaskAssign", HttpMethodEnum.POST, item).Result.Data;
//if (true)
if (res.Success)
{
//var res = Wtm.CallAPI<ApiJsonResult<dynamic>>("WCS", "TaskAssign", HttpMethodEnum.POST, item).Result.Data;
if (true)
//if (res.Success)
{
var locationList = _unitwork.Find<Location>(x => task.FromLocation.Equals(x.Code) || task.ToLocation.Equals(x.Code)).ToList();
var begin = locationList.FirstOrDefault(x => x.Code.Equals(task.FromLocation));
var end = locationList.FirstOrDefault(x => x.Code.Equals(task.ToLocation));
@@ -140,15 +154,52 @@ namespace HHWMS.Web
var details = task.TaskDetails.Where(x => x.Status == TaskStatusEnum.新建
&& string.IsNullOrEmpty(x.ContainerCode));
var count = details.Count();
// 查找可用站台
//根据任务库存查询可对应的出库托盘与巷道
var Length = 23;
Inventory inventory = _unitwork.Find<Inventory>(x => x.ContainerCode == task.FromLocation).FirstOrDefault();
if (inventory != null)
{
switch (inventory.Flag)
{
case 8:
Length = 23;
break;
case 10:
Length = 19;
break;
case 16:
Length = 16;
break;
case 24:
Length = 13;
break;
default:
break;
}
}
var station = _unitwork.FindSingle<Location>(x => x.Type.Equals(LocationTypeEnum.堆垛机工位)
&& x.Status != LocationStatus.任务锁);
if (task.FromLocation == "L01")
{
station = _unitwork.Find<Location>(x => x.Type.Equals(LocationTypeEnum.堆垛机工位)
&& x.Status != LocationStatus.任务锁).OrderByDescending(x => x.Row).FirstOrDefault();
}
if (station != null && count > 0)
{
var container = _unitwork.Find<Location>(x => x.Row == station.Row && x.ZoneCode == LocationTypeEnum.盘料库位
&& (x.Status == LocationStatus.有货 || x.Status == LocationStatus.空容器))
.OrderByDescending(x => x.Length).FirstOrDefault();
if(container != null)
&& (x.Status == LocationStatus.有货 || x.Status == LocationStatus.空容器) && x.Length == Length && !x.IsStop)
.OrderByDescending(x => x.Length - x.Width).FirstOrDefault();
if (Length == 23 && container == null && station.Row == 3)
{
station = _unitwork.Find<Location>(x => x.Type.Equals(LocationTypeEnum.堆垛机工位)
&& x.Status != LocationStatus.任务锁 && x.Row == 1).FirstOrDefault();
container = _unitwork.Find<Location>(x => x.Row == station.Row && x.ZoneCode == LocationTypeEnum.盘料库位
&& (x.Status == LocationStatus.有货 || x.Status == LocationStatus.空容器) && x.Length == Length && !x.IsStop)
.OrderByDescending(x => x.Length - x.Width).FirstOrDefault();
}
if(station != null && container != null)
{
var newTask = new TaskHeader();
newTask.ZoneCode = ZoneCodeEnum.盘料库;
@@ -161,7 +212,7 @@ namespace HHWMS.Web
newTask.Station = "2";
_unitwork.Add(newTask);
task.ContainerCode = container.ContainerCode;
task.ContainerCode += container.ContainerCode;
// 更新库位
container.Status = LocationStatus.任务锁;
_unitwork.Update(container);
@@ -185,6 +236,13 @@ namespace HHWMS.Web
break;
}
_unitwork.Update(task);
station.Status = LocationStatus.任务锁;
_unitwork.Update(station);
}
else
{
task.ErrorMsg = "库内没有符合条件的盘料箱";
_unitwork.Update(task);
}
}
}
@@ -4,6 +4,7 @@ using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Threading.Tasks;
using HHWMS.Web.Models;
using Humanizer;
using Microsoft.EntityFrameworkCore;
using Newtonsoft.Json;
using Quartz;
@@ -28,7 +29,7 @@ namespace HHWMS.Web
var Shipments = _unitwork.Find<ShipmentHeader>(x =>x.FirstStatus == ShipStatusEnum.分配中)
.Include(x => x.ShipmentDetails)
.ToList();
var shipments = Shipments.Take(5).ToList();
var shipments = Shipments.Take(1).ToList();
foreach (var shipment in shipments)
{
@@ -37,7 +38,6 @@ namespace HHWMS.Web
foreach (var ShipmentDetail in ShipmentDetails)
{
var inventory = _unitwork.Find<Inventory>(x => x.UniqueCode == ShipmentDetail.UniqueCode
&& x.ZoneCode == ZoneCodeEnum.盘料库
&& x.TaskStatus == InventoryTaskStatus.无任务).FirstOrDefault();
if (inventory == null)
{
@@ -50,86 +50,172 @@ namespace HHWMS.Web
}
//出库库存通过托盘号分组
var Inventorys = ShiInventorys.GroupBy(x => x.ContainerCode).ToList();
foreach (var item in Inventorys)
//散料库
if (Inventorys.First().Key.Contains("C"))
{
var task = new TaskHeader();
task.TaskDetails = new List<TaskDetail>();
var Inventory = item.FirstOrDefault();
var location = _unitwork.Find<Location>(x => x.ContainerCode == Inventory.ContainerCode
&& x.Status != LocationStatus.空仓位
&& x.Status != LocationStatus.空容器).FirstOrDefault();
//查询仓位表是否符合
if (location != null)
foreach (var item in Inventorys)
{
//查找料塔工位
var to = _unitwork.Find<Location>(x => string.IsNullOrEmpty(x.ContainerCode)
&& x.Row == (Inventory.Flag == 8 ? 1 : 3)
&& x.Type.Equals(LocationTypeEnum.料塔)).FirstOrDefault();
//查询料塔是否为空
if (to == null)
var inventory = item.FirstOrDefault();
//出库托盘
Location location = _unitwork.Find<Location>(x => x.Code == inventory.ContainerCode && x.Status != LocationStatus.任务锁).FirstOrDefault();
if (location == null)
{
continue;
}
task.TaskNo = _unitwork.GetSerialNumber("pout", 4);
task.TaskType = TaskTypeEnum.盘料出库;
task.Status = TaskStatusEnum.待下发;
task.ContainerCode = Inventory.ContainerCode;
task.ToLocation = to.Code;
task.ZoneCode = ZoneCodeEnum.盘料库;
foreach (var inventory in item)
// 查询目的地站台是否可用
var stations = _unitwork.Find<Location>(x => x.Row == location.Row && x.Type == LocationTypeEnum.散料库站台 && string.IsNullOrEmpty(x.ContainerCode)).FirstOrDefault();
if (stations == null)
{
var detail = new TaskDetail
continue;
}
else
{
//判断是否已经有目的站台的出库任务
TaskHeader taskHeader = _unitwork.Find<TaskHeader>(x => x.ToLocation == stations.Code && x.TaskType == TaskTypeEnum.散料盒出库).FirstOrDefault();
if (taskHeader != null)
{
UniqueCode = inventory.UniqueCode,
FromLocation = inventory.Lot,
Status = TaskStatusEnum.新建,
continue;
}
// 创建任务
var task = new TaskHeader
{
ZoneCode = ZoneCodeEnum.散料库,
TaskNo = _unitwork.GetSerialNumber("SOut"),
TaskType = TaskTypeEnum.散料盒出库,
ContainerCode = inventory.ContainerCode,
CreateTime = DateTime.Now
FromLocation = location.ContainerCode,
ToLocation = stations.Code,
Status = TaskStatusEnum.待下发,
CreateTime = DateTime.Now,
};
task.TaskDetails.Add(detail);
}
_unitwork.Add(task);
//更新库位状态
var container = _unitwork.Find<Location>(x => x.ContainerCode == Inventory.ContainerCode).FirstOrDefault();
if (container != null)
{
container.Status = LocationStatus.任务锁;
_unitwork.Update(container);
}
to.ContainerCode = to.Code;
_unitwork.Update(to);
//更新库存状态
var invs = _unitwork.Find<Inventory>(x => x.ContainerCode == Inventory.ContainerCode).ToList();
if (invs.Count() > 0)
{
foreach (var inv in invs)
_unitwork.Add(task);
//更新库位状态
location.Status = LocationStatus.任务锁;
_unitwork.Update(location);
//更新库存状态
var invs = _unitwork.Find<Inventory>(x => x.ContainerCode == inventory.ContainerCode).ToList();
if (invs.Count() > 0)
{
inv.TaskStatus = InventoryTaskStatus.任务中;
_unitwork.Update(inv);
foreach (var inv in invs)
{
inv.TaskStatus = InventoryTaskStatus.任务中;
_unitwork.Update(inv);
}
}
//更新单据主表状态
foreach (var Inventory in item)
{
var shipmentdetail = shipment.ShipmentDetails.Where(x => x.ID == int.Parse(Inventory.SourceCode)).FirstOrDefault();
if (shipmentdetail != null)
{
shipmentdetail.Status = ShipStatusEnum.分配完成;
}
}
if (!shipment.ShipmentDetails.Any(x => x.Status < ShipStatusEnum.分配完成))
{
shipment.FirstStatus = ShipStatusEnum.分配完成;
_unitwork.Update(shipment);
}
}
//更新单据主表状态
foreach (var inventory in item)
{
var shipmentdetail = shipment.ShipmentDetails.Where(x => x.ID == int.Parse(inventory.SourceCode)).FirstOrDefault();
if (shipmentdetail != null)
{
shipmentdetail.Status = ShipStatusEnum.分配完成;
}
}
if (!shipment.ShipmentDetails.Any(x => x.Status < ShipStatusEnum.分配完成))
{
shipment.FirstStatus = ShipStatusEnum.分配完成;
_unitwork.Update(shipment);
}
}
else
{
continue;
}
}
//盘料库
else if(Inventorys.First().Key.Contains("L"))
{
foreach (var item in Inventorys)
{
var task = new TaskHeader();
task.TaskDetails = new List<TaskDetail>();
var Inventory = item.FirstOrDefault();
var location = _unitwork.Find<Location>(x => x.ContainerCode == Inventory.ContainerCode
&& x.Status != LocationStatus.空仓位
&& x.Status != LocationStatus.空容器).FirstOrDefault();
//查询仓位表是否符合
if (location != null)
{
var row = 1;
if (Inventory.Flag == 8)
{
row = 3;
}
else if(Inventory.Flag == 24 || Inventory.Flag == 16 || Inventory.Flag == 10)
{
row = 1;
}
//查找料塔工位
var to = _unitwork.Find<Location>(x => string.IsNullOrEmpty(x.ContainerCode)
&& x.Row == row
&& x.Type.Equals(LocationTypeEnum.料塔)).FirstOrDefault();
//查询料塔是否为空
if (to == null)
{
continue;
}
task.TaskNo = _unitwork.GetSerialNumber("pout", 4);
task.TaskType = TaskTypeEnum.盘料出库;
task.Status = TaskStatusEnum.待下发;
task.ContainerCode = Inventory.ContainerCode;
task.ToLocation = to.Code;
task.ZoneCode = ZoneCodeEnum.盘料库;
foreach (var inventory in item)
{
var detail = new TaskDetail
{
UniqueCode = inventory.UniqueCode,
FromLocation = inventory.Lot,
Status = TaskStatusEnum.新建,
ContainerCode = inventory.ContainerCode,
CreateTime = DateTime.Now
};
task.TaskDetails.Add(detail);
}
_unitwork.Add(task);
//更新库位状态
var container = _unitwork.Find<Location>(x => x.ContainerCode == Inventory.ContainerCode).FirstOrDefault();
if (container != null)
{
container.Status = LocationStatus.任务锁;
_unitwork.Update(container);
}
to.ContainerCode = to.Code;
_unitwork.Update(to);
//更新库存状态
var invs = _unitwork.Find<Inventory>(x => x.ContainerCode == Inventory.ContainerCode).ToList();
if (invs.Count() > 0)
{
foreach (var inv in invs)
{
inv.TaskStatus = InventoryTaskStatus.任务中;
_unitwork.Update(inv);
}
}
//更新单据主表状态
foreach (var inventory in item)
{
var shipmentdetail = shipment.ShipmentDetails.Where(x => x.ID == int.Parse(inventory.SourceCode)).FirstOrDefault();
if (shipmentdetail != null)
{
shipmentdetail.Status = ShipStatusEnum.分配完成;
}
}
if (!shipment.ShipmentDetails.Any(x => x.Status < ShipStatusEnum.分配完成))
{
shipment.FirstStatus = ShipStatusEnum.分配完成;
_unitwork.Update(shipment);
}
}
else
{
continue;
}
}
}
}