重写了 出库任务生成盒下发流程
修改了部分页面的查询条件
This commit is contained in:
parent
40a6810713
commit
8606f7abcb
@ -201,21 +201,27 @@ namespace HHWMS.Web
|
||||
if (task.Station == "1")
|
||||
{
|
||||
// 下发盘料出库
|
||||
var plrTask = _unitwork.Find<TaskHeader>(x => x.TaskType.Equals(TaskTypeEnum.盘料出库)
|
||||
var plcTaskList = _unitwork.Find<TaskHeader>(x => x.TaskType.Equals(TaskTypeEnum.盘料出库)
|
||||
&& x.ContainerCode.Contains(task.ContainerCode))
|
||||
.Include(x => x.TaskDetails).FirstOrDefault();
|
||||
if (plrTask != null)
|
||||
.Include(x => x.TaskDetails)
|
||||
.ToList();
|
||||
if (plcTaskList.Any())
|
||||
{
|
||||
var details = plrTask.TaskDetails.Where(x => !string.IsNullOrEmpty(x.ContainerCode)
|
||||
&& x.ContainerCode.Equals(task.ContainerCode)
|
||||
&& !string.IsNullOrEmpty(x.ToLocation));
|
||||
foreach (var detail in details)
|
||||
foreach (var plcTask in plcTaskList)
|
||||
{
|
||||
detail.Status = TaskStatusEnum.待下发;
|
||||
detail.UpdateTime = DateTime.Now;
|
||||
var details = plcTask.TaskDetails.Where(x =>
|
||||
!string.IsNullOrEmpty(x.ContainerCode)
|
||||
&& x.ContainerCode.Equals(task.ContainerCode)
|
||||
&& !string.IsNullOrEmpty(x.ToLocation));
|
||||
foreach (var detail in details)
|
||||
{
|
||||
detail.Status = TaskStatusEnum.待下发;
|
||||
detail.UpdateTime = DateTime.Now;
|
||||
}
|
||||
|
||||
plcTask.Status = TaskStatusEnum.待下发;
|
||||
_unitwork.Update(plcTask);
|
||||
}
|
||||
plrTask.Status = TaskStatusEnum.待下发;
|
||||
_unitwork.Update(plrTask);
|
||||
}
|
||||
}
|
||||
else if (task.Station == "2")
|
||||
|
||||
@ -5,7 +5,8 @@
|
||||
<wt:row items-per-row="ItemsPerRowEnum.Three">
|
||||
<wt:combobox field="Searcher.ZoneCode" items="ZoneCodes" />
|
||||
<wt:textbox field="Searcher.Code" />
|
||||
@* <wt:combobox field="Searcher.Type" items="Types" />
|
||||
<wt:combobox field="Searcher.Type" items="Types" />
|
||||
@*
|
||||
<wt:combobox field="Searcher.Status" items="LocationStatus" />
|
||||
<wt:textbox field="Searcher.Row" />
|
||||
<wt:textbox field="Searcher.Line" />
|
||||
|
||||
@ -122,7 +122,7 @@ namespace HHWMS.Web
|
||||
.CheckContain(Searcher.Lot, x => x.Lot)
|
||||
.CheckContain(Searcher.SourceCode, x => x.SourceCode)
|
||||
.CheckContain(Searcher.ReceiptCode, x => x.ReceiptCode)
|
||||
.CheckContain(Searcher.Status, x => x.Status)
|
||||
.CheckContain(Searcher.TaskStatus, x => x.TaskStatus)
|
||||
.Select(x => new Inventory_View
|
||||
{
|
||||
ID = x.ID,
|
||||
|
||||
@ -14,8 +14,13 @@ namespace HHWMS.Web
|
||||
{
|
||||
[Display(Name = "Task.ZoneCode")]
|
||||
public String ZoneCode { get; set; }
|
||||
[Display(Name = "Inventory.LocationCode")]
|
||||
|
||||
[Display(Name = "Container.LocationCode")]
|
||||
public String LocationCode { get; set; }
|
||||
|
||||
[Display(Name = "Inventory.TaskStatus", Description = "任务状态")]
|
||||
public string TaskStatus { get; set; }
|
||||
|
||||
[Display(Name = "Inventory.UniqueCode")]
|
||||
public String UniqueCode { get; set; }
|
||||
[Display(Name = "Inventory.MaterialCode")]
|
||||
|
||||
@ -6,7 +6,9 @@
|
||||
<wt:combobox field="Searcher.ZoneCode" items="ZoneCodes" />
|
||||
<wt:textbox field="Searcher.UniqueCode" />
|
||||
<wt:textbox field="Searcher.MaterialCode" />
|
||||
<wt:textbox field="Searcher.Batch" />
|
||||
<wt:textbox field="Searcher.Batch" />
|
||||
<wt:combobox field="Searcher.TaskStatus" items="InventoryTaskStatus" />
|
||||
<wt:textbox field="Searcher.LocationCode" />
|
||||
@*<wt:textbox field="Searcher.MaterialType" />
|
||||
<wt:textbox field="Searcher.MaterialName" />
|
||||
<wt:textbox field="Searcher.MaterialSpec" />
|
||||
@ -15,7 +17,7 @@
|
||||
<wt:textbox field="Searcher.Lot" />
|
||||
<wt:textbox field="Searcher.SourceCode" />
|
||||
<wt:textbox field="Searcher.ReceiptCode" />
|
||||
<wt:textbox field="Searcher.Status" /> *@
|
||||
*@
|
||||
</wt:row>
|
||||
</wt:searchpanel>
|
||||
<wt:grid vm="@Model" url="/inventory/Inventory/Search"/>
|
||||
|
||||
@ -72,9 +72,9 @@ 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));
|
||||
@ -107,12 +107,12 @@ namespace HHWMS.Web
|
||||
_unitwork.Update(begin);
|
||||
_unitwork.Update(end);
|
||||
}
|
||||
else
|
||||
{
|
||||
task.ErrorMsg += $",任务下发失败,失败原因:{res.Msg}";
|
||||
_unitwork.Update(task);
|
||||
continue;
|
||||
}
|
||||
// else
|
||||
// {
|
||||
// task.ErrorMsg += $",任务下发失败,失败原因:{res.Msg}";
|
||||
// _unitwork.Update(task);
|
||||
// continue;
|
||||
// }
|
||||
//Task.Delay(500);
|
||||
}
|
||||
catch (Exception ex)
|
||||
|
||||
@ -39,12 +39,14 @@ namespace HHWMS.Web
|
||||
{
|
||||
foreach (var shipment in Shipments)
|
||||
{
|
||||
var shipmentDetails = shipment.ShipmentDetails.Where(x => x.Status.Equals(ShipStatusEnum.新建)).ToList();
|
||||
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.无任务
|
||||
&& x.ZoneCode != ZoneCodeEnum.货架库).ToList();
|
||||
var inventorys = _unitwork.Find<Inventory>(x =>
|
||||
x.UniqueCode == shipmentDetail.UniqueCode
|
||||
&& x.TaskStatus == InventoryTaskStatus.无任务
|
||||
&& x.ZoneCode != ZoneCodeEnum.货架库).ToList();
|
||||
if (inventorys.Count <= 0)
|
||||
{
|
||||
continue;
|
||||
@ -62,6 +64,7 @@ namespace HHWMS.Web
|
||||
|
||||
shipmentDetail.Status = ShipStatusEnum.分配完成;
|
||||
}
|
||||
|
||||
shipmentDetail.UpdateTime = DateTime.Now;
|
||||
shipmentDetail.UpdateBy = "wmsjob";
|
||||
}
|
||||
@ -81,18 +84,18 @@ namespace HHWMS.Web
|
||||
}
|
||||
|
||||
var inTaskContainerList = _unitwork.Find<TaskHeader>(x => x.TaskType == TaskTypeEnum.盘料盒入库
|
||||
|| x.TaskType == TaskTypeEnum.盘料入库
|
||||
|| 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();
|
||||
&& !"L01,L02".Contains(x.LocationCode)
|
||||
&& !inTaskContainerList.Contains(x.LocationCode))
|
||||
.ToList();
|
||||
shiInventorys.AddRange(lockInvs);
|
||||
//已生成任务的库存不再生成任务
|
||||
var taskUniques = _unitwork.Find<TaskDetail>(x => x.Status > TaskStatusEnum.新建)
|
||||
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();
|
||||
@ -100,19 +103,29 @@ namespace HHWMS.Web
|
||||
var inventoryList = newList.GroupBy(x => x.ContainerCode)
|
||||
.ToList();
|
||||
|
||||
// 堆垛机工位点
|
||||
var gLocDict = new Dictionary<int, dynamic>();
|
||||
gLocDict.Add(1, new { Row = 1, GLoc = "L01-01-34-02", TLoc = "L01-02" });
|
||||
gLocDict.Add(2, new { Row = 3, GLoc = "L01-02-34-02", TLoc = "L01-01" });
|
||||
|
||||
//散料库
|
||||
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();
|
||||
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();
|
||||
var station = _unitwork.Find<Location>(x =>
|
||||
x.Row == location.Row && x.Type == LocationTypeEnum.散料库站台 &&
|
||||
string.IsNullOrWhiteSpace(x.ContainerCode)).FirstOrDefault();
|
||||
if (station == null)
|
||||
{
|
||||
continue;
|
||||
@ -121,7 +134,8 @@ namespace HHWMS.Web
|
||||
{
|
||||
//判断是否已经有目的站台的出库任务
|
||||
TaskHeader taskHeader = _unitwork.Find<TaskHeader>(x =>
|
||||
x.ToLocation == station.Code && x.TaskType == TaskTypeEnum.散料盒出库).FirstOrDefault();
|
||||
x.ToLocation == station.Code && x.TaskType == TaskTypeEnum.散料盒出库)
|
||||
.FirstOrDefault();
|
||||
if (taskHeader != null)
|
||||
{
|
||||
continue;
|
||||
@ -148,11 +162,157 @@ namespace HHWMS.Web
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//盘料库
|
||||
if (inventoryList.Any(x => x.Key.Contains("L")))
|
||||
{
|
||||
foreach (var item in inventoryList.Where(x => x.Key.Contains("L")))
|
||||
{
|
||||
#region new task flow
|
||||
|
||||
//判断是否存在此托盘入库任务
|
||||
// 存在 跳过
|
||||
if (_unitwork.IsExit<TaskHeader>(x =>
|
||||
x.ContainerCode.Equals(item.Key)
|
||||
&& (x.TaskType == TaskTypeEnum.盘料入库
|
||||
|| x.TaskType == TaskTypeEnum.盘料盒入库)))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
// 不用判断是否存在出库任务,可创建多个相同容器的盘料出库任务,存在盘料盒出库也无所谓
|
||||
|
||||
// 根据库存的库位信息,查找盘料出库的起点站台 堆垛机工位
|
||||
var invLoc = _unitwork.FindSingle<Location>(x => x.Code == item.Key);
|
||||
|
||||
var taskHeader = new TaskHeader();
|
||||
taskHeader.TaskDetails = new List<TaskDetail>();
|
||||
|
||||
taskHeader.ZoneCode = ZoneCodeEnum.盘料库;
|
||||
taskHeader.TaskNo = _unitwork.GetSerialNumber("pout", 4);
|
||||
taskHeader.TaskType = TaskTypeEnum.盘料出库;
|
||||
taskHeader.Status = TaskStatusEnum.新建;
|
||||
taskHeader.ContainerCode = item.Key;
|
||||
taskHeader.Priority = 100;
|
||||
taskHeader.FromLocation = gLocDict.First(x => x.Value.Row == invLoc.Row).Value.TLoc;
|
||||
taskHeader.ToLocation = item.First().Flag == 8 ? "L01" : "L02";
|
||||
taskHeader.CreateTime = DateTime.Now;
|
||||
taskHeader.CreateBy = "wmsjob";
|
||||
|
||||
// 创建任务明细
|
||||
foreach (var inventory in item)
|
||||
{
|
||||
if (!taskHeader.TaskDetails.Any(x => x.UniqueCode.Equals(inventory.UniqueCode)))
|
||||
taskHeader.TaskDetails.Add(new TaskDetail
|
||||
{
|
||||
UniqueCode = inventory.UniqueCode,
|
||||
Lot = $"{Convert.ToInt32(invLoc.Length)}-{taskHeader.ToLocation}",
|
||||
FromLocation = inventory.Lot,
|
||||
ToLocation = "",
|
||||
Status = TaskStatusEnum.新建,
|
||||
ContainerCode = inventory.ContainerCode,
|
||||
CreateTime = DateTime.Now
|
||||
});
|
||||
}
|
||||
|
||||
_unitwork.Add(taskHeader);
|
||||
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
|
||||
// 根据盘料出库,生成盘料盒出库任务,并更新盘料出库明细的 出库库位
|
||||
var plcTaskList = _unitwork.Find<TaskHeader>(x =>
|
||||
x.TaskType == TaskTypeEnum.盘料出库
|
||||
&& x.Status == TaskStatusEnum.新建)
|
||||
.Include(x => x.TaskDetails)
|
||||
.ToList();
|
||||
|
||||
// 查询当前工位的状态
|
||||
var workLocList = _unitwork.Find<Location>(x =>
|
||||
"L01,L02,L01-01-34-02,L01-02-34-02".Contains(x.Code)
|
||||
).ToList();
|
||||
|
||||
|
||||
foreach (var plcTask in plcTaskList)
|
||||
{
|
||||
|
||||
var lLoc = workLocList.First(x => x.Code.Equals(plcTask.ToLocation));
|
||||
var container = _unitwork.FindSingle<Location>(x => x.Code.Equals(plcTask.ContainerCode));
|
||||
|
||||
// 判断是否已存在盘料盒出库任务,或者盘料盒已在堆垛机工位 L01-34-02/L02-34-02
|
||||
var isOut = workLocList.Any(x => x.ContainerCode.Equals(plcTask.ContainerCode));
|
||||
string toLocCode = gLocDict.First(x => x.Value.Row == container.Row).Value.GLoc;
|
||||
|
||||
// 存在去相同工位点的 盘料盒出库任务 跳过(保持一个工位只有一条盘料盒出库任务)
|
||||
// 工位有货 也跳过
|
||||
var c1 = _unitwork.IsExit<TaskHeader>(x =>
|
||||
x.TaskType == TaskTypeEnum.盘料盒出库
|
||||
&& x.ContainerCode != plcTask.ContainerCode
|
||||
&& x.ToLocation == toLocCode);
|
||||
var c2 = workLocList.Any(x => x.Code == toLocCode
|
||||
&& !string.IsNullOrWhiteSpace(x.ContainerCode)
|
||||
&& !x.ContainerCode.Equals(plcTask.ContainerCode));
|
||||
if(c1 || c2)
|
||||
continue;
|
||||
|
||||
if (!plcTask.TaskDetails.Any(x =>
|
||||
x.Status == TaskStatusEnum.新建 && string.IsNullOrWhiteSpace(x.ToLocation))) continue;
|
||||
|
||||
if (_unitwork.IsExit<TaskHeader>(x =>
|
||||
x.ContainerCode.Equals(plcTask.ContainerCode)
|
||||
&& x.TaskType == TaskTypeEnum.盘料盒出库)
|
||||
||
|
||||
isOut
|
||||
)
|
||||
{
|
||||
// 更新任务明细的 location ,status一般在盘料盒出库完成后更新为 待下发
|
||||
// 1. 计算周转箱可用层数
|
||||
var canUse = CalCanUse(Convert.ToInt32(lLoc.Length), plcTask.ToLocation, _unitwork);
|
||||
foreach (var detail in plcTask.TaskDetails.Where(x => x.Status == TaskStatusEnum.新建
|
||||
&& string.IsNullOrWhiteSpace(x.ToLocation)))
|
||||
{
|
||||
if (canUse.Length > 0)
|
||||
{
|
||||
// 2.更新目标库位
|
||||
detail.ToLocation = canUse.First().ToString();
|
||||
detail.UpdateTime = DateTime.Now;
|
||||
|
||||
canUse = canUse.Where(x => x != canUse.First()).ToArray();
|
||||
}
|
||||
else
|
||||
{
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
_unitwork.Update(plcTask);
|
||||
}
|
||||
else if (!isOut && !_unitwork.IsExit<TaskHeader>(x =>
|
||||
x.ToLocation.Equals(toLocCode)))
|
||||
{
|
||||
// 不存在盘料盒出库任务,创建盘料盒出库任务
|
||||
// 判断堆垛机工位是否有货,并且没有其他去该工位的盘料盒出库
|
||||
|
||||
var pTask = new TaskHeader
|
||||
{
|
||||
ZoneCode = ZoneCodeEnum.盘料库,
|
||||
TaskNo = _unitwork.GetSerialNumber("Out"),
|
||||
TaskType = TaskTypeEnum.盘料盒出库,
|
||||
ContainerCode = plcTask.ContainerCode,
|
||||
FromLocation = plcTask.ContainerCode,
|
||||
ToLocation = toLocCode,
|
||||
Station = "1",
|
||||
Status = TaskStatusEnum.待下发,
|
||||
Priority = 0,
|
||||
CreateTime = DateTime.Now,
|
||||
CreateBy = "wmsjob"
|
||||
};
|
||||
_unitwork.Add(pTask);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
/*
|
||||
var task = new TaskHeader();
|
||||
task.TaskDetails = new List<TaskDetail>();
|
||||
var inv = item.FirstOrDefault();
|
||||
@ -364,6 +524,7 @@ namespace HHWMS.Web
|
||||
}
|
||||
}
|
||||
}
|
||||
*/
|
||||
tran.Commit();
|
||||
}
|
||||
catch
|
||||
@ -377,19 +538,26 @@ namespace HHWMS.Web
|
||||
var job = _unitwork.FindSingle<SysJob>(x => x.JobName == context.JobDetail.Key.Name);
|
||||
if (job != null)
|
||||
{
|
||||
job.LastFireTime = TimeZoneInfo.ConvertTimeFromUtc(context.FireTimeUtc.DateTime, TimeZoneInfo.Local);
|
||||
job.LastFireTime =
|
||||
TimeZoneInfo.ConvertTimeFromUtc(context.FireTimeUtc.DateTime, TimeZoneInfo.Local);
|
||||
// 只执行一次 没有下次执行时间
|
||||
if (context.NextFireTimeUtc != null)
|
||||
{
|
||||
job.NextFireTime = TimeZoneInfo.ConvertTimeFromUtc(context.NextFireTimeUtc.Value.DateTime, TimeZoneInfo.Local);
|
||||
job.NextFireTime = TimeZoneInfo.ConvertTimeFromUtc(context.NextFireTimeUtc.Value.DateTime,
|
||||
TimeZoneInfo.Local);
|
||||
}
|
||||
|
||||
_unitwork.Update<SysJob>(job);
|
||||
}
|
||||
|
||||
Wtm.DoLog("出库分解", ActionLogTypesEnum.Job, "SendWmsJob");
|
||||
|
||||
#endregion 更新时间
|
||||
}
|
||||
catch { }
|
||||
catch(Exception ex)
|
||||
{
|
||||
Wtm.DoLog("出库分解", ActionLogTypesEnum.Job, "SendWmsJob", result:ex.Message);
|
||||
}
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
@ -573,7 +741,8 @@ namespace HHWMS.Web
|
||||
{
|
||||
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))
|
||||
var used2 = _unitwork.Find<TaskDetail>(x => x.Lot.Contains(code)
|
||||
&& !string.IsNullOrWhiteSpace(x.ToLocation))
|
||||
.Select(x => int.Parse(x.ToLocation)).ToArray();
|
||||
var used = used1.Union(used2);
|
||||
var caseList = Enumerable.Range(1, length).ToArray();
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
<wt:searchpanel vm="@Model" reset-btn="true">
|
||||
<wt:row items-per-row="ItemsPerRowEnum.Three">
|
||||
<wt:combobox field="Searcher.TaskHeaderId" items="Searcher.AllTaskHeaders" empty-text="@Localizer["Sys.All"]" />
|
||||
@* <wt:combobox field="Searcher.TaskHeaderId" items="Searcher.AllTaskHeaders" empty-text="@Localizer["Sys.All"]" /> *@
|
||||
<wt:textbox field="Searcher.UniqueCode" />
|
||||
<wt:textbox field="Searcher.ContainerCode" />
|
||||
<wt:textbox field="Searcher.FromLocation" />
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user