base
This commit is contained in:
1 parent
d1781f7326
commit
aa33eadcb6
1066 files changed
+68
-335722
No files matched your search
@@ -1,109 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel;
|
||||
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;
|
||||
|
||||
namespace HHWMS.Web
|
||||
{
|
||||
//[QuartzRepeat(10,10, true, 30)]
|
||||
//定时回传入库完成物料信息
|
||||
[PersistJobDataAfterExecution]
|
||||
[DisallowConcurrentExecution]
|
||||
public class InvBackJob : WtmJob
|
||||
{
|
||||
public override Task Execute(IJobExecutionContext context)
|
||||
{
|
||||
try
|
||||
{
|
||||
var _unitwork = new UnitWork(Wtm);
|
||||
List<Inventory> inventories = _unitwork.Find<Inventory>(x => x.Status == "0"
|
||||
&& x.TaskStatus == InventoryTaskStatus.无任务)
|
||||
.ToList();
|
||||
var Invs = inventories.Take(20).ToList();
|
||||
|
||||
var bizData = new InStore
|
||||
{
|
||||
INWMS = new INWMS
|
||||
{
|
||||
INITEMS = new INITEMS
|
||||
{
|
||||
INITEM = new List<INITEMItem>()
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
if (Invs.Count > 0)
|
||||
{
|
||||
foreach (var inv in Invs)
|
||||
{
|
||||
//var inv = _unitwork.FindById<Inventory>(int.Parse(id));
|
||||
var qr = _unitwork.FindSingle<MaterialQr>(x => x.UniqueCode.Equals(inv.UniqueCode))?.QRCode;
|
||||
bizData.INWMS.INITEMS.INITEM.Add(
|
||||
new INITEMItem()
|
||||
{
|
||||
ERPSN = qr,
|
||||
WMSSN = inv?.UniqueCode,
|
||||
QTY = ((int?)inv?.Qty).ToString(),
|
||||
TYPE = "2",
|
||||
FLAG = "1"
|
||||
});
|
||||
}
|
||||
var str = JsonConvert.SerializeObject(bizData);
|
||||
var request = new ServiceReference1.bizOperationV1Request
|
||||
{
|
||||
fromUnit = "8357S",
|
||||
toUnit = "8357S",
|
||||
fromSys = "WMSTEST",
|
||||
toSys = "MES",
|
||||
bizOperation = "InStore",
|
||||
bizData = str
|
||||
};
|
||||
var client = new ServiceReference1.portTypeClient();
|
||||
var result = client.bizOperationV1Async(request).Result;
|
||||
if (result.Status == "Y")
|
||||
{
|
||||
_unitwork.BatchUpdate<Inventory>(x => Invs.Select(y => y.ID).Contains(x.ID), x => new Inventory
|
||||
{
|
||||
Status = "1",
|
||||
UpdateBy = "invjob",
|
||||
UpdateTime = DateTime.Now
|
||||
});
|
||||
Wtm.DoLog("", ActionLogTypesEnum.Normal, "mes", request: JsonConvert.SerializeObject(request), result: "success");
|
||||
//return FFResult().Message("库存回传成功").RefreshGrid();
|
||||
}
|
||||
else
|
||||
{
|
||||
Wtm.DoLog("", ActionLogTypesEnum.Normal, "mes", request: JsonConvert.SerializeObject(request), result: "error");
|
||||
//return FFResult().Message($"{result.Message}").RefreshGrid();
|
||||
}
|
||||
}
|
||||
#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, "SendWcsJob");
|
||||
#endregion 更新时间
|
||||
}
|
||||
catch { }
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,351 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.Linq;
|
||||
using System.Reflection.Emit;
|
||||
using System.Threading.Tasks;
|
||||
using HHWMS.Web.Models;
|
||||
using Humanizer;
|
||||
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 LoopTaskJob : WtmJob
|
||||
{
|
||||
public override Task Execute(IJobExecutionContext context)
|
||||
{
|
||||
try
|
||||
{
|
||||
var _unitwork = new UnitWork(Wtm);
|
||||
|
||||
var PTask = _unitwork.Find<TaskHeader>(x =>x.TaskNo.Contains("PLoop")).Include(x => x.TaskDetails).ToList();
|
||||
//var STask = _unitwork.Find<TaskHeader>(x => x.TaskNo.Contains("SLoop")).Include(x => x.TaskDetails).ToList();
|
||||
//没有盘料循环任务
|
||||
if (PTask.Count() == 0)
|
||||
{
|
||||
Location location = _unitwork.Find<Location>(x => x.Type == LocationTypeEnum.料塔
|
||||
&& !string.IsNullOrEmpty(x.ContainerCode)).FirstOrDefault();
|
||||
//创建入库任务
|
||||
if (location != null)
|
||||
{
|
||||
List<Inventory> inventories = _unitwork.Find<Inventory>(x => x.ContainerCode == location.Code).ToList();
|
||||
if (inventories.Count() > 0)
|
||||
{
|
||||
var task = new TaskHeader
|
||||
{
|
||||
TaskNo = _unitwork.GetSerialNumber("PLoopin", 4),
|
||||
TaskType = TaskTypeEnum.盘料入库,
|
||||
Status = TaskStatusEnum.待下发,
|
||||
ZoneCode = ZoneCodeEnum.盘料库,
|
||||
FromLocation = location.Code,
|
||||
TaskDetails = new List<TaskDetail>(),
|
||||
};
|
||||
foreach (var inventorie in inventories)
|
||||
{
|
||||
var detail = new TaskDetail
|
||||
{
|
||||
UniqueCode = inventorie.UniqueCode,
|
||||
FromLocation = inventorie.Lot,
|
||||
Status = TaskStatusEnum.新建,
|
||||
CreateTime = DateTime.Now
|
||||
};
|
||||
task.TaskDetails.Add(detail);
|
||||
}
|
||||
_unitwork.Add(task);
|
||||
|
||||
// 查找符合条件的料盒出库,创建料盒出库任务 length-width, 默认小盘料 找23格的料盒
|
||||
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.Type == LocationTypeEnum.盘料库位
|
||||
&& (x.Status == LocationStatus.有货 || x.Status == LocationStatus.空容器) && x.Length == Length && !x.IsStop && x.Height < 1)
|
||||
.OrderBy(x => x.Height).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.Type == LocationTypeEnum.盘料库位
|
||||
&& (x.Status == LocationStatus.有货 || x.Status == LocationStatus.空容器) && x.Length == Length && !x.IsStop && x.Height < 1)
|
||||
.OrderBy(x => x.Height).FirstOrDefault();
|
||||
}
|
||||
if (station != null && container != null)
|
||||
{
|
||||
var newTask = new TaskHeader();
|
||||
newTask.ZoneCode = ZoneCodeEnum.盘料库;
|
||||
newTask.TaskNo = _unitwork.GetSerialNumber("PLoopout", 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.任务锁;
|
||||
container.Height += 1;
|
||||
_unitwork.Update(container);
|
||||
|
||||
// 计算 容器可用格
|
||||
var used = _unitwork.Find<Inventory>(x => x.LocationCode.Equals(container.Code))
|
||||
.Select(x => int.Parse(x.Lot)).ToArray();
|
||||
var caseCount = Convert.ToInt32(container.Length);
|
||||
var caseList = Enumerable.Range(1, caseCount).ToArray();
|
||||
var canUse = caseList.Except(used).ToArray<int>();
|
||||
foreach (var item in canUse)
|
||||
{
|
||||
var detail = details.FirstOrDefault();
|
||||
if (detail != null)
|
||||
{
|
||||
details.First().Lot = $"{task.FromLocation}-{Convert.ToInt32(container.Length)}";
|
||||
details.First().ToLocation = item.ToString();
|
||||
details.First().ContainerCode = container.Code;
|
||||
}
|
||||
else
|
||||
break;
|
||||
}
|
||||
_unitwork.Update(task);
|
||||
station.Status = LocationStatus.任务锁;
|
||||
_unitwork.Update(station);
|
||||
}
|
||||
else
|
||||
{
|
||||
task.ErrorMsg = "循环任务:库内没有符合条件的盘料箱";
|
||||
_unitwork.Update(task);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
//创建出库任务
|
||||
else
|
||||
{
|
||||
List<Inventory> inventories = _unitwork.Find<Inventory>(x => x.ZoneCode == ZoneCodeEnum.盘料库
|
||||
&& x.TaskStatus == InventoryTaskStatus.无任务).OrderBy(x => x.Qty).ToList();
|
||||
if (inventories.Count() > 0)
|
||||
{
|
||||
var Inventorys = inventories.GroupBy(x => x.ContainerCode).ToList();
|
||||
foreach (var item in Inventorys)
|
||||
{
|
||||
var task = new TaskHeader();
|
||||
task.TaskDetails = new List<TaskDetail>();
|
||||
var Inventory = item.FirstOrDefault();
|
||||
//查询剩余满足条件库位有多少个
|
||||
var Length = 23;
|
||||
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 locCon = _unitwork.Find<Location>(x => x.Type == Inventory.ZoneCode
|
||||
&& (x.Status == LocationStatus.有货 || x.Status == LocationStatus.空容器)
|
||||
&& x.Length == Length
|
||||
&& x.Height < 1).Count();
|
||||
if (locCon == 0)
|
||||
{
|
||||
Inventory.Qty += 1;
|
||||
_unitwork.Update(Inventory);
|
||||
continue;
|
||||
}
|
||||
var loc = _unitwork.Find<Location>(x => x.ContainerCode == Inventory.ContainerCode && x.Type == ZoneCodeEnum.盘料库).FirstOrDefault();
|
||||
//查询仓位表是否符合
|
||||
if (loc != 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();
|
||||
|
||||
task.TaskNo = _unitwork.GetSerialNumber("PLooppout", 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);
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
else
|
||||
{
|
||||
continue;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
/*if (STask.Count() ==0)
|
||||
{
|
||||
Location location = _unitwork.Find<Location>(x => x.Type == LocationTypeEnum.散料库站台 && !string.IsNullOrEmpty(x.ContainerCode)).FirstOrDefault();
|
||||
//创建入库任务
|
||||
if (location != null)
|
||||
{
|
||||
// 查找目标库位
|
||||
var toLocation = _unitwork.FindSingle<Location>(x => x.Status.Equals(LocationStatus.空仓位)
|
||||
&& x.Type.Equals(LocationTypeEnum.散料库位)
|
||||
&& x.Code == location.ContainerCode);
|
||||
if (toLocation != null)
|
||||
{
|
||||
// 创建任务
|
||||
var task = new TaskHeader
|
||||
{
|
||||
ZoneCode = ZoneCodeEnum.散料库,
|
||||
TaskNo = _unitwork.GetSerialNumber("SLoopIn"),
|
||||
TaskType = TaskTypeEnum.散料盒入库,
|
||||
ContainerCode = location.ContainerCode,
|
||||
FromLocation = location.Code,
|
||||
ToLocation = toLocation.Code,
|
||||
Status = TaskStatusEnum.待下发,
|
||||
CreateTime = DateTime.Now
|
||||
};
|
||||
_unitwork.Add(task);
|
||||
|
||||
toLocation.Status = LocationStatus.任务锁;
|
||||
toLocation.Height += 1; // 是否满盘
|
||||
_unitwork.Update(toLocation);
|
||||
}
|
||||
}
|
||||
//创建出库任务
|
||||
else
|
||||
{
|
||||
Location location1 = _unitwork.Find<Location>(x => !string.IsNullOrEmpty(x.ContainerCode)
|
||||
&& x.Status != LocationStatus.任务锁
|
||||
&& x.Status != LocationStatus.满货
|
||||
&& x.Type == LocationTypeEnum.散料库位
|
||||
&& x.Status != LocationStatus.空仓位).OrderBy(x => x.Height).FirstOrDefault();
|
||||
if (location1 != null)
|
||||
{
|
||||
var stations = _unitwork.Find<Location>(x => x.Row == location1.Row
|
||||
&& x.Type == LocationTypeEnum.散料库站台).FirstOrDefault();
|
||||
// 创建任务
|
||||
var task = new TaskHeader
|
||||
{
|
||||
ZoneCode = ZoneCodeEnum.散料库,
|
||||
TaskNo = _unitwork.GetSerialNumber("SLoopOut"),
|
||||
TaskType = TaskTypeEnum.散料盒出库,
|
||||
ContainerCode = location1.ContainerCode,
|
||||
FromLocation = location1.ContainerCode,
|
||||
ToLocation = stations.Code,
|
||||
Status = TaskStatusEnum.待下发,
|
||||
CreateTime = DateTime.Now,
|
||||
};
|
||||
_unitwork.Add(task);
|
||||
}
|
||||
}
|
||||
}*/
|
||||
#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, "LoopTaskJob");
|
||||
#endregion 更新时间
|
||||
}
|
||||
catch { }
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -24,113 +24,6 @@ namespace HHWMS.Web
|
||||
{
|
||||
var _unitwork = new UnitWork(Wtm);
|
||||
|
||||
var tasks = _unitwork.Find<TaskHeader>(x =>x.Status > TaskStatusEnum.新建 && x.Status < TaskStatusEnum.已下发)
|
||||
.Include(x => x.TaskDetails)
|
||||
.OrderBy(x => x.Priority)
|
||||
.ToList();
|
||||
foreach (var task in tasks)
|
||||
{
|
||||
if (task != null)
|
||||
{
|
||||
var count = 0;
|
||||
if (task.TaskType == TaskTypeEnum.盘料入库)
|
||||
{
|
||||
GenTask(task, _unitwork);
|
||||
|
||||
count = task.TaskDetails.Where(x => x.Status <= TaskStatusEnum.待下发).Count();
|
||||
}
|
||||
else if (task.TaskType == TaskTypeEnum.盘料出库)
|
||||
{
|
||||
// OutGenTask(task, _unitwork);
|
||||
count = task.TaskDetails.Where(x => x.Status <= TaskStatusEnum.待下发).Count();
|
||||
}
|
||||
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;
|
||||
}
|
||||
else
|
||||
{
|
||||
count = 1;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
count = 1;
|
||||
}
|
||||
if (count > 0)
|
||||
{
|
||||
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 (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));
|
||||
switch (task.TaskType)
|
||||
{
|
||||
//根据任务类型不同,更新任务状态与库位状态
|
||||
case TaskTypeEnum.盘料盒入库:
|
||||
case TaskTypeEnum.散料盒入库:
|
||||
end.ContainerCode = task.ContainerCode;
|
||||
task.Status = TaskStatusEnum.已下发;
|
||||
break;
|
||||
case TaskTypeEnum.盘料盒出库:
|
||||
case TaskTypeEnum.散料盒出库:
|
||||
begin.ContainerCode = task.ContainerCode;
|
||||
begin.Status = LocationStatus.任务锁;
|
||||
end.Status = LocationStatus.任务锁;
|
||||
end.ContainerCode = task.ContainerCode;
|
||||
task.Status = TaskStatusEnum.已下发;
|
||||
break;
|
||||
//不带盒的更新明细任务状态
|
||||
case TaskTypeEnum.盘料入库:
|
||||
case TaskTypeEnum.盘料出库:
|
||||
task.TaskDetails.Where(x => x.UniqueCode.Equals(item.ObjId)).First().Status = TaskStatusEnum.已下发;
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
_unitwork.Update(begin);
|
||||
_unitwork.Update(end);
|
||||
}
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
#region 更新时间
|
||||
|
||||
var job = _unitwork.FindSingle<SysJob>(x => x.JobName == context.JobDetail.Key.Name);
|
||||
@@ -150,380 +43,5 @@ namespace HHWMS.Web
|
||||
catch { }
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
/// <summary>
|
||||
/// 根据盘料入库生成盘料盒出库任务
|
||||
/// </summary>
|
||||
public void GenTask(TaskHeader task, UnitWork _unitwork)
|
||||
{
|
||||
// 查找符合条件的料盒出库,创建料盒出库任务 length-width, 默认小盘料 找23格的料盒
|
||||
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 = new Location();
|
||||
if (task.FromLocation == "L01")
|
||||
{
|
||||
// L01 优先从左边入
|
||||
station = _unitwork.Find<Location>(x => x.Type.Equals(LocationTypeEnum.堆垛机工位)
|
||||
&& x.Status != LocationStatus.任务锁)
|
||||
.OrderByDescending(x => x.Row)
|
||||
.FirstOrDefault();
|
||||
}
|
||||
else
|
||||
{
|
||||
// L02 只能入右边 row=1
|
||||
station = _unitwork.FindSingle<Location>(x => x.Type.Equals(LocationTypeEnum.堆垛机工位)
|
||||
&&x.Row == 1
|
||||
&& x.Status != LocationStatus.任务锁);
|
||||
}
|
||||
if (station != null && count > 0)
|
||||
{
|
||||
var container = _unitwork.Find<Location>(x => x.Row == station.Row
|
||||
&& x.Type == LocationTypeEnum.盘料库位
|
||||
&& (x.Status == LocationStatus.有货 || x.Status == LocationStatus.空容器)
|
||||
&& x.Length == Length && !x.IsStop)
|
||||
.OrderByDescending(x => x.Length - x.Width)
|
||||
.ThenBy(x => x.Layer)
|
||||
.ThenByDescending(x => x.Line)
|
||||
.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.Type == LocationTypeEnum.盘料库位
|
||||
&& (x.Status == LocationStatus.有货 || x.Status == LocationStatus.空容器)
|
||||
&& x.Length == Length
|
||||
&& !x.IsStop)
|
||||
.OrderByDescending(x => x.Length - x.Width)
|
||||
.ThenBy(x => x.Layer)
|
||||
.ThenByDescending(x => x.Line)
|
||||
.FirstOrDefault();
|
||||
|
||||
}
|
||||
if(station != null && 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 = "2";
|
||||
_unitwork.Add(newTask);
|
||||
|
||||
task.ContainerCode += container.ContainerCode;
|
||||
// 更新库位
|
||||
container.Status = LocationStatus.任务锁;
|
||||
_unitwork.Update(container);
|
||||
|
||||
// 计算 容器可用格
|
||||
var used = _unitwork.Find<Inventory>(x => x.LocationCode.Equals(container.Code))
|
||||
.Select(x => int.Parse(x.Lot)).ToArray();
|
||||
var caseCount = Convert.ToInt32(container.Length);
|
||||
var caseList = Enumerable.Range(1, caseCount).ToArray();
|
||||
var canUse = caseList.Except(used).ToArray<int>();
|
||||
foreach(var item in canUse)
|
||||
{
|
||||
var detail = details.FirstOrDefault();
|
||||
if (detail != null)
|
||||
{
|
||||
details.First().Lot = $"{task.FromLocation}-{Convert.ToInt32(container.Length)}";
|
||||
details.First().ToLocation = item.ToString();
|
||||
details.First().ContainerCode = container.Code;
|
||||
}
|
||||
else
|
||||
break;
|
||||
}
|
||||
_unitwork.Update(task);
|
||||
station.Status = LocationStatus.任务锁;
|
||||
_unitwork.Update(station);
|
||||
}
|
||||
else
|
||||
{
|
||||
task.ErrorMsg = "库内没有符合条件的盘料箱或站台被占用";
|
||||
_unitwork.Update(task);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 根据盘料出库生成盘料盒出库任务
|
||||
/// </summary>
|
||||
public bool OutGenTask(TaskHeader task, UnitWork _unitwork)
|
||||
{
|
||||
var details = task.TaskDetails.Where(x => x.Status == TaskStatusEnum.新建
|
||||
&& string.IsNullOrEmpty(x.ToLocation));
|
||||
if(!details.Any())
|
||||
{
|
||||
return true;
|
||||
}
|
||||
var container = _unitwork.Find<Location>(n => n.ContainerCode == task.ContainerCode).FirstOrDefault();
|
||||
|
||||
var tLoc = _unitwork.FindSingle<Location>(x => x.Code == task.ToLocation);
|
||||
|
||||
var outTask = _unitwork.Find<TaskHeader>(x => x.ContainerCode == task.ContainerCode
|
||||
&& x.TaskType == TaskTypeEnum.盘料盒出库).FirstOrDefault();
|
||||
if(outTask != null && tLoc.Height < tLoc.Length)
|
||||
{
|
||||
foreach (var detail in details)
|
||||
{
|
||||
if (tLoc.Height >= tLoc.Length)
|
||||
{
|
||||
break;
|
||||
}
|
||||
else
|
||||
{
|
||||
detail.ToLocation = (Convert.ToInt32(tLoc.Height) + 1).ToString();
|
||||
detail.Lot = $"{Convert.ToInt32(container.Length)}-{task.ToLocation}";
|
||||
tLoc.Height += 1;
|
||||
if (tLoc.Height == tLoc.Length)
|
||||
{
|
||||
tLoc.Height = tLoc.Length;
|
||||
_unitwork.Update(tLoc);
|
||||
}
|
||||
}
|
||||
}
|
||||
_unitwork.Update(tLoc);
|
||||
_unitwork.Update(task);
|
||||
return true;
|
||||
}
|
||||
if (string.IsNullOrEmpty(task.FromLocation))
|
||||
{
|
||||
//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;
|
||||
//更新任务明细对应在料塔的位置
|
||||
|
||||
foreach (var detail in details)
|
||||
{
|
||||
if (tLoc.Height >= tLoc.Length)
|
||||
{
|
||||
break;
|
||||
}
|
||||
else
|
||||
{
|
||||
detail.ToLocation = (Convert.ToInt32(tLoc.Height) + 1).ToString();
|
||||
detail.Lot = $"{Convert.ToInt32(container.Length)}-{task.ToLocation}";
|
||||
tLoc.Height += 1;
|
||||
if (tLoc.Height == tLoc.Length)
|
||||
{
|
||||
tLoc.Height = tLoc.Length;
|
||||
_unitwork.Update(tLoc);
|
||||
}
|
||||
}
|
||||
}
|
||||
_unitwork.Update(tLoc);
|
||||
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);
|
||||
|
||||
}
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
/// <summary>
|
||||
/// 创建WCS任务
|
||||
/// </summary>
|
||||
public List<TaskInfo> CreateWCSTask(TaskHeader task, UnitWork _unitwork)
|
||||
{
|
||||
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.FirstOrDefault(x => x.Code.Equals(task.FromLocation));
|
||||
var end = locationList.FirstOrDefault(x => x.Code.Equals(task.ToLocation));
|
||||
// 根据不同任务类型 创建任务
|
||||
switch (task.TaskType)
|
||||
{
|
||||
case TaskTypeEnum.盘料盒入库:
|
||||
case TaskTypeEnum.盘料盒出库:
|
||||
case TaskTypeEnum.散料盒入库:
|
||||
case TaskTypeEnum.散料盒出库:
|
||||
var taskInfo = new TaskInfo();
|
||||
taskInfo.TaskType = (int)task.TaskType;
|
||||
taskInfo.TaskId = task.TaskNo;
|
||||
taskInfo.ObjId = task.ContainerCode;
|
||||
taskInfo.StartType = ConvertTypeLocation(begin.Length.ToString());
|
||||
taskInfo.StartPos = new CoordPos
|
||||
{
|
||||
X = begin.Line,
|
||||
Y = begin.Row,
|
||||
Z = begin.Layer
|
||||
};
|
||||
taskInfo.EndType = ConvertTypeLocation(end.Length.ToString());
|
||||
taskInfo.EndPos = new CoordPos
|
||||
{
|
||||
X = end.Line,
|
||||
Y = end.Row,
|
||||
Z = end.Layer
|
||||
};
|
||||
taskInfoList.Add(taskInfo);
|
||||
break;
|
||||
|
||||
case TaskTypeEnum.盘料入库:
|
||||
var container = _unitwork.Find<Location>(x => x.Type == LocationTypeEnum.堆垛机工位)
|
||||
.Select(x => x.ContainerCode).ToList();
|
||||
foreach (var item in task.TaskDetails.Where(x => x.Status == TaskStatusEnum.待下发))
|
||||
{
|
||||
if (container.Any(x => x == item.ContainerCode))
|
||||
{
|
||||
taskInfoList.Add(new TaskInfo
|
||||
{
|
||||
TaskId = $"{task.TaskNo}-{item.FromLocation}",
|
||||
TaskType = (int)task.TaskType,
|
||||
ObjId = item.UniqueCode,
|
||||
StartType = ConvertTypeLT(item.Lot.Split('-')[0]),
|
||||
StartPos = new CoordPos
|
||||
{
|
||||
X = begin.Line,
|
||||
Y = 2,
|
||||
Z = int.Parse(item.FromLocation)
|
||||
},
|
||||
EndType = ConvertTypeLocation(item.Lot.Split('-')[1]),
|
||||
EndPos = new CoordPos
|
||||
{
|
||||
X = end.Line,
|
||||
Y = int.Parse(item.ToLocation),
|
||||
Z = 2
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case TaskTypeEnum.盘料出库:
|
||||
foreach (var item in task.TaskDetails.Where(x => x.Status == TaskStatusEnum.待下发))
|
||||
{
|
||||
taskInfoList.Add(new TaskInfo
|
||||
{
|
||||
TaskId = $"{task.TaskNo}-{item.FromLocation}",
|
||||
TaskType = (int)task.TaskType,
|
||||
ObjId = item.UniqueCode,
|
||||
StartType = ConvertTypeLocation(item.Lot.Split('-')[0]),
|
||||
StartPos = new CoordPos
|
||||
{
|
||||
X = begin.Line,
|
||||
Y = int.Parse(item.FromLocation),
|
||||
Z = 2
|
||||
},
|
||||
|
||||
EndType = ConvertTypeLT(item.Lot.Split('-')[1]),
|
||||
EndPos = new CoordPos
|
||||
{
|
||||
X = end.Line,
|
||||
Y = 2,
|
||||
Z = int.Parse(item.ToLocation)
|
||||
}
|
||||
});
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
return taskInfoList;
|
||||
}
|
||||
|
||||
public int ConvertTypeLocation(string length)
|
||||
{
|
||||
var type = 0;
|
||||
if (!string.IsNullOrEmpty(length) )
|
||||
{
|
||||
switch (length)
|
||||
{
|
||||
case "23":
|
||||
type = (int)ContainerTypeEnum.格料盒23;
|
||||
break;
|
||||
|
||||
case "13":
|
||||
type = (int)ContainerTypeEnum.格料盒13;
|
||||
break;
|
||||
|
||||
case "16":
|
||||
type = (int)ContainerTypeEnum.格料盒16;
|
||||
break;
|
||||
|
||||
case "19":
|
||||
type = (int)ContainerTypeEnum.格料盒19;
|
||||
break;
|
||||
|
||||
default:
|
||||
type = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
return type;
|
||||
}
|
||||
|
||||
public int ConvertTypeLT(string LiaoTa)
|
||||
{
|
||||
var type = 0;
|
||||
if (!string.IsNullOrEmpty(LiaoTa))
|
||||
{
|
||||
switch (LiaoTa)
|
||||
{
|
||||
case "L01":
|
||||
type = (int)LiaoTaTypeEnum.L01;
|
||||
break;
|
||||
|
||||
case "L02":
|
||||
type = (int)LiaoTaTypeEnum.L02;
|
||||
break;
|
||||
}
|
||||
}
|
||||
return type;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,17 +1,9 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel;
|
||||
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;
|
||||
using WalkingTec.Mvvm.Core;
|
||||
using WalkingTec.Mvvm.Core.Support.Quartz;
|
||||
using static HHWMS.Web.Controllers.ReceiptInOperationController;
|
||||
|
||||
namespace HHWMS.Web
|
||||
{
|
||||
@@ -27,342 +19,6 @@ namespace HHWMS.Web
|
||||
{
|
||||
var _unitwork = new UnitWork(Wtm);
|
||||
|
||||
var Shipments = _unitwork.Find<ShipmentHeader>(x => x.FirstStatus == ShipStatusEnum.分配中)
|
||||
.Include(x => x.ShipmentDetails)
|
||||
.Take(5)
|
||||
.ToList();
|
||||
|
||||
List<Inventory> shiInventorys = new List<Inventory>();
|
||||
using (var tran = Wtm.DC.Database.BeginTransaction())
|
||||
{
|
||||
try
|
||||
{
|
||||
foreach (var shipment in Shipments)
|
||||
{
|
||||
var shipmentDetails = shipment.ShipmentDetails.Where(x => x.Status.Equals(ShipStatusEnum.新建)).ToList();
|
||||
foreach (var shipmentDetail in shipmentDetails)
|
||||
{
|
||||
var inventorys = _unitwork.Find<Inventory>(x => x.UniqueCode == shipmentDetail.UniqueCode
|
||||
&& x.TaskStatus == InventoryTaskStatus.无任务).ToList();
|
||||
if (inventorys.Count <= 0)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
foreach (var inventory in inventorys)
|
||||
{
|
||||
inventory.SourceCode = shipmentDetail.ShipmentHeader.Code;
|
||||
inventory.TaskStatus = InventoryTaskStatus.任务中;
|
||||
inventory.UpdateBy = "wmsjob";
|
||||
inventory.UpdateTime = DateTime.Now;
|
||||
|
||||
_unitwork.Update(inventory);
|
||||
shiInventorys.Add(inventory);
|
||||
|
||||
shipmentDetail.Status = ShipStatusEnum.分配完成;
|
||||
}
|
||||
shipmentDetail.UpdateTime = DateTime.Now;
|
||||
shipmentDetail.UpdateBy = "wmsjob";
|
||||
}
|
||||
|
||||
if (!shipment.ShipmentDetails.Any(x => x.Status < ShipStatusEnum.分配完成))
|
||||
{
|
||||
shipment.FirstStatus = ShipStatusEnum.分配完成;
|
||||
}
|
||||
else
|
||||
{
|
||||
shipment.FirstStatus = ShipStatusEnum.分配中;
|
||||
}
|
||||
|
||||
shipment.UpdateBy = "wmsjob";
|
||||
shipment.UpdateTime = DateTime.Now;
|
||||
_unitwork.Update(shipment);
|
||||
}
|
||||
|
||||
var inTaskContainerList = _unitwork.Find<TaskHeader>(x => x.TaskType == TaskTypeEnum.盘料盒入库
|
||||
|| x.TaskType == TaskTypeEnum.盘料入库
|
||||
|| x.TaskType == TaskTypeEnum.散料盒入库)
|
||||
.Select(x => x.ContainerCode)
|
||||
.ToList();
|
||||
//出库库存通过托盘号分组
|
||||
var lockInvs = _unitwork.Find<Inventory>(x => x.TaskStatus == InventoryTaskStatus.任务中
|
||||
&& !"L01,L02".Contains(x.LocationCode)
|
||||
&& !inTaskContainerList.Contains(x.LocationCode))
|
||||
.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();
|
||||
var newList = shiInventorys.Except(taskInvs).ToList();
|
||||
newList = newList.DistinctBy(x => x.UniqueCode).ToList();
|
||||
var inventoryList = newList.GroupBy(x => x.ContainerCode)
|
||||
.ToList();
|
||||
|
||||
//散料库
|
||||
if (inventoryList.Any(x => x.Key.Contains("C")))
|
||||
{
|
||||
foreach (var item in inventoryList.Where(x => x.Key.Contains("C")))
|
||||
{
|
||||
//出库托盘
|
||||
Location location = _unitwork.Find<Location>(x => x.Code == item.Key && x.Status != LocationStatus.任务锁).FirstOrDefault();
|
||||
if (location == null)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
// 查询目的地站台是否可用
|
||||
var station = _unitwork.Find<Location>(x => x.Row == location.Row && x.Type == LocationTypeEnum.散料库站台 && string.IsNullOrEmpty(x.ContainerCode)).FirstOrDefault();
|
||||
if (station == null)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
else
|
||||
{
|
||||
//判断是否已经有目的站台的出库任务
|
||||
TaskHeader taskHeader = _unitwork.Find<TaskHeader>(x =>
|
||||
x.ToLocation == station.Code && x.TaskType == TaskTypeEnum.散料盒出库).FirstOrDefault();
|
||||
if (taskHeader != null)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
// 创建任务
|
||||
var task = new TaskHeader
|
||||
{
|
||||
ZoneCode = ZoneCodeEnum.散料库,
|
||||
TaskNo = _unitwork.GetSerialNumber("SOut"),
|
||||
TaskType = TaskTypeEnum.散料盒出库,
|
||||
ContainerCode = item.Key,
|
||||
FromLocation = location.ContainerCode,
|
||||
ToLocation = station.Code,
|
||||
Status = TaskStatusEnum.待下发,
|
||||
Priority = 0,
|
||||
CreateTime = DateTime.Now,
|
||||
CreateBy = "wmsjob"
|
||||
};
|
||||
_unitwork.Add(task);
|
||||
//更新库位状态
|
||||
location.Status = LocationStatus.任务锁;
|
||||
_unitwork.Update(location);
|
||||
}
|
||||
}
|
||||
}
|
||||
//盘料库
|
||||
if (inventoryList.Any(x => x.Key.Contains("L")))
|
||||
{
|
||||
foreach (var item in inventoryList.Where(x => x.Key.Contains("L")))
|
||||
{
|
||||
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.空仓位).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();
|
||||
var cTask = _unitwork.Find<TaskHeader>(x =>
|
||||
x.ContainerCode.Equals(item.Key)
|
||||
&& x.TaskType == TaskTypeEnum.盘料盒出库
|
||||
).FirstOrDefault();
|
||||
//查找料塔工位 T
|
||||
var tLoc = _unitwork.Find<Location>(x => x.Row == row
|
||||
&& x.Type.Equals(LocationTypeEnum.料塔))
|
||||
.FirstOrDefault();
|
||||
if(_unitwork.IsExit<TaskHeader>(x => x.FromLocation.Equals(tLoc.Code)))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
//if (gLoc != null || cTask != null)
|
||||
//{
|
||||
// //盘料箱已在堆垛机工位,或者有此料箱的出库任务,直接生成盘料出库任务
|
||||
//}
|
||||
if (gLoc == null && cTask == null)
|
||||
{
|
||||
// 盘料箱在库内,工位为空,先生成料盘箱出库任务
|
||||
|
||||
gLoc = _unitwork.Find<Location>(x => string.IsNullOrEmpty(x.ContainerCode)
|
||||
&& x.Row == location.Row
|
||||
&& x.Type.Equals(LocationTypeEnum.堆垛机工位)).FirstOrDefault();
|
||||
|
||||
if (gLoc != null)
|
||||
{
|
||||
// 工位为空,先判断是否有去此工位的任务
|
||||
var gTask = _unitwork.FindSingle<TaskHeader>(x => x.ToLocation.Equals(gLoc.Code));
|
||||
if (gTask != null)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
var pTask = new TaskHeader
|
||||
{
|
||||
ZoneCode = ZoneCodeEnum.盘料库,
|
||||
TaskNo = _unitwork.GetSerialNumber("Out"),
|
||||
TaskType = TaskTypeEnum.盘料盒出库,
|
||||
ContainerCode = item.Key,
|
||||
FromLocation = location.ContainerCode,
|
||||
ToLocation = gLoc.Code,
|
||||
Station = "1",
|
||||
Status = TaskStatusEnum.待下发,
|
||||
Priority = 0,
|
||||
CreateTime = DateTime.Now,
|
||||
CreateBy = "wmsjob"
|
||||
};
|
||||
_unitwork.Add(pTask);
|
||||
}
|
||||
}
|
||||
|
||||
if (gLoc != null || cTask != 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();
|
||||
var canUse = CalCanUse(Convert.ToInt32(tLoc.Length), containerTask.ToLocation,_unitwork);
|
||||
foreach (var inventory in item)
|
||||
{
|
||||
if (canUse.Length > 0)
|
||||
{
|
||||
// 库存不在已建任务明细中,新增任务明细
|
||||
if (!containerTask.TaskDetails.Any(x => x.UniqueCode.Equals(inventory.UniqueCode)))
|
||||
{
|
||||
containerTask.TaskDetails.Add(new TaskDetail
|
||||
{
|
||||
UniqueCode = inventory.UniqueCode,
|
||||
Lot = $"{Convert.ToInt32(location.Length)}-{tLoc.Code}",
|
||||
FromLocation = inventory.Lot,
|
||||
ToLocation = canUse.First().ToString(),
|
||||
Status = TaskStatusEnum.待下发,
|
||||
ContainerCode = inventory.ContainerCode,
|
||||
CreateTime = DateTime.Now
|
||||
});
|
||||
canUse = canUse.Where(x => x != canUse.First()).ToArray();
|
||||
}
|
||||
//存在
|
||||
else
|
||||
{
|
||||
var i = containerTask.TaskDetails.Where(x => x.UniqueCode == inventory.UniqueCode)
|
||||
.FirstOrDefault();
|
||||
if (string.IsNullOrEmpty(i.ToLocation))
|
||||
{
|
||||
i.Lot = $"{Convert.ToInt32(location.Length)}-{tLoc.Code}";
|
||||
i.ToLocation = canUse.First().ToString();
|
||||
i.Status = TaskStatusEnum.待下发;
|
||||
canUse = canUse.Where(x => x != canUse.First()).ToArray();
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// 库存不在已建任务明细中,新增任务明细
|
||||
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
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
containerTask.Status = TaskStatusEnum.待下发;
|
||||
tLoc.ContainerCode = tLoc.Code;
|
||||
_unitwork.Update(tLoc);
|
||||
_unitwork.Update(containerTask);
|
||||
}
|
||||
else
|
||||
{
|
||||
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";
|
||||
var canUse = CalCanUse(Convert.ToInt32(tLoc.Length), tLoc.Code, _unitwork);
|
||||
foreach (var inventory in item)
|
||||
{
|
||||
if (canUse.Length > 0)
|
||||
{
|
||||
var detail = new TaskDetail
|
||||
{
|
||||
UniqueCode = inventory.UniqueCode,
|
||||
Lot = $"{Convert.ToInt32(location.Length)}-{tLoc.Code}",
|
||||
FromLocation = inventory.Lot,
|
||||
ToLocation = canUse.First().ToString(),
|
||||
Status = TaskStatusEnum.新建,
|
||||
ContainerCode = inventory.ContainerCode,
|
||||
CreateTime = DateTime.Now
|
||||
};
|
||||
task.TaskDetails.Add(detail);
|
||||
canUse = canUse.Where(x => x != canUse.First()).ToArray();
|
||||
}
|
||||
else
|
||||
{
|
||||
task.TaskDetails.Add(new TaskDetail
|
||||
{
|
||||
UniqueCode = inventory.UniqueCode,
|
||||
FromLocation = inventory.Lot,
|
||||
Status = TaskStatusEnum.新建,
|
||||
ContainerCode = inventory.ContainerCode,
|
||||
CreateTime = DateTime.Now
|
||||
});
|
||||
}
|
||||
}
|
||||
_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);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
tran.Commit();
|
||||
}
|
||||
catch
|
||||
{
|
||||
tran.Rollback();
|
||||
}
|
||||
}
|
||||
|
||||
#region 更新时间
|
||||
|
||||
var job = _unitwork.FindSingle<SysJob>(x => x.JobName == context.JobDetail.Key.Name);
|
||||
@@ -383,193 +39,5 @@ 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);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public int[] CalCanUse(int length, string code, UnitWork _unitwork)
|
||||
{
|
||||
var used1 = _unitwork.Find<Inventory>(x => x.LocationCode.Equals(code))
|
||||
.Select(x => int.Parse(x.Lot)).ToArray();
|
||||
var used2 = _unitwork.Find<TaskDetail>(x => x.Lot.Contains(code))
|
||||
.Select(x => int.Parse(x.ToLocation)).ToArray();
|
||||
var used = used1.Union(used2);
|
||||
var caseList = Enumerable.Range(1, length).ToArray();
|
||||
var canUse = caseList.Except(used).ToArray<int>();
|
||||
return canUse;
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user