修改WCS任务反馈逻辑,添加盘料入库扫描料箱号占用站台逻辑,修改盘料库启动入库逻辑,将启动入库功能迁移到盘料操作界面中,修改盘料出库料塔取料逻辑,创建出库单据分解定时器,任务下发定时器添加盘料出库任务逻辑

This commit is contained in:
霍尔 committed 2023-09-13 10:39:23 +08:00
1 parent 79d4512266
commit 1fa11ab235
11 files changed
+536 -136

No files matched your search

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Threading.Tasks;
@@ -23,40 +24,97 @@ namespace HHWMS.Web
{
var _unitwork = new UnitWork(Wtm);
var task = _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)
.FirstOrDefault();
if (task != null) {
if (task.TaskType == TaskTypeEnum.盘料入库)
.ToList();
foreach (var task in tasks)
{
if (task != null)
{
GenTask(task, _unitwork);
}
var taskList = CreateWCSTask(task, _unitwork);
foreach (var item in taskList)
{
task.ErrorMsg += JsonConvert.SerializeObject(item);
// 调用wcs任务下发接口
try
var count = 0;
if (task.TaskType == TaskTypeEnum.盘料入库)
{
//var res = Wtm.CallAPI<ApiJsonResult<dynamic>>("WCS", "TaskAssign", HttpMethodEnum.POST, item).Result.Data;
//if (res.Success)
//{
// task.TaskDetails.Where(x => x.UniqueCode.Equals(item.ObjId)).First().Status = TaskStatusEnum.已下发;
//}
Task.Delay(500);
GenTask(task, _unitwork);
//子任务为新建的盘料入库任务不需要下发给WCS
count = task.TaskDetails.Where(x => x.Status == TaskStatusEnum.新建).Count();
}
catch(Exception ex)
if (task.TaskType == TaskTypeEnum.盘料出库)
{
task.ErrorMsg += ex.Message;
OutGenTask(task, _unitwork);
//子任务为新建的盘料入库任务不需要下发给WCS
count = task.TaskDetails.Where(x => x.Status == TaskStatusEnum.新建).Count();
}
if(task.TaskDetails.Count(x => x.Status == TaskStatusEnum.新建) == 0)
if (count == 0)
{
task.Status = TaskStatusEnum.已下发;
var taskList = CreateWCSTask(task, _unitwork);
foreach (var item in taskList)
{
task.ErrorMsg += JsonConvert.SerializeObject(item);
// 调用wcs任务下发接口
try
{
var res = Wtm.CallAPI<ApiJsonResult<dynamic>>("WCS", "TaskAssign", HttpMethodEnum.POST, item).Result.Data;
if (res.Success)
{
Location LocStation = new Location();
Location location = new Location();
switch (task.TaskType)
{
//根据任务类型不同,更新任务状态与库位状态
case TaskTypeEnum.盘料盒入库:
case TaskTypeEnum.散料盒入库:
LocStation = _unitwork.FindSingle<Location>(x => x.Code.Equals(task.FromLocation));
location = _unitwork.FindSingle<Location>(x => x.Code.Equals(task.ToLocation));
LocStation.ContainerCode = "";
location.ContainerCode = task.ContainerCode;
task.Status = TaskStatusEnum.已下发;
_unitwork.Update(LocStation);
_unitwork.Update(location);
break;
case TaskTypeEnum.盘料盒出库:
case TaskTypeEnum.散料盒出库:
LocStation = _unitwork.FindSingle<Location>(x => x.Code.Equals(task.ToLocation));
location = _unitwork.FindSingle<Location>(x => x.Code.Equals(task.FromLocation));
LocStation.ContainerCode = task.ContainerCode;
location.ContainerCode = "";
task.Status = TaskStatusEnum.已下发;
_unitwork.Update(LocStation);
_unitwork.Update(location);
break;
//不带盒的更新明细任务状态
case TaskTypeEnum.盘料入库:
case TaskTypeEnum.盘料出库:
task.TaskDetails.Where(x => x.UniqueCode.Equals(item.ObjId)).First().Status = TaskStatusEnum.已下发;
break;
default:
break;
}
}
else
{
task.ErrorMsg += ",任务下发失败,失败原因:"+ res.Msg;
_unitwork.Update(task);
continue;
}
//Task.Delay(500);
}
catch (Exception ex)
{
task.ErrorMsg += ex.Message;
}
if (task.TaskDetails.Count(x => x.Status == TaskStatusEnum.新建) == 0 && (task.TaskType == TaskTypeEnum.盘料入库 || task.TaskType == TaskTypeEnum.盘料出库))
{
task.Status = TaskStatusEnum.已下发;
}
_unitwork.Update(task);
}
}
_unitwork.Update(task);
}
}
#region 更新时间
@@ -78,7 +136,7 @@ namespace HHWMS.Web
return Task.CompletedTask;
}
/// <summary>
/// 生成任务
/// 根据盘料入库生成盘料盒出库任务
/// </summary>
public void GenTask(TaskHeader task, UnitWork _unitwork)
{
@@ -89,24 +147,25 @@ namespace HHWMS.Web
// 查找可用站台
var station = _unitwork.FindSingle<Location>(x => x.Type.Equals(LocationTypeEnum.堆垛机工位)
&& x.Status != LocationStatus.任务锁);
if (station != null)
if (station != null && count > 0)
{
var container = _unitwork.Find<Location>(x => x.Row == station.Row
&& x.Length == 23
var container = _unitwork.Find<Location>(x => x.Row == station.Row && x.ZoneCode == LocationTypeEnum.盘料库位
&& (x.Status == LocationStatus.有货 || x.Status == LocationStatus.空容器))
.OrderByDescending(x => x.Length - x.Width).FirstOrDefault();
.OrderByDescending(x => x.Length).FirstOrDefault();
if(container != null)
{
var newTask = new TaskHeader();
newTask.ZoneCode = "L";
newTask.TaskNo = _unitwork.GetSerialNumber("in", 4);
newTask.ZoneCode = ZoneCodeEnum.盘料库;
newTask.TaskNo = _unitwork.GetSerialNumber("out", 4);
newTask.TaskType = TaskTypeEnum.盘料盒出库;
newTask.ContainerCode = container.Code;
newTask.FromLocation = container.Code;
newTask.ToLocation = station.Code;
newTask.Status = TaskStatusEnum.待下发;
newTask.Station = "2";
_unitwork.Add(newTask);
task.ContainerCode = container.ContainerCode;
// 更新库位
container.Status = LocationStatus.任务锁;
_unitwork.Update(container);
@@ -133,6 +192,57 @@ namespace HHWMS.Web
}
}
}
/// <summary>
/// 根据盘料出库生成盘料盒出库任务
/// </summary>
public void OutGenTask(TaskHeader task, UnitWork _unitwork)
{
//查找料塔工位
var to = _unitwork.Find<Location>(x => string.IsNullOrEmpty(x.ContainerCode)
&& x.Code == task.ToLocation).FirstOrDefault();
if (string.IsNullOrEmpty(task.FromLocation) && to != null)
{
var details = task.TaskDetails.Where(x => x.Status == TaskStatusEnum.新建);
//根据盘料出库的托盘创建盘料盒出库任务
var container = _unitwork.Find<Location>(n => n.ContainerCode == task.ContainerCode).FirstOrDefault();
var station = _unitwork.FindSingle<Location>(x => x.Type.Equals(LocationTypeEnum.堆垛机工位) && x.Row == container.Row);
if (container != null)
{
var newTask = new TaskHeader();
newTask.ZoneCode = ZoneCodeEnum.盘料库;
newTask.TaskNo = _unitwork.GetSerialNumber("out", 4);
newTask.TaskType = TaskTypeEnum.盘料盒出库;
newTask.ContainerCode = container.Code;
newTask.FromLocation = container.Code;
newTask.ToLocation = station.Code;
newTask.Status = TaskStatusEnum.待下发;
newTask.Station = "1";
_unitwork.Add(newTask);
var from = _unitwork.FindSingle<Location>(x => x.ContiguousCode == station.Code
&& x.Type.Equals(LocationTypeEnum.机械臂工位))?.Code;
task.FromLocation = from;
//更新任务明细对应在料塔的位置
var Invcount = 0;
foreach (var detail in details)
{
detail.ToLocation = (Invcount + 1).ToString();
Invcount = Invcount + 1;
detail.Lot = $"{Convert.ToInt32(container.Length)}-{task.ToLocation}";
}
var fromstation = _unitwork.Find<Location>(n => n.ContiguousCode == station.Code && n.Type.Equals(LocationTypeEnum.机械臂工位)).FirstOrDefault();
if (fromstation != null)
{
task.FromLocation = fromstation.Code;
}
_unitwork.Update(task);
}
}
}
/// <summary>
/// 创建WCS任务
/// </summary>
@@ -141,9 +251,10 @@ namespace HHWMS.Web
var taskInfoList = new List<TaskInfo>();
if (task != null)
{
var locationList = _unitwork.Find<Location>(x => task.FromLocation.Equals(x.Code) || task.ToLocation.Equals(x.Code)).ToList();
var begin = locationList.First(x => x.Code.Equals(task.FromLocation));
var end = locationList.First(x => x.Code.Equals(task.ToLocation));
var begin = locationList.FirstOrDefault(x => x.Code.Equals(task.FromLocation));
var end = locationList.FirstOrDefault(x => x.Code.Equals(task.ToLocation));
// 根据不同任务类型 创建任务
switch (task.TaskType)
{
@@ -0,0 +1,156 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Threading.Tasks;
using HHWMS.Web.Models;
using Microsoft.EntityFrameworkCore;
using Newtonsoft.Json;
using Quartz;
using WalkingTec.Mvvm.Core;
using WalkingTec.Mvvm.Core.Support.Quartz;
using static HHWMS.Web.Controllers.ReceiptInOperationController;
namespace HHWMS.Web
{
//[QuartzRepeat(10,10, true, 30)]
//出库单据分解,为每个出库物料创建出库明细,状态为新建,通过唯一码绑定任务与库存
[PersistJobDataAfterExecution]
[DisallowConcurrentExecution]
public class SendWmsJob : WtmJob
{
public override Task Execute(IJobExecutionContext context)
{
try
{
var _unitwork = new UnitWork(Wtm);
var Shipments = _unitwork.Find<ShipmentHeader>(x =>x.FirstStatus == ShipStatusEnum.分配中)
.Include(x => x.ShipmentDetails)
.ToList();
var shipments = Shipments.Take(5).ToList();
foreach (var shipment in shipments)
{
List<Inventory> ShiInventorys = new List<Inventory>();
var ShipmentDetails = shipment.ShipmentDetails.Where(x => x.Status.Equals(ShipStatusEnum.新建)).ToList();
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)
{
continue;
}
inventory.SourceCode = ShipmentDetail.ID.ToString();
_unitwork.Update(inventory);
//更新单据子表状态
ShiInventorys.Add(inventory);
}
//出库库存通过托盘号分组
var Inventorys = ShiInventorys.GroupBy(x => x.ContainerCode).ToList();
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 to = _unitwork.Find<Location>(x => string.IsNullOrEmpty(x.ContainerCode)
&& x.Row == (Inventory.Flag == 8 ? 1 : 3)
&& 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;
}
}
}
#region 更新时间
var job = _unitwork.FindSingle<SysJob>(x => x.JobName == context.JobDetail.Key.Name);
if (job != null)
{
job.LastFireTime = TimeZoneInfo.ConvertTimeFromUtc(context.FireTimeUtc.DateTime, TimeZoneInfo.Local);
// 只执行一次 没有下次执行时间
if (context.NextFireTimeUtc != null)
{
job.NextFireTime = TimeZoneInfo.ConvertTimeFromUtc(context.NextFireTimeUtc.Value.DateTime, TimeZoneInfo.Local);
}
_unitwork.Update<SysJob>(job);
}
Wtm.DoLog("出库分解", ActionLogTypesEnum.Job, "SendWmsJob");
#endregion 更新时间
}
catch { }
return Task.CompletedTask;
}
}
}